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

amor/CMakeLists.txt

@@ -31,7 +31,7 @@ tde_add_executable( amor AUTOMOC
     main.cpp amoranim.cpp amorpm.cpp
     amorbubble.cpp amorconfig.cpp amortips.cpp
     AmorIface.skel
-  LINK kio-shared Xext
+  LINK tdeio-shared Xext
   DESTINATION ${BIN_INSTALL_DIR}
 )
 

amor/amoranim.h

@@ -36,7 +36,7 @@
 #include <tqmemarray.h>
 #include <tqdict.h>
 #include <tqstringlist.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <ksimpleconfig.h>
 
 //---------------------------------------------------------------------------

amor/amorconfig.cpp

@@ -26,7 +26,7 @@
 */
 #include <kapplication.h>
 #include "amorconfig.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 //---------------------------------------------------------------------------
 //

kmoon/kmoonapplet.cpp

@@ -41,7 +41,7 @@
 #include <kcmdlineargs.h>
 #include <kiconloader.h>
 #include <kiconeffect.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 
 #include "version.h"

kmoon/kmoonwidget.cpp

@@ -41,7 +41,7 @@
 #include <kcmdlineargs.h>
 #include <kiconloader.h>
 #include <kiconeffect.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "kmoondlg.h"
 #include "kmoonwidget.h"

kodo/CMakeLists.txt

@@ -26,7 +26,7 @@ link_directories(
 
 tde_add_executable( kodo AUTOMOC
   SOURCES main.cpp kodometer.cpp kimagenumber.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 

kodo/kodometer.h

@@ -38,7 +38,7 @@
 #include <kaboutdata.h>
 #include <kuniqueapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>

kteatime/CMakeLists.txt

@@ -27,7 +27,7 @@ link_directories(
 tde_add_executable( kteatime AUTOMOC
   SOURCES main.cpp toplevel.cpp tealist.cpp
     timeedit.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 

kteatime/toplevel.cpp

@@ -38,7 +38,7 @@
 #include <tqpixmap.h>
 #include <tqbitmap.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <klocale.h>

ktux/CMakeLists.txt

@@ -29,7 +29,7 @@ link_directories(
 tde_add_executable( ktux AUTOMOC
   SOURCES spriteanim.cpp spritemisc.cpp
     spritepm.cpp sprite.cpp
-  LINK kio-shared tdescreensaver-shared
+  LINK tdeio-shared tdescreensaver-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 

ktux/spriteanim.h

@@ -17,7 +17,7 @@
 #include <tqptrlist.h>
 #include <tqstrlist.h>
 #include <tqcanvas.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <ksimpleconfig.h>                                                      
 
 //---------------------------------------------------------------------------

ktux/spritepm.h

@@ -15,7 +15,7 @@
 #include <tqdict.h>
 #include <tqpixmap.h>
 #include <tqcanvas.h>
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <ksimpleconfig.h>                                                      
 
 //---------------------------------------------------------------------------

kweather/CMakeLists.txt

@@ -40,7 +40,7 @@ tde_add_executable( kweatherservice AUTOMOC
     weatherlib.cpp weatherservice.cpp
     weatherservice.skel stationdatabase.cpp
     sun.cpp weatherservice.stub
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
@@ -94,7 +94,7 @@ tde_add_kpart( weather_panelapplet AUTOMOC
 tde_add_kpart( kcm_weather AUTOMOC
   SOURCES kcmweather.cpp prefdialogdata.ui
     weatherservice.stub
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 

kweather/kcmweather.cpp

@@ -28,7 +28,7 @@
 
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kurlrequester.h>

kweather/kweather.cpp

@@ -24,7 +24,7 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 #include <kpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <ksettings/dialog.h>
 #include <ksettings/dispatcher.h>
 #include <dcopclient.h>

kweather/reportview.cpp

@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>

kweather/serviceconfigwidget.cpp

@@ -23,7 +23,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>
 #include <klistview.h>

kweather/weatherbar.cpp

@@ -30,7 +30,7 @@
 #include <tqgroupbox.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
 #include <dcopref.h>

kweather/weatherlib.cpp

@@ -27,7 +27,7 @@ email                : geiseri@msoe.edu
 #include <kdebug.h>
 #include <math.h>
 #include <krfcdate.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 #include <knotifyclient.h>
 #include <ktempfile.h>

kweather/weatherservice.cpp

@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kstandarddirs.h>

kworldwatch/CMakeLists.txt

@@ -38,7 +38,7 @@ tde_add_library( ww STATIC_PIC AUTOMOC
 
 tde_add_executable( kworldclock AUTOMOC
   SOURCES main.cpp
-  LINK kio-shared ww-static
+  LINK tdeio-shared ww-static
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
@@ -47,7 +47,7 @@ tde_add_executable( kworldclock AUTOMOC
 
 tde_add_kpart( ww_panelapplet AUTOMOC
   SOURCES applet.cpp
-  LINK kio-shared ww-static
+  LINK tdeio-shared ww-static
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 

kworldwatch/flags.h

@@ -38,7 +38,7 @@
 #include <tqbitmap.h>
 
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 class Flag

kworldwatch/main.cpp

@@ -36,7 +36,7 @@
 
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>

kworldwatch/mapwidget.cpp

@@ -38,7 +38,7 @@
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <kcolordialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <klocale.h>

kworldwatch/mapwidget.h

@@ -43,7 +43,7 @@
 class TQPopupMenu;
 
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 class CityList;

kworldwatch/zoneclock.cpp

@@ -45,7 +45,7 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 #include "flow.h"