diff options
| author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2012-07-26 07:43:27 (GMT) |
|---|---|---|
| committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2012-07-26 07:43:27 (GMT) |
| commit | d099501f5c186173dbf0580362116fb6df11a701 (patch) | |
| tree | badda91ce0a30405174283f88cb88684a3895fe8 | |
| parent | 6434359cb37b42766891d937867b5f198098fbfd (diff) | |
| download | libcalendaring-d099501f5c186173dbf0580362116fb6df11a701.tar.gz | |
removed another dbus dependency
| -rw-r--r-- | kdecore/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kdecore/io/kdebug.cpp | 17 |
2 files changed, 15 insertions, 4 deletions
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt index af002f2..d273636 100644 --- a/kdecore/CMakeLists.txt +++ b/kdecore/CMakeLists.txt @@ -264,7 +264,7 @@ set(kdecore_LIB_SRCS # io/karchive.cpp # io/kautosavefile.cpp io/kdebug.cpp - io/kdebugdbusiface.cpp +# io/kdebugdbusiface.cpp # io/kdirwatch.cpp io/kfilesystemtype_p.cpp # io/klimitediodevice.cpp diff --git a/kdecore/io/kdebug.cpp b/kdecore/io/kdebug.cpp index 7526904..da2ce2a 100644 --- a/kdecore/io/kdebug.cpp +++ b/kdecore/io/kdebug.cpp @@ -100,8 +100,10 @@ #include <cxxabi.h> #endif #endif - +#define KDE_NO_DBUS +#ifndef KDE_NO_DBUS #include "kdebugdbusiface_p.h" +#endif #include <QMutex> @@ -217,7 +219,11 @@ struct KDebugPrivate typedef QHash<unsigned int, Area> Cache; KDebugPrivate() - : config(0), kDebugDBusIface(0), m_disableAll(false), m_seenMainComponent(false) + : config(0), +#ifndef KDE_NO_DBUS + kDebugDBusIface(0), +#endif + m_disableAll(false), m_seenMainComponent(false) { Q_ASSERT(int(QtDebugMsg) == 0); Q_ASSERT(int(QtFatalMsg) == 3); @@ -234,10 +240,11 @@ struct KDebugPrivate // // Solution: we have a bool that is set by KApplication // (kioslaves should use QCoreApplication but not KApplication). +#ifndef KDE_NO_DBUS if (kde_kdebug_enable_dbus_interface) { kDebugDBusIface = new KDebugDBusIface; } - +#endif for (int i = 0; i < 8; i++) { m_nullOutputYesNoCache[i] = -1; } @@ -247,7 +254,9 @@ struct KDebugPrivate ~KDebugPrivate() { delete config; +#ifndef KDE_NO_DBUS delete kDebugDBusIface; +#endif } void loadAreaNames() @@ -685,7 +694,9 @@ struct KDebugPrivate QMutex mutex; KConfig *config; +#ifndef KDE_NO_DBUS KDebugDBusIface *kDebugDBusIface; +#endif Cache cache; bool m_disableAll; bool m_seenMainComponent; // false: area zero still contains qAppName |