pull/1/head
Timothy Pearson 13 years ago
parent e621be81bb
commit 30c6cf3115

@ -11,9 +11,10 @@
include_directories( include_directories(
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
${TDE_INCLUDE_DIR}
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/tdecore ${CMAKE_BINARY_DIR}/src
${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/kio/kio ${CMAKE_SOURCE_DIR}/kio/kio
) )

@ -226,7 +226,7 @@ static const UDSEntry pathToUDSEntry(const TQString& path, const TQString& displ
if (S_ISLNK(type)) { if (S_ISLNK(type)) {
TQString slink = TQString(); TQString slink = TQString();
char buff[1000]; char buff[1000];
int n = readlink(path, buff, 1000); int n = readlink(path.ascii(), buff, 1000);
if (n != -1) { if (n != -1) {
buff[n] = 0; buff[n] = 0;
slink = buff; slink = buff;
@ -610,7 +610,7 @@ void LocateProtocol::processLocateOutput(const TQStringList& items)
} }
// Go through what we have found. // Go through what we have found.
TQStringList::ConstIterator it = items.begin(); TQStringList::ConstIterator it = items.begin();
if (m_pendingPath) { if (!m_pendingPath.isNull()) {
processPath(m_pendingPath, *it); processPath(m_pendingPath, *it);
m_pendingPath = TQString(); m_pendingPath = TQString();
} }
@ -625,7 +625,7 @@ void LocateProtocol::processLocateOutput(const TQStringList& items)
void LocateProtocol::locateFinished() void LocateProtocol::locateFinished()
{ {
// Add any pending items. // Add any pending items.
if (m_pendingPath) { if (!m_pendingPath.isNull()) {
processPath(m_pendingPath, ""); processPath(m_pendingPath, "");
m_pendingPath = TQString(); m_pendingPath = TQString();
} }

@ -57,9 +57,9 @@ void Locater::setupLocate(const TQString& binary, const TQString& additionalArgu
// Automatically choose the correct binary if not specified. // Automatically choose the correct binary if not specified.
if (binary.isEmpty()) { if (binary.isEmpty()) {
if (KStandardDirs::findExe("slocate")) { if (!KStandardDirs::findExe("slocate").isNull()) {
m_binary = "slocate"; m_binary = "slocate";
} else if (KStandardDirs::findExe("rlocate")) { } else if (!KStandardDirs::findExe("rlocate").isNull()) {
m_binary = "rlocate"; m_binary = "rlocate";
} else { } else {
m_binary = "locate"; m_binary = "locate";

Loading…
Cancel
Save