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

6 files changed, 10 insertions, 10 deletions

diff --git a/kcontrol/background/background.desktop b/kcontrol/background/background.desktop
index f6b63372a..05fe47bd5 100644
--- a/kcontrol/background/background.desktop
+++ b/kcontrol/background/background.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell background
+Exec=tdecmshell background
 Icon=background
 Type=Application
 DocPath=kcontrol/background/index.html
diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp
index 5eae86c62..bfe3eff28 100644
--- a/kcontrol/background/bgadvanced.cpp
+++ b/kcontrol/background/bgadvanced.cpp
@@ -32,7 +32,7 @@
 #include <tqspinbox.h>
 #include <tqwhatsthis.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcolorbutton.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 448eda455..ff200149a 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -40,10 +40,10 @@
 #include <tqwhatsthis.h>
 #include <tqapplication.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
-#include <kfilemetainfo.h>
+#include <tdefiledialog.h>
+#include <tdefilemetainfo.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kimageio.h>
@@ -1243,10 +1243,10 @@ void BGDialog::slotGetNewStuff()
 {
    //FIXME set this to a server when we get one
    //should really be in a .rc file but could be either
-   //kcmshellrc or kcontrolrc
+   //tdecmshellrc or kcontrolrc
    TDEConfig* config = TDEGlobal::config();
    config->setGroup("KNewStuff");
-   config->writeEntry( "ProvidersUrl", "http://download.kde.org/khotnewstuff/wallpaper-providers.xml" );
+   config->writeEntry( "ProvidersUrl", "http://download.kde.org/tdehotnewstuff/wallpaper-providers.xml" );
    config->writeEntry( "StandardResource", "wallpaper" );
    config->sync();
 
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index 3aed1a6fd..9c207e409 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -30,7 +30,7 @@
 #include <ktempfile.h>
 #include <kcursor.h>
 #include <kmimetype.h>
-#include <kfilemetainfo.h>
+#include <tdefilemetainfo.h>
 
 #ifdef HAVE_LIBART
 #include <ksvgiconengine.h>
diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp
index f10add59a..1edf37a8d 100644
--- a/kcontrol/background/bgwallpaper.cpp
+++ b/kcontrol/background/bgwallpaper.cpp
@@ -27,7 +27,7 @@
 #include <tqpushbutton.h>
 #include <tqspinbox.h>
 
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kimageio.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp
index 06d84ff86..fa71af901 100644
--- a/kcontrol/background/main.cpp
+++ b/kcontrol/background/main.cpp
@@ -18,7 +18,7 @@
 #include <tqlayout.h>
 #include <kapplication.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 #include <kimageio.h>