Rename many classes and header files to avoid conflicts with KDE4

atlantik/ChangeLog

@@ -97,7 +97,7 @@
 - use disability to join game when size == MAX in gameupdate (games in
   updategamelist now have canbejoined boolean attribute)
 - using playerupdate for player list in SelectConfiguration
-- use portfolioview instead of klistview for players during config
+- use portfolioview instead of tdelistview for players during config
 - better handling of display messages from server
 - fixed token animation
 

atlantik/client/atlantik.cpp

@@ -23,7 +23,7 @@
 #include <tqpopupmenu.h>
 
 #include <kaboutapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <tdeconfig.h>
@@ -34,7 +34,7 @@
 #include <kstatusbar.h>
 #include <kstdgameaction.h>
 #include <kstdaction.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 #include <tdeversion.h>
 #undef KDE_3_2_FEATURES

atlantik/client/atlantik.h

@@ -23,7 +23,7 @@
 #include <tqlabel.h>
 #include <tqptrlist.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "configdlg.h"
 #include "portfolioview.h"

atlantik/client/eventlogwidget.cpp

@@ -21,7 +21,7 @@
 #include <tqdatetime.h>
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdialogbase.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>

atlantik/client/selectconfiguration_widget.h

@@ -21,7 +21,7 @@
 #include <tqlayout.h>
 #include <tqvgroupbox.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 
 class TQCheckBox;

atlantik/client/selectgame_widget.h

@@ -20,7 +20,7 @@
 #include <tqwidget.h>
 #include <tqlayout.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 
 class AtlanticCore;

atlantik/client/selectserver_widget.h

@@ -22,7 +22,7 @@
 #include <tqradiobutton.h>
 
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 
 #include "monopigator.h"

atlantik/libatlantikui/auction_widget.h

@@ -21,7 +21,7 @@
 #include <tqlayout.h>
 #include <tqmap.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TQVGroupBox;
 class TQSpinBox;

atlantik/libatlantikui/estatedetails.cpp

@@ -24,7 +24,7 @@
 #include <kdialog.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kpixmap.h>
 #include <kpushbutton.h>

atlantik/libatlantikui/estateview.cpp

@@ -26,7 +26,7 @@
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <kpixmapeffect.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
 

atlantik/libatlantikui/kwrappedlistviewitem.cpp

@@ -26,7 +26,7 @@
 #include <tqstring.h>
 
 #include <kglobalsettings.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kwordwrap.h>
 
 #include "kwrappedlistviewitem.h"

atlantik/libatlantikui/kwrappedlistviewitem.h

@@ -28,7 +28,7 @@
 #include <tqobject.h>
 #include <tqstring.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class KWordWrap;
 

atlantik/libatlantikui/portfolioview.cpp

@@ -22,7 +22,7 @@
 #include <kiconeffect.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 #include <atlantic_core.h>

atlantik/libatlantikui/trade_widget.cpp

@@ -27,14 +27,14 @@
 #include <tqspinbox.h>
 
 #include <klocale.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <kcombobox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <atlantic_core.h>
 #include <player.h>

atlantik/pics/toolbar/Makefile.am

@@ -1,2 +1,2 @@
-atlantiktoolbardir = $(kde_datadir)/atlantik/icons
+atlantitdetoolbardir = $(kde_datadir)/atlantik/icons
-atlantiktoolbar_ICON = AUTO
+atlantitdetoolbar_ICON = AUTO

kasteroids/toplevel.cpp

@@ -17,7 +17,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kkeydialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdgameaction.h>
 #include <kaudioplayer.h>
 #include <kscoredialog.h>

kasteroids/toplevel.h

@@ -7,8 +7,8 @@
 #ifndef __KAST_TOPLEVEL_H__
 #define __KAST_TOPLEVEL_H__
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tqdict.h>
 #include <tqmap.h>
 

katomic/toplevel.cpp

@@ -31,7 +31,7 @@
 #include "toplevel.h"
 #include "settings.h"
 #include "configbox.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstdgameaction.h>
 #include <kdebug.h>

katomic/toplevel.h

@@ -11,7 +11,7 @@ class GameWidget;
 class TDEAction;
 class TDEConfig;
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 /**
  * This is the class AtomTopLevel. The class is used only for the program

kbackgammon/engines/fibs/kbgfibs.cpp

@@ -46,7 +46,7 @@
 #include <tqgroupbox.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klineeditdlg.h>
 #include <kmessagebox.h>
 #include <tqdatetime.h>
@@ -59,7 +59,7 @@
 #include <kpassdlg.h>
 #include <tqcstring.h>
 #include <knotifyclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 
 #include <stdlib.h>

kbackgammon/engines/fibs/kbgfibschat.cpp

@@ -52,7 +52,7 @@
 #include <kdebug.h>
 #include <kstdaction.h>
 #include <ktabctl.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 
 #include "clip.h"

kbackgammon/engines/fibs/kplayerlist.cpp

@@ -36,7 +36,7 @@
 
 #include <kapplication.h>
 #include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <ktabctl.h>
 #include <kiconloader.h>

kbackgammon/engines/fibs/kplayerlist.h

@@ -28,7 +28,7 @@
 #include <config.h>
 #endif
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class KTabCtl;
 class KFibsPlayerListPrivate;

kbackgammon/engines/gnubg/kbggnubg.cpp

@@ -37,7 +37,7 @@
 #include <tdeconfig.h>
 #include <iostream>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klineeditdlg.h>
 #include <tqregexp.h>
 #include <kregexp.h>

kbackgammon/engines/gnubg/kbggnubg.h

@@ -32,7 +32,7 @@
 
 #include <tqtimer.h>
 #include <tqspinbox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <krandomsequence.h>
 #include <kprocess.h>
 #include <tqstringlist.h>

kbackgammon/engines/nextgen/kbgng.cpp

@@ -36,7 +36,7 @@
 #include <tqcheckbox.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klineeditdlg.h>
 #include <krandomsequence.h>
 #include <tqstringlist.h>

kbackgammon/engines/nextgen/kbgng.h

@@ -31,7 +31,7 @@
 
 #include <tqtimer.h>
 #include <tqspinbox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqdatastream.h>
 #include <kgameproperty.h>
 

kbackgammon/engines/offline/kbgoffline.cpp

@@ -39,9 +39,9 @@
 #include <kstdaction.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klineeditdlg.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <krandomsequence.h>
 #include <ktabctl.h>
 #include <stdlib.h>

kbackgammon/kbg.cpp

@@ -36,12 +36,12 @@
 #include <tqvbox.h>
 
 #include <kmenubar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <kedittoolbar.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstdgameaction.h>
 #include <kaboutdata.h>
@@ -49,7 +49,7 @@
 #include <tdeconfig.h>
 #include <kcompletion.h>
 #include <kcompletionbox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurllabel.h>
 #include <krun.h>
 #include <kstatusbar.h>

kbackgammon/kbg.h

@@ -28,7 +28,7 @@
 #include <config.h>
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TQSplitter;
 class TQCheckBox;

kbackgammon/kbgboard.h

@@ -57,7 +57,7 @@
 #include <tqpopupmenu.h>
 #include <tqcombobox.h>
 #include <kdialogbase.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 
 #include "kbgstatus.h"
 

kbackgammon/kbgtextview.cpp

@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kcmenumngr.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <tqfont.h>
 #include <kapplication.h>
 

kbattleship/kbattleship/kbattleship.h

@@ -18,12 +18,12 @@
 #ifndef KBATTLESHIP_H
 #define KBATTLESHIP_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
 #include <kstdaction.h>

kbattleship/kbattleship/kbattleshipview.h

@@ -18,7 +18,7 @@
 #ifndef KBATTLESHIPVIEW_H
 #define KBATTLESHIPVIEW_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include <tqpainter.h>
 #include <tqptrlist.h>

kblackbox/kbbgame.cpp

@@ -26,7 +26,7 @@
 #include <kmenubar.h>
 #include <kiconloader.h>
 #include <khelpmenu.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstatusbar.h>
 #include <kstdgameaction.h>

kblackbox/kbbgame.h

@@ -15,7 +15,7 @@
 #include "kbbgfx.h"
 #include "util.h"
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <krandomsequence.h>
 
 class TDESelectAction;

kbounce/kbounce.cpp

@@ -19,7 +19,7 @@
 #include <tqlayout.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdgameaction.h>
 #include <tqtimer.h>
 #include <tqlcdnumber.h>

kbounce/kbounce.h

@@ -19,7 +19,7 @@
 #ifndef KBOUNCE_H
 #define KBOUNCE_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class JezzGame;
 class TQLCDNumber;

kenolaba/AbTop.cpp

@@ -4,14 +4,14 @@
 #include <tqtimer.h>
 #include <tqclipboard.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmenubar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kglobal.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>

kenolaba/AbTop.h

@@ -6,7 +6,7 @@
 #ifndef _ABTOP_H_
 #define _ABTOP_H_
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "Move.h"
 

kgoldrunner/src/kgoldrunner.cpp

@@ -12,16 +12,16 @@
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
 #include <tdeconfig.h>
 
 #include <kedittoolbar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstdgameaction.h>
 

kgoldrunner/src/kgoldrunner.h

@@ -21,9 +21,9 @@ const int L_SCORE       = 17;
 const int L_LEVEL       = 15;
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kstandarddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class KGrGame;
 class KGrCanvas;

kjumpingcube/kjumpingcube.cpp

@@ -36,7 +36,7 @@
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <kstdgameaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeio/netaccess.h>
 #include <kstatusbar.h>
 

kjumpingcube/kjumpingcube.h

@@ -26,7 +26,7 @@
 #include <config.h>
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 
 class TDEAction;

klines/klines.cpp

@@ -36,9 +36,9 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kmenubar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kscoredialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstdgameaction.h>
 

klines/klines.h

@@ -16,7 +16,7 @@
 #ifndef KLINES_H
 #define KLINES_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "linesboard.h"
 #include "mwidget.h"

kmahjongg/Editor.cpp

@@ -11,7 +11,7 @@
 #include <klocale.h>     // Needed to use TDELocale
 #include <kiconloader.h> //
 #include <kstandarddirs.h>
-#include <ktoolbarradiogroup.h>
+#include <tdetoolbarradiogroup.h>
 
 #define ID_TOOL_NEW  100
 #define ID_TOOL_LOAD 101

kmahjongg/Editor.h

@@ -3,7 +3,7 @@
 
 #include <tqdialog.h>
 #include <tqframe.h>   
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kstatusbar.h>
 #include <tdefiledialog.h>
 

kmahjongg/kmahjongg.cpp

@@ -28,7 +28,7 @@
 #include <limits.h>
 
 #include <kaboutdata.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfigdialog.h>
 #include <kinputdialog.h>
 #include <kmenubar.h>

kmahjongg/kmahjongg.h

@@ -28,7 +28,7 @@
 #ifndef _KMAHJONGG_H
 #define _KMAHJONGG_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "KmTypes.h"
 #include "Tileset.h"

kmines/kzoommainwindow.cpp

@@ -20,7 +20,7 @@
 #include "kzoommainwindow.h"
 #include "kzoommainwindow.moc"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kmenubar.h>
 #include <kcmenumngr.h>

kmines/kzoommainwindow.h

@@ -20,7 +20,7 @@
 #ifndef KZOOMMAINWINDOW_H
 #define KZOOMMAINWINDOW_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TDEToggleAction;
 

kmines/main.cpp

@@ -21,7 +21,7 @@
 
 #include <tqptrvector.h>
 
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kcmdlineargs.h>
@@ -29,7 +29,7 @@
 #include <kstdaction.h>
 #include <kkeydialog.h>
 #include <kstdgameaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>

kmines/status.cpp

@@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <ktempfile.h>

knetwalk/src/mainwindow.cpp

@@ -37,7 +37,7 @@
 #include <kscoredialog.h>
 #include <khighscore.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdgameaction.h>
 #include <kmenubar.h>
 #include <kstatusbar.h>

knetwalk/src/mainwindow.h

@@ -16,7 +16,7 @@
 #define MAINWINDOW_H
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class Cell;
 class TQAction;

kolf/editor.cpp

@@ -1,5 +1,5 @@
 #include <kdialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>

kolf/kolf.cpp

@@ -1,4 +1,4 @@
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
@@ -7,14 +7,14 @@
 #include <kglobal.h>
 #include <tdeio/netaccess.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmimetype.h>
 #include <kmessagebox.h>
 #include <kprinter.h>
 #include <kscoredialog.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstdgameaction.h>
 #include <kstdguiitem.h>

kolf/kolf.h

@@ -1,7 +1,7 @@
 #ifndef KOLF_H
 #define KOLF_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 
 #include <tqmap.h>

kolf/newgame.cpp

@@ -18,7 +18,7 @@
 #include <tqpen.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <tqstyle.h>
 #include <tqrect.h>
 #include <tqmap.h>

konquest/fleetdlg.h

@@ -1,7 +1,7 @@
 #ifndef FLEETDLG_H
 #define FLEETDLG_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqdialog.h>
 

konquest/mainwin.cc

@@ -6,9 +6,9 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmenubar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kiconloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstdgameaction.h>
 

konquest/mainwin.h

@@ -1,7 +1,7 @@
 #ifndef _MAIN_WIN_H
 #define _MAIN_WIN_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "gameboard.h"
 

konquest/scoredlg.h

@@ -1,7 +1,7 @@
 #ifndef _SCOREDLG_H_
 #define _SCOREDLG_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqdialog.h>
 

kpat/dealer.cpp

@@ -3,11 +3,11 @@
 #include <kdebug.h>
 #include "deck.h"
 #include <assert.h>
-#include "kmainwindow.h"
+#include "tdemainwindow.h"
 #include <kapplication.h>
 #include <kpixmapeffect.h>
 #include <tqtimer.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include "cardmaps.h"
 #include "speeds.h"

kpat/grandf.cpp

@@ -21,7 +21,7 @@
 #include "grandf.h"
 #include <klocale.h>
 #include "deck.h"
-#include <kaction.h>
+#include <tdeaction.h>
 #include <assert.h>
 #include "cardmaps.h"
 

kpat/pwidget.cpp

@@ -26,7 +26,7 @@
 
 #include <kapplication.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kcarddialog.h>
 #include <kinputdialog.h>
@@ -36,7 +36,7 @@
 #include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kstatusbar.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 #include <kmenubar.h>
 
 #include "pwidget.h"

kpat/pwidget.h

@@ -23,7 +23,7 @@
 #ifndef __PWIDGET__H__
 #define __PWIDGET__H__
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class Dealer;
 class TDEToggleAction;

kpoker/top.cpp

@@ -26,11 +26,11 @@
 #include <kmessagebox.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstdgameaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 // own includes
 #include "top.h"

kpoker/top.h

@@ -19,7 +19,7 @@
 #define __PokerWindow__
 
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 
 class TQLabel;

kreversi/kreversi.cpp

@@ -50,7 +50,7 @@
 #include <kstatusbar.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdgameaction.h>
 #include <kkeydialog.h>
 #include <tdeconfigdialog.h>

kreversi/kzoommainwindow.cpp

@@ -21,7 +21,7 @@
 #include "kzoommainwindow.h"
 #include "kzoommainwindow.moc"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kmenubar.h>
 #include <kcmenumngr.h>

kreversi/kzoommainwindow.h

@@ -22,7 +22,7 @@
 #define KZOOMMAINWINDOW_H
 
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 
 class TDEToggleAction;

ksame/KSameWidget.cpp

@@ -37,7 +37,7 @@
 #include <kmessagebox.h>
 #include <tdeconfig.h>
 #include <kstdgameaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 
 #include "StoneWidget.h"

ksame/KSameWidget.h

@@ -22,7 +22,7 @@
 #ifndef _KSAMEWIDGET
 #define _KSAMEWIDGET
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TDEToggleAction;
 class StoneWidget;

kshisen/app.cpp

@@ -40,12 +40,12 @@
 #include <kseparator.h>
 #include <kmessagebox.h>
 #include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdgameaction.h>
 #include <khighscore.h>
 #include <kdebug.h>
 #include <kkeydialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstatusbar.h>
 #include <klocale.h>
 #include <kpushbutton.h>

kshisen/app.h

@@ -43,7 +43,7 @@
 // Should this get the whole HAVE_SYS_TIME_H TIME_WITH_SYS_TIME treatment?
 #include <time.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include "board.h"
 
 class KHighscore;

ksirtet/CHANGELOG

@@ -123,7 +123,7 @@
    name [proposed by Lotta Inkovaara]
  * fixed repaint problems of piece shadow [some flicker added though]
  * keys bindings should be now saved [due to some obscure bug in
-   tdelibs/kaccel ; thanks to Chris]
+   tdelibs/tdeaccel ; thanks to Chris]
 
 2.0.3
  * use of TDEMainWindow + interception of LayoutHint events to fix the resize

ksmiletris/gamewindow.cpp

@@ -34,7 +34,7 @@ this software.
 #include "gamewidget.h"
 #include "kscoredialog.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdgameaction.h>
 
 

ksmiletris/gamewindow.h

@@ -24,7 +24,7 @@ this software.
 #ifndef GAMEWINDOW_H
 #define GAMEWINDOW_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "ksmiletris.h"
 

ksnake/game.h

@@ -26,7 +26,7 @@
 #ifndef GAME_H
 #define GAME_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class TDEAction;
 class Rattler;

ksnake/rattler.h

@@ -27,7 +27,7 @@
 #define RATTLER_H
 
 #include <tqwidget.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include "ball.h"
 #include "snake.h"
 

ksokoban/MainWindow.cpp

@@ -35,9 +35,9 @@
 #include <kiconloader.h>
 #include <tqiconset.h>
 #include <tqdragobject.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurldrag.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 
 #include "MainWindow.h"
 #include "PlayField.h"

ksokoban/MainWindow.h

@@ -20,7 +20,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 #include "Bookmark.h"
 #include "InternalCollections.h"

kspaceduel/mainview.cpp

@@ -6,7 +6,7 @@
 #include <tqvbox.h>
 
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>

kspaceduel/topwidget.cpp

@@ -1,7 +1,7 @@
 #include <klocale.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kkeydialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdgameaction.h>
 #include <tqlayout.h>
 #include <kstatusbar.h>

kspaceduel/topwidget.h

@@ -1,7 +1,7 @@
 #ifndef __MY_TOP_WIDGET_H
 #define __MY_TOP_WIDGET_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 class PlayerInfo;
 class MyMainView;

ktron/ktron.cpp

@@ -24,7 +24,7 @@
 #include <tdeconfigdialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdgameaction.h>
 #include <kapplication.h>
 #include <kstatusbar.h>

ktron/ktron.h

@@ -26,7 +26,7 @@
 #include <config.h>
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include "tron.h"
 
 class TDEAccel;

ktron/tron.cpp

@@ -30,7 +30,7 @@
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kcolordialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "settings.h"
 #include "tron.h"

ktuberling/toplevel.cpp

@@ -10,7 +10,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstdgameaction.h>
 

ktuberling/toplevel.h

@@ -8,7 +8,7 @@
 #ifndef _TOPLEVEL_H_
 #define _TOPLEVEL_H_
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 
 class TQDomDocument;

libksirtet/base/kzoommainwindow.cpp

@@ -20,7 +20,7 @@
 #include "kzoommainwindow.h"
 #include "kzoommainwindow.moc"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kmenubar.h>
 #include <kcmenumngr.h>

libksirtet/base/kzoommainwindow.h

@@ -20,7 +20,7 @@
 #ifndef KZOOMMAINWINDOW_H
 #define KZOOMMAINWINDOW_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kdemacros.h>
 
 

libksirtet/base/main.cpp

@@ -1,7 +1,7 @@
 #include "main.h"
 #include "main.moc"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kmenubar.h>
 #include <kstdgameaction.h>

libksirtet/common/inter.cpp

@@ -2,7 +2,7 @@
 #include "inter.moc"
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 
 #include "factory.h"

libksirtet/common/main.cpp

@@ -2,7 +2,7 @@
 #include "main.moc"
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <kkeydialog.h>
 #include <tdeconfigdialog.h>

libksirtet/lib/keys.h

@@ -2,7 +2,7 @@
 #define KEYS_H
 
 #include <tqmap.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include "mp_interface.h"
 

libksirtet/lib/mp_simple_interface.cpp

@@ -4,8 +4,8 @@
 #include <kmessagebox.h>
 #include <tqtimer.h>
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 
 #define PAUSE_ACTION \

libtdegames/highscore/kexthighscore_gui.h

@@ -25,7 +25,7 @@
 #include <tqvbox.h>
 #include <tqtabwidget.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <kdialogbase.h>

libtdegames/highscore/kexthighscore_tab.cpp

@@ -27,7 +27,7 @@
 #include <tqheader.h>
 
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <kglobal.h>
 

libtdegames/kchatdialog.cpp

@@ -22,7 +22,7 @@
 #include "kchatbase.h"
 
 #include <klocale.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>

libtdegames/kgame/dialogs/kgamedebugdialog.cpp

@@ -25,8 +25,8 @@
 #include "kplayer.h"
 #include "kgamepropertyhandler.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kpushbutton.h>

libtdegames/kgame/dialogs/kgamedialogconfig.cpp

@@ -28,7 +28,7 @@
 #include <klocale.h>
 #include <knuminput.h>
 #include <kdialog.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kmessagebox.h>
 
 #include <tqlayout.h>

libtdegames/kstdgameaction.cpp

@@ -20,8 +20,8 @@
 #include "kstdgameaction.h"
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 

lskat/lskat/lskat.cpp

@@ -26,7 +26,7 @@
 #include <tdeconfig.h>
 #include <khelpmenu.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 
 // application specific includes

lskat/lskat/lskat.h

@@ -28,8 +28,8 @@
 
 // include files for TDE 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 
 #include "KEInput.h"
 #include "KEMessage.h"

twin4/twin4/twin4.cpp

@@ -34,7 +34,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tqpushbutton.h>
 #include <kstatusbar.h>
 #include <tdeconfigdialog.h>

twin4/twin4/twin4.h

@@ -18,7 +18,7 @@
 #ifndef TWIN4_H
 #define TWIN4_H
  
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kdialogbase.h>
 #include "twin4doc.h"
 #include <kdemacros.h>