summaryrefslogtreecommitdiffstats
path: root/kopete/plugins/translator
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:58 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:58 -0600
commitb10a61b1fd2fe561ba61a384d4a344bae2a4aa29 (patch)
tree99dc6b2584265b2df91f7dbc1dcbf7a54efd205e /kopete/plugins/translator
parent64c3be47ff36e40035ead93f913aeeb1e4f85e4b (diff)
downloadtdenetwork-b10a61b1fd2fe561ba61a384d4a344bae2a4aa29.tar.gz
tdenetwork-b10a61b1fd2fe561ba61a384d4a344bae2a4aa29.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kopete/plugins/translator')
-rw-r--r--kopete/plugins/translator/CMakeLists.txt2
-rw-r--r--kopete/plugins/translator/Makefile.am2
-rw-r--r--kopete/plugins/translator/translatorguiclient.h2
-rw-r--r--kopete/plugins/translator/translatorplugin.cpp2
-rw-r--r--kopete/plugins/translator/translatorplugin.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/kopete/plugins/translator/CMakeLists.txt b/kopete/plugins/translator/CMakeLists.txt
index 5dd274db..4c4e4756 100644
--- a/kopete/plugins/translator/CMakeLists.txt
+++ b/kopete/plugins/translator/CMakeLists.txt
@@ -25,7 +25,7 @@ link_directories(
##### other data ################################
install( FILES kopete_translator.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES kopete_translator_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+install( FILES kopete_translator_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
install( FILES translatorui.rc translatorchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_translator )
diff --git a/kopete/plugins/translator/Makefile.am b/kopete/plugins/translator/Makefile.am
index 679c1ed8..fd58d26f 100644
--- a/kopete/plugins/translator/Makefile.am
+++ b/kopete/plugins/translator/Makefile.am
@@ -17,7 +17,7 @@ service_DATA = kopete_translator.desktop
servicedir = $(kde_servicesdir)
kcm_DATA = kopete_translator_config.desktop
-kcmdir = $(kde_servicesdir)/kconfiguredialog
+kcmdir = $(kde_servicesdir)/tdeconfiguredialog
mydatadir = $(kde_datadir)/kopete_translator
mydata_DATA = translatorui.rc translatorchatui.rc
diff --git a/kopete/plugins/translator/translatorguiclient.h b/kopete/plugins/translator/translatorguiclient.h
index 21675216..2f7a9f0f 100644
--- a/kopete/plugins/translator/translatorguiclient.h
+++ b/kopete/plugins/translator/translatorguiclient.h
@@ -23,7 +23,7 @@
#include <tqobject.h>
#include <kxmlguiclient.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include "kopetemessage.h"
#include "kopeteplugin.h"
diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp
index a2614640..066f93a9 100644
--- a/kopete/plugins/translator/translatorplugin.cpp
+++ b/kopete/plugins/translator/translatorplugin.cpp
@@ -29,7 +29,7 @@
#include <kaction.h>
#include <kgenericfactory.h>
#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tdeversion.h>
#include <kaboutdata.h>
diff --git a/kopete/plugins/translator/translatorplugin.h b/kopete/plugins/translator/translatorplugin.h
index 762b6018..d7700d8e 100644
--- a/kopete/plugins/translator/translatorplugin.h
+++ b/kopete/plugins/translator/translatorplugin.h
@@ -27,7 +27,7 @@
#include <tqintdict.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include "kopetemessage.h"
#include "kopeteplugin.h"