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/addbookmarks/CMakeLists.txt                | 2 +-
 kopete/plugins/addbookmarks/Makefile.am                   | 2 +-
 kopete/plugins/addbookmarks/addbookmarksplugin.h          | 2 +-
 kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kopete/plugins/addbookmarks')

diff --git a/kopete/plugins/addbookmarks/CMakeLists.txt b/kopete/plugins/addbookmarks/CMakeLists.txt
index 4d1df111..d7a3b1c8 100644
--- a/kopete/plugins/addbookmarks/CMakeLists.txt
+++ b/kopete/plugins/addbookmarks/CMakeLists.txt
@@ -25,7 +25,7 @@ link_directories(
 ##### other data ################################
 
 install( FILES kopete_addbookmarks.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_addbookmarks_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_addbookmarks_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kopete_addbookmarks (module) ##############
diff --git a/kopete/plugins/addbookmarks/Makefile.am b/kopete/plugins/addbookmarks/Makefile.am
index 1a6d19df..006ed524 100644
--- a/kopete/plugins/addbookmarks/Makefile.am
+++ b/kopete/plugins/addbookmarks/Makefile.am
@@ -19,4 +19,4 @@ service_DATA = kopete_addbookmarks.desktop
 servicedir = $(kde_servicesdir)
 
 kcm_DATA = kopete_addbookmarks_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
diff --git a/kopete/plugins/addbookmarks/addbookmarksplugin.h b/kopete/plugins/addbookmarks/addbookmarksplugin.h
index 32143ff9..4bf10668 100644
--- a/kopete/plugins/addbookmarks/addbookmarksplugin.h
+++ b/kopete/plugins/addbookmarks/addbookmarksplugin.h
@@ -16,7 +16,7 @@
 #include <kgenericfactory.h>
 #include <kopeteplugin.h>
 #include <kbookmarkmanager.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <tqcstring.h>
 #include <tqmap.h>
 
diff --git a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
index 31f12978..8fe0fed1 100644
--- a/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
+++ b/kopete/plugins/addbookmarks/addbookmarksprefssettings.cpp
@@ -10,7 +10,7 @@
 //
 //
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include "addbookmarksprefssettings.h"
-- 
cgit v1.2.1