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/smpppdcs/CMakeLists.txt     | 2 +-
 kopete/plugins/smpppdcs/Makefile.am        | 2 +-
 kopete/plugins/smpppdcs/detectorsmpppd.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kopete/plugins/smpppdcs')

diff --git a/kopete/plugins/smpppdcs/CMakeLists.txt b/kopete/plugins/smpppdcs/CMakeLists.txt
index cac131f9..ac985dd2 100644
--- a/kopete/plugins/smpppdcs/CMakeLists.txt
+++ b/kopete/plugins/smpppdcs/CMakeLists.txt
@@ -31,7 +31,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_smpppdcs.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_smpppdcs_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_smpppdcs_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 install( FILES smpppdcs.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 
 
diff --git a/kopete/plugins/smpppdcs/Makefile.am b/kopete/plugins/smpppdcs/Makefile.am
index 11173ac6..fe8792fc 100644
--- a/kopete/plugins/smpppdcs/Makefile.am
+++ b/kopete/plugins/smpppdcs/Makefile.am
@@ -26,7 +26,7 @@ service_DATA = kopete_smpppdcs.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_smpppdcs_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
 
 kde_kcfg_DATA = smpppdcs.kcfg
 
diff --git a/kopete/plugins/smpppdcs/detectorsmpppd.cpp b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
index 772090d9..b6f6fc30 100644
--- a/kopete/plugins/smpppdcs/detectorsmpppd.cpp
+++ b/kopete/plugins/smpppdcs/detectorsmpppd.cpp
@@ -16,7 +16,7 @@
 
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 #include "iconnector.h"
-- 
cgit v1.2.1