diff options
Diffstat (limited to 'tdecore/tdesycoca.cpp')
| -rw-r--r-- | tdecore/tdesycoca.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tdecore/tdesycoca.cpp b/tdecore/tdesycoca.cpp index a11175117..80764faec 100644 --- a/tdecore/tdesycoca.cpp +++ b/tdecore/tdesycoca.cpp @@ -30,8 +30,8 @@ #include <dcopclient.h> #include <tdeglobal.h> #include <kdebug.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <assert.h> #include <stdlib.h> @@ -42,7 +42,7 @@ #include <sys/mman.h> #endif -#ifdef Q_OS_SOLARIS +#if defined(Q_OS_SOLARIS) && !defined(__dilos__) extern "C" { extern int madvise(caddr_t, size_t, int); @@ -92,9 +92,9 @@ KSycoca::KSycoca() { d = new KSycocaPrivate; // Register app as able to receive DCOP messages - if (kapp && !kapp->dcopClient()->isAttached()) + if (tdeApp && !tdeApp->dcopClient()->isAttached()) { - kapp->dcopClient()->attach(); + tdeApp->dcopClient()->attach(); } // We register with DCOP _before_ we try to open the database. // This way we can be relative sure that the KDE framework is @@ -228,7 +228,7 @@ KSycoca::~KSycoca() void KSycoca::closeDatabase() { - QIODevice *device = 0; + TQIODevice *device = 0; if (m_str) device = m_str->device(); #ifdef HAVE_MMAP @@ -246,7 +246,7 @@ void KSycoca::closeDatabase() delete m_str; m_str = 0; delete device; - if (TQT_TQIODEVICE(d->database) != device) + if (d->database != device) delete d->database; if (m_barray) delete m_barray; m_barray = 0; |