summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-24 14:30:23 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-24 14:30:23 -0600
commit30c6cf311507c9bf7eeb706ea8948c5c81aa1404 (patch)
tree92c025f23d7666581db15bdb901ad34bcf7a58c7
parente621be81bb814466886544a9a6d9a328c24d88f7 (diff)
downloadtdeio-locate-30c6cf311507c9bf7eeb706ea8948c5c81aa1404.tar.gz
tdeio-locate-30c6cf311507c9bf7eeb706ea8948c5c81aa1404.zip
Fix FTBFS
-rw-r--r--src/CMakeLists.txt5
-rw-r--r--src/kio_locate.cpp6
-rw-r--r--src/locater.cpp4
3 files changed, 8 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6677503..9ebb1d6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,9 +11,10 @@
include_directories(
${TQT_INCLUDE_DIRS}
+ ${TDE_INCLUDE_DIR}
${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/tdecore
- ${CMAKE_SOURCE_DIR}/tdecore
+ ${CMAKE_BINARY_DIR}/src
+ ${CMAKE_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/kio/kio
)
diff --git a/src/kio_locate.cpp b/src/kio_locate.cpp
index d213ded..3530af9 100644
--- a/src/kio_locate.cpp
+++ b/src/kio_locate.cpp
@@ -226,7 +226,7 @@ static const UDSEntry pathToUDSEntry(const TQString& path, const TQString& displ
if (S_ISLNK(type)) {
TQString slink = TQString();
char buff[1000];
- int n = readlink(path, buff, 1000);
+ int n = readlink(path.ascii(), buff, 1000);
if (n != -1) {
buff[n] = 0;
slink = buff;
@@ -610,7 +610,7 @@ void LocateProtocol::processLocateOutput(const TQStringList& items)
}
// Go through what we have found.
TQStringList::ConstIterator it = items.begin();
- if (m_pendingPath) {
+ if (!m_pendingPath.isNull()) {
processPath(m_pendingPath, *it);
m_pendingPath = TQString();
}
@@ -625,7 +625,7 @@ void LocateProtocol::processLocateOutput(const TQStringList& items)
void LocateProtocol::locateFinished()
{
// Add any pending items.
- if (m_pendingPath) {
+ if (!m_pendingPath.isNull()) {
processPath(m_pendingPath, "");
m_pendingPath = TQString();
}
diff --git a/src/locater.cpp b/src/locater.cpp
index 120ec99..a160673 100644
--- a/src/locater.cpp
+++ b/src/locater.cpp
@@ -57,9 +57,9 @@ void Locater::setupLocate(const TQString& binary, const TQString& additionalArgu
// Automatically choose the correct binary if not specified.
if (binary.isEmpty()) {
- if (KStandardDirs::findExe("slocate")) {
+ if (!KStandardDirs::findExe("slocate").isNull()) {
m_binary = "slocate";
- } else if (KStandardDirs::findExe("rlocate")) {
+ } else if (!KStandardDirs::findExe("rlocate").isNull()) {
m_binary = "rlocate";
} else {
m_binary = "locate";