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

12 files changed, 16 insertions, 16 deletions

diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp
index 46e325ac..7daf2f8d 100644
--- a/kopete/protocols/irc/ircaccount.cpp
+++ b/kopete/protocols/irc/ircaccount.cpp
@@ -43,7 +43,7 @@
 #include <kaction.h>
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcompletionbox.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/kopete/protocols/irc/irccontactmanager.cpp b/kopete/protocols/irc/irccontactmanager.cpp
index 84c88f39..10ae8a69 100644
--- a/kopete/protocols/irc/irccontactmanager.cpp
+++ b/kopete/protocols/irc/irccontactmanager.cpp
@@ -31,7 +31,7 @@
 #include <kopetecontactlist.h>
 #include <kopeteview.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 
 #include <tqtimer.h>
@@ -67,7 +67,7 @@ IRCContactManager::IRCContactManager(const TQString &nickName, IRCAccount *accou
 			this, TQT_SLOT( slotContactAdded( Kopete::MetaContact* )));
 
 	socketTimeout = 15000;
-	TQString timeoutPath = locate( "config", "kioslaverc" );
+	TQString timeoutPath = locate( "config", "tdeioslaverc" );
 	if( !timeoutPath.isEmpty() )
 	{
 		TDEConfig config( timeoutPath );
diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp
index 96d905c0..e2d359dd 100644
--- a/kopete/protocols/irc/ircprotocol.cpp
+++ b/kopete/protocols/irc/ircprotocol.cpp
@@ -23,7 +23,7 @@
 #include "ircchannelcontact.h"
 #include "irccontactmanager.h"
 
-#include "networkconfig.h"
+#include "networtdeconfig.h"
 #include "channellist.h"
 #include "ircguiclient.h"
 #include "ircusercontact.h"
diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp
index 54c40132..fa2ae7b5 100644
--- a/kopete/protocols/irc/ircusercontact.cpp
+++ b/kopete/protocols/irc/ircusercontact.cpp
@@ -28,7 +28,7 @@
 
 #include <kaction.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 
 #include <tqtimer.h>
diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp
index 0fddaab7..79bc56df 100644
--- a/kopete/protocols/irc/libkirc/kircengine.cpp
+++ b/kopete/protocols/irc/libkirc/kircengine.cpp
@@ -24,7 +24,7 @@
 #include "kircengine.h"
 #include "ksslsocket.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kextsock.h>
 #include <klocale.h>
diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp
index 5db30998..d3615fc5 100644
--- a/kopete/protocols/irc/libkirc/ksslsocket.cpp
+++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp
@@ -184,16 +184,16 @@ void KSSLSocket::showInfoDialog()
 {
 	if( socketStatus() == connected )
 	{
-		if (!d->dcc->isApplicationRegistered("kio_uiserver"))
+		if (!d->dcc->isApplicationRegistered("tdeio_uiserver"))
 		{
-			TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList());
+			TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",TQStringList());
 		}
 
 		TQByteArray data, ignore;
 		TQCString ignoretype;
 		TQDataStream arg(data, IO_WriteOnly);
 		arg << "irc://" + peerAddress()->pretty() + ":" + port() << d->metaData;
-		d->dcc->call("kio_uiserver", "UIServer",
+		d->dcc->call("tdeio_uiserver", "UIServer",
 			"showSSLInfoDialog(TQString,TDEIO::MetaData)", data, ignoretype, ignore);
 	}
 }
@@ -233,12 +233,12 @@ int KSSLSocket::messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQStrin
 	TQDataStream arg(data, IO_WriteOnly);
 	arg << (int)1 << (int)type << text << caption << buttonYes << buttonNo;
 
-	if (!d->dcc->isApplicationRegistered("kio_uiserver"))
+	if (!d->dcc->isApplicationRegistered("tdeio_uiserver"))
 	{
-		TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList());
+		TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",TQStringList());
 	}
 
-	d->dcc->call("kio_uiserver", "UIServer",
+	d->dcc->call("tdeio_uiserver", "UIServer",
 			"messageBox(int,int,TQString,TQString,TQString,TQString)", data, returnType, result);
 
 	if( returnType == "int" )
diff --git a/kopete/protocols/irc/libkirc/ksslsocket.h b/kopete/protocols/irc/libkirc/ksslsocket.h
index a036a71d..f0b8e76c 100644
--- a/kopete/protocols/irc/libkirc/ksslsocket.h
+++ b/kopete/protocols/irc/libkirc/ksslsocket.h
@@ -22,7 +22,7 @@
 
 #include <tqvariant.h>
 #include <kextsock.h>
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 
 class KSSLSocketPrivate;
 
diff --git a/kopete/protocols/irc/ui/CMakeLists.txt b/kopete/protocols/irc/ui/CMakeLists.txt
index 7d77d5b8..d90cdd65 100644
--- a/kopete/protocols/irc/ui/CMakeLists.txt
+++ b/kopete/protocols/irc/ui/CMakeLists.txt
@@ -26,5 +26,5 @@ include_directories(
 tde_add_library( kopeteircui STATIC_PIC AUTOMOC
   SOURCES
     ircadd.ui empty.cpp irceditaccountwidget.cpp irceditaccount.ui
-    channellist.cpp channellistdialog.cpp networkconfig.ui
+    channellist.cpp channellistdialog.cpp networtdeconfig.ui
 )
diff --git a/kopete/protocols/irc/ui/Makefile.am b/kopete/protocols/irc/ui/Makefile.am
index 854a7398..b31b75ea 100644
--- a/kopete/protocols/irc/ui/Makefile.am
+++ b/kopete/protocols/irc/ui/Makefile.am
@@ -8,5 +8,5 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) \
 
 
 libkopeteircui_la_SOURCES = ircadd.ui empty.cpp irceditaccountwidget.cpp \
-	irceditaccount.ui channellist.cpp channellistdialog.cpp networkconfig.ui
+	irceditaccount.ui channellist.cpp channellistdialog.cpp networtdeconfig.ui
 EXTRA_DIST = ircadd.ui ircprefs.ui empty.cpp
diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
index f09ea21e..430282fb 100644
--- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp
+++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp
@@ -32,7 +32,7 @@
 #include <klistview.h>
 #include <kdebug.h>
 #include <kextsock.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kcharsets.h>
 
diff --git a/kopete/protocols/irc/ui/networkconfig.ui b/kopete/protocols/irc/ui/networtdeconfig.ui
index 09121e54..09121e54 100644
--- a/kopete/protocols/irc/ui/networkconfig.ui
+++ b/kopete/protocols/irc/ui/networtdeconfig.ui
diff --git a/kopete/protocols/irc/ui/networkconfig.ui.h b/kopete/protocols/irc/ui/networtdeconfig.ui.h
index 183ba57f..183ba57f 100644
--- a/kopete/protocols/irc/ui/networkconfig.ui.h
+++ b/kopete/protocols/irc/ui/networtdeconfig.ui.h