From b10a61b1fd2fe561ba61a384d4a344bae2a4aa29 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:04:58 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kopete/protocols/yahoo/libkyahoo/logintask.cpp            | 2 +-
 kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp        | 6 +++---
 kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp      | 6 +++---
 kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp         | 2 +-
 kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp      | 6 +++---
 kopete/protocols/yahoo/libkyahoo/yabtask.cpp              | 6 +++---
 kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp | 6 +++---
 kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp        | 6 +++---
 kopete/protocols/yahoo/yahooaccount.cpp                   | 2 +-
 kopete/protocols/yahoo/yahoochatsession.cpp               | 2 +-
 kopete/protocols/yahoo/yahooconferencemessagemanager.cpp  | 2 +-
 kopete/protocols/yahoo/yahoocontact.cpp                   | 8 ++++----
 kopete/protocols/yahoo/yahooeditaccount.cpp               | 4 ++--
 kopete/protocols/yahoo/yahooverifyaccount.cpp             | 6 +++---
 14 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'kopete/protocols/yahoo')

diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp
index b3c3f297..7e853fec 100644
--- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <stdlib.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kmdcodec.h>
 
 extern "C"
diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
index cd77498e..668e29c3 100644
--- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp
@@ -25,9 +25,9 @@
 #include <tqdatastream.h>
 #include <tqdom.h>
 #include <klocale.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kbufferedsocket.h>
 
 using namespace KNetwork;
diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
index 4528612b..532e21bf 100644
--- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp
@@ -24,9 +24,9 @@
 #include <tqfile.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 
 ReceiveFileTask::ReceiveFileTask(Task* parent) : Task(parent)
 {
diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
index e435f568..9cfe6763 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp
@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstreamsocket.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 using namespace KNetwork;
 
diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
index a5f8f821..95193241 100644
--- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp
@@ -22,9 +22,9 @@
 #include <tqstring.h>
 #include <tqfile.h>
 #include <tqdatastream.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kbufferedsocket.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
index 4eb82cc4..98df4ef0 100644
--- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp
@@ -22,9 +22,9 @@
 #include "client.h"
 #include <tqstring.h>
 #include <tqdatastream.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <klocale.h>
 
 YABTask::YABTask(Task* parent) : Task(parent)
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
index b9a270f8..96f96389 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp
@@ -21,9 +21,9 @@
 // KDE Includes
 #include <kdebug.h>
 #include <ktempfile.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
index 3f8650f5..96cc20c5 100644
--- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
+++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp
@@ -22,9 +22,9 @@
 #include "client.h"
 #include <kdebug.h>
 #include <klocale.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <tqdom.h>
 
 YahooChatTask::YahooChatTask(Task* parent) : Task(parent)
diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp
index 53f7c2b4..7e36d04e 100644
--- a/kopete/protocols/yahoo/yahooaccount.cpp
+++ b/kopete/protocols/yahoo/yahooaccount.cpp
@@ -33,7 +33,7 @@
 
 // KDE
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kaction.h>
 #include <kpopupmenu.h>
diff --git a/kopete/protocols/yahoo/yahoochatsession.cpp b/kopete/protocols/yahoo/yahoochatsession.cpp
index 5402919c..3bb8e717 100644
--- a/kopete/protocols/yahoo/yahoochatsession.cpp
+++ b/kopete/protocols/yahoo/yahoochatsession.cpp
@@ -21,7 +21,7 @@
 #include <tqfile.h>
 #include <tqiconset.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <klocale.h>
diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp
index 8d34689b..8e6132b6 100644
--- a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp
+++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kopetecontactaction.h>
 #include <kopetecontactlist.h>
diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp
index 3bd55b85..f827bba3 100644
--- a/kopete/protocols/yahoo/yahoocontact.cpp
+++ b/kopete/protocols/yahoo/yahoocontact.cpp
@@ -52,13 +52,13 @@
 #include <kshortcut.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
-#include <kio/global.h>
-#include <kio/job.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
 #include <kurl.h>
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 #include <kimageio.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 YahooContact::YahooContact( YahooAccount *account, const TQString &userId, const TQString &fullName, Kopete::MetaContact *metaContact )
 	: Kopete::Contact( account, userId, metaContact )
diff --git a/kopete/protocols/yahoo/yahooeditaccount.cpp b/kopete/protocols/yahoo/yahooeditaccount.cpp
index e047e849..8913eba3 100644
--- a/kopete/protocols/yahoo/yahooeditaccount.cpp
+++ b/kopete/protocols/yahoo/yahooeditaccount.cpp
@@ -32,9 +32,9 @@
 #include <kmessagebox.h>
 #include <krun.h>
 #include <kurl.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kpassdlg.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kpixmapregionselectordialog.h>
 
diff --git a/kopete/protocols/yahoo/yahooverifyaccount.cpp b/kopete/protocols/yahoo/yahooverifyaccount.cpp
index 14912167..62dde427 100644
--- a/kopete/protocols/yahoo/yahooverifyaccount.cpp
+++ b/kopete/protocols/yahoo/yahooverifyaccount.cpp
@@ -23,9 +23,9 @@
 #include <klineedit.h>
 #include <ktempfile.h>
 #include <klocale.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <kstandarddirs.h>
 
 // Kopete Includes
-- 
cgit v1.2.1