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

---
 libkcddb/asynchttplookup.cpp          | 2 +-
 libkcddb/asynchttpsubmit.cpp          | 2 +-
 libkcddb/asyncsmtpsubmit.h            | 2 +-
 libkcddb/httplookup.cpp               | 2 +-
 libkcddb/httpsubmit.cpp               | 2 +-
 libkcddb/kcmcddb/Makefile.am          | 2 +-
 libkcddb/kcmcddb/cddbconfigwidget.cpp | 2 +-
 libkcddb/kcmcddb/kcmcddb.cpp          | 4 ++--
 libkcddb/kcmcddb/libkcddb.desktop     | 2 +-
 libkcddb/sites.cpp                    | 2 +-
 libkcddb/smtpsubmit.cpp               | 2 +-
 libkcddb/synchttplookup.cpp           | 4 ++--
 libkcddb/synchttpsubmit.cpp           | 4 ++--
 libkcddb/syncsmtpsubmit.cpp           | 4 ++--
 14 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'libkcddb')

diff --git a/libkcddb/asynchttplookup.cpp b/libkcddb/asynchttplookup.cpp
index e46df657..5bcf1f76 100644
--- a/libkcddb/asynchttplookup.cpp
+++ b/libkcddb/asynchttplookup.cpp
@@ -22,7 +22,7 @@
 #include <tqapplication.h>
 
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 #include "asynchttplookup.h"
 
diff --git a/libkcddb/asynchttpsubmit.cpp b/libkcddb/asynchttpsubmit.cpp
index 6caf2bf4..246e5804 100644
--- a/libkcddb/asynchttpsubmit.cpp
+++ b/libkcddb/asynchttpsubmit.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "asynchttpsubmit.h"
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kdebug.h>
 
 namespace KCDDB
diff --git a/libkcddb/asyncsmtpsubmit.h b/libkcddb/asyncsmtpsubmit.h
index aebf53a9..17351497 100644
--- a/libkcddb/asyncsmtpsubmit.h
+++ b/libkcddb/asyncsmtpsubmit.h
@@ -20,7 +20,7 @@
 */
 
 #include "smtpsubmit.h"
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 namespace KCDDB
 {
diff --git a/libkcddb/httplookup.cpp b/libkcddb/httplookup.cpp
index 461a9334..af785854 100644
--- a/libkcddb/httplookup.cpp
+++ b/libkcddb/httplookup.cpp
@@ -19,7 +19,7 @@
   Boston, MA 02110-1301, USA.
 */
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kdebug.h>
 
 #include "httplookup.h"
diff --git a/libkcddb/httpsubmit.cpp b/libkcddb/httpsubmit.cpp
index d42d5a3d..5acde285 100644
--- a/libkcddb/httpsubmit.cpp
+++ b/libkcddb/httpsubmit.cpp
@@ -19,7 +19,7 @@
 */
 #include "httpsubmit.h"
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 namespace KCDDB
 {
diff --git a/libkcddb/kcmcddb/Makefile.am b/libkcddb/kcmcddb/Makefile.am
index 8233116d..3a93445f 100644
--- a/libkcddb/kcmcddb/Makefile.am
+++ b/libkcddb/kcmcddb/Makefile.am
@@ -19,5 +19,5 @@ xdg_apps_DATA = libkcddb.desktop
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kcmcddb.pot
 
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = kcmcddb-emailsettings.upd
diff --git a/libkcddb/kcmcddb/cddbconfigwidget.cpp b/libkcddb/kcmcddb/cddbconfigwidget.cpp
index 442efd12..a693d22f 100644
--- a/libkcddb/kcmcddb/cddbconfigwidget.cpp
+++ b/libkcddb/kcmcddb/cddbconfigwidget.cpp
@@ -27,7 +27,7 @@
 #include <tqcombobox.h>
 #include <tqspinbox.h>
 #include <tqlineedit.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kinputdialog.h>
diff --git a/libkcddb/kcmcddb/kcmcddb.cpp b/libkcddb/kcmcddb/kcmcddb.cpp
index 75dd8501..8ce6a6dd 100644
--- a/libkcddb/kcmcddb/kcmcddb.cpp
+++ b/libkcddb/kcmcddb/kcmcddb.cpp
@@ -28,12 +28,12 @@
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kgenericfactory.h>
 #include <kmessagebox.h>
-#include <kconfigdialogmanager.h>
+#include <tdeconfigdialogmanager.h>
 
 #include "cddbconfigwidget.h"
 
diff --git a/libkcddb/kcmcddb/libkcddb.desktop b/libkcddb/kcmcddb/libkcddb.desktop
index a2c2a5da..fb0163ad 100644
--- a/libkcddb/kcmcddb/libkcddb.desktop
+++ b/libkcddb/kcmcddb/libkcddb.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell libkcddb
+Exec=tdecmshell libkcddb
 Icon=cdaudio_unmount
 Type=Application
 X-TDE-ModuleType=Library
diff --git a/libkcddb/sites.cpp b/libkcddb/sites.cpp
index a031c949..56cc5eb6 100644
--- a/libkcddb/sites.cpp
+++ b/libkcddb/sites.cpp
@@ -19,7 +19,7 @@
 
 #include "sites.h"
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqfile.h>
 #include <kdebug.h>
 #include <tqregexp.h>
diff --git a/libkcddb/smtpsubmit.cpp b/libkcddb/smtpsubmit.cpp
index ed4e7357..2341f256 100644
--- a/libkcddb/smtpsubmit.cpp
+++ b/libkcddb/smtpsubmit.cpp
@@ -19,7 +19,7 @@
 
 #include "smtpsubmit.h"
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 namespace KCDDB
 {
diff --git a/libkcddb/synchttplookup.cpp b/libkcddb/synchttplookup.cpp
index c50618e1..42c45aba 100644
--- a/libkcddb/synchttplookup.cpp
+++ b/libkcddb/synchttplookup.cpp
@@ -22,8 +22,8 @@
 #include <tqapplication.h>
 
 #include <kdebug.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 
 #include "synchttplookup.h"
 
diff --git a/libkcddb/synchttpsubmit.cpp b/libkcddb/synchttpsubmit.cpp
index 7920fce2..271367da 100644
--- a/libkcddb/synchttpsubmit.cpp
+++ b/libkcddb/synchttpsubmit.cpp
@@ -18,8 +18,8 @@
 */
 
 #include "synchttpsubmit.h"
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 
 namespace KCDDB
 {
diff --git a/libkcddb/syncsmtpsubmit.cpp b/libkcddb/syncsmtpsubmit.cpp
index 002c3304..f875e2ef 100644
--- a/libkcddb/syncsmtpsubmit.cpp
+++ b/libkcddb/syncsmtpsubmit.cpp
@@ -19,8 +19,8 @@
 
 #include "syncsmtpsubmit.h"
 #include "cdinfo.h"
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 
 namespace KCDDB
 {
-- 
cgit v1.2.1