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

20 files changed, 21 insertions, 21 deletions

diff --git a/tdescreensaver/kdesavers/CMakeLists.txt b/tdescreensaver/kdesavers/CMakeLists.txt
index f2e3f027..f08693ee 100644
--- a/tdescreensaver/kdesavers/CMakeLists.txt
+++ b/tdescreensaver/kdesavers/CMakeLists.txt
@@ -39,7 +39,7 @@ set( kblob_DESKTOP      KBlob.desktop )
 set( kvm_SOURCES        kvm.cpp vm.c vm_random.c )
 set( kvm_DESKTOP        KVm.desktop )
 
-set( kslideshow_LINK	kio-shared )
+set( kslideshow_LINK	tdeio-shared )
 
 set( NORMAL_SCREENSAVERS 
 	kbanner kpolygon kslideshow	klines klorenz kblob kvm )
diff --git a/tdescreensaver/kdesavers/Euphoria.cpp b/tdescreensaver/kdesavers/Euphoria.cpp
index 304aaeee..bae407da 100644
--- a/tdescreensaver/kdesavers/Euphoria.cpp
+++ b/tdescreensaver/kdesavers/Euphoria.cpp
@@ -890,7 +890,7 @@ void EuphoriaWidget::setDefaults(int which)
 #ifndef UNIT_TEST
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 // libtdescreensaver interface
diff --git a/tdescreensaver/kdesavers/Flux.cpp b/tdescreensaver/kdesavers/Flux.cpp
index 0ee9c0d3..507b2433 100644
--- a/tdescreensaver/kdesavers/Flux.cpp
+++ b/tdescreensaver/kdesavers/Flux.cpp
@@ -774,7 +774,7 @@ void FluxWidget::updateParameters()
 #ifndef UNIT_TEST
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 // libtdescreensaver interface
diff --git a/tdescreensaver/kdesavers/SolarWinds.cpp b/tdescreensaver/kdesavers/SolarWinds.cpp
index c55fe531..ed0856ad 100644
--- a/tdescreensaver/kdesavers/SolarWinds.cpp
+++ b/tdescreensaver/kdesavers/SolarWinds.cpp
@@ -588,7 +588,7 @@ void SWindsWidget::setDefaults(int which)
 #ifndef UNIT_TEST
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 // libtdescreensaver interface
diff --git a/tdescreensaver/kdesavers/banner.cpp b/tdescreensaver/kdesavers/banner.cpp
index 5e907c25..8cfe7e06 100644
--- a/tdescreensaver/kdesavers/banner.cpp
+++ b/tdescreensaver/kdesavers/banner.cpp
@@ -29,7 +29,7 @@
 #include <krandomsequence.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kcolorbutton.h>
 #include <kfontcombo.h>
diff --git a/tdescreensaver/kdesavers/blob.cpp b/tdescreensaver/kdesavers/blob.cpp
index 763cf10c..427a7237 100644
--- a/tdescreensaver/kdesavers/blob.cpp
+++ b/tdescreensaver/kdesavers/blob.cpp
@@ -31,7 +31,7 @@
 #include <tqimage.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <knuminput.h>
 #include <klocale.h>
diff --git a/tdescreensaver/kdesavers/firesaver.cpp b/tdescreensaver/kdesavers/firesaver.cpp
index 71954242..7c7c2665 100644
--- a/tdescreensaver/kdesavers/firesaver.cpp
+++ b/tdescreensaver/kdesavers/firesaver.cpp
@@ -21,7 +21,7 @@
 #include <math.h>
 #include <sys/time.h>
 #include <stdlib.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
diff --git a/tdescreensaver/kdesavers/firesaversetup.ui.h b/tdescreensaver/kdesavers/firesaversetup.ui.h
index da8ed42a..a07d8896 100644
--- a/tdescreensaver/kdesavers/firesaversetup.ui.h
+++ b/tdescreensaver/kdesavers/firesaversetup.ui.h
@@ -13,7 +13,7 @@
 
 #include <tqcolor.h>
 #include <tqtimer.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 void KFireSaverSetup::init()
diff --git a/tdescreensaver/kdesavers/fountain.cpp b/tdescreensaver/kdesavers/fountain.cpp
index 7e4c13f8..35b5a2cf 100644
--- a/tdescreensaver/kdesavers/fountain.cpp
+++ b/tdescreensaver/kdesavers/fountain.cpp
@@ -12,7 +12,7 @@
 #include <tqlayout.h>
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcolordialog.h>
 #include <kbuttonbox.h>
 #include <kcolorbutton.h>
diff --git a/tdescreensaver/kdesavers/gravity.cpp b/tdescreensaver/kdesavers/gravity.cpp
index 8c0accc1..21933e18 100644
--- a/tdescreensaver/kdesavers/gravity.cpp
+++ b/tdescreensaver/kdesavers/gravity.cpp
@@ -12,7 +12,7 @@
 #include <tqlayout.h>
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcolordialog.h>
 #include <kbuttonbox.h>
 #include <kcolorbutton.h>
diff --git a/tdescreensaver/kdesavers/kclock.cpp b/tdescreensaver/kdesavers/kclock.cpp
index 5201f222..ce8ef182 100644
--- a/tdescreensaver/kdesavers/kclock.cpp
+++ b/tdescreensaver/kdesavers/kclock.cpp
@@ -23,7 +23,7 @@
 
 #include <kapplication.h>
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/tdescreensaver/kdesavers/kvm.cpp b/tdescreensaver/kdesavers/kvm.cpp
index 3ba233fa..c110d894 100644
--- a/tdescreensaver/kdesavers/kvm.cpp
+++ b/tdescreensaver/kdesavers/kvm.cpp
@@ -41,7 +41,7 @@
 #include <tqbitmap.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
diff --git a/tdescreensaver/kdesavers/lines.cpp b/tdescreensaver/kdesavers/lines.cpp
index a2692217..3349fe8e 100644
--- a/tdescreensaver/kdesavers/lines.cpp
+++ b/tdescreensaver/kdesavers/lines.cpp
@@ -14,7 +14,7 @@
 #include <tqcolor.h>
 #include <tqlabel.h>
 #include <tqslider.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <kcolorbutton.h>
diff --git a/tdescreensaver/kdesavers/lorenz.cpp b/tdescreensaver/kdesavers/lorenz.cpp
index 91e6bbfc..24a799a8 100644
--- a/tdescreensaver/kdesavers/lorenz.cpp
+++ b/tdescreensaver/kdesavers/lorenz.cpp
@@ -20,7 +20,7 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 
 #include "lorenz.h"
diff --git a/tdescreensaver/kdesavers/pendulum.cpp b/tdescreensaver/kdesavers/pendulum.cpp
index d1889877..1b2abc0f 100644
--- a/tdescreensaver/kdesavers/pendulum.cpp
+++ b/tdescreensaver/kdesavers/pendulum.cpp
@@ -38,7 +38,7 @@
 #include <tqtooltip.h>
 // KDE headers
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 
diff --git a/tdescreensaver/kdesavers/polygon.cpp b/tdescreensaver/kdesavers/polygon.cpp
index a28cd34c..f4cb08ba 100644
--- a/tdescreensaver/kdesavers/polygon.cpp
+++ b/tdescreensaver/kdesavers/polygon.cpp
@@ -15,7 +15,7 @@
 #include <tqslider.h>
 #include <tqlayout.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 
diff --git a/tdescreensaver/kdesavers/rotation.cpp b/tdescreensaver/kdesavers/rotation.cpp
index fb38b71f..30b49da8 100644
--- a/tdescreensaver/kdesavers/rotation.cpp
+++ b/tdescreensaver/kdesavers/rotation.cpp
@@ -38,7 +38,7 @@
 #include <tqtooltip.h>
 // KDE headers
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 
diff --git a/tdescreensaver/kdesavers/science.cpp b/tdescreensaver/kdesavers/science.cpp
index 1eea3262..06b780be 100644
--- a/tdescreensaver/kdesavers/science.cpp
+++ b/tdescreensaver/kdesavers/science.cpp
@@ -24,7 +24,7 @@
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <krandomsequence.h>
 
diff --git a/tdescreensaver/kdesavers/slideshow.cpp b/tdescreensaver/kdesavers/slideshow.cpp
index ea216991..738558c6 100644
--- a/tdescreensaver/kdesavers/slideshow.cpp
+++ b/tdescreensaver/kdesavers/slideshow.cpp
@@ -22,13 +22,13 @@
 #include <tqframe.h>
 #include <tqdesktopwidget.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kimageio.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 #include <kaboutdata.h>
diff --git a/tdescreensaver/kdesavers/wave.cpp b/tdescreensaver/kdesavers/wave.cpp
index 67357f89..d8e0c8a9 100644
--- a/tdescreensaver/kdesavers/wave.cpp
+++ b/tdescreensaver/kdesavers/wave.cpp
@@ -9,7 +9,7 @@
 #include <tqlayout.h>
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcolordialog.h>
 #include <kbuttonbox.h>
 #include <kcolorbutton.h>