From b10a61b1fd2fe561ba61a384d4a344bae2a4aa29 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:04:58 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kopete/plugins/motionautoaway/CMakeLists.txt       |  2 +-
 kopete/plugins/motionautoaway/Makefile.am          |  2 +-
 kopete/plugins/motionautoaway/motionawayplugin.cpp | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'kopete/plugins/motionautoaway')

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);
 }
 
-- 
cgit v1.2.1