Rename a number of libraries and executables to avoid conflicts with KDE4

22 files changed, 28 insertions, 28 deletions

diff --git a/kopete/libkopete/avdevice/videodevicepool.h b/kopete/libkopete/avdevice/videodevicepool.h
index 75ed9ed4..2a42f97f 100644
--- a/kopete/libkopete/avdevice/videodevicepool.h
+++ b/kopete/libkopete/avdevice/videodevicepool.h
@@ -32,7 +32,7 @@
 #include "videodevice.h"
 #include "kopete_export.h"
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 namespace Kopete {
diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp
index 14c5efaf..e1fcf210 100644
--- a/kopete/libkopete/kautoconfig.cpp
+++ b/kopete/libkopete/kautoconfig.cpp
@@ -23,7 +23,7 @@
 #include <kglobal.h>
 #include <tqsqlpropertymap.h>
 #include <tqobjectlist.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <tdeversion.h>
 
@@ -101,8 +101,8 @@ public:
   }
 };
 
-KAutoConfig::KAutoConfig(TDEConfig *kconfig, TQObject *parent,
-    const char *name) : TQObject(parent, name), config(kconfig) {
+KAutoConfig::KAutoConfig(TDEConfig *tdeconfig, TQObject *parent,
+    const char *name) : TQObject(parent, name), config(tdeconfig) {
   d = new KAutoConfigPrivate();
 }
 
diff --git a/kopete/libkopete/kautoconfig.h b/kopete/libkopete/kautoconfig.h
index b582e85a..1779f174 100644
--- a/kopete/libkopete/kautoconfig.h
+++ b/kopete/libkopete/kautoconfig.h
@@ -119,12 +119,12 @@ signals:
 public:
   /**
    * Constructor.
-   * @param kconfig - TDEConfig to use when retrieving/saving the widgets
+   * @param tdeconfig - TDEConfig to use when retrieving/saving the widgets
    * that KAutoConfig knows about.
    * @param parent - Parent object.
    * @param name - Object name.
    */ 
-  KAutoConfig( TDEConfig *kconfig, TQObject *parent=0, const char *name=0 );
+  KAutoConfig( TDEConfig *tdeconfig, TQObject *parent=0, const char *name=0 );
  
   /**
    * Constructor.
diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp
index e8f69779..e0f49646 100644
--- a/kopete/libkopete/knotification.cpp
+++ b/kopete/libkopete/knotification.cpp
@@ -24,7 +24,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kpassivepopup.h>
 #include <kactivelabel.h>
 #include <kprocess.h>
diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp
index 69efb623..ccca93be 100644
--- a/kopete/libkopete/kopeteaccount.cpp
+++ b/kopete/libkopete/kopeteaccount.cpp
@@ -19,7 +19,7 @@
 #include <tqapplication.h>
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <kdialogbase.h>
diff --git a/kopete/libkopete/kopeteaccountmanager.cpp b/kopete/libkopete/kopeteaccountmanager.cpp
index 21f0d688..df844211 100644
--- a/kopete/libkopete/kopeteaccountmanager.cpp
+++ b/kopete/libkopete/kopeteaccountmanager.cpp
@@ -22,7 +22,7 @@
 #include <tqregexp.h>
 #include <tqtimer.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kplugininfo.h>
diff --git a/kopete/libkopete/kopeteaway.cpp b/kopete/libkopete/kopeteaway.cpp
index 94e07ddd..e0bf1553 100644
--- a/kopete/libkopete/kopeteaway.cpp
+++ b/kopete/libkopete/kopeteaway.cpp
@@ -29,7 +29,7 @@
 #include "kopetecontact.h"
 #include "kopeteprefs.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqtimer.h>
 #include <kapplication.h>
 #include <dcopref.h>
diff --git a/kopete/libkopete/kopeteblacklister.cpp b/kopete/libkopete/kopeteblacklister.cpp
index e31a5d1a..e249d736 100644
--- a/kopete/libkopete/kopeteblacklister.cpp
+++ b/kopete/libkopete/kopeteblacklister.cpp
@@ -17,7 +17,7 @@
 
 #include "kopetecontact.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include <tqstringlist.h>
diff --git a/kopete/libkopete/kopetecontactlistelement.cpp b/kopete/libkopete/kopetecontactlistelement.cpp
index 89e9ea29..86fc19c1 100644
--- a/kopete/libkopete/kopetecontactlistelement.cpp
+++ b/kopete/libkopete/kopetecontactlistelement.cpp
@@ -18,7 +18,7 @@
 
 #include "kopetecontactlistelement.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 
diff --git a/kopete/libkopete/kopeteglobal.cpp b/kopete/libkopete/kopeteglobal.cpp
index 1c889fc5..4b77444d 100644
--- a/kopete/libkopete/kopeteglobal.cpp
+++ b/kopete/libkopete/kopeteglobal.cpp
@@ -21,7 +21,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmimetype.h>
 #include <kmessagebox.h>
 #include <kprogress.h>
diff --git a/kopete/libkopete/kopetemimetypehandler.cpp b/kopete/libkopete/kopetemimetypehandler.cpp
index b05b2f4e..90da909b 100644
--- a/kopete/libkopete/kopetemimetypehandler.cpp
+++ b/kopete/libkopete/kopetemimetypehandler.cpp
@@ -24,7 +24,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmimetype.h>
 #include <kmessagebox.h>
 #include <kprogress.h>
diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp
index e56e0f5d..8ee74036 100644
--- a/kopete/libkopete/kopetepassword.cpp
+++ b/kopete/libkopete/kopetepassword.cpp
@@ -28,7 +28,7 @@
 
 #include <kactivelabel.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>
diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp
index a98b0fc3..5648e0cc 100644
--- a/kopete/libkopete/kopetepluginmanager.cpp
+++ b/kopete/libkopete/kopetepluginmanager.cpp
@@ -505,7 +505,7 @@ bool PluginManager::setPluginEnabled( const TQString &_pluginId, bool enabled /*
 	TDEConfig *config = TDEGlobal::config();
 	config->setGroup( "Plugins" );
 
-	// FIXME: What is this for? This sort of thing is kconf_update's job - Richard
+	// FIXME: What is this for? This sort of thing is tdeconf_update's job - Richard
 	if ( !pluginId.startsWith( TQString::fromLatin1( "kopete_" ) ) )
 		pluginId.prepend( TQString::fromLatin1( "kopete_" ) );
 
diff --git a/kopete/libkopete/kopeteprefs.cpp b/kopete/libkopete/kopeteprefs.cpp
index 353ea46d..77e8381a 100644
--- a/kopete/libkopete/kopeteprefs.cpp
+++ b/kopete/libkopete/kopeteprefs.cpp
@@ -22,7 +22,7 @@
 
 #include <kapplication.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
diff --git a/kopete/libkopete/kopetetransfermanager.cpp b/kopete/libkopete/kopetetransfermanager.cpp
index 27952b9a..43e57573 100644
--- a/kopete/libkopete/kopetetransfermanager.cpp
+++ b/kopete/libkopete/kopetetransfermanager.cpp
@@ -18,10 +18,10 @@
 
 #include <klocale.h>
 #include <kstaticdeleter.h>
-#include <kfiledialog.h>
-#include <kfileitem.h>
+#include <tdefiledialog.h>
+#include <tdefileitem.h>
 #include <kmessagebox.h>
-#include <kio/observer.h>
+#include <tdeio/observer.h>
 
 #include "kopetemetacontact.h"
 #include "kopetecontact.h"
diff --git a/kopete/libkopete/kopetetransfermanager.h b/kopete/libkopete/kopetetransfermanager.h
index bd18c3f3..0333fc5a 100644
--- a/kopete/libkopete/kopetetransfermanager.h
+++ b/kopete/libkopete/kopetetransfermanager.h
@@ -24,7 +24,7 @@
 #include <tqmap.h>
 #include "kopete_export.h"
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 namespace Kopete
 {
diff --git a/kopete/libkopete/kopeteutils.cpp b/kopete/libkopete/kopeteutils.cpp
index 07e56734..0681b4c7 100644
--- a/kopete/libkopete/kopeteutils.cpp
+++ b/kopete/libkopete/kopeteutils.cpp
@@ -2,7 +2,7 @@
     Kopete Utils.
     Copyright (c) 2005 Duncan Mac-Vicar Prett <[email protected]>
 
-      isHostReachable function code derived from KDE's HTTP kioslave
+      isHostReachable function code derived from KDE's HTTP tdeioslave
         Copyright (c) 2005 Waldo Bastian <[email protected]>
 
     Kopete    (c) 2002-2003 by the Kopete developers  <[email protected]>
diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp
index 37f04e02..9fbc19c7 100644
--- a/kopete/libkopete/private/kopeteviewmanager.cpp
+++ b/kopete/libkopete/private/kopeteviewmanager.cpp
@@ -16,7 +16,7 @@
 
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tqptrlist.h>
diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp
index 7b6fc27f..5a75bbf9 100644
--- a/kopete/libkopete/ui/addressbookselectorwidget.cpp
+++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp
@@ -27,7 +27,7 @@
 
 #include <tqcheckbox.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
 
diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
index 7291feb9..524d6bed 100644
--- a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
+++ b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp
@@ -18,9 +18,9 @@
 #include <tqtextedit.h>
 
 #include <klineedit.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kpushbutton.h>
 #include <kmessagebox.h>
 
diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp
index 7e783024..b0f7e787 100644
--- a/kopete/libkopete/ui/kopetelistview.cpp
+++ b/kopete/libkopete/ui/kopetelistview.cpp
@@ -24,7 +24,7 @@
 
 #include <tqapplication.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 
 #include <tqtimer.h>
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp
index 0fa64a4e..26b075a3 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.cpp
+++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp
@@ -27,7 +27,7 @@
 #include <tqvaluelist.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>