diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2014-02-04 02:46:39 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-02-04 02:46:39 +0100 |
| commit | 1f3832a1368de214e95a38dd391367f8ae2456cb (patch) | |
| tree | ac2c0e68c7a1393b124528054bd11df69e32381b /ksmserver | |
| parent | 6275375b6aa17c6da78ab6486a8c930e9fd595f5 (diff) | |
| download | tdebase-1f3832a1368de214e95a38dd391367f8ae2456cb.tar.gz tdebase-1f3832a1368de214e95a38dd391367f8ae2456cb.zip | |
Removed unnecessary dependency on dbus-tqt and dbus-1-tqt
Diffstat (limited to 'ksmserver')
| -rw-r--r-- | ksmserver/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ksmserver/shutdowndlg.h | 13 |
2 files changed, 3 insertions, 14 deletions
diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt index dc197e1f8..fdd521b90 100644 --- a/ksmserver/CMakeLists.txt +++ b/ksmserver/CMakeLists.txt @@ -23,14 +23,12 @@ include_directories( ${CMAKE_SOURCE_DIR}/tdmlib ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} - ${DBUS_1_TQT_INCLUDE_DIRS} ${DBUS_TQT_INCLUDE_DIRS} ${HAL_INCLUDE_DIRS} ) link_directories( ${TQT_LIBRARY_DIRS} - ${DBUS_1_TQT_LIBRARY_DIRS} ${DBUS_TQT_LIBRARY_DIRS} ) @@ -50,5 +48,5 @@ tde_add_tdeinit_executable( ksmserver AUTOMOC main.cpp server.cpp shutdowndlg.cpp startupdlg.cpp legacy.cpp startup.cpp shutdown.cpp client.cpp KSMServerInterface.skel server.skel timed.ui - LINK dmctl-static tdeui-shared tdersync-shared ${HAL_LIBRARIES} ${DBUS_1_TQT_LIBRARIES} ${DBUS_TQT_LIBRARIES} + LINK dmctl-static tdeui-shared tdersync-shared ${HAL_LIBRARIES} ${DBUS_TQT_LIBRARIES} ) diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h index d8f6b9d3b..a3864e616 100644 --- a/ksmserver/shutdowndlg.h +++ b/ksmserver/shutdowndlg.h @@ -34,20 +34,15 @@ class TDEAction; #include <config.h> -#ifdef WITH_UPOWER - #include <tqdbusconnection.h> -#else - #warning test +#ifdef COMPILE_HALBACKEND #ifndef NO_QT3_DBUS_SUPPORT /* We acknowledge the the dbus API is unstable */ #define DBUS_API_SUBJECT_TO_CHANGE #include <dbus/connection.h> #endif // NO_QT3_DBUS_SUPPORT - #ifdef COMPILE_HALBACKEND #include <hal/libhal.h> - #endif -#endif // WITH_UPOWER +#endif // COMPILE_HALBACKEND // The (singleton) widget that makes/fades the desktop gray. class KSMShutdownFeedback : public TQWidget @@ -153,14 +148,10 @@ private: TQString m_bootOption; TQPopupMenu *targets; TQStringList rebootOptions; -#ifdef WITH_UPOWER - TQT_DBusConnection m_dbusConn; -#else #ifdef COMPILE_HALBACKEND LibHalContext* m_halCtx; DBusConnection *m_dbusConn; #endif -#endif // WITH_UPOWER bool m_lockOnResume; int* m_selection; }; |