diff options
Diffstat (limited to 'kdecore')
| -rw-r--r-- | kdecore/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | kdecore/date/ksystemtimezone.cpp | 2 | ||||
| -rw-r--r-- | kdecore/io/kdebug.cpp | 2 | ||||
| -rw-r--r-- | kdecore/kernel/ktoolinvocation.cpp | 15 |
4 files changed, 18 insertions, 9 deletions
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt index d273636..f543f0e 100644 --- a/kdecore/CMakeLists.txt +++ b/kdecore/CMakeLists.txt @@ -407,7 +407,7 @@ set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS} util/kautostart.cpp util/kdedmodule.cpp util/kdeversion.cpp - util/klauncher_iface.cpp + # util/klauncher_iface.cpp util/klibrary.cpp util/kmacroexpander.cpp util/kpluginfactory.cpp @@ -444,7 +444,9 @@ QT4_AUTOMOC("${kdecore_LIB_SRCS}") add_library(calendaring-kdecore ${LIBRARY_TYPE} ${kdecore_LIB_SRCS}) -target_link_libraries(calendaring-kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARY} ${kdecore_OPTIONAL_LIBS}) +#set(DBUS_LIBRARY ${QT_QTDBUS_LIBRARY}) + +target_link_libraries(calendaring-kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${DBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARY} ${kdecore_OPTIONAL_LIBS}) # if(WINCE) # target_link_libraries(kdecore ${WCECOMPAT_LIBRARIES} Ceshell.lib) @@ -468,7 +470,7 @@ target_link_libraries(calendaring-kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LI # if(APPLE) # set(kdecore_LINK_INTERFACE_LIBRARIES ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} ${CARBON_LIBRARY}) # else(APPLE) - set(kdecore_LINK_INTERFACE_LIBRARIES ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} ) +set(kdecore_LINK_INTERFACE_LIBRARIES ${DBUS_LIBRARY} ${QT_QTCORE_LIBRARY} ) # endif(APPLE) # endif(WIN32) diff --git a/kdecore/date/ksystemtimezone.cpp b/kdecore/date/ksystemtimezone.cpp index 5846fc4..cdb71fb 100644 --- a/kdecore/date/ksystemtimezone.cpp +++ b/kdecore/date/ksystemtimezone.cpp @@ -44,8 +44,6 @@ #include <QtCore/QStringList> #include <QtCore/QTextStream> -#define KDE_NO_TIMEZONED - #ifndef KDE_NO_TIMEZONED #include <QtDBus/QDBusConnection> #include <QtDBus/QDBusInterface> diff --git a/kdecore/io/kdebug.cpp b/kdecore/io/kdebug.cpp index da2ce2a..b29df9f 100644 --- a/kdecore/io/kdebug.cpp +++ b/kdecore/io/kdebug.cpp @@ -100,7 +100,7 @@ #include <cxxabi.h> #endif #endif -#define KDE_NO_DBUS + #ifndef KDE_NO_DBUS #include "kdebugdbusiface_p.h" #endif diff --git a/kdecore/kernel/ktoolinvocation.cpp b/kdecore/kernel/ktoolinvocation.cpp index 560803a..50f4f12 100644 --- a/kdecore/kernel/ktoolinvocation.cpp +++ b/kdecore/kernel/ktoolinvocation.cpp @@ -19,7 +19,9 @@ */ #include "ktoolinvocation.h" +#ifndef KDE_NO_DBUS #include "klauncher_iface.h" +#endif #include "kdebug.h" #include "kglobal.h" #include "kstandarddirs.h" @@ -51,7 +53,7 @@ KToolInvocation::KToolInvocation() : QObject(0), d(0) KToolInvocation::~KToolInvocation() { } - +#ifndef KDE_NO_DBUS Q_GLOBAL_STATIC_WITH_ARGS(org::kde::KLauncher, klauncherIface, (QString::fromLatin1("org.kde.klauncher"), QString::fromLatin1("/KLauncher"), QDBusConnection::sessionBus())) @@ -63,7 +65,7 @@ org::kde::KLauncher *KToolInvocation::klauncher() } return ::klauncherIface(); } - +#endif static void printError(const QString& text, QString* error) { if (error) @@ -89,6 +91,7 @@ int KToolInvocation::startServiceInternal(const char *_function, const QByteArray& startup_id, bool noWait, const QString& workdir) { +#ifndef KDE_NO_DBUS QString function = QLatin1String(_function); org::kde::KLauncher *launcher = KToolInvocation::klauncher(); QDBusMessage msg = QDBusMessage::createMethodCall(launcher->service(), @@ -137,6 +140,9 @@ int KToolInvocation::startServiceInternal(const char *_function, if (pid) *pid = reply.arguments().at(3).toInt(); return reply.arguments().at(0).toInt(); +#else + return 0; +#endif } #ifndef KDE_NO_DEPRECATED @@ -283,7 +289,7 @@ void KToolInvocation::invokeHelp( const QString& anchor, invokeBrowser(url.url()); return; } - +#ifndef KDE_NO_DBUS QDBusInterface *iface = new QDBusInterface(QLatin1String("org.kde.khelpcenter"), QLatin1String("/KHelpCenter"), QLatin1String("org.kde.khelpcenter.khelpcenter"), @@ -314,6 +320,7 @@ void KToolInvocation::invokeHelp( const QString& anchor, iface->call(QString::fromLatin1("openUrl"), url.url(), startup_id ); delete iface; +#endif } void KToolInvocation::invokeMailer(const QString &address, const QString &subject, const QByteArray& startup_id) @@ -369,6 +376,7 @@ void KToolInvocation::invokeMailer(const KUrl &mailtoURL, const QByteArray& star void KToolInvocation::startKdeinit() { +#ifndef KDE_NO_DBUS KComponentData inst( "startkdeinitlock" ); KLockFile lock( KStandardDirs::locateLocal("tmp", QString::fromLatin1("startkdeinitlock"), inst )); if( lock.lock( KLockFile::NoBlockFlag ) != KLockFile::LockOK ) { @@ -391,6 +399,7 @@ void KToolInvocation::startKdeinit() QProcess::execute(srv, args); // if ( gui ) // qApp->restoreOverrideCursor(); +#endif } #include "../../ktoolinvocation.moc" |