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

7 files changed, 13 insertions, 13 deletions

diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp
index 63c51b89..0aff7691 100644
--- a/kopete/kopete/config/appearance/appearanceconfig.cpp
+++ b/kopete/kopete/config/appearance/appearanceconfig.cpp
@@ -43,11 +43,11 @@
 #include <kapplication.h>
 #include <kcolorcombo.h>
 #include <kcolorbutton.h>
-#include <kconfig.h> // for KNewStuff emoticon fetching
+#include <tdeconfig.h> // for KNewStuff emoticon fetching
 #include <kdebug.h>
 #include <kfontrequester.h>
 #include <kgenericfactory.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tdehtmlview.h>
 #include <klineedit.h>
 #include <klocale.h>
@@ -59,7 +59,7 @@
 #include <kurlrequesterdlg.h>
 #include <kurlrequester.h>
 #include <krun.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include <knewstuff/downloaddialog.h> // knewstuff emoticon and chatwindow fetching
 #include <knewstuff/engine.h>         // "
@@ -696,7 +696,7 @@ void AppearanceConfig::slotGetChatStyles()
 	// you have to do this by hand when providing your own Engine
 	KNS::ProviderLoader *provider = new KNS::ProviderLoader( this );
 	TQObject::connect( provider, TQT_SIGNAL( providersLoaded(Provider::List*) ), downloadDialog, TQT_SLOT( slotProviders (Provider::List *) ) );
-	provider->load( "kopete/chatstyle", "http://download.kde.org/khotnewstuff/kopetestyles12-providers.xml" );
+	provider->load( "kopete/chatstyle", "http://download.kde.org/tdehotnewstuff/kopetestyles12-providers.xml" );
 	downloadDialog->exec();
 }
 
@@ -856,7 +856,7 @@ void AppearanceConfig::slotGetEmoticonThemes()
 	TDEConfig* config = TDEGlobal::config();
 	config->setGroup( "KNewStuff" );
 	config->writeEntry( "ProvidersUrl",
-						"http://download.kde.org/khotnewstuff/emoticons-providers.xml" );
+						"http://download.kde.org/tdehotnewstuff/emoticons-providers.xml" );
 	config->writeEntry( "StandardResource", "emoticons" );
 	config->writeEntry( "Uncompress", "application/x-gzip" );
 	config->sync();
diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.cpp b/kopete/kopete/config/appearance/emoticonseditdialog.cpp
index d432d22e..f0510a5f 100644
--- a/kopete/kopete/config/appearance/emoticonseditdialog.cpp
+++ b/kopete/kopete/config/appearance/emoticonseditdialog.cpp
@@ -23,8 +23,8 @@
 #include <klocale.h>
 #include <klistview.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
-#include <kio/job.h>
+#include <tdefiledialog.h>
+#include <tdeio/job.h>
 #include <tqpixmap.h>
 #include <tqheader.h>
 #include <tqlayout.h>
diff --git a/kopete/kopete/config/avdevice/avdeviceconfig.cpp b/kopete/kopete/config/avdevice/avdeviceconfig.cpp
index cf619fd7..cf5f98ed 100644
--- a/kopete/kopete/config/avdevice/avdeviceconfig.cpp
+++ b/kopete/kopete/config/avdevice/avdeviceconfig.cpp
@@ -32,7 +32,7 @@
 #include <kpushbutton.h>
 #include <kgenericfactory.h>
 #include <ktrader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
diff --git a/kopete/kopete/config/behavior/behaviorconfig.cpp b/kopete/kopete/config/behavior/behaviorconfig.cpp
index bae2d832..f3d61b44 100644
--- a/kopete/kopete/config/behavior/behaviorconfig.cpp
+++ b/kopete/kopete/config/behavior/behaviorconfig.cpp
@@ -33,7 +33,7 @@
 #include <kpushbutton.h>
 #include <kgenericfactory.h>
 #include <ktrader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 
 #include "kopeteprefs.h"
diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.cpp b/kopete/kopete/config/identity/kopeteidentityconfig.cpp
index da13d3cc..1d513964 100644
--- a/kopete/kopete/config/identity/kopeteidentityconfig.cpp
+++ b/kopete/kopete/config/identity/kopeteidentityconfig.cpp
@@ -30,7 +30,7 @@
 
 // KDE includes
 #include <kcombobox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
@@ -45,7 +45,7 @@
 #include <kmdcodec.h>
 
 // KDE KIO includes
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 // KDE KABC(AddressBook) includes
 #include <kabc/addresseedialog.h>
diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.h b/kopete/kopete/config/identity/kopeteidentityconfig.h
index d0795412..37f4e7df 100644
--- a/kopete/kopete/config/identity/kopeteidentityconfig.h
+++ b/kopete/kopete/config/identity/kopeteidentityconfig.h
@@ -19,7 +19,7 @@
 #define _IDENTITYCONFIG_H
 
 #include <tdecmodule.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include "kopetemetacontact.h"
 
diff --git a/kopete/kopete/config/identity/kopeteidentityconfigpreferences.kcfgc b/kopete/kopete/config/identity/kopeteidentityconfigpreferences.kcfgc
index 6f93d40f..ffa89670 100644
--- a/kopete/kopete/config/identity/kopeteidentityconfigpreferences.kcfgc
+++ b/kopete/kopete/config/identity/kopeteidentityconfigpreferences.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kopeteidentityconfigpreferences.kcfg
 ClassName=KopeteIdentityConfigPreferences
 Singleton=true