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

12 files changed, 19 insertions, 19 deletions

diff --git a/libtdegames/highscore/Makefile.am b/libtdegames/highscore/Makefile.am
index 6fa18cc0..3635c3b5 100644
--- a/libtdegames/highscore/Makefile.am
+++ b/libtdegames/highscore/Makefile.am
@@ -2,8 +2,8 @@ noinst_LTLIBRARIES = libkhighscore.la
 
 INCLUDES = $(all_includes)
 
-libkhighscore_la_SOURCES =  kconfigrawbackend.cpp \
-	                    kfilelock.cpp khighscore.cpp kscoredialog.cpp \
+libkhighscore_la_SOURCES =  tdeconfigrawbackend.cpp \
+	                    tdefilelock.cpp khighscore.cpp kscoredialog.cpp \
                             kexthighscore_item.cpp kexthighscore_internal.cpp \
                             kexthighscore_tab.cpp kexthighscore_gui.cpp \
                             kexthighscore.cpp
@@ -11,9 +11,9 @@ libkhighscore_la_SOURCES =  kconfigrawbackend.cpp \
 include_HEADERS = khighscore.h kscoredialog.h \
                   kexthighscore_item.h kexthighscore.h
 
-noinst_HEADERS = kconfigrawbackend.h \
-                 kfilelock.h kexthighscore_internal.h kexthighscore_tab.h \
+noinst_HEADERS = tdeconfigrawbackend.h \
+                 tdefilelock.h kexthighscore_internal.h kexthighscore_tab.h \
                  kexthighscore_gui.h
 
-METASOURCES = kconfigrawbackend.moc khighscore.moc kscoredialog.moc \
+METASOURCES = tdeconfigrawbackend.moc khighscore.moc kscoredialog.moc \
               kexthighscore_tab.moc kexthighscore_gui.moc
diff --git a/libtdegames/highscore/kexthighscore_gui.cpp b/libtdegames/highscore/kexthighscore_gui.cpp
index fa1a1887..a66050a6 100644
--- a/libtdegames/highscore/kexthighscore_gui.cpp
+++ b/libtdegames/highscore/kexthighscore_gui.cpp
@@ -31,9 +31,9 @@
 #include <kurllabel.h>
 #include <kopenwith.h>
 #include <krun.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kiconloader.h>
 
 #include "kexthighscore_internal.h"
diff --git a/libtdegames/highscore/kexthighscore_internal.cpp b/libtdegames/highscore/kexthighscore_internal.cpp
index dae5be91..05c51562 100644
--- a/libtdegames/highscore/kexthighscore_internal.cpp
+++ b/libtdegames/highscore/kexthighscore_internal.cpp
@@ -28,8 +28,8 @@
 #include <tqdom.h>
 
 #include <kglobal.h>
-#include <kio/netaccess.h>
-#include <kio/job.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/job.h>
 #include <kmessagebox.h>
 #include <kmdcodec.h>
 #include <kdebug.h>
diff --git a/libtdegames/highscore/kexthighscore_internal.h b/libtdegames/highscore/kexthighscore_internal.h
index f6924662..fd690b07 100644
--- a/libtdegames/highscore/kexthighscore_internal.h
+++ b/libtdegames/highscore/kexthighscore_internal.h
@@ -21,7 +21,7 @@
 #define KEXTHIGHSCORE_INTERNAL_H
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kurl.h>
 
diff --git a/libtdegames/highscore/khighscore.cpp b/libtdegames/highscore/khighscore.cpp
index 8a36a748..3555c76e 100644
--- a/libtdegames/highscore/khighscore.cpp
+++ b/libtdegames/highscore/khighscore.cpp
@@ -36,8 +36,8 @@
 #include <kstaticdeleter.h>
 
 #include "khighscore.h"
-#include "kconfigrawbackend.h"
-#include "kfilelock.h"
+#include "tdeconfigrawbackend.h"
+#include "tdefilelock.h"
 
 #define GROUP "KHighscore"
 
diff --git a/libtdegames/highscore/kscoredialog.cpp b/libtdegames/highscore/kscoredialog.cpp
index 1c3d241a..8db70fee 100644
--- a/libtdegames/highscore/kscoredialog.cpp
+++ b/libtdegames/highscore/kscoredialog.cpp
@@ -33,7 +33,7 @@ this software.
 #include <tqptrvector.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kseparator.h>
 
diff --git a/libtdegames/highscore/kconfigrawbackend.cpp b/libtdegames/highscore/tdeconfigrawbackend.cpp
index 7f75ed5d..80b4da96 100644
--- a/libtdegames/highscore/kconfigrawbackend.cpp
+++ b/libtdegames/highscore/tdeconfigrawbackend.cpp
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kconfigrawbackend.h"
-#include "kconfigrawbackend.moc"
+#include "tdeconfigrawbackend.h"
+#include "tdeconfigrawbackend.moc"
 
 #include <unistd.h>
 #include <tqfile.h>
diff --git a/libtdegames/highscore/kconfigrawbackend.h b/libtdegames/highscore/tdeconfigrawbackend.h
index 249fa22b..53cfd174 100644
--- a/libtdegames/highscore/kconfigrawbackend.h
+++ b/libtdegames/highscore/tdeconfigrawbackend.h
@@ -22,7 +22,7 @@
 
 #include <tqfile.h>
 
-#include <kconfigbackend.h>
+#include <tdeconfigbackend.h>
 #include <ksimpleconfig.h>
 
 
diff --git a/libtdegames/highscore/kfilelock.cpp b/libtdegames/highscore/tdefilelock.cpp
index 4f632f02..b5f56dfd 100644
--- a/libtdegames/highscore/kfilelock.cpp
+++ b/libtdegames/highscore/tdefilelock.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include "kfilelock.h"
+#include "tdefilelock.h"
 
 #include <unistd.h>
 #include <sys/file.h>
diff --git a/libtdegames/highscore/kfilelock.h b/libtdegames/highscore/tdefilelock.h
index de47f945..de47f945 100644
--- a/libtdegames/highscore/kfilelock.h
+++ b/libtdegames/highscore/tdefilelock.h
diff --git a/libtdegames/kchatbase.cpp b/libtdegames/kchatbase.cpp
index 5422c552..14395d1e 100644
--- a/libtdegames/kchatbase.cpp
+++ b/libtdegames/kchatbase.cpp
@@ -22,7 +22,7 @@
 #include <klineedit.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kdebug.h>
 
diff --git a/libtdegames/kstdgameaction.cpp b/libtdegames/kstdgameaction.cpp
index 8e94a908..368b26ff 100644
--- a/libtdegames/kstdgameaction.cpp
+++ b/libtdegames/kstdgameaction.cpp
@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <kaction.h>
 #include <kstdaccel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>