summaryrefslogtreecommitdiffstats
path: root/lib/compatibility
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:06:46 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:06:46 -0600
commitef2264e9790ae7e700ad3cf5fb3dbad05efd98d8 (patch)
treeac4650a642d502c458d0b654c8b731739ce601dc /lib/compatibility
parenta32b928478b59d4fa8b8495bbad6864476c129b1 (diff)
downloadtdewebdev-ef2264e9790ae7e700ad3cf5fb3dbad05efd98d8.tar.gz
tdewebdev-ef2264e9790ae7e700ad3cf5fb3dbad05efd98d8.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'lib/compatibility')
-rw-r--r--lib/compatibility/knewstuff/downloaddialog.cpp6
-rw-r--r--lib/compatibility/knewstuff/engine.cpp2
-rw-r--r--lib/compatibility/knewstuff/knewstuffgeneric.cpp2
-rw-r--r--lib/compatibility/knewstuff/knewstuffsecure.cpp4
-rw-r--r--lib/compatibility/knewstuff/provider.cpp4
-rw-r--r--lib/compatibility/knewstuff/uploaddialog.cpp2
-rw-r--r--lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp2
-rw-r--r--lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp2
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp2
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp2
-rw-r--r--lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp2
11 files changed, 15 insertions, 15 deletions
diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp
index c5f402e1..afc27b16 100644
--- a/lib/compatibility/knewstuff/downloaddialog.cpp
+++ b/lib/compatibility/knewstuff/downloaddialog.cpp
@@ -25,11 +25,11 @@
#include <ktabctl.h>
#include <klistview.h>
#include <kdebug.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
#include <kmessagebox.h>
#include <kurl.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kapplication.h>
#include <kiconloader.h>
diff --git a/lib/compatibility/knewstuff/engine.cpp b/lib/compatibility/knewstuff/engine.cpp
index 2abb7bca..12857917 100644
--- a/lib/compatibility/knewstuff/engine.cpp
+++ b/lib/compatibility/knewstuff/engine.cpp
@@ -24,7 +24,7 @@
#include <kapplication.h>
#include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
diff --git a/lib/compatibility/knewstuff/knewstuffgeneric.cpp b/lib/compatibility/knewstuff/knewstuffgeneric.cpp
index 163d9ade..9d516298 100644
--- a/lib/compatibility/knewstuff/knewstuffgeneric.cpp
+++ b/lib/compatibility/knewstuff/knewstuffgeneric.cpp
@@ -26,7 +26,7 @@
#include <kdebug.h>
#include <klocale.h>
#include <kprocess.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <kmessagebox.h>
#include <ktar.h>
diff --git a/lib/compatibility/knewstuff/knewstuffsecure.cpp b/lib/compatibility/knewstuff/knewstuffsecure.cpp
index 3c90f068..a6a905c0 100644
--- a/lib/compatibility/knewstuff/knewstuffsecure.cpp
+++ b/lib/compatibility/knewstuff/knewstuffsecure.cpp
@@ -16,10 +16,10 @@
#include <tqfileinfo.h>
//kde includes
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kglobal.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kstandarddirs.h>
diff --git a/lib/compatibility/knewstuff/provider.cpp b/lib/compatibility/knewstuff/provider.cpp
index 92be65b6..4c631847 100644
--- a/lib/compatibility/knewstuff/provider.cpp
+++ b/lib/compatibility/knewstuff/provider.cpp
@@ -18,9 +18,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <kglobal.h>
#include <kmessagebox.h>
#include <klocale.h>
diff --git a/lib/compatibility/knewstuff/uploaddialog.cpp b/lib/compatibility/knewstuff/uploaddialog.cpp
index 9e6ae83a..08940d0a 100644
--- a/lib/compatibility/knewstuff/uploaddialog.cpp
+++ b/lib/compatibility/knewstuff/uploaddialog.cpp
@@ -31,7 +31,7 @@
#include <kdebug.h>
#include <kurlrequester.h>
#include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kapplication.h>
#include "engine.h"
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
index 47e2d71d..b0f12173 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
@@ -33,7 +33,7 @@
#include <tqstyle.h>
#ifndef NO_KDE2
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kglobal.h>
#include <klocale.h>
#include <ktoolbar.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp b/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp
index 041143d9..3b17a43a 100644
--- a/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp
@@ -21,7 +21,7 @@
#include <tqapplication.h>
#include <tqstyle.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kiconloader.h>
#include <kstringhandler.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
index 91dcb4cd..916cee5b 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
@@ -30,7 +30,7 @@
#include "tdemdidefines.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kglobal.h>
#include <kglobalsettings.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
index 80307785..6099d0c1 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
@@ -33,7 +33,7 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klocale.h>
//TODO: Well, this is already defined in tdeui/kdockwidget.cpp
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
index e326cc26..bef9fb12 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
@@ -22,7 +22,7 @@
#include <tqpopupmenu.h>
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <ktoolbar.h>
#include <kmainwindow.h>
#include <klocale.h>