summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/msn
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/protocols/msn
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/protocols/msn')
-rw-r--r--kopete/protocols/msn/config/CMakeLists.txt2
-rw-r--r--kopete/protocols/msn/config/Makefile.am2
-rw-r--r--kopete/protocols/msn/msnaccount.cpp2
-rw-r--r--kopete/protocols/msn/msnchatsession.cpp2
-rw-r--r--kopete/protocols/msn/msncontact.cpp6
-rw-r--r--kopete/protocols/msn/msnfiletransfersocket.cpp2
-rw-r--r--kopete/protocols/msn/msnnotifysocket.cpp4
-rw-r--r--kopete/protocols/msn/msnprotocol.cpp2
-rw-r--r--kopete/protocols/msn/msnsecureloginhandler.cpp2
-rw-r--r--kopete/protocols/msn/msnsocket.cpp2
-rw-r--r--kopete/protocols/msn/msnswitchboardsocket.cpp2
-rw-r--r--kopete/protocols/msn/ui/msneditaccountwidget.cpp6
-rw-r--r--kopete/protocols/msn/webcam.cpp2
13 files changed, 18 insertions, 18 deletions
diff --git a/kopete/protocols/msn/config/CMakeLists.txt b/kopete/protocols/msn/config/CMakeLists.txt
index 7e0d1337..d9fd401b 100644
--- a/kopete/protocols/msn/config/CMakeLists.txt
+++ b/kopete/protocols/msn/config/CMakeLists.txt
@@ -25,7 +25,7 @@ link_directories(
install( FILES
kopete_msn_config.desktop
- DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+ DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
##### kcm_kopete_msn (module) ###################
diff --git a/kopete/protocols/msn/config/Makefile.am b/kopete/protocols/msn/config/Makefile.am
index b5e2026a..f01cb0f1 100644
--- a/kopete/protocols/msn/config/Makefile.am
+++ b/kopete/protocols/msn/config/Makefile.am
@@ -8,5 +8,5 @@ kcm_kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
kcm_kopete_msn_la_LIBADD = ../../../libkopete/libkopete.la $(LIB_KUTILS)
service_DATA = kopete_msn_config.desktop
-servicedir = $(kde_servicesdir)/kconfiguredialog
+servicedir = $(kde_servicesdir)/tdeconfiguredialog
diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp
index 58072441..39033752 100644
--- a/kopete/protocols/msn/msnaccount.cpp
+++ b/kopete/protocols/msn/msnaccount.cpp
@@ -22,7 +22,7 @@
#include <config.h>
#include <kaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kinputdialog.h>
#include <kmessagebox.h>
diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp
index df621d65..487f4aaa 100644
--- a/kopete/protocols/msn/msnchatsession.cpp
+++ b/kopete/protocols/msn/msnchatsession.cpp
@@ -24,7 +24,7 @@
#include <tqiconset.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kinputdialog.h>
#include <klocale.h>
diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp
index 84333bcf..c487f1df 100644
--- a/kopete/protocols/msn/msncontact.cpp
+++ b/kopete/protocols/msn/msncontact.cpp
@@ -26,17 +26,17 @@
#undef KDE_NO_COMPAT
#include <kaction.h>
#include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <klineedit.h>
#include <klocale.h>
#include <kstandarddirs.h>
#include <kmessagebox.h>
#include <krun.h>
#include <ktempfile.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kglobal.h>
#include <tqregexp.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include "kopetecontactlist.h"
#include "kopetechatsessionmanager.h"
diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp
index cfe74905..3c480092 100644
--- a/kopete/protocols/msn/msnfiletransfersocket.cpp
+++ b/kopete/protocols/msn/msnfiletransfersocket.cpp
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <kserversocket.h>
#include <kbufferedsocket.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <klocale.h>
#include "kopetetransfermanager.h"
diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp
index 1093370a..5f20d9ca 100644
--- a/kopete/protocols/msn/msnnotifysocket.cpp
+++ b/kopete/protocols/msn/msnnotifysocket.cpp
@@ -40,9 +40,9 @@
#include <kstandarddirs.h>
#include <ktempfile.h>
#include <krun.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <tqfile.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <knotification.h>
#include "kopeteuiglobal.h"
diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp
index 9ef32e04..cab1407d 100644
--- a/kopete/protocols/msn/msnprotocol.cpp
+++ b/kopete/protocols/msn/msnprotocol.cpp
@@ -22,7 +22,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tdeversion.h>
#include <kaboutdata.h>
diff --git a/kopete/protocols/msn/msnsecureloginhandler.cpp b/kopete/protocols/msn/msnsecureloginhandler.cpp
index 58f4f66f..f8431f9f 100644
--- a/kopete/protocols/msn/msnsecureloginhandler.cpp
+++ b/kopete/protocols/msn/msnsecureloginhandler.cpp
@@ -20,7 +20,7 @@
#include <tqregexp.h>
// KDE includes
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <kurl.h>
#include <kdebug.h>
diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp
index 2496006b..32b3d17a 100644
--- a/kopete/protocols/msn/msnsocket.cpp
+++ b/kopete/protocols/msn/msnsocket.cpp
@@ -27,7 +27,7 @@
#include <tqtimer.h>
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kbufferedsocket.h>
#include <kserversocket.h>
#include <kresolver.h>
diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp
index 7239e54f..9dc475ab 100644
--- a/kopete/protocols/msn/msnswitchboardsocket.cpp
+++ b/kopete/protocols/msn/msnswitchboardsocket.cpp
@@ -39,7 +39,7 @@
#include <kapplication.h>
#include <kaboutdata.h>
#include <ktempfile.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kmdcodec.h>
#include <kstandarddirs.h>
#include <ktempfile.h>
diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
index 57764d14..57022e6d 100644
--- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp
+++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp
@@ -31,15 +31,15 @@
#include <kcombobox.h>
#include <kautoconfig.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
#include <kdebug.h>
#include <kpassdlg.h>
#include <krun.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kpixmapregionselectordialog.h>
#include "kopeteuiglobal.h"
diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp
index fde51060..b7f991cd 100644
--- a/kopete/protocols/msn/webcam.cpp
+++ b/kopete/protocols/msn/webcam.cpp
@@ -28,7 +28,7 @@
#include <tqtimer.h>
#include <tqevent.h>
#include <tqdatetime.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include "dispatcher.h"