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

atlantik/client/atlantik.cpp

@@ -26,7 +26,7 @@
 #include <kaction.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <knotifyclient.h>

atlantik/client/eventlogwidget.cpp

@@ -23,7 +23,7 @@
 #include <klocale.h>
 #include <klistview.h>
 #include <kdialogbase.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <kstringhandler.h>

atlantik/client/monopigator.h

@@ -22,7 +22,7 @@
 #include <tqlistview.h>
 #include <tqtimer.h>
 
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kurl.h>
 
 class KExtendedSocket;

atlantik/kio_atlantik/Makefile.am

@@ -12,4 +12,4 @@ kdelnk_DATA = atlantik.protocol
 kdelnkdir = $(kde_servicesdir)
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kio_atlantik.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_atlantik.pot

atlantik/kio_atlantik/kio_atlantik.cpp

@@ -25,7 +25,7 @@
 #define KDE_3_1_FEATURES
 #endif
 #endif
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 #include <kinstance.h>
 #include <kprocess.h>
 

kasteroids/settings.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kasteroids.kcfg
 ClassName=Settings
 Singleton=true

kasteroids/toplevel.cpp

@@ -21,7 +21,7 @@
 #include <kstdgameaction.h>
 #include <kaudioplayer.h>
 #include <kscoredialog.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include "settings.h"
 #include "toplevel.h"

katomic/configbox.cpp

@@ -7,7 +7,7 @@
 #include "configbox.h"
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <tqslider.h>

kbackgammon/engines/fibs/kbgfibs.cpp

@@ -36,7 +36,7 @@
 #include "kbgfibs.moc"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqtimer.h>
 #include <tqcheckbox.h>
 #include <tqlayout.h>

kbackgammon/engines/fibs/kbgfibschat.cpp

@@ -47,7 +47,7 @@
 #include <tqdict.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kstdaction.h>

kbackgammon/engines/fibs/kplayerlist.cpp

@@ -35,7 +35,7 @@
 #include <tqlabel.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 #include <kstdaction.h>
 #include <ktabctl.h>

kbackgammon/engines/gnubg/kbggnubg.cpp

@@ -34,7 +34,7 @@
 #include <kstdaction.h>
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <iostream>
 #include <klocale.h>
 #include <kmainwindow.h>

kbackgammon/engines/nextgen/kbgng.cpp

@@ -34,7 +34,7 @@
 #include <kstdaction.h>
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmainwindow.h>
 #include <klineeditdlg.h>

kbackgammon/engines/offline/kbgoffline.cpp

@@ -37,7 +37,7 @@
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kstdaction.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmainwindow.h>
 #include <klineeditdlg.h>

kbackgammon/kbg.cpp

@@ -46,7 +46,7 @@
 #include <kstdgameaction.h>
 #include <kaboutdata.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcompletion.h>
 #include <kcompletionbox.h>
 #include <kpopupmenu.h>
@@ -573,7 +573,7 @@ void KBg::setupDlg()
 			arg(kapp->aboutData()->programName()));
 
 	TQGridLayout *gle = new TQGridLayout(gbe, 1, 1, nb->spacingHint());
-	KURLLabel *lab = new KURLLabel("kcmshell kcmnotify",
+	KURLLabel *lab = new KURLLabel("tdecmshell kcmnotify",
 				       i18n("Klick here to configure the event notification"), gbe);
 	lab->setMaximumSize(lab->sizeHint());
 

kbackgammon/kbgboard.cpp

@@ -42,7 +42,7 @@
 #include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <tqbuttongroup.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqwhatsthis.h>
 #include <tqvbox.h>
 #include <kiconloader.h>

kbackgammon/kbgtextview.cpp

@@ -23,7 +23,7 @@
 #include "kbgtextview.h"
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcmenumngr.h>
 #include <kfontdialog.h>
 #include <tqfont.h>

kbattleship/kbattleship/kbattleship.h

@@ -20,7 +20,7 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmainwindow.h>

kbattleship/kbattleship/kclientdialog.h

@@ -19,7 +19,7 @@
 #define KCLIENTDIALOG_H
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <dnssd/servicebrowser.h>
 #include <dnssd/remoteservice.h>
 #include <tqstring.h>

kblackbox/kbbgame.cpp

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

kbounce/kbounce.cpp

@@ -25,7 +25,7 @@
 #include <tqlcdnumber.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kstatusbar.h>
 #include <khighscore.h>
 #include <kexthighscore.h>

kenolaba/AbTop.cpp

@@ -6,7 +6,7 @@
 
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <klocale.h>

kenolaba/Board.cpp

@@ -14,7 +14,7 @@
 #include <tqdatetime.h>
 #include <tqstrlist.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <krandomsequence.h>
 
 #include "Board.h"

kenolaba/EvalDlgImpl.cpp

@@ -10,7 +10,7 @@
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kapplication.h>

kenolaba/EvalScheme.cpp

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

kfouleggs/prefs.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kfouleggs.kcfg
 IncludeFiles=common/commonprefs.h
 Inherits=CommonPrefs

kgoldrunner/src/kgoldrunner.cpp

@@ -13,9 +13,9 @@
 #include <kstatusbar.h>
 #include <kkeydialog.h>
 #include <kaccel.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
-#include <kconfig.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeconfig.h>
 
 #include <kedittoolbar.h>
 #include <ktoolbar.h>

kjumpingcube/kcubeboxwidget.cpp

@@ -22,7 +22,7 @@
 #include "kcubeboxwidget.h"
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqlayout.h>
 #include <tqtimer.h>
 #include <assert.h>

kjumpingcube/kjumpingcube.cpp

@@ -25,19 +25,19 @@
 
 // Settings
 #include "settings.h"
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include "prefs.h"
 
 #include <tqregexp.h>
 
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <kstdgameaction.h>
 #include <kaction.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kstatusbar.h>
 
 #define ID_STATUS_TURN_TEXT 1000

kjumpingcube/prefs.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kjumpingcube.kcfg
 #IncludeFiles=defines.h
 ClassName=Prefs

klines/klines.cpp

@@ -34,7 +34,7 @@
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmenubar.h>
 #include <kpopupmenu.h>
 #include <kscoredialog.h>

klines/prefs.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=klines.kcfg
 #IncludeFiles=defines.h
 ClassName=Prefs

kmahjongg/Editor.h

@@ -5,7 +5,7 @@
 #include <tqframe.h>   
 #include <ktoolbar.h>
 #include <kstatusbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 #include "Tileset.h"
 #include "BoardLayout.h"

kmahjongg/Preview.cpp

@@ -1,5 +1,5 @@
 #include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>

kmahjongg/boardwidget.cpp

@@ -8,7 +8,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <tqfile.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 /**
  * Constructor.

kmahjongg/kmahjongg.cpp

@@ -29,13 +29,13 @@
 
 #include <kaboutdata.h>
 #include <kaction.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include <kinputdialog.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <kstdgameaction.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 #include "prefs.h"
 #include "kmahjongg.h"

kmahjongg/prefs.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kmahjongg.kcfg
 #IncludeFiles=defines.h
 ClassName=Prefs

kmines/dialogs.cpp

@@ -35,7 +35,7 @@
 #include <kcombobox.h>
 #include <knuminput.h>
 #include <kcolorbutton.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kdialogbase.h>
 

kmines/highscores.cpp

@@ -21,7 +21,7 @@
 #include <kurl.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "version.h"
 #include "defines.h"

kmines/main.cpp

@@ -34,7 +34,7 @@
 #include <knotifyclient.h>
 #include <knotifydialog.h>
 #include <khighscore.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include "settings.h"
 #include "status.h"

kmines/settings.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kmines.kcfg
 IncludeFiles=defines.h
 ClassName=Settings

kmines/status.cpp

@@ -29,13 +29,13 @@
 
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <kaction.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <knotifyclient.h>
 #include <kexthighscore.h>
 

knetwalk/src/highscores.cpp

@@ -15,7 +15,7 @@
 #include <kurl.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "defines.h"
 #include "highscores.h"

knetwalk/src/settings.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=knetwalk.kcfg
 ClassName=Settings
 Singleton=true

kolf/canvasitem.cpp

@@ -1,6 +1,6 @@
 #include <tqcanvas.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "game.h"
 #include "canvasitem.h"

kolf/floater.cpp

@@ -1,7 +1,7 @@
 #include <tqlabel.h>
 #include <tqslider.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "floater.h"
 

kolf/game.cpp

@@ -3,11 +3,11 @@
 #include <arts/kplayobjectfactory.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <knuminput.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <klineedit.h>
 #include <kmessagebox.h>

kolf/kcomboboxdialog.cpp

@@ -28,7 +28,7 @@
 
 #include <klocale.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 

kolf/kolf.cpp

@@ -1,11 +1,11 @@
 #include <kaction.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kmainwindow.h>
 #include <kmimetype.h>

kolf/newgame.cpp

@@ -1,5 +1,5 @@
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kmessagebox.h>
@@ -9,7 +9,7 @@
 #include <kseparator.h>
 #include <klineedit.h>
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurllabel.h>
 
 #include <tqcheckbox.h>

kolf/objects/poolball/poolball.cpp

@@ -10,7 +10,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <knuminput.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <kolf/statedb.h>
 #include <kolf/canvasitem.h>

kolf/objects/test/test.cpp

@@ -9,7 +9,7 @@
 #include <klibloader.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "test.h"
 

kolf/slope.cpp

@@ -7,7 +7,7 @@
 
 #include <kapplication.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knuminput.h>
 #include <kpixmapeffect.h>
 #include <kstandarddirs.h>

konquest/gameenddlg.cc

@@ -4,7 +4,7 @@
 #include <tqvbox.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kstdguiitem.h>
 

konquest/newgamedlg.cc

@@ -10,7 +10,7 @@
 #include <tqlineedit.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>

kpat/cardmaps.cpp

@@ -23,7 +23,7 @@
 
 #include <tqpainter.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <config.h>
 #include "cardmaps.h"

kpat/dealer.cpp

@@ -11,7 +11,7 @@
 #include <klocale.h>
 #include "cardmaps.h"
 #include "speeds.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "version.h"
 
 

kpat/gamestatsimpl.cpp

@@ -6,7 +6,7 @@
 #include <tqlabel.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 
 GameStatsImpl::GameStatsImpl(TQWidget* aParent, const char* aname)

kpat/pwidget.cpp

@@ -31,9 +31,9 @@
 #include <kcarddialog.h>
 #include <kinputdialog.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kstatusbar.h>
 #include <kaccelmanager.h>

kpoker/global.h

@@ -18,7 +18,7 @@
 #define __GLOBAL__H__
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 extern KLocale  *locale;
 extern TDEConfig  *conf;

kpoker/kpoker.cpp

@@ -30,7 +30,7 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kaudioplayer.h>
 #include <kcarddialog.h>

kpoker/newgamedlg.cpp

@@ -26,7 +26,7 @@
 #include <klocale.h>
 #include <knuminput.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knumvalidator.h>
 
 // own includes

kpoker/top.cpp

@@ -24,7 +24,7 @@
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kstdaccel.h>
 #include <kstdaction.h>

kreversi/board.cpp

@@ -43,7 +43,7 @@
 
 #include <kapplication.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knotifyclient.h>
 #include <klocale.h>
 #include <kexthighscore.h>

kreversi/highscores.cpp

@@ -20,7 +20,7 @@
 #include "highscores.h"
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 

kreversi/kreversi.cpp

@@ -45,7 +45,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <klocale.h>
@@ -53,7 +53,7 @@
 #include <kaction.h>
 #include <kstdgameaction.h>
 #include <kkeydialog.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
 #include <kexthighscore.h>

kreversi/prefs.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kreversi.kcfg
 #IncludeFiles=defines.h
 ClassName=Prefs

kreversi/qreversigameview.cpp

@@ -52,7 +52,7 @@
 
 #include <kapplication.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knotifyclient.h>
 #include <klocale.h>
 #include <kexthighscore.h>

ksame/KSameWidget.cpp

@@ -33,9 +33,9 @@
 #include <klocale.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstdgameaction.h>
 #include <kaction.h>
 #include <kdebug.h>

ksame/StoneWidget.cpp

@@ -29,7 +29,7 @@
 #include <tqcursor.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 
 #include <time.h>

kshisen/app.cpp

@@ -39,7 +39,7 @@
 #include <kapplication.h>
 #include <kseparator.h>
 #include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaction.h>
 #include <kstdgameaction.h>
 #include <khighscore.h>
@@ -50,7 +50,7 @@
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include <tqlayout.h>
 #include <tqtimer.h>
@@ -68,7 +68,7 @@ App::App(TQWidget *parent, const char *name) : KMainWindow(parent, name),
 	highscoreTable = new KHighscore(TQT_TQOBJECT(this));
 
 	// TODO?
-	// Would it make sense long term to have a kconfig update rather then
+	// Would it make sense long term to have a tdeconfig update rather then
 	// havin both formats supported in the code?
 	if(highscoreTable->hasTable())
 		readHighscore();

kshisen/main.cpp

@@ -39,7 +39,7 @@
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "version.h"
 #include "app.h"

kshisen/prefs.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kshisen.kcfg
 ClassName=Prefs
 Singleton=true

ksirtet/ksirtet/prefs.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ksirtet.kcfg
 IncludeFiles=common/commonprefs.h
 Inherits=CommonPrefs

ksmiletris/gamewindow.cpp

@@ -25,7 +25,7 @@ this software.
 
 #include <kapplication.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>
 

ksnake/game.cpp

@@ -34,7 +34,7 @@
 
 
 #include <klocale.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include <kstdgameaction.h>
 #include <kscoredialog.h>

ksnake/settings.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ksnake.kcfg
 ClassName=Settings
 Singleton=true

ksokoban/LevelCollection.cpp

@@ -8,7 +8,7 @@
 #include <assert.h>
 #include <unistd.h>
 #include <string.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 static inline unsigned long

ksokoban/LevelMap.cpp

@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 #include <unistd.h>

ksokoban/MainWindow.cpp

@@ -20,18 +20,18 @@
 #include <stdio.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmenubar.h>
 #include <tqpopupmenu.h>
 #include <tqkeycode.h>
 #include <assert.h>
 #include <klocale.h>
 #include <tqstring.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqframe.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kiconloader.h>
 #include <tqiconset.h>
 #include <tqdragobject.h>

ksokoban/PlayField.cpp

@@ -23,7 +23,7 @@
 #include <tqwidget.h>
 #include <tqpixmap.h>
 #include <tqkeycode.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <tqpainter.h>

kspaceduel/dialogs.h

@@ -9,7 +9,7 @@ class TQSlider;
 class TQLCDNumber;
 class TQCheckBox;
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include "defines.h"
 #include "structs.h"

kspaceduel/mainview.cpp

@@ -10,7 +10,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 
 #include "ai.h"

kspaceduel/options.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kspaceduel.kcfg
 ClassName=Options
 Singleton=true

ktron/ktron.cpp

@@ -21,7 +21,7 @@
 
 #include "ktron.h"
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kaction.h>

ktron/settings.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=ktron.kcfg
 ClassName=Settings
 Singleton=true

ktron/tron.cpp

@@ -19,7 +19,7 @@
 
   ***************************************************************************/
 // Background
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 
 // Normal class
@@ -28,7 +28,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcolordialog.h>
 #include <kaction.h>
 

ktuberling/toplevel.cpp

@@ -6,10 +6,10 @@
 
 #include <kapplication.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kstdgameaction.h>

libksirtet/base/baseprefs.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=libksirtet1.kcfg
 #IncludeFiles=defines.h
 ClassName=BasePrefs

libksirtet/base/main.cpp

@@ -11,7 +11,7 @@
 #include <knotifyclient.h>
 #include <knotifydialog.h>
 #include <kexthighscore.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include "inter.h"
 #include "factory.h"

libksirtet/base/settings.h

@@ -2,7 +2,7 @@
 #define BASE_SETTINGS_H
 
 #include <tqwidget.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class TQGridLayout;
 

libksirtet/common/ai.cpp

@@ -11,7 +11,7 @@
 #include <tqwhatsthis.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 
 #include "commonprefs.h"

libksirtet/common/commonprefs.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=libksirtet2.kcfg
 IncludeFiles=base/baseprefs.h
 ClassName=CommonPrefs

libksirtet/common/highscores.cpp

@@ -2,7 +2,7 @@
 
 #include <klocale.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "base/factory.h"
 

libksirtet/common/main.cpp

@@ -5,7 +5,7 @@
 #include <kaction.h>
 #include <kstdaction.h>
 #include <kkeydialog.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include "inter.h"
 #include "factory.h"

libksirtet/lib/wizard.h

@@ -8,7 +8,7 @@
 #include <tqpushbutton.h>
 
 #include <knuminput.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kwizard.h>
 
 #include "pline.h"

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

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"

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>

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>
 

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"
 

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>
 

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>

libtdegames/highscore/tdeconfigrawbackend.h

@@ -22,7 +22,7 @@
 
 #include <tqfile.h>
 
-#include <kconfigbackend.h>
+#include <tdeconfigbackend.h>
 #include <ksimpleconfig.h>
 
 

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>

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>
 

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>
 
 

lskat/lskat.kdevprj

@@ -16,7 +16,7 @@ type=DATA
 [Config for BinMakefileAm]
 bin_program=lskat
 cxxflags=-O0 -g3 -Wall
-ldadd=-lkfile -ltdeui -ltdecore -lqt -lXext -lX11
+ldadd=-ltdefile -ltdeui -ltdecore -lqt -lXext -lX11
 ldflags=
 [General]
 author=Martin Heni

lskat/lskat/lskat.cpp

@@ -21,9 +21,9 @@
 // include files for TDE
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <khelpmenu.h>
 #include <kstdaction.h>
 #include <kaction.h>

lskat/lskat/lskatdoc.h

@@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqptrlist.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include "lskat.h"
 #include "KEInput.h"
 

twin4/twin4/kspritecache.cpp

@@ -17,7 +17,7 @@
 
 #include "kspritecache.h"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqbitmap.h>
 #include <tqimage.h>
 #include <tqwmatrix.h>
@@ -221,7 +221,7 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(TDEConfig *config,TQString
     //kdDebug(11002) << " Reading " << number << " frames " << endl;
 
     TQString pixfile=config->readPathEntry(name+"file");
-    TQString maskfile=config->readPathEntry(name+"mask");
+    TQString mastdefile=config->readPathEntry(name+"mask");
 
     // Load a given set of images or replace a %d by a sequence if there are
     // less image names than number given
@@ -232,7 +232,7 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(TDEConfig *config,TQString
       {
         TQString tmpfile,tmpmask;
         tmpfile.sprintf(pixfile.latin1(),i);
-        tmpmask.sprintf(maskfile.latin1(),i);
+        tmpmask.sprintf(mastdefile.latin1(),i);
 
         pixmap=loadPixmap(tmpfile,tmpmask);
         if (!pixmap) kdError() << "Could not create pixmap="<<tmpfile << " with mask " << tmpmask << endl;
@@ -255,9 +255,9 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(TDEConfig *config,TQString
       double step;
       if (number>1) step=(100.0-finalscale)/100.0/(double)(number-1);
       else step=1.0;
-      //kdDebug(11002) << " Scaling " << number << " pics axis="<<axis<<" final="<<finalscale<<" file="<<pixfile<< " mask="<<maskfile<<endl;
+      //kdDebug(11002) << " Scaling " << number << " pics axis="<<axis<<" final="<<finalscale<<" file="<<pixfile<< " mask="<<mastdefile<<endl;
 
-      pixmap=loadPixmap(pixfile,maskfile);
+      pixmap=loadPixmap(pixfile,mastdefile);
       for (unsigned int j=0;j<(unsigned int)number;j++)
       {
         TQWMatrix matrix;

twin4/twin4/prefs.kcfgc

@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=twin4.kcfg
 #IncludeFiles=defines.h
 ClassName=Prefs

twin4/twin4/twin4.cpp

@@ -28,16 +28,16 @@
 #include <kapplication.h>
 #include <kstdgameaction.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <khelpmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kstdaction.h>
 #include <kaction.h>
 #include <tqpushbutton.h>
 #include <kstatusbar.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #include <kchatdialog.h>
 #include <kgamechat.h>

twin4/twin4/twin4doc.cpp

@@ -23,7 +23,7 @@
 
 // include files for TDE
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <krandomsequence.h>

twin4/twin4/twin4player.cpp

@@ -18,7 +18,7 @@
 
 // include files for TDE
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kgamepropertyhandler.h>
 
 #include "twin4player.h"

twin4/twin4/twin4view.cpp

@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <math.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>