diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:04:58 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:04:58 -0600 |
| commit | b10a61b1fd2fe561ba61a384d4a344bae2a4aa29 (patch) | |
| tree | 99dc6b2584265b2df91f7dbc1dcbf7a54efd205e /kopete/plugins/motionautoaway | |
| parent | 64c3be47ff36e40035ead93f913aeeb1e4f85e4b (diff) | |
| download | tdenetwork-b10a61b1fd2fe561ba61a384d4a344bae2a4aa29.tar.gz tdenetwork-b10a61b1fd2fe561ba61a384d4a344bae2a4aa29.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kopete/plugins/motionautoaway')
| -rw-r--r-- | kopete/plugins/motionautoaway/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kopete/plugins/motionautoaway/Makefile.am | 2 | ||||
| -rw-r--r-- | kopete/plugins/motionautoaway/motionawayplugin.cpp | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/kopete/plugins/motionautoaway/CMakeLists.txt b/kopete/plugins/motionautoaway/CMakeLists.txt index 650766ef..a484ec5e 100644 --- a/kopete/plugins/motionautoaway/CMakeLists.txt +++ b/kopete/plugins/motionautoaway/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( ##### other data ################################ install( FILES kopete_motionaway.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kopete_motionaway_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) +install( FILES kopete_motionaway_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) install( FILES motionawayconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) diff --git a/kopete/plugins/motionautoaway/Makefile.am b/kopete/plugins/motionautoaway/Makefile.am index ff2c5bd8..8f8bbaa3 100644 --- a/kopete/plugins/motionautoaway/Makefile.am +++ b/kopete/plugins/motionautoaway/Makefile.am @@ -18,7 +18,7 @@ service_DATA = kopete_motionaway.desktop servicedir = $(kde_servicesdir) kcm_DATA = kopete_motionaway_config.desktop -kcmdir = $(kde_servicesdir)/kconfiguredialog +kcmdir = $(kde_servicesdir)/tdeconfiguredialog kde_kcfg_DATA = motionawayconfig.kcfg diff --git a/kopete/plugins/motionautoaway/motionawayplugin.cpp b/kopete/plugins/motionautoaway/motionawayplugin.cpp index ea4bf2bc..56aed0ff 100644 --- a/kopete/plugins/motionautoaway/motionawayplugin.cpp +++ b/kopete/plugins/motionautoaway/motionawayplugin.cpp @@ -38,7 +38,7 @@ #include <tqtimer.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kgenericfactory.h> @@ -159,12 +159,12 @@ MotionAwayPlugin::~MotionAwayPlugin() } void MotionAwayPlugin::loadSettings(){ - TDEConfig *kconfig = TDEGlobal::config(); - kconfig->setGroup("MotionAway Plugin"); + TDEConfig *tdeconfig = TDEGlobal::config(); + tdeconfig->setGroup("MotionAway Plugin"); - awayTimeout = kconfig->readNumEntry("AwayTimeout", 1); - becomeAvailableWithActivity = kconfig->readBoolEntry("BecomeAvailableWithActivity", true); - videoDevice = kconfig->readEntry("VideoDevice", "/dev/video0"); + awayTimeout = tdeconfig->readNumEntry("AwayTimeout", 1); + becomeAvailableWithActivity = tdeconfig->readBoolEntry("BecomeAvailableWithActivity", true); + videoDevice = tdeconfig->readEntry("VideoDevice", "/dev/video0"); m_awayTimer->changeInterval(awayTimeout * 60 * 1000); } |