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

(limited to 'kopete/plugins/texteffect')

diff --git a/kopete/plugins/texteffect/CMakeLists.txt b/kopete/plugins/texteffect/CMakeLists.txt
index e88a0e34..c56f73ad 100644
--- a/kopete/plugins/texteffect/CMakeLists.txt
+++ b/kopete/plugins/texteffect/CMakeLists.txt
@@ -28,7 +28,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_texteffect.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_texteffect_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_texteffect_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kopete_texteffect (module) ################
diff --git a/kopete/plugins/texteffect/Makefile.am b/kopete/plugins/texteffect/Makefile.am
index ee008e27..7f721dee 100644
--- a/kopete/plugins/texteffect/Makefile.am
+++ b/kopete/plugins/texteffect/Makefile.am
@@ -17,4 +17,4 @@ service_DATA = kopete_texteffect.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_texteffect_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
diff --git a/kopete/plugins/texteffect/texteffectconfig.cpp b/kopete/plugins/texteffect/texteffectconfig.cpp
index b1e2417c..a411b363 100644
--- a/kopete/plugins/texteffect/texteffectconfig.cpp
+++ b/kopete/plugins/texteffect/texteffectconfig.cpp
@@ -19,7 +19,7 @@
 #include <tqstring.h>
 
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "texteffectconfig.h"
 
-- 
cgit v1.2.1