summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-15 21:57:10 -0600
committerTimothy Pearson <[email protected]>2013-02-15 21:57:10 -0600
commit6946130bb142337c633a25f34f11f9cd0e12d5de (patch)
treee4d2629cabc5254b98c1c0095d1f45e793edf226
parent8a9553c17f4228afc6e0642c259a83d8dd37027d (diff)
downloadtdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.tar.gz
tdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.zip
Rename additional header files to avoid conflicts with KDE4
-rw-r--r--atlantik/client/atlantik.cpp4
-rw-r--r--atlantik/client/configdlg.cpp2
-rw-r--r--atlantik/client/eventlogwidget.cpp2
-rw-r--r--atlantik/client/main.cpp4
-rw-r--r--atlantik/client/selectconfiguration_widget.cpp4
-rw-r--r--atlantik/client/selectgame_widget.cpp2
-rw-r--r--atlantik/client/selectserver_widget.cpp2
-rw-r--r--atlantik/libatlantikclient/atlantik_network.cpp2
-rw-r--r--atlantik/libatlantikui/auction_widget.cpp2
-rw-r--r--atlantik/libatlantikui/board.cpp2
-rw-r--r--atlantik/libatlantikui/estatedetails.cpp4
-rw-r--r--atlantik/libatlantikui/estateview.cpp4
-rw-r--r--atlantik/libatlantikui/kwrappedlistviewitem.cpp2
-rw-r--r--atlantik/libatlantikui/portfolioview.cpp4
-rw-r--r--atlantik/libatlantikui/token.cpp2
-rw-r--r--atlantik/libatlantikui/trade_widget.cpp2
-rw-r--r--kasteroids/toplevel.cpp6
-rw-r--r--kasteroids/view.cpp2
-rw-r--r--katomic/configbox.cpp4
-rw-r--r--katomic/feld.cpp2
-rw-r--r--katomic/gamewidget.cpp8
-rw-r--r--katomic/main.cpp2
-rw-r--r--katomic/molek.cpp4
-rw-r--r--katomic/toplevel.cpp4
-rw-r--r--kbackgammon/engines/fibs/kbgfibs.cpp2
-rw-r--r--kbackgammon/engines/fibs/kbgfibs.h2
-rw-r--r--kbackgammon/engines/fibs/kbgfibschat.cpp2
-rw-r--r--kbackgammon/engines/fibs/kbginvite.cpp2
-rw-r--r--kbackgammon/engines/gnubg/kbggnubg.cpp4
-rw-r--r--kbackgammon/engines/nextgen/kbgng.cpp4
-rw-r--r--kbackgammon/engines/offline/kbgoffline.cpp4
-rw-r--r--kbackgammon/kbg.cpp6
-rw-r--r--kbackgammon/kbgboard.cpp2
-rw-r--r--kbackgammon/kbgtextview.cpp2
-rw-r--r--kbackgammon/main.cpp2
-rw-r--r--kbattleship/kbattleship/kbattleship.cpp2
-rw-r--r--kbattleship/kbattleship/kbattleship.h6
-rw-r--r--kbattleship/kbattleship/kbattleshipserver.cpp4
-rw-r--r--kbattleship/kbattleship/kbattleshipview.cpp2
-rw-r--r--kbattleship/kbattleship/kclientdialog.cpp2
-rw-r--r--kbattleship/kbattleship/kmessage.cpp2
-rw-r--r--kbattleship/kbattleship/konnectionhandling.h4
-rw-r--r--kbattleship/kbattleship/kserverdialog.cpp2
-rw-r--r--kbattleship/kbattleship/kshiplist.h4
-rw-r--r--kbattleship/kbattleship/main.cpp2
-rw-r--r--kblackbox/kbbgame.cpp8
-rw-r--r--kblackbox/main.cpp2
-rw-r--r--kbounce/game.cpp2
-rw-r--r--kbounce/highscores.cpp2
-rw-r--r--kbounce/kbounce.cpp4
-rw-r--r--kenolaba/AbTop.cpp6
-rw-r--r--kenolaba/BoardWidget.cpp2
-rw-r--r--kenolaba/EvalDlgImpl.cpp2
-rw-r--r--kenolaba/Move.cpp2
-rw-r--r--kenolaba/Spy.cpp2
-rw-r--r--kenolaba/kenolaba.cpp4
-rw-r--r--kfouleggs/ai.cpp2
-rw-r--r--kfouleggs/board.cpp2
-rw-r--r--kfouleggs/field.cpp2
-rw-r--r--kfouleggs/main.cpp2
-rw-r--r--kfouleggs/piece.cpp2
-rw-r--r--kgoldrunner/src/data_messages.cpp2
-rw-r--r--kgoldrunner/src/kgoldrunner.cpp6
-rw-r--r--kgoldrunner/src/kgrdialog.cpp2
-rw-r--r--kgoldrunner/src/kgrdialog.h4
-rw-r--r--kgoldrunner/src/kgrgame.cpp2
-rw-r--r--kgoldrunner/src/main.cpp2
-rw-r--r--kjumpingcube/kjumpingcube.cpp6
-rw-r--r--klickety/field.cpp2
-rw-r--r--klickety/main.cpp2
-rw-r--r--klickety/piece.cpp2
-rw-r--r--klines/ballpainter.cpp4
-rw-r--r--klines/klines.cpp4
-rw-r--r--klines/linesboard.cpp2
-rw-r--r--klines/main.cpp2
-rw-r--r--klines/mwidget.cpp2
-rw-r--r--kmahjongg/Editor.cpp4
-rw-r--r--kmahjongg/HighScore.cpp4
-rw-r--r--kmahjongg/Preview.cpp4
-rw-r--r--kmahjongg/boardwidget.cpp4
-rw-r--r--kmahjongg/kmahjongg.cpp4
-rw-r--r--kmines/defines.cpp2
-rw-r--r--kmines/dialogs.cpp4
-rw-r--r--kmines/field.cpp2
-rw-r--r--kmines/highscores.cpp2
-rw-r--r--kmines/kzoommainwindow.cpp2
-rw-r--r--kmines/main.cpp2
-rw-r--r--kmines/solver/solver.cpp2
-rw-r--r--kmines/status.cpp6
-rw-r--r--knetwalk/src/cell.cpp2
-rw-r--r--knetwalk/src/highscores.cpp2
-rw-r--r--knetwalk/src/main.cpp2
-rw-r--r--knetwalk/src/mainwindow.cpp6
-rw-r--r--kolf/config.cpp2
-rw-r--r--kolf/game.cpp4
-rw-r--r--kolf/game.h2
-rw-r--r--kolf/kcomboboxdialog.cpp4
-rw-r--r--kolf/kcomboboxdialog.h2
-rw-r--r--kolf/kolf.cpp6
-rw-r--r--kolf/main.cpp2
-rw-r--r--kolf/newgame.cpp6
-rw-r--r--kolf/objects/poolball/poolball.cpp2
-rw-r--r--kolf/objects/test/test.cpp2
-rw-r--r--kolf/pluginloader.cpp2
-rw-r--r--kolf/printdialogpage.cpp2
-rw-r--r--kolf/scoreboard.cpp2
-rw-r--r--konquest/Konquest.cc2
-rw-r--r--konquest/fleetdlg.cc4
-rw-r--r--konquest/gameboard.cc6
-rw-r--r--konquest/gameenddlg.cc2
-rw-r--r--konquest/mainwin.cc6
-rw-r--r--konquest/map_widget.cc4
-rw-r--r--konquest/newgamedlg.cc4
-rw-r--r--konquest/planet_info.cc4
-rw-r--r--konquest/scoredlg.cc2
-rw-r--r--kpat/cardmaps.cpp4
-rw-r--r--kpat/clock.cpp2
-rw-r--r--kpat/computation.cpp2
-rw-r--r--kpat/dealer.cpp2
-rw-r--r--kpat/fortyeight.cpp2
-rw-r--r--kpat/freecell.cpp2
-rw-r--r--kpat/gamestatsimpl.cpp2
-rw-r--r--kpat/golf.cpp2
-rw-r--r--kpat/grandf.cpp2
-rw-r--r--kpat/gypsy.cpp2
-rw-r--r--kpat/idiot.cpp2
-rw-r--r--kpat/kings.cpp2
-rw-r--r--kpat/klondike.cpp2
-rw-r--r--kpat/mod3.cpp2
-rw-r--r--kpat/napoleon.cpp2
-rw-r--r--kpat/pwidget.cpp10
-rw-r--r--kpat/simon.cpp2
-rw-r--r--kpat/spider.cpp2
-rw-r--r--kpat/yukon.cpp2
-rw-r--r--kpoker/betbox.cpp4
-rw-r--r--kpoker/global.h2
-rw-r--r--kpoker/kpaint.cpp2
-rw-r--r--kpoker/kpoker.cpp6
-rw-r--r--kpoker/main.cpp2
-rw-r--r--kpoker/newgamedlg.cpp2
-rw-r--r--kpoker/optionsdlg.cpp2
-rw-r--r--kpoker/playerbox.cpp4
-rw-r--r--kpoker/top.cpp6
-rw-r--r--kreversi/board.cpp2
-rw-r--r--kreversi/highscores.cpp2
-rw-r--r--kreversi/kreversi.cpp4
-rw-r--r--kreversi/kreversi.kcfg2
-rw-r--r--kreversi/kzoommainwindow.cpp2
-rw-r--r--kreversi/qreversigameview.cpp4
-rw-r--r--ksame/KSameWidget.cpp4
-rw-r--r--ksame/StoneWidget.cpp2
-rw-r--r--ksame/main.cpp4
-rw-r--r--kshisen/app.cpp4
-rw-r--r--kshisen/board.cpp4
-rw-r--r--kshisen/tileset.cpp4
-rw-r--r--ksirtet/ksirtet/ai.cpp2
-rw-r--r--ksirtet/ksirtet/field.cpp2
-rw-r--r--ksirtet/ksirtet/main.cpp2
-rw-r--r--ksirtet/ksirtet/piece.cpp2
-rw-r--r--ksirtet/ksirtet/piece.h2
-rw-r--r--ksirtet/ksirtet/settings.cpp2
-rw-r--r--ksmiletris/gamewidget.cpp4
-rw-r--r--ksmiletris/gamewindow.cpp4
-rw-r--r--ksmiletris/main.cpp2
-rw-r--r--ksnake/game.cpp4
-rw-r--r--ksnake/pixServer.cpp2
-rw-r--r--ksnake/rattler.cpp4
-rw-r--r--ksnake/startroom.cpp2
-rw-r--r--ksokoban/Bookmark.cpp2
-rw-r--r--ksokoban/InternalCollections.cpp2
-rw-r--r--ksokoban/MainWindow.cpp6
-rw-r--r--ksokoban/ModalLabel.cpp2
-rw-r--r--ksokoban/PlayField.cpp6
-rw-r--r--ksokoban/main.cpp2
-rw-r--r--kspaceduel/dialogs.cpp2
-rw-r--r--kspaceduel/mainview.cpp4
-rw-r--r--kspaceduel/playerinfo.cpp2
-rw-r--r--kspaceduel/topwidget.cpp2
-rw-r--r--ktron/ktron.cpp4
-rw-r--r--ktron/tron.cpp4
-rw-r--r--ktuberling/main.cpp2
-rw-r--r--ktuberling/playground.cpp4
-rw-r--r--ktuberling/soundfactory.cpp4
-rw-r--r--ktuberling/toplevel.cpp4
-rw-r--r--libksirtet/base/board.cpp2
-rw-r--r--libksirtet/base/factory.cpp4
-rw-r--r--libksirtet/base/field.cpp2
-rw-r--r--libksirtet/base/kzoommainwindow.cpp2
-rw-r--r--libksirtet/base/main.cpp4
-rw-r--r--libksirtet/base/piece.cpp2
-rw-r--r--libksirtet/base/settings.cpp2
-rw-r--r--libksirtet/common/ai.cpp2
-rw-r--r--libksirtet/common/board.cpp2
-rw-r--r--libksirtet/common/field.cpp2
-rw-r--r--libksirtet/common/highscores.cpp2
-rw-r--r--libksirtet/common/inter.cpp2
-rw-r--r--libksirtet/common/main.cpp2
-rw-r--r--libksirtet/common/settings.cpp4
-rw-r--r--libksirtet/lib/defines.cpp2
-rw-r--r--libksirtet/lib/defines.h2
-rw-r--r--libksirtet/lib/internal.cpp2
-rw-r--r--libksirtet/lib/keys.cpp2
-rw-r--r--libksirtet/lib/meeting.cpp4
-rw-r--r--libksirtet/lib/miscui.cpp2
-rw-r--r--libksirtet/lib/mp_interface.cpp4
-rw-r--r--libksirtet/lib/mp_simple_interface.cpp4
-rw-r--r--libksirtet/lib/pline.cpp2
-rw-r--r--libksirtet/lib/types.cpp2
-rw-r--r--libksirtet/lib/wizard.cpp4
-rw-r--r--libtdegames/highscore/kexthighscore_gui.cpp4
-rw-r--r--libtdegames/highscore/kexthighscore_internal.cpp6
-rw-r--r--libtdegames/highscore/kexthighscore_internal.h2
-rw-r--r--libtdegames/highscore/kexthighscore_item.cpp2
-rw-r--r--libtdegames/highscore/kexthighscore_tab.cpp2
-rw-r--r--libtdegames/highscore/khighscore.cpp6
-rw-r--r--libtdegames/highscore/kscoredialog.cpp2
-rw-r--r--libtdegames/kcarddialog.cpp2
-rw-r--r--libtdegames/kchat.cpp2
-rw-r--r--libtdegames/kchatbase.cpp2
-rw-r--r--libtdegames/kchatbase.h2
-rw-r--r--libtdegames/kchatdialog.cpp2
-rw-r--r--libtdegames/kgame/dialogs/kgameconnectdialog.cpp2
-rw-r--r--libtdegames/kgame/dialogs/kgamedebugdialog.cpp2
-rw-r--r--libtdegames/kgame/dialogs/kgamedialog.cpp2
-rw-r--r--libtdegames/kgame/dialogs/kgamedialogconfig.cpp4
-rw-r--r--libtdegames/kgame/dialogs/kgameerrordialog.cpp4
-rw-r--r--libtdegames/kgame/kgame.cpp2
-rw-r--r--libtdegames/kgame/kgamechat.cpp2
-rw-r--r--libtdegames/kgame/kgameerror.cpp2
-rw-r--r--libtdegames/kgame/kgamemessage.cpp2
-rw-r--r--libtdegames/kgame/kgamepropertyhandler.cpp2
-rw-r--r--libtdegames/kgame/kplayer.cpp2
-rw-r--r--libtdegames/kgamelcd.cpp2
-rw-r--r--libtdegames/kgamemisc.cpp2
-rw-r--r--libtdegames/kgrid2d.h2
-rw-r--r--libtdegames/kstdgameaction.cpp2
-rw-r--r--lskat/lskat/lskat.cpp4
-rw-r--r--lskat/lskat/lskatdoc.cpp2
-rw-r--r--lskat/lskat/lskatview.cpp6
-rw-r--r--lskat/lskat/main.cpp2
-rw-r--r--lskat/lskat/msgdlg.cpp2
-rw-r--r--lskat/lskat/namedlg.cpp2
-rw-r--r--twin4/twin4/scorewidget.cpp2
-rw-r--r--twin4/twin4/twin4.cpp4
-rw-r--r--twin4/twin4/twin4doc.cpp2
-rw-r--r--twin4/twin4/twin4view.cpp2
246 files changed, 358 insertions, 358 deletions
diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp
index 23e4cd4f..efbf2a0d 100644
--- a/atlantik/client/atlantik.cpp
+++ b/atlantik/client/atlantik.cpp
@@ -27,8 +27,8 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <knotifyclient.h>
#include <knotifydialog.h>
#include <kstatusbar.h>
diff --git a/atlantik/client/configdlg.cpp b/atlantik/client/configdlg.cpp
index 9703f676..e24244c5 100644
--- a/atlantik/client/configdlg.cpp
+++ b/atlantik/client/configdlg.cpp
@@ -33,7 +33,7 @@
#include <kicondialog.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <kstandarddirs.h>
diff --git a/atlantik/client/eventlogwidget.cpp b/atlantik/client/eventlogwidget.cpp
index ae9e7f94..ea80aadc 100644
--- a/atlantik/client/eventlogwidget.cpp
+++ b/atlantik/client/eventlogwidget.cpp
@@ -20,7 +20,7 @@
#include <tqlayout.h>
#include <tqdatetime.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdelistview.h>
#include <kdialogbase.h>
#include <tdefiledialog.h>
diff --git a/atlantik/client/main.cpp b/atlantik/client/main.cpp
index 52b5a412..3333c88e 100644
--- a/atlantik/client/main.cpp
+++ b/atlantik/client/main.cpp
@@ -16,9 +16,9 @@
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "main.h"
#include "atlantik.h"
diff --git a/atlantik/client/selectconfiguration_widget.cpp b/atlantik/client/selectconfiguration_widget.cpp
index 2d500976..eb67a997 100644
--- a/atlantik/client/selectconfiguration_widget.cpp
+++ b/atlantik/client/selectconfiguration_widget.cpp
@@ -21,9 +21,9 @@
#include <kdebug.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <atlantic_core.h>
diff --git a/atlantik/client/selectgame_widget.cpp b/atlantik/client/selectgame_widget.cpp
index 0eb22877..34636afa 100644
--- a/atlantik/client/selectgame_widget.cpp
+++ b/atlantik/client/selectgame_widget.cpp
@@ -19,7 +19,7 @@
#include <kdebug.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <knotifyclient.h>
diff --git a/atlantik/client/selectserver_widget.cpp b/atlantik/client/selectserver_widget.cpp
index def6beaf..9d8f0e3c 100644
--- a/atlantik/client/selectserver_widget.cpp
+++ b/atlantik/client/selectserver_widget.cpp
@@ -23,7 +23,7 @@
#include <kdialog.h>
#include <kextendedsocket.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include "selectserver_widget.moc"
diff --git a/atlantik/libatlantikclient/atlantik_network.cpp b/atlantik/libatlantikclient/atlantik_network.cpp
index 51347f84..3dad4bda 100644
--- a/atlantik/libatlantikclient/atlantik_network.cpp
+++ b/atlantik/libatlantikclient/atlantik_network.cpp
@@ -22,7 +22,7 @@
#include <tqtimer.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <atlantic_core.h>
#include <auction.h>
diff --git a/atlantik/libatlantikui/auction_widget.cpp b/atlantik/libatlantikui/auction_widget.cpp
index a7ffcc04..85e3a857 100644
--- a/atlantik/libatlantikui/auction_widget.cpp
+++ b/atlantik/libatlantikui/auction_widget.cpp
@@ -23,7 +23,7 @@
#include <kdialog.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <atlantic_core.h>
diff --git a/atlantik/libatlantikui/board.cpp b/atlantik/libatlantikui/board.cpp
index 89581a35..bc7402a1 100644
--- a/atlantik/libatlantikui/board.cpp
+++ b/atlantik/libatlantikui/board.cpp
@@ -20,7 +20,7 @@
#include <tqstring.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <atlantic_core.h>
#include <player.h>
diff --git a/atlantik/libatlantikui/estatedetails.cpp b/atlantik/libatlantikui/estatedetails.cpp
index 242ae778..45cc4c15 100644
--- a/atlantik/libatlantikui/estatedetails.cpp
+++ b/atlantik/libatlantikui/estatedetails.cpp
@@ -22,10 +22,10 @@
#include <tqvgroupbox.h>
#include <kdialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpixmap.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
diff --git a/atlantik/libatlantikui/estateview.cpp b/atlantik/libatlantikui/estateview.cpp
index 4481117c..fe53d63e 100644
--- a/atlantik/libatlantikui/estateview.cpp
+++ b/atlantik/libatlantikui/estateview.cpp
@@ -23,8 +23,8 @@
#include <kdebug.h>
#include <tdeversion.h>
#include <kdialogbase.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <kpixmapeffect.h>
#include <tdepopupmenu.h>
#include <kstandarddirs.h>
diff --git a/atlantik/libatlantikui/kwrappedlistviewitem.cpp b/atlantik/libatlantikui/kwrappedlistviewitem.cpp
index f437cf62..94143bca 100644
--- a/atlantik/libatlantikui/kwrappedlistviewitem.cpp
+++ b/atlantik/libatlantikui/kwrappedlistviewitem.cpp
@@ -25,7 +25,7 @@
#include <tqheader.h>
#include <tqstring.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdelistview.h>
#include <kwordwrap.h>
diff --git a/atlantik/libatlantikui/portfolioview.cpp b/atlantik/libatlantikui/portfolioview.cpp
index d0ab8e92..19424e3b 100644
--- a/atlantik/libatlantikui/portfolioview.cpp
+++ b/atlantik/libatlantikui/portfolioview.cpp
@@ -20,8 +20,8 @@
#include <kdebug.h>
#include <kdialogbase.h>
#include <kiconeffect.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <kstandarddirs.h>
diff --git a/atlantik/libatlantikui/token.cpp b/atlantik/libatlantikui/token.cpp
index 791062eb..d6534df5 100644
--- a/atlantik/libatlantikui/token.cpp
+++ b/atlantik/libatlantikui/token.cpp
@@ -23,7 +23,7 @@
#include <kdebug.h>
#include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include "board.h"
#include "estate.h"
diff --git a/atlantik/libatlantikui/trade_widget.cpp b/atlantik/libatlantikui/trade_widget.cpp
index deb56f30..e8c819aa 100644
--- a/atlantik/libatlantikui/trade_widget.cpp
+++ b/atlantik/libatlantikui/trade_widget.cpp
@@ -26,7 +26,7 @@
#include <tqlabel.h>
#include <tqspinbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdelistview.h>
#include <kdebug.h>
#include <kdialogbase.h>
diff --git a/kasteroids/toplevel.cpp b/kasteroids/toplevel.cpp
index 32604b59..6947365a 100644
--- a/kasteroids/toplevel.cpp
+++ b/kasteroids/toplevel.cpp
@@ -13,9 +13,9 @@
#include <kdebug.h>
#include <tdeapplication.h>
#include <kstandarddirs.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kkeydialog.h>
#include <tdeaction.h>
#include <kstdgameaction.h>
diff --git a/kasteroids/view.cpp b/kasteroids/view.cpp
index c35b7fcb..1a45c044 100644
--- a/kasteroids/view.cpp
+++ b/kasteroids/view.cpp
@@ -8,7 +8,7 @@
#include <math.h>
#include <tdeapplication.h>
#include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include "settings.h"
#include "view.h"
diff --git a/katomic/configbox.cpp b/katomic/configbox.cpp
index 0b8561d4..c8a9fcd5 100644
--- a/katomic/configbox.cpp
+++ b/katomic/configbox.cpp
@@ -5,8 +5,8 @@
*/
#include "configbox.h"
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <tqlayout.h>
#include <tqgroupbox.h>
diff --git a/katomic/feld.cpp b/katomic/feld.cpp
index b18f78ae..3411b7fb 100644
--- a/katomic/feld.cpp
+++ b/katomic/feld.cpp
@@ -13,7 +13,7 @@
// oder auch einfach bewegt wird
#include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <ksimpleconfig.h>
#include "molek.h"
diff --git a/katomic/gamewidget.cpp b/katomic/gamewidget.cpp
index c27cdeb3..4886cb41 100644
--- a/katomic/gamewidget.cpp
+++ b/katomic/gamewidget.cpp
@@ -31,12 +31,12 @@
#include <tdeapplication.h>
#include <kscoredialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <ksimpleconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
Options settings;
diff --git a/katomic/main.cpp b/katomic/main.cpp
index 0847e846..9d63150d 100644
--- a/katomic/main.cpp
+++ b/katomic/main.cpp
@@ -22,7 +22,7 @@
#include "toplevel.h"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
diff --git a/katomic/molek.cpp b/katomic/molek.cpp
index 4a0562c2..46132502 100644
--- a/katomic/molek.cpp
+++ b/katomic/molek.cpp
@@ -16,10 +16,10 @@
#include "molek.moc"
#include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <ctype.h>
diff --git a/katomic/toplevel.cpp b/katomic/toplevel.cpp
index 30c369bd..5603f505 100644
--- a/katomic/toplevel.cpp
+++ b/katomic/toplevel.cpp
@@ -21,8 +21,8 @@
#include <tqgroupbox.h>
#include <tqlayout.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
#include <tdeapplication.h>
diff --git a/kbackgammon/engines/fibs/kbgfibs.cpp b/kbackgammon/engines/fibs/kbgfibs.cpp
index f6de53f3..ab970518 100644
--- a/kbackgammon/engines/fibs/kbgfibs.cpp
+++ b/kbackgammon/engines/fibs/kbgfibs.cpp
@@ -48,7 +48,7 @@
#include <tqradiobutton.h>
#include <tdemainwindow.h>
#include <klineeditdlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqdatetime.h>
#include <tqwhatsthis.h>
#include <kaudioplayer.h>
diff --git a/kbackgammon/engines/fibs/kbgfibs.h b/kbackgammon/engines/fibs/kbgfibs.h
index a2c9e048..0c143744 100644
--- a/kbackgammon/engines/fibs/kbgfibs.h
+++ b/kbackgammon/engines/fibs/kbgfibs.h
@@ -39,7 +39,7 @@
#include <tqstringlist.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
class TQTimer;
class TQSocket;
diff --git a/kbackgammon/engines/fibs/kbgfibschat.cpp b/kbackgammon/engines/fibs/kbgfibschat.cpp
index bab4fdb9..de7311d4 100644
--- a/kbackgammon/engines/fibs/kbgfibschat.cpp
+++ b/kbackgammon/engines/fibs/kbgfibschat.cpp
@@ -46,7 +46,7 @@
#include <tqstringlist.h>
#include <tqdict.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
#include <kdebug.h>
diff --git a/kbackgammon/engines/fibs/kbginvite.cpp b/kbackgammon/engines/fibs/kbginvite.cpp
index f43c3b6a..1858fdd5 100644
--- a/kbackgammon/engines/fibs/kbginvite.cpp
+++ b/kbackgammon/engines/fibs/kbginvite.cpp
@@ -30,7 +30,7 @@
#include <tqspinbox.h>
#include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
diff --git a/kbackgammon/engines/gnubg/kbggnubg.cpp b/kbackgammon/engines/gnubg/kbggnubg.cpp
index ed40188c..32dd96cf 100644
--- a/kbackgammon/engines/gnubg/kbggnubg.cpp
+++ b/kbackgammon/engines/gnubg/kbggnubg.cpp
@@ -25,7 +25,7 @@
#include "kbggnubg.h"
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <stdlib.h>
#include <time.h>
#include <unistd.h>
@@ -36,7 +36,7 @@
#include <tqcheckbox.h>
#include <tdeconfig.h>
#include <iostream>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdemainwindow.h>
#include <klineeditdlg.h>
#include <tqregexp.h>
diff --git a/kbackgammon/engines/nextgen/kbgng.cpp b/kbackgammon/engines/nextgen/kbgng.cpp
index eb78c4d8..018f701d 100644
--- a/kbackgammon/engines/nextgen/kbgng.cpp
+++ b/kbackgammon/engines/nextgen/kbgng.cpp
@@ -25,7 +25,7 @@
#include "kbgng.h"
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <stdlib.h>
#include <time.h>
#include <unistd.h>
@@ -35,7 +35,7 @@
#include <tqbuttongroup.h>
#include <tqcheckbox.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdemainwindow.h>
#include <klineeditdlg.h>
#include <krandomsequence.h>
diff --git a/kbackgammon/engines/offline/kbgoffline.cpp b/kbackgammon/engines/offline/kbgoffline.cpp
index c0dc8126..681a6514 100644
--- a/kbackgammon/engines/offline/kbgoffline.cpp
+++ b/kbackgammon/engines/offline/kbgoffline.cpp
@@ -34,11 +34,11 @@
#include <tqvbox.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kiconloader.h>
#include <kstdaction.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdemainwindow.h>
#include <klineeditdlg.h>
#include <tdeaction.h>
diff --git a/kbackgammon/kbg.cpp b/kbackgammon/kbg.cpp
index a6a0fd84..3bb99777 100644
--- a/kbackgammon/kbg.cpp
+++ b/kbackgammon/kbg.cpp
@@ -35,17 +35,17 @@
#include <tqiconset.h>
#include <tqvbox.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <tdetoolbar.h>
#include <tdeapplication.h>
#include <kiconloader.h>
#include <kedittoolbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <kstdaction.h>
#include <kstdgameaction.h>
#include <tdeaboutdata.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
#include <kcompletion.h>
#include <tdecompletionbox.h>
diff --git a/kbackgammon/kbgboard.cpp b/kbackgammon/kbgboard.cpp
index dfd0a5da..e8cb6c0d 100644
--- a/kbackgammon/kbgboard.cpp
+++ b/kbackgammon/kbgboard.cpp
@@ -38,7 +38,7 @@
#include <stdlib.h>
#include <math.h>
#include <kcolordialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqgroupbox.h>
#include <tqbuttongroup.h>
diff --git a/kbackgammon/kbgtextview.cpp b/kbackgammon/kbgtextview.cpp
index ba8cdd0c..d17352e5 100644
--- a/kbackgammon/kbgtextview.cpp
+++ b/kbackgammon/kbgtextview.cpp
@@ -22,7 +22,7 @@
#include "kbgtextview.moc"
#include "kbgtextview.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kcmenumngr.h>
#include <tdefontdialog.h>
diff --git a/kbackgammon/main.cpp b/kbackgammon/main.cpp
index 57e31823..c1121338 100644
--- a/kbackgammon/main.cpp
+++ b/kbackgammon/main.cpp
@@ -21,7 +21,7 @@
#include <tdeapplication.h>
#include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
diff --git a/kbattleship/kbattleship/kbattleship.cpp b/kbattleship/kbattleship/kbattleship.cpp
index f59e5a7a..144af63a 100644
--- a/kbattleship/kbattleship/kbattleship.cpp
+++ b/kbattleship/kbattleship/kbattleship.cpp
@@ -26,7 +26,7 @@
#include <kstatusbar.h>
#include <kstdgameaction.h>
#include <tdecmdlineargs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kuser.h>
#include <kscoredialog.h>
diff --git a/kbattleship/kbattleship/kbattleship.h b/kbattleship/kbattleship/kbattleship.h
index ed63623f..c834491d 100644
--- a/kbattleship/kbattleship/kbattleship.h
+++ b/kbattleship/kbattleship/kbattleship.h
@@ -22,10 +22,10 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdemainwindow.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
#include <kstdaction.h>
#include <tqstring.h>
diff --git a/kbattleship/kbattleship/kbattleshipserver.cpp b/kbattleship/kbattleship/kbattleshipserver.cpp
index 85e90ffa..a864cb61 100644
--- a/kbattleship/kbattleship/kbattleshipserver.cpp
+++ b/kbattleship/kbattleship/kbattleshipserver.cpp
@@ -26,8 +26,8 @@
#endif
#include <sys/ioctl.h>
#include <tqtimer.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include "kbattleshipserver.moc"
KBattleshipServer::KBattleshipServer(int port, const TQString& name)
diff --git a/kbattleship/kbattleship/kbattleshipview.cpp b/kbattleship/kbattleship/kbattleshipview.cpp
index f746e2ab..42b699bb 100644
--- a/kbattleship/kbattleship/kbattleshipview.cpp
+++ b/kbattleship/kbattleship/kbattleshipview.cpp
@@ -17,7 +17,7 @@
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kbattleship.h"
#include "kbattleshipview.moc"
diff --git a/kbattleship/kbattleship/kclientdialog.cpp b/kbattleship/kbattleship/kclientdialog.cpp
index 97015b71..e5a65cf7 100644
--- a/kbattleship/kbattleship/kclientdialog.cpp
+++ b/kbattleship/kbattleship/kclientdialog.cpp
@@ -18,7 +18,7 @@
#include <tqstring.h>
#include <tqglobal.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcombobox.h>
#include <kuser.h>
#include <tqlayout.h>
diff --git a/kbattleship/kbattleship/kmessage.cpp b/kbattleship/kbattleship/kmessage.cpp
index baf5d916..37246d40 100644
--- a/kbattleship/kbattleship/kmessage.cpp
+++ b/kbattleship/kbattleship/kmessage.cpp
@@ -17,7 +17,7 @@
//#define XMLDUMP
-#include <klocale.h>
+#include <tdelocale.h>
#ifdef XMLDUMP
#include <kdebug.h>
diff --git a/kbattleship/kbattleship/konnectionhandling.h b/kbattleship/kbattleship/konnectionhandling.h
index b6526bed..b78895b7 100644
--- a/kbattleship/kbattleship/konnectionhandling.h
+++ b/kbattleship/kbattleship/konnectionhandling.h
@@ -18,8 +18,8 @@
#ifndef KONNECTIONHANDLING_H
#define KONNECTIONHANDLING_H
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqobject.h>
diff --git a/kbattleship/kbattleship/kserverdialog.cpp b/kbattleship/kbattleship/kserverdialog.cpp
index 1a045cc6..7fb8a5a1 100644
--- a/kbattleship/kbattleship/kserverdialog.cpp
+++ b/kbattleship/kbattleship/kserverdialog.cpp
@@ -15,7 +15,7 @@
* *
***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kuser.h>
#include <tqlayout.h>
diff --git a/kbattleship/kbattleship/kshiplist.h b/kbattleship/kbattleship/kshiplist.h
index 7416a867..c7dcb8a6 100644
--- a/kbattleship/kbattleship/kshiplist.h
+++ b/kbattleship/kbattleship/kshiplist.h
@@ -19,8 +19,8 @@
#ifndef KSHIPLIST_H
#define KSHIPLIST_H
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tqptrlist.h>
#include "kbattlefield.h"
#include "kship.h"
diff --git a/kbattleship/kbattleship/main.cpp b/kbattleship/kbattleship/main.cpp
index 35011c08..c53a5942 100644
--- a/kbattleship/kbattleship/main.cpp
+++ b/kbattleship/kbattleship/main.cpp
@@ -17,7 +17,7 @@
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include "kbattleship.h"
diff --git a/kblackbox/kbbgame.cpp b/kblackbox/kbbgame.cpp
index 8b26d813..01fc7bc4 100644
--- a/kblackbox/kbbgame.cpp
+++ b/kblackbox/kbbgame.cpp
@@ -17,13 +17,13 @@
#include <tqtooltip.h>
#include <tqstring.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <kmenubar.h>
+#include <tdeglobal.h>
+#include <tdemenubar.h>
#include <kiconloader.h>
#include <khelpmenu.h>
#include <tdeaction.h>
diff --git a/kblackbox/main.cpp b/kblackbox/main.cpp
index 3ecc170f..47fe402a 100644
--- a/kblackbox/main.cpp
+++ b/kblackbox/main.cpp
@@ -10,7 +10,7 @@
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
diff --git a/kbounce/game.cpp b/kbounce/game.cpp
index f6583de8..4b60df2e 100644
--- a/kbounce/game.cpp
+++ b/kbounce/game.cpp
@@ -23,7 +23,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <tqimage.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include "game.h"
diff --git a/kbounce/highscores.cpp b/kbounce/highscores.cpp
index 5dc3bf47..53789f7c 100644
--- a/kbounce/highscores.cpp
+++ b/kbounce/highscores.cpp
@@ -1,6 +1,6 @@
#include "highscores.h"
-#include <klocale.h>
+#include <tdelocale.h>
using namespace KExtHighscore;
diff --git a/kbounce/kbounce.cpp b/kbounce/kbounce.cpp
index bdfa4f32..11bd64fa 100644
--- a/kbounce/kbounce.cpp
+++ b/kbounce/kbounce.cpp
@@ -17,13 +17,13 @@
*/
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdeaction.h>
#include <kstdgameaction.h>
#include <tqtimer.h>
#include <tqlcdnumber.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tdefiledialog.h>
#include <kstatusbar.h>
diff --git a/kenolaba/AbTop.cpp b/kenolaba/AbTop.cpp
index 750d988d..0e808e08 100644
--- a/kenolaba/AbTop.cpp
+++ b/kenolaba/AbTop.cpp
@@ -9,10 +9,10 @@
#include <tdeconfig.h>
#include <kdialogbase.h>
#include <kiconloader.h>
-#include <klocale.h>
-#include <kmenubar.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
#include <tdestdaccel.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstatusbar.h>
#include <kstdaction.h>
#include <kstdgameaction.h>
diff --git a/kenolaba/BoardWidget.cpp b/kenolaba/BoardWidget.cpp
index 744ccb16..456bb75c 100644
--- a/kenolaba/BoardWidget.cpp
+++ b/kenolaba/BoardWidget.cpp
@@ -10,7 +10,7 @@
#include <tqpainter.h>
#include <tqcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#ifdef HAVE_KIR
diff --git a/kenolaba/EvalDlgImpl.cpp b/kenolaba/EvalDlgImpl.cpp
index 79f4dde7..dddbcd2b 100644
--- a/kenolaba/EvalDlgImpl.cpp
+++ b/kenolaba/EvalDlgImpl.cpp
@@ -11,7 +11,7 @@
#include <tqpushbutton.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeapplication.h>
diff --git a/kenolaba/Move.cpp b/kenolaba/Move.cpp
index 27e7b53a..6d07d855 100644
--- a/kenolaba/Move.cpp
+++ b/kenolaba/Move.cpp
@@ -9,7 +9,7 @@
#include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "Move.h"
#include "Board.h"
diff --git a/kenolaba/Spy.cpp b/kenolaba/Spy.cpp
index 614c810f..37b5406c 100644
--- a/kenolaba/Spy.cpp
+++ b/kenolaba/Spy.cpp
@@ -8,7 +8,7 @@
#include <tqlayout.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include "BoardWidget.h"
diff --git a/kenolaba/kenolaba.cpp b/kenolaba/kenolaba.cpp
index f2f15504..f642fef3 100644
--- a/kenolaba/kenolaba.cpp
+++ b/kenolaba/kenolaba.cpp
@@ -3,8 +3,8 @@
#include <tqobject.h>
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
diff --git a/kfouleggs/ai.cpp b/kfouleggs/ai.cpp
index ee8a6c4b..bd145456 100644
--- a/kfouleggs/ai.cpp
+++ b/kfouleggs/ai.cpp
@@ -1,7 +1,7 @@
#include "ai.h"
#include "ai.moc"
-#include <klocale.h>
+#include <tdelocale.h>
#include "board.h"
diff --git a/kfouleggs/board.cpp b/kfouleggs/board.cpp
index 5383c619..aa62626c 100644
--- a/kfouleggs/board.cpp
+++ b/kfouleggs/board.cpp
@@ -1,7 +1,7 @@
#include "board.h"
#include "board.moc"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "common/misc_ui.h"
#include "piece.h"
diff --git a/kfouleggs/field.cpp b/kfouleggs/field.cpp
index ae9bcdce..89e2d953 100644
--- a/kfouleggs/field.cpp
+++ b/kfouleggs/field.cpp
@@ -3,7 +3,7 @@
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgamelcd.h>
#include "common/commonprefs.h"
diff --git a/kfouleggs/main.cpp b/kfouleggs/main.cpp
index 0ea94b01..efc27d6c 100644
--- a/kfouleggs/main.cpp
+++ b/kfouleggs/main.cpp
@@ -1,7 +1,7 @@
#include "main.h"
#include "main.moc"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <khighscore.h>
diff --git a/kfouleggs/piece.cpp b/kfouleggs/piece.cpp
index 075bac7a..309ed6ac 100644
--- a/kfouleggs/piece.cpp
+++ b/kfouleggs/piece.cpp
@@ -5,7 +5,7 @@
#include <tqpainter.h>
#include <tqbitmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "base/board.h"
diff --git a/kgoldrunner/src/data_messages.cpp b/kgoldrunner/src/data_messages.cpp
index 465c9a2f..f905168b 100644
--- a/kgoldrunner/src/data_messages.cpp
+++ b/kgoldrunner/src/data_messages.cpp
@@ -4,7 +4,7 @@
they will be re-formatted into a .pot file for the translators.
*/
-#include <klocale.h>
+#include <tdelocale.h>
dont_call_me() {
diff --git a/kgoldrunner/src/kgoldrunner.cpp b/kgoldrunner/src/kgoldrunner.cpp
index 665d804f..f8bfcbd0 100644
--- a/kgoldrunner/src/kgoldrunner.cpp
+++ b/kgoldrunner/src/kgoldrunner.cpp
@@ -6,10 +6,10 @@
#include <tqpainter.h>
#include <tqpaintdevicemetrics.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kstatusbar.h>
#include <kkeydialog.h>
#include <tdeaccel.h>
diff --git a/kgoldrunner/src/kgrdialog.cpp b/kgoldrunner/src/kgrdialog.cpp
index 79d19f3a..def7af7d 100644
--- a/kgoldrunner/src/kgrdialog.cpp
+++ b/kgoldrunner/src/kgrdialog.cpp
@@ -19,7 +19,7 @@
#include "kgrdialog.h"
#ifndef KGR_PORTABLE
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#endif
/******************************************************************************/
diff --git a/kgoldrunner/src/kgrdialog.h b/kgoldrunner/src/kgrdialog.h
index 1e62a3eb..a3514a1e 100644
--- a/kgoldrunner/src/kgrdialog.h
+++ b/kgoldrunner/src/kgrdialog.h
@@ -19,10 +19,10 @@
#include <tqmessagebox.h>
#else
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialogbase.h>
#define KGR_DIALOG KDialogBase
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#endif
#include <tqlayout.h>
diff --git a/kgoldrunner/src/kgrgame.cpp b/kgoldrunner/src/kgrgame.cpp
index 13157225..ffe0987d 100644
--- a/kgoldrunner/src/kgrgame.cpp
+++ b/kgoldrunner/src/kgrgame.cpp
@@ -30,7 +30,7 @@
#include <kstdguiitem.h>
#ifndef KGR_PORTABLE
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#endif
/******************************************************************************/
diff --git a/kgoldrunner/src/main.cpp b/kgoldrunner/src/main.cpp
index c8057ca8..287f3b85 100644
--- a/kgoldrunner/src/main.cpp
+++ b/kgoldrunner/src/main.cpp
@@ -6,7 +6,7 @@
#include <dcopclient.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kgrconsts.h"
#include "kgoldrunner.h"
diff --git a/kjumpingcube/kjumpingcube.cpp b/kjumpingcube/kjumpingcube.cpp
index ac5bf928..8813d018 100644
--- a/kjumpingcube/kjumpingcube.cpp
+++ b/kjumpingcube/kjumpingcube.cpp
@@ -31,10 +31,10 @@
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
#include <kstdgameaction.h>
#include <tdeaction.h>
#include <tdeio/netaccess.h>
diff --git a/klickety/field.cpp b/klickety/field.cpp
index 9288e24f..84deebfd 100644
--- a/klickety/field.cpp
+++ b/klickety/field.cpp
@@ -5,7 +5,7 @@
#include <tqlayout.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgamelcd.h>
#include "base/board.h"
diff --git a/klickety/main.cpp b/klickety/main.cpp
index 46381858..c4879ec7 100644
--- a/klickety/main.cpp
+++ b/klickety/main.cpp
@@ -1,7 +1,7 @@
#include "main.h"
#include "main.moc"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <khighscore.h>
#include <tdeaboutdata.h>
diff --git a/klickety/piece.cpp b/klickety/piece.cpp
index fcc2fdff..a24702fc 100644
--- a/klickety/piece.cpp
+++ b/klickety/piece.cpp
@@ -1,7 +1,7 @@
#include "piece.h"
#include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "base/board.h"
diff --git a/klines/ballpainter.cpp b/klines/ballpainter.cpp
index 034ecb3d..a878e751 100644
--- a/klines/ballpainter.cpp
+++ b/klines/ballpainter.cpp
@@ -15,14 +15,14 @@
* *
***************************************************************************/
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
//#include "shotcounter.h"
#include <tqpainter.h>
#include "linesboard.h"
//#include <tqcolor.h>
#include <tqjpegio.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <stdlib.h>
#include "prefs.h"
diff --git a/klines/klines.cpp b/klines/klines.cpp
index 85d4aa16..7e258562 100644
--- a/klines/klines.cpp
+++ b/klines/klines.cpp
@@ -33,9 +33,9 @@
#include <tdeapplication.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <tdepopupmenu.h>
#include <kscoredialog.h>
#include <tdeaction.h>
diff --git a/klines/linesboard.cpp b/klines/linesboard.cpp
index 356db61a..81e7eb77 100644
--- a/klines/linesboard.cpp
+++ b/klines/linesboard.cpp
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpixmap.h>
#include <kpixmapeffect.h>
diff --git a/klines/main.cpp b/klines/main.cpp
index 933acb92..13aa6940 100644
--- a/klines/main.cpp
+++ b/klines/main.cpp
@@ -21,7 +21,7 @@
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
diff --git a/klines/mwidget.cpp b/klines/mwidget.cpp
index fbb69161..cfae3a1c 100644
--- a/klines/mwidget.cpp
+++ b/klines/mwidget.cpp
@@ -17,7 +17,7 @@
#include "mwidget.moc"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <tqlayout.h>
diff --git a/kmahjongg/Editor.cpp b/kmahjongg/Editor.cpp
index 43594a72..b344710b 100644
--- a/kmahjongg/Editor.cpp
+++ b/kmahjongg/Editor.cpp
@@ -7,8 +7,8 @@
#include "Editor.h"
#include "prefs.h"
-#include <kmessagebox.h>
-#include <klocale.h> // Needed to use TDELocale
+#include <tdemessagebox.h>
+#include <tdelocale.h> // Needed to use TDELocale
#include <kiconloader.h> //
#include <kstandarddirs.h>
#include <tdetoolbarradiogroup.h>
diff --git a/kmahjongg/HighScore.cpp b/kmahjongg/HighScore.cpp
index c91d99a7..7240e8e0 100644
--- a/kmahjongg/HighScore.cpp
+++ b/kmahjongg/HighScore.cpp
@@ -5,8 +5,8 @@
#include <tqlabel.h>
#include <tqfileinfo.h>
-#include <kmessagebox.h>
-#include "klocale.h"
+#include <tdemessagebox.h>
+#include "tdelocale.h"
#include <kstandarddirs.h>
#include <kiconloader.h>
#include <tqlineedit.h>
diff --git a/kmahjongg/Preview.cpp b/kmahjongg/Preview.cpp
index e9d192b4..725e0a93 100644
--- a/kmahjongg/Preview.cpp
+++ b/kmahjongg/Preview.cpp
@@ -1,7 +1,7 @@
#include <tdeapplication.h>
#include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kpushbutton.h>
#include <kstandarddirs.h>
#include <kstdguiitem.h>
diff --git a/kmahjongg/boardwidget.cpp b/kmahjongg/boardwidget.cpp
index 933e2f3b..8bf8256a 100644
--- a/kmahjongg/boardwidget.cpp
+++ b/kmahjongg/boardwidget.cpp
@@ -1,11 +1,11 @@
#include "boardwidget.h"
#include "prefs.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <tqtimer.h>
#include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tqfile.h>
#include <tdeconfig.h>
diff --git a/kmahjongg/kmahjongg.cpp b/kmahjongg/kmahjongg.cpp
index 954e4caa..8edf7b6c 100644
--- a/kmahjongg/kmahjongg.cpp
+++ b/kmahjongg/kmahjongg.cpp
@@ -31,8 +31,8 @@
#include <tdeaction.h>
#include <tdeconfigdialog.h>
#include <kinputdialog.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
#include <kstdgameaction.h>
#include <tdeio/netaccess.h>
diff --git a/kmines/defines.cpp b/kmines/defines.cpp
index b008de00..9dc0158b 100644
--- a/kmines/defines.cpp
+++ b/kmines/defines.cpp
@@ -18,7 +18,7 @@
#include "defines.h"
-#include <klocale.h>
+#include <tdelocale.h>
const char *Level::LABELS[NB_TYPES+1] = {
I18N_NOOP("Easy"), I18N_NOOP("Normal"), I18N_NOOP("Expert"),
diff --git a/kmines/dialogs.cpp b/kmines/dialogs.cpp
index b6991d19..21120478 100644
--- a/kmines/dialogs.cpp
+++ b/kmines/dialogs.cpp
@@ -30,8 +30,8 @@
#include <tqwhatsthis.h>
#include <tqcheckbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kcombobox.h>
#include <knuminput.h>
#include <kcolorbutton.h>
diff --git a/kmines/field.cpp b/kmines/field.cpp
index ff3b4e46..993e1d8f 100644
--- a/kmines/field.cpp
+++ b/kmines/field.cpp
@@ -25,7 +25,7 @@
#include <tqtimer.h>
#include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knotifyclient.h>
#include "settings.h"
diff --git a/kmines/highscores.cpp b/kmines/highscores.cpp
index 6ad1e617..51324533 100644
--- a/kmines/highscores.cpp
+++ b/kmines/highscores.cpp
@@ -19,7 +19,7 @@
#include "highscores.h"
#include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
diff --git a/kmines/kzoommainwindow.cpp b/kmines/kzoommainwindow.cpp
index 8c3fef13..758d73d6 100644
--- a/kmines/kzoommainwindow.cpp
+++ b/kmines/kzoommainwindow.cpp
@@ -22,7 +22,7 @@
#include <tdeaction.h>
#include <kstdaction.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kcmenumngr.h>
KZoomMainWindow::KZoomMainWindow(uint min, uint max, uint step, const char *name)
diff --git a/kmines/main.cpp b/kmines/main.cpp
index 602fc044..eee46237 100644
--- a/kmines/main.cpp
+++ b/kmines/main.cpp
@@ -23,7 +23,7 @@
#include <tdeaccel.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
#include <kstdaction.h>
diff --git a/kmines/solver/solver.cpp b/kmines/solver/solver.cpp
index f8607b79..99070cad 100644
--- a/kmines/solver/solver.cpp
+++ b/kmines/solver/solver.cpp
@@ -28,7 +28,7 @@
#include <tqlabel.h>
#include <kprogress.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "headerP.h"
diff --git a/kmines/status.cpp b/kmines/status.cpp
index 3c88961e..69f568cd 100644
--- a/kmines/status.cpp
+++ b/kmines/status.cpp
@@ -28,13 +28,13 @@
#include <tqtimer.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeaction.h>
#include <kdebug.h>
#include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdeio/netaccess.h>
#include <knotifyclient.h>
#include <kexthighscore.h>
diff --git a/knetwalk/src/cell.cpp b/knetwalk/src/cell.cpp
index e507a79f..d3ce0906 100644
--- a/knetwalk/src/cell.cpp
+++ b/knetwalk/src/cell.cpp
@@ -15,7 +15,7 @@
#include <tqpainter.h>
#include <tqimage.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kstandarddirs.h>
diff --git a/knetwalk/src/highscores.cpp b/knetwalk/src/highscores.cpp
index a33185eb..a3ef3f3c 100644
--- a/knetwalk/src/highscores.cpp
+++ b/knetwalk/src/highscores.cpp
@@ -13,7 +13,7 @@
***************************************************************************/
#include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
diff --git a/knetwalk/src/main.cpp b/knetwalk/src/main.cpp
index 326ed74c..0a1b9438 100644
--- a/knetwalk/src/main.cpp
+++ b/knetwalk/src/main.cpp
@@ -15,7 +15,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <khighscore.h>
diff --git a/knetwalk/src/mainwindow.cpp b/knetwalk/src/mainwindow.cpp
index eb5828da..a831c96f 100644
--- a/knetwalk/src/mainwindow.cpp
+++ b/knetwalk/src/mainwindow.cpp
@@ -31,15 +31,15 @@
#include <stdlib.h>
#include <time.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kscoredialog.h>
#include <khighscore.h>
#include <kstdaction.h>
#include <tdeaction.h>
#include <kstdgameaction.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kstatusbar.h>
#include <kdebug.h>
#include <knotifyclient.h>
diff --git a/kolf/config.cpp b/kolf/config.cpp
index 7c333755..7dba99fd 100644
--- a/kolf/config.cpp
+++ b/kolf/config.cpp
@@ -2,7 +2,7 @@
#include <tqlayout.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "config.h"
diff --git a/kolf/game.cpp b/kolf/game.cpp
index 8544cbd6..3c6978fd 100644
--- a/kolf/game.cpp
+++ b/kolf/game.cpp
@@ -8,9 +8,9 @@
#include <kdebug.h>
#include <knuminput.h>
#include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kpixmapeffect.h>
#include <kprinter.h>
#include <kstandarddirs.h>
diff --git a/kolf/game.h b/kolf/game.h
index ee940802..fcbeec4e 100644
--- a/kolf/game.h
+++ b/kolf/game.h
@@ -2,7 +2,7 @@
#define GAME_H
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpixmap.h>
#include <arts/kplayobject.h>
#include <arts/kartsserver.h>
diff --git a/kolf/kcomboboxdialog.cpp b/kolf/kcomboboxdialog.cpp
index 72fdcb57..228e4b3e 100644
--- a/kolf/kcomboboxdialog.cpp
+++ b/kolf/kcomboboxdialog.cpp
@@ -26,11 +26,11 @@
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcombobox.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "kcomboboxdialog.h"
diff --git a/kolf/kcomboboxdialog.h b/kolf/kcomboboxdialog.h
index b55d68d1..c533a305 100644
--- a/kolf/kcomboboxdialog.h
+++ b/kolf/kcomboboxdialog.h
@@ -28,7 +28,7 @@
#include <tqstringlist.h>
#include <kdialogbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
class TQCheckBox;
class KHistoryCombo;
diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp
index 2fe55956..ec7fffef 100644
--- a/kolf/kolf.cpp
+++ b/kolf/kolf.cpp
@@ -4,12 +4,12 @@
#include <kdebug.h>
#include <tdeversion.h>
#include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdemainwindow.h>
#include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kprinter.h>
#include <kscoredialog.h>
#include <kstandarddirs.h>
diff --git a/kolf/main.cpp b/kolf/main.cpp
index 235ef614..a7b33cda 100644
--- a/kolf/main.cpp
+++ b/kolf/main.cpp
@@ -2,7 +2,7 @@
#include <tqfile.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
#include <kdebug.h>
diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp
index d4e4e00a..45eb4b1a 100644
--- a/kolf/newgame.cpp
+++ b/kolf/newgame.cpp
@@ -2,13 +2,13 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <kdialogbase.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
#include <kscoredialog.h>
#include <kstandarddirs.h>
#include <kseparator.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <kurllabel.h>
diff --git a/kolf/objects/poolball/poolball.cpp b/kolf/objects/poolball/poolball.cpp
index 147c8e1e..58e62deb 100644
--- a/kolf/objects/poolball/poolball.cpp
+++ b/kolf/objects/poolball/poolball.cpp
@@ -5,7 +5,7 @@
#include <tqlayout.h>
#include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klibloader.h>
#include <tdeapplication.h>
#include <kdebug.h>
diff --git a/kolf/objects/test/test.cpp b/kolf/objects/test/test.cpp
index 7e0fe011..45124f9c 100644
--- a/kolf/objects/test/test.cpp
+++ b/kolf/objects/test/test.cpp
@@ -5,7 +5,7 @@
#include <tqlayout.h>
#include <tqslider.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klibloader.h>
#include <tdeapplication.h>
#include <kdebug.h>
diff --git a/kolf/pluginloader.cpp b/kolf/pluginloader.cpp
index 9f320856..3adb7e3f 100644
--- a/kolf/pluginloader.cpp
+++ b/kolf/pluginloader.cpp
@@ -5,7 +5,7 @@
#include <tqobject.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <ksimpleconfig.h>
#include <klibloader.h>
diff --git a/kolf/printdialogpage.cpp b/kolf/printdialogpage.cpp
index e8733c81..0a9759a7 100644
--- a/kolf/printdialogpage.cpp
+++ b/kolf/printdialogpage.cpp
@@ -2,7 +2,7 @@
#include <tqlayout.h>
#include <tqwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <kdebug.h>
diff --git a/kolf/scoreboard.cpp b/kolf/scoreboard.cpp
index 717dbc36..17c29bce 100644
--- a/kolf/scoreboard.cpp
+++ b/kolf/scoreboard.cpp
@@ -1,5 +1,5 @@
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqtable.h>
diff --git a/konquest/Konquest.cc b/konquest/Konquest.cc
index 953852a2..a0c772a8 100644
--- a/konquest/Konquest.cc
+++ b/konquest/Konquest.cc
@@ -1,5 +1,5 @@
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
diff --git a/konquest/fleetdlg.cc b/konquest/fleetdlg.cc
index bfa7a696..5fd71239 100644
--- a/konquest/fleetdlg.cc
+++ b/konquest/fleetdlg.cc
@@ -1,8 +1,8 @@
#include <tqlayout.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <math.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
diff --git a/konquest/gameboard.cc b/konquest/gameboard.cc
index 2f279f27..69aec42c 100644
--- a/konquest/gameboard.cc
+++ b/konquest/gameboard.cc
@@ -11,9 +11,9 @@
#include <tqtextedit.h>
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <ctype.h>
diff --git a/konquest/gameenddlg.cc b/konquest/gameenddlg.cc
index c8c954f4..d999c375 100644
--- a/konquest/gameenddlg.cc
+++ b/konquest/gameenddlg.cc
@@ -5,7 +5,7 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstdguiitem.h>
#include "gameenddlg.h"
diff --git a/konquest/mainwin.cc b/konquest/mainwin.cc
index 7ccdfe9f..8982974a 100644
--- a/konquest/mainwin.cc
+++ b/konquest/mainwin.cc
@@ -3,9 +3,9 @@
#include <tqpushbutton.h>
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kmenubar.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdemenubar.h>
#include <tdetoolbar.h>
#include <kiconloader.h>
#include <tdeaction.h>
diff --git a/konquest/map_widget.cc b/konquest/map_widget.cc
index a5bc0069..af39b032 100644
--- a/konquest/map_widget.cc
+++ b/konquest/map_widget.cc
@@ -4,9 +4,9 @@
#include <tdeapplication.h>
#include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "map_widget.moc"
ConquestMap::ConquestMap( Map *newMap, TQWidget *parent )
diff --git a/konquest/newgamedlg.cc b/konquest/newgamedlg.cc
index 85672550..b609f1a2 100644
--- a/konquest/newgamedlg.cc
+++ b/konquest/newgamedlg.cc
@@ -11,8 +11,8 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
diff --git a/konquest/planet_info.cc b/konquest/planet_info.cc
index afc80f72..d4c3cbaa 100644
--- a/konquest/planet_info.cc
+++ b/konquest/planet_info.cc
@@ -3,10 +3,10 @@
#include <tqpalette.h>
#include <tqcolor.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "planet_info.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "planet_info.moc"
PlanetInfo::PlanetInfo( TQWidget *parent, TQPalette palette )
diff --git a/konquest/scoredlg.cc b/konquest/scoredlg.cc
index bcbe45ec..a633e3b6 100644
--- a/konquest/scoredlg.cc
+++ b/konquest/scoredlg.cc
@@ -1,6 +1,6 @@
#include <tqlayout.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
diff --git a/kpat/cardmaps.cpp b/kpat/cardmaps.cpp
index d00fc8cf..79a950bd 100644
--- a/kpat/cardmaps.cpp
+++ b/kpat/cardmaps.cpp
@@ -32,13 +32,13 @@
#include <config.h>
#include <kdebug.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "version.h"
#include <kstaticdeleter.h>
#include <tqimage.h>
#include <kimageeffect.h>
#include <kcarddialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <assert.h>
cardMap *cardMap::_self = 0;
diff --git a/kpat/clock.cpp b/kpat/clock.cpp
index 433fa2d9..a1002d80 100644
--- a/kpat/clock.cpp
+++ b/kpat/clock.cpp
@@ -1,5 +1,5 @@
#include "clock.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include "deck.h"
#include <assert.h>
#include "cardmaps.h"
diff --git a/kpat/computation.cpp b/kpat/computation.cpp
index f8475d0a..e443b57c 100644
--- a/kpat/computation.cpp
+++ b/kpat/computation.cpp
@@ -22,7 +22,7 @@
****************************************/
#include "computation.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include "deck.h"
#include <assert.h>
#include "cardmaps.h"
diff --git a/kpat/dealer.cpp b/kpat/dealer.cpp
index 49395057..ff6889a1 100644
--- a/kpat/dealer.cpp
+++ b/kpat/dealer.cpp
@@ -8,7 +8,7 @@
#include <kpixmapeffect.h>
#include <tqtimer.h>
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "cardmaps.h"
#include "speeds.h"
#include <tdeconfig.h>
diff --git a/kpat/fortyeight.cpp b/kpat/fortyeight.cpp
index 05fabd74..64bd8a2f 100644
--- a/kpat/fortyeight.cpp
+++ b/kpat/fortyeight.cpp
@@ -1,5 +1,5 @@
#include "fortyeight.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "deck.h"
#include <assert.h>
diff --git a/kpat/freecell.cpp b/kpat/freecell.cpp
index 7cbb9470..d222020a 100644
--- a/kpat/freecell.cpp
+++ b/kpat/freecell.cpp
@@ -20,7 +20,7 @@
---------------------------------------------------------------------------*/
#include "freecell.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include "deck.h"
#include <assert.h>
#include <kdebug.h>
diff --git a/kpat/gamestatsimpl.cpp b/kpat/gamestatsimpl.cpp
index 0de9da08..2b27ee74 100644
--- a/kpat/gamestatsimpl.cpp
+++ b/kpat/gamestatsimpl.cpp
@@ -7,7 +7,7 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
GameStatsImpl::GameStatsImpl(TQWidget* aParent, const char* aname)
: GameStats(aParent, aname)
diff --git a/kpat/golf.cpp b/kpat/golf.cpp
index 7f21744f..0a37dae4 100644
--- a/kpat/golf.cpp
+++ b/kpat/golf.cpp
@@ -1,5 +1,5 @@
#include "golf.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include "deck.h"
#include <kdebug.h>
#include "cardmaps.h"
diff --git a/kpat/grandf.cpp b/kpat/grandf.cpp
index bbd40848..d2808a27 100644
--- a/kpat/grandf.cpp
+++ b/kpat/grandf.cpp
@@ -19,7 +19,7 @@
****************************************/
#include "grandf.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include "deck.h"
#include <tdeaction.h>
#include <assert.h>
diff --git a/kpat/gypsy.cpp b/kpat/gypsy.cpp
index db38aa20..ea4727fa 100644
--- a/kpat/gypsy.cpp
+++ b/kpat/gypsy.cpp
@@ -1,5 +1,5 @@
#include "gypsy.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include "deck.h"
#include "cardmaps.h"
diff --git a/kpat/idiot.cpp b/kpat/idiot.cpp
index 40fd041c..65397616 100644
--- a/kpat/idiot.cpp
+++ b/kpat/idiot.cpp
@@ -20,7 +20,7 @@
#include "idiot.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include "deck.h"
#include "cardmaps.h"
diff --git a/kpat/kings.cpp b/kpat/kings.cpp
index 739d3166..81f3c0bc 100644
--- a/kpat/kings.cpp
+++ b/kpat/kings.cpp
@@ -1,5 +1,5 @@
#include "kings.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "deck.h"
#include <assert.h>
diff --git a/kpat/klondike.cpp b/kpat/klondike.cpp
index cb137c0c..b7091f37 100644
--- a/kpat/klondike.cpp
+++ b/kpat/klondike.cpp
@@ -23,7 +23,7 @@
****************************************/
#include "klondike.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include "deck.h"
#include <kdebug.h>
#include <assert.h>
diff --git a/kpat/mod3.cpp b/kpat/mod3.cpp
index 96b42a5a..64687162 100644
--- a/kpat/mod3.cpp
+++ b/kpat/mod3.cpp
@@ -20,7 +20,7 @@
#include "mod3.h"
#include "cardmaps.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include "deck.h"
#include <kdebug.h>
diff --git a/kpat/napoleon.cpp b/kpat/napoleon.cpp
index 289501a0..053b158e 100644
--- a/kpat/napoleon.cpp
+++ b/kpat/napoleon.cpp
@@ -18,7 +18,7 @@
*/
#include "napoleon.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include "deck.h"
#include "cardmaps.h"
diff --git a/kpat/pwidget.cpp b/kpat/pwidget.cpp
index dbc211ec..2eb38fc1 100644
--- a/kpat/pwidget.cpp
+++ b/kpat/pwidget.cpp
@@ -25,19 +25,19 @@
#include <tqimage.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <kdebug.h>
#include <kcarddialog.h>
#include <kinputdialog.h>
#include <kstandarddirs.h>
#include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstatusbar.h>
#include <tdeaccelmanager.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include "pwidget.h"
#include "version.h"
@@ -465,7 +465,7 @@ void pWidget::gameLost()
{
TQString dontAskAgainName = "gameLostDontAskAgain";
- // The following code is taken out of kmessagebox.cpp in tdeui.
+ // The following code is taken out of tdemessagebox.cpp in tdeui.
// Is there a better way?
TDEConfig *config = 0;
TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
diff --git a/kpat/simon.cpp b/kpat/simon.cpp
index 0639ded4..5cd66f32 100644
--- a/kpat/simon.cpp
+++ b/kpat/simon.cpp
@@ -1,5 +1,5 @@
#include "simon.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "deck.h"
#include <assert.h>
diff --git a/kpat/spider.cpp b/kpat/spider.cpp
index b4ac19c0..383f96a2 100644
--- a/kpat/spider.cpp
+++ b/kpat/spider.cpp
@@ -20,7 +20,7 @@
#include "spider.h"
#include "cardmaps.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include "deck.h"
#include <kdebug.h>
diff --git a/kpat/yukon.cpp b/kpat/yukon.cpp
index dad4e7f8..276a488e 100644
--- a/kpat/yukon.cpp
+++ b/kpat/yukon.cpp
@@ -1,5 +1,5 @@
#include "yukon.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "deck.h"
#include <assert.h>
diff --git a/kpoker/betbox.cpp b/kpoker/betbox.cpp
index 2ed453e4..01d6fe3c 100644
--- a/kpoker/betbox.cpp
+++ b/kpoker/betbox.cpp
@@ -18,8 +18,8 @@
#include <tqpushbutton.h>
#include <tqlayout.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include "betbox.h"
diff --git a/kpoker/global.h b/kpoker/global.h
index 087f3e2b..a6a25ba5 100644
--- a/kpoker/global.h
+++ b/kpoker/global.h
@@ -17,7 +17,7 @@
#ifndef __GLOBAL__H__
#define __GLOBAL__H__
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
extern TDELocale *locale;
diff --git a/kpoker/kpaint.cpp b/kpoker/kpaint.cpp
index 1669820c..29e11608 100644
--- a/kpoker/kpaint.cpp
+++ b/kpoker/kpaint.cpp
@@ -20,7 +20,7 @@
#include <tqlayout.h>
// KDE includes
-//#include <kglobal.h>
+//#include <tdeglobal.h>
#include <kdebug.h>
#include <kcarddialog.h>
diff --git a/kpoker/kpoker.cpp b/kpoker/kpoker.cpp
index 7cfec655..29da61d8 100644
--- a/kpoker/kpoker.cpp
+++ b/kpoker/kpoker.cpp
@@ -25,13 +25,13 @@
#include <tqlayout.h>
// KDE includes
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kaudioplayer.h>
#include <kcarddialog.h>
diff --git a/kpoker/main.cpp b/kpoker/main.cpp
index df81b0d3..c635b1b9 100644
--- a/kpoker/main.cpp
+++ b/kpoker/main.cpp
@@ -15,7 +15,7 @@
*/
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
diff --git a/kpoker/newgamedlg.cpp b/kpoker/newgamedlg.cpp
index 5ac23449..21023ccd 100644
--- a/kpoker/newgamedlg.cpp
+++ b/kpoker/newgamedlg.cpp
@@ -23,7 +23,7 @@
#include <tqlayout.h>
// KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
diff --git a/kpoker/optionsdlg.cpp b/kpoker/optionsdlg.cpp
index 5fdfbfcf..e095bd1d 100644
--- a/kpoker/optionsdlg.cpp
+++ b/kpoker/optionsdlg.cpp
@@ -20,7 +20,7 @@
#include <tqlayout.h>
// KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
// own includes
diff --git a/kpoker/playerbox.cpp b/kpoker/playerbox.cpp
index dee8337f..8076554f 100644
--- a/kpoker/playerbox.cpp
+++ b/kpoker/playerbox.cpp
@@ -20,8 +20,8 @@
#include <tqlayout.h>
#include <tqhbox.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "player.h"
diff --git a/kpoker/top.cpp b/kpoker/top.cpp
index 731d1d6f..76e4029e 100644
--- a/kpoker/top.cpp
+++ b/kpoker/top.cpp
@@ -21,11 +21,11 @@
// KDE includes
#include <tdeapplication.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kstatusbar.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdestdaccel.h>
#include <kstdaction.h>
#include <kstdgameaction.h>
diff --git a/kreversi/board.cpp b/kreversi/board.cpp
index 7ac24169..6112c116 100644
--- a/kreversi/board.cpp
+++ b/kreversi/board.cpp
@@ -45,7 +45,7 @@
#include <kstandarddirs.h>
#include <tdeconfig.h>
#include <knotifyclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kexthighscore.h>
#include <kdebug.h>
diff --git a/kreversi/highscores.cpp b/kreversi/highscores.cpp
index 74fd1590..9aadd4a5 100644
--- a/kreversi/highscores.cpp
+++ b/kreversi/highscores.cpp
@@ -19,7 +19,7 @@
#include "highscores.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
diff --git a/kreversi/kreversi.cpp b/kreversi/kreversi.cpp
index 24bfc5d8..0d73ba0f 100644
--- a/kreversi/kreversi.cpp
+++ b/kreversi/kreversi.cpp
@@ -48,8 +48,8 @@
#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <kstatusbar.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeaction.h>
#include <kstdgameaction.h>
#include <kkeydialog.h>
diff --git a/kreversi/kreversi.kcfg b/kreversi/kreversi.kcfg
index 900a3cdf..64fa5039 100644
--- a/kreversi/kreversi.kcfg
+++ b/kreversi/kreversi.kcfg
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<include>kstandarddirs.h</include>
- <include>kglobal.h</include>
+ <include>tdeglobal.h</include>
<kcfgfile name="kreversirc"/>
<group name="Game">
<entry name="Grayscale" type="Bool">
diff --git a/kreversi/kzoommainwindow.cpp b/kreversi/kzoommainwindow.cpp
index 7500f7cb..f8c3c490 100644
--- a/kreversi/kzoommainwindow.cpp
+++ b/kreversi/kzoommainwindow.cpp
@@ -23,7 +23,7 @@
#include <tdeaction.h>
#include <kstdaction.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kcmenumngr.h>
diff --git a/kreversi/qreversigameview.cpp b/kreversi/qreversigameview.cpp
index c64932b9..cc88e1e7 100644
--- a/kreversi/qreversigameview.cpp
+++ b/kreversi/qreversigameview.cpp
@@ -41,7 +41,7 @@
#include <tqwidget.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#if 0
@@ -54,7 +54,7 @@
#include <kstandarddirs.h>
#include <tdeconfig.h>
#include <knotifyclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kexthighscore.h>
#include <kdebug.h>
diff --git a/ksame/KSameWidget.cpp b/ksame/KSameWidget.cpp
index 90b20b10..ae19c62f 100644
--- a/ksame/KSameWidget.cpp
+++ b/ksame/KSameWidget.cpp
@@ -30,11 +30,11 @@
#include <kscoredialog.h>
#include <kstatusbar.h>
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knotifyclient.h>
#include <knotifydialog.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
#include <kstdgameaction.h>
#include <tdeaction.h>
diff --git a/ksame/StoneWidget.cpp b/ksame/StoneWidget.cpp
index 6f6372f9..c4fbb987 100644
--- a/ksame/StoneWidget.cpp
+++ b/ksame/StoneWidget.cpp
@@ -33,7 +33,7 @@
#include <kiconloader.h>
#include <time.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <assert.h>
diff --git a/ksame/main.cpp b/ksame/main.cpp
index 8bb084c6..15484755 100644
--- a/ksame/main.cpp
+++ b/ksame/main.cpp
@@ -22,13 +22,13 @@
#include <tqwidget.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include "version.h"
#include "KSameWidget.h"
#include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
static const char description[] = I18N_NOOP("Same Game - a little game about balls and how to get rid of them");
static const char copyright[] = "(c) 1997-1998 Marcus Kreutzberger";
diff --git a/kshisen/app.cpp b/kshisen/app.cpp
index c392fe65..d84352f3 100644
--- a/kshisen/app.cpp
+++ b/kshisen/app.cpp
@@ -38,7 +38,7 @@
#include <tdeapplication.h>
#include <kseparator.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
#include <tdeaction.h>
#include <kstdgameaction.h>
@@ -47,7 +47,7 @@
#include <kkeydialog.h>
#include <tdepopupmenu.h>
#include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
#include <tdeconfigdialog.h>
diff --git a/kshisen/board.cpp b/kshisen/board.cpp
index 110460d2..ce8c9150 100644
--- a/kshisen/board.cpp
+++ b/kshisen/board.cpp
@@ -37,9 +37,9 @@
*/
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kdebug.h>
#include <tqpainter.h>
diff --git a/kshisen/tileset.cpp b/kshisen/tileset.cpp
index 30f055e9..45497576 100644
--- a/kshisen/tileset.cpp
+++ b/kshisen/tileset.cpp
@@ -23,8 +23,8 @@
#include <tdeapplication.h>
#include <kstandarddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tqimage.h>
diff --git a/ksirtet/ksirtet/ai.cpp b/ksirtet/ksirtet/ai.cpp
index eba477d2..61309852 100644
--- a/ksirtet/ksirtet/ai.cpp
+++ b/ksirtet/ksirtet/ai.cpp
@@ -1,7 +1,7 @@
#include "ai.h"
#include "ai.moc"
-#include <klocale.h>
+#include <tdelocale.h>
const AI::Data KSAI::DATA[] = {
diff --git a/ksirtet/ksirtet/field.cpp b/ksirtet/ksirtet/field.cpp
index 918fa8f1..e74b43e6 100644
--- a/ksirtet/ksirtet/field.cpp
+++ b/ksirtet/ksirtet/field.cpp
@@ -3,7 +3,7 @@
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgamelcd.h>
#include "board.h"
diff --git a/ksirtet/ksirtet/main.cpp b/ksirtet/ksirtet/main.cpp
index 7b2eee1e..30879777 100644
--- a/ksirtet/ksirtet/main.cpp
+++ b/ksirtet/ksirtet/main.cpp
@@ -1,7 +1,7 @@
#include "main.h"
#include "main.moc"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <khighscore.h>
diff --git a/ksirtet/ksirtet/piece.cpp b/ksirtet/ksirtet/piece.cpp
index a77812bf..cc1db723 100644
--- a/ksirtet/ksirtet/piece.cpp
+++ b/ksirtet/ksirtet/piece.cpp
@@ -1,7 +1,7 @@
#include "piece.h"
#include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
const KSPieceInfo::Form KSPieceInfo::FORMS[NB_FORMS] = {
diff --git a/ksirtet/ksirtet/piece.h b/ksirtet/ksirtet/piece.h
index 3d772e29..f1ecaecf 100644
--- a/ksirtet/ksirtet/piece.h
+++ b/ksirtet/ksirtet/piece.h
@@ -1,7 +1,7 @@
#ifndef KS_PIECE_H
#define KS_PIECE_H
-#include <klocale.h>
+#include <tdelocale.h>
#include "base/piece.h"
diff --git a/ksirtet/ksirtet/settings.cpp b/ksirtet/ksirtet/settings.cpp
index b35891b8..4d81723e 100644
--- a/ksirtet/ksirtet/settings.cpp
+++ b/ksirtet/ksirtet/settings.cpp
@@ -4,7 +4,7 @@
#include <tqlayout.h>
#include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
KSGameConfig::KSGameConfig()
diff --git a/ksmiletris/gamewidget.cpp b/ksmiletris/gamewidget.cpp
index f1417a8c..fa1ff075 100644
--- a/ksmiletris/gamewidget.cpp
+++ b/ksmiletris/gamewidget.cpp
@@ -40,8 +40,8 @@ this software.
#include "mirrorwidget.h"
#include "npiecewidget.h"
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
GameWidget::GameWidget(TQWidget *parent, const char *name)
: TQWidget(parent, name)
diff --git a/ksmiletris/gamewindow.cpp b/ksmiletris/gamewindow.cpp
index fc53b5ff..ff820058 100644
--- a/ksmiletris/gamewindow.cpp
+++ b/ksmiletris/gamewindow.cpp
@@ -24,9 +24,9 @@ this software.
#include "config.h"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kstatusbar.h>
#include "ksmiletris.h"
diff --git a/ksmiletris/main.cpp b/ksmiletris/main.cpp
index 20f1e4ba..79f8018c 100644
--- a/ksmiletris/main.cpp
+++ b/ksmiletris/main.cpp
@@ -24,7 +24,7 @@ this software.
#include "config.h"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
diff --git a/ksnake/game.cpp b/ksnake/game.cpp
index 8054a901..8008b9ee 100644
--- a/ksnake/game.cpp
+++ b/ksnake/game.cpp
@@ -33,13 +33,13 @@
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfigdialog.h>
#include <kstdgameaction.h>
#include <kscoredialog.h>
#include <kstatusbar.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include "rattler.h"
#include "game.h"
diff --git a/ksnake/pixServer.cpp b/ksnake/pixServer.cpp
index 08bbb0f0..b13bfa43 100644
--- a/ksnake/pixServer.cpp
+++ b/ksnake/pixServer.cpp
@@ -30,7 +30,7 @@
#include <tqbitmap.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "board.h"
diff --git a/ksnake/rattler.cpp b/ksnake/rattler.cpp
index ed9758fb..94c467fe 100644
--- a/ksnake/rattler.cpp
+++ b/ksnake/rattler.cpp
@@ -30,8 +30,8 @@
#include <tdeapplication.h>
#include <kstdgameaction.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tqbitarray.h>
#include <kstandarddirs.h>
diff --git a/ksnake/startroom.cpp b/ksnake/startroom.cpp
index 24874ee9..725fe690 100644
--- a/ksnake/startroom.cpp
+++ b/ksnake/startroom.cpp
@@ -28,7 +28,7 @@
#include <tqpixmap.h>
#include <tqwmatrix.h>
#include <tqspinbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include "levels.h"
diff --git a/ksokoban/Bookmark.cpp b/ksokoban/Bookmark.cpp
index 693a886c..d6262f3a 100644
--- a/ksokoban/Bookmark.cpp
+++ b/ksokoban/Bookmark.cpp
@@ -25,7 +25,7 @@
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <stdio.h>
diff --git a/ksokoban/InternalCollections.cpp b/ksokoban/InternalCollections.cpp
index 5b019f52..e54b8959 100644
--- a/ksokoban/InternalCollections.cpp
+++ b/ksokoban/InternalCollections.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
diff --git a/ksokoban/MainWindow.cpp b/ksokoban/MainWindow.cpp
index 7c02c1d8..8ebef3f2 100644
--- a/ksokoban/MainWindow.cpp
+++ b/ksokoban/MainWindow.cpp
@@ -21,15 +21,15 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <tqpopupmenu.h>
#include <tqkeycode.h>
#include <assert.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqstring.h>
#include <tdefiledialog.h>
#include <tqframe.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdeio/netaccess.h>
#include <kiconloader.h>
diff --git a/ksokoban/ModalLabel.cpp b/ksokoban/ModalLabel.cpp
index 4fd7b25c..8d5f43d7 100644
--- a/ksokoban/ModalLabel.cpp
+++ b/ksokoban/ModalLabel.cpp
@@ -22,7 +22,7 @@
#include <tqlabel.h>
#include <tqfont.h>
#include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tqwidgetlist.h>
#include <tqstring.h>
diff --git a/ksokoban/PlayField.cpp b/ksokoban/PlayField.cpp
index b5433ed9..1483aa44 100644
--- a/ksokoban/PlayField.cpp
+++ b/ksokoban/PlayField.cpp
@@ -25,10 +25,10 @@
#include <tqkeycode.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpainter.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
#include "PlayField.h"
#include "ModalLabel.h"
diff --git a/ksokoban/main.cpp b/ksokoban/main.cpp
index 5f589a8f..4dd605eb 100644
--- a/ksokoban/main.cpp
+++ b/ksokoban/main.cpp
@@ -20,7 +20,7 @@
// #include <kuniqueapplication.h>
#include <tdeapplication.h>
#include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
diff --git a/kspaceduel/dialogs.cpp b/kspaceduel/dialogs.cpp
index 636ac21e..bf4b7c3e 100644
--- a/kspaceduel/dialogs.cpp
+++ b/kspaceduel/dialogs.cpp
@@ -5,7 +5,7 @@
#include <tqlcdnumber.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "options.h"
#include "dialogs.h"
diff --git a/kspaceduel/mainview.cpp b/kspaceduel/mainview.cpp
index eb5f437f..a2645087 100644
--- a/kspaceduel/mainview.cpp
+++ b/kspaceduel/mainview.cpp
@@ -7,9 +7,9 @@
#include <tdeapplication.h>
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdeconfig.h>
#include <kiconloader.h>
diff --git a/kspaceduel/playerinfo.cpp b/kspaceduel/playerinfo.cpp
index 2e1ef91d..1308feaf 100644
--- a/kspaceduel/playerinfo.cpp
+++ b/kspaceduel/playerinfo.cpp
@@ -1,7 +1,7 @@
#include "playerinfo.h"
#include <tqpixmap.h>
#include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
diff --git a/kspaceduel/topwidget.cpp b/kspaceduel/topwidget.cpp
index 8d614f88..cd8fd8dc 100644
--- a/kspaceduel/topwidget.cpp
+++ b/kspaceduel/topwidget.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaccel.h>
#include <kkeydialog.h>
#include <tdeaction.h>
diff --git a/ktron/ktron.cpp b/ktron/ktron.cpp
index 8fab5eac..1209421a 100644
--- a/ktron/ktron.cpp
+++ b/ktron/ktron.cpp
@@ -22,8 +22,8 @@
#include "ktron.h"
#include <tdeconfigdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeaction.h>
#include <kstdgameaction.h>
#include <tdeapplication.h>
diff --git a/ktron/tron.cpp b/ktron/tron.cpp
index 2ed4cd74..4fb53878 100644
--- a/ktron/tron.cpp
+++ b/ktron/tron.cpp
@@ -20,13 +20,13 @@
***************************************************************************/
// Background
#include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
// Normal class
#include <tqtimer.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kcolordialog.h>
diff --git a/ktuberling/main.cpp b/ktuberling/main.cpp
index a8525e8d..d7107719 100644
--- a/ktuberling/main.cpp
+++ b/ktuberling/main.cpp
@@ -6,7 +6,7 @@
#include <tdeapplication.h>
#include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
diff --git a/ktuberling/playground.cpp b/ktuberling/playground.cpp
index 62d2b107..1e76057b 100644
--- a/ktuberling/playground.cpp
+++ b/ktuberling/playground.cpp
@@ -6,8 +6,8 @@
#include <stdlib.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kprinter.h>
diff --git a/ktuberling/soundfactory.cpp b/ktuberling/soundfactory.cpp
index 857c26d5..c52975a4 100644
--- a/ktuberling/soundfactory.cpp
+++ b/ktuberling/soundfactory.cpp
@@ -6,8 +6,8 @@
#include <stdlib.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kaudioplayer.h>
diff --git a/ktuberling/toplevel.cpp b/ktuberling/toplevel.cpp
index a0eeafbc..eadedb09 100644
--- a/ktuberling/toplevel.cpp
+++ b/ktuberling/toplevel.cpp
@@ -5,9 +5,9 @@
------------------------------------------------------------- */
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdeio/netaccess.h>
#include <tdeaction.h>
diff --git a/libksirtet/base/board.cpp b/libksirtet/base/board.cpp
index 12193e31..f29bdb15 100644
--- a/libksirtet/base/board.cpp
+++ b/libksirtet/base/board.cpp
@@ -2,7 +2,7 @@
#include "board.moc"
#include <knotifyclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kzoommainwindow.h>
#include "piece.h"
diff --git a/libksirtet/base/factory.cpp b/libksirtet/base/factory.cpp
index 00b8874d..d76da791 100644
--- a/libksirtet/base/factory.cpp
+++ b/libksirtet/base/factory.cpp
@@ -3,8 +3,8 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include "settings.h"
diff --git a/libksirtet/base/field.cpp b/libksirtet/base/field.cpp
index f31ec06c..f443c96c 100644
--- a/libksirtet/base/field.cpp
+++ b/libksirtet/base/field.cpp
@@ -5,7 +5,7 @@
#include <tqlabel.h>
#include <tqpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcanvasrootpixmap.h>
#include <knotifyclient.h>
#include <kgamelcd.h>
diff --git a/libksirtet/base/kzoommainwindow.cpp b/libksirtet/base/kzoommainwindow.cpp
index 8c3fef13..758d73d6 100644
--- a/libksirtet/base/kzoommainwindow.cpp
+++ b/libksirtet/base/kzoommainwindow.cpp
@@ -22,7 +22,7 @@
#include <tdeaction.h>
#include <kstdaction.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kcmenumngr.h>
KZoomMainWindow::KZoomMainWindow(uint min, uint max, uint step, const char *name)
diff --git a/libksirtet/base/main.cpp b/libksirtet/base/main.cpp
index bda4982e..8f5479f1 100644
--- a/libksirtet/base/main.cpp
+++ b/libksirtet/base/main.cpp
@@ -3,11 +3,11 @@
#include <tdeaction.h>
#include <kstdaction.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kstdgameaction.h>
#include <kcmenumngr.h>
#include <kkeydialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knotifyclient.h>
#include <knotifydialog.h>
#include <kexthighscore.h>
diff --git a/libksirtet/base/piece.cpp b/libksirtet/base/piece.cpp
index d423473c..061088fb 100644
--- a/libksirtet/base/piece.cpp
+++ b/libksirtet/base/piece.cpp
@@ -1,6 +1,6 @@
#include "piece.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <krandomsequence.h>
#include "baseprefs.h"
diff --git a/libksirtet/base/settings.cpp b/libksirtet/base/settings.cpp
index 83c1a7a6..5b2735b5 100644
--- a/libksirtet/base/settings.cpp
+++ b/libksirtet/base/settings.cpp
@@ -7,7 +7,7 @@
#include <tqcheckbox.h>
#include <tqhgroupbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kcolorbutton.h>
#include <tdeapplication.h>
diff --git a/libksirtet/common/ai.cpp b/libksirtet/common/ai.cpp
index 36e4716c..d201d9fd 100644
--- a/libksirtet/common/ai.cpp
+++ b/libksirtet/common/ai.cpp
@@ -10,7 +10,7 @@
#include <tqgrid.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
diff --git a/libksirtet/common/board.cpp b/libksirtet/common/board.cpp
index 7a0802ad..05d016f2 100644
--- a/libksirtet/common/board.cpp
+++ b/libksirtet/common/board.cpp
@@ -2,7 +2,7 @@
#include "board.moc"
#include <knotifyclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "factory.h"
#include "base/piece.h"
diff --git a/libksirtet/common/field.cpp b/libksirtet/common/field.cpp
index 4c00ba4e..f1b9cbc9 100644
--- a/libksirtet/common/field.cpp
+++ b/libksirtet/common/field.cpp
@@ -5,7 +5,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprogress.h>
#include <kgameprogress.h>
#include <kcanvasrootpixmap.h>
diff --git a/libksirtet/common/highscores.cpp b/libksirtet/common/highscores.cpp
index 9ac4a005..78eb8b2b 100644
--- a/libksirtet/common/highscores.cpp
+++ b/libksirtet/common/highscores.cpp
@@ -1,6 +1,6 @@
#include "highscores.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
diff --git a/libksirtet/common/inter.cpp b/libksirtet/common/inter.cpp
index 2cd3e981..cc9a86ed 100644
--- a/libksirtet/common/inter.cpp
+++ b/libksirtet/common/inter.cpp
@@ -1,7 +1,7 @@
#include "inter.h"
#include "inter.moc"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <tdeapplication.h>
diff --git a/libksirtet/common/main.cpp b/libksirtet/common/main.cpp
index 9c4f98f4..fa3b7a91 100644
--- a/libksirtet/common/main.cpp
+++ b/libksirtet/common/main.cpp
@@ -1,7 +1,7 @@
#include "main.h"
#include "main.moc"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <kstdaction.h>
#include <kkeydialog.h>
diff --git a/libksirtet/common/settings.cpp b/libksirtet/common/settings.cpp
index 058de034..27be2047 100644
--- a/libksirtet/common/settings.cpp
+++ b/libksirtet/common/settings.cpp
@@ -6,10 +6,10 @@
#include <tqcheckbox.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
//-----------------------------------------------------------------------------
diff --git a/libksirtet/lib/defines.cpp b/libksirtet/lib/defines.cpp
index baf91083..a968ff88 100644
--- a/libksirtet/lib/defines.cpp
+++ b/libksirtet/lib/defines.cpp
@@ -1,6 +1,6 @@
#include "defines.h"
-#include <klocale.h>
+#include <tdelocale.h>
void errorBox(const TQString &msg1, const TQString &msg2, TQWidget *parent)
{
diff --git a/libksirtet/lib/defines.h b/libksirtet/lib/defines.h
index a6728a38..05fd8907 100644
--- a/libksirtet/lib/defines.h
+++ b/libksirtet/lib/defines.h
@@ -1,7 +1,7 @@
#ifndef DEFINES_H
#define DEFINES_H
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kextsock.h>
// constants
diff --git a/libksirtet/lib/internal.cpp b/libksirtet/lib/internal.cpp
index 25a19bd9..a3f07cbb 100644
--- a/libksirtet/lib/internal.cpp
+++ b/libksirtet/lib/internal.cpp
@@ -2,7 +2,7 @@
#include "internal.moc"
#include <tqptrlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "mp_interface.h"
#define DATA_ERROR(i) { dataError(i); return; }
diff --git a/libksirtet/lib/keys.cpp b/libksirtet/lib/keys.cpp
index 801d46d0..5d250680 100644
--- a/libksirtet/lib/keys.cpp
+++ b/libksirtet/lib/keys.cpp
@@ -3,7 +3,7 @@
#include <tqsignal.h>
#include <kkeydialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
KeyData::KeyData(uint maxNb, uint nbActions, const ActionData *data,
diff --git a/libksirtet/lib/meeting.cpp b/libksirtet/lib/meeting.cpp
index e35a6cbc..88203601 100644
--- a/libksirtet/lib/meeting.cpp
+++ b/libksirtet/lib/meeting.cpp
@@ -3,8 +3,8 @@
#include <tqmessagebox.h>
#include <tqpushbutton.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "defines.h"
#include "mp_option.h"
diff --git a/libksirtet/lib/miscui.cpp b/libksirtet/lib/miscui.cpp
index dde70adb..97a7bfa4 100644
--- a/libksirtet/lib/miscui.cpp
+++ b/libksirtet/lib/miscui.cpp
@@ -3,7 +3,7 @@
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
//-----------------------------------------------------------------------------
diff --git a/libksirtet/lib/mp_interface.cpp b/libksirtet/lib/mp_interface.cpp
index fda2c909..1ad8a572 100644
--- a/libksirtet/lib/mp_interface.cpp
+++ b/libksirtet/lib/mp_interface.cpp
@@ -4,8 +4,8 @@
#include <tqpainter.h>
#include <tqlayout.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <kkeydialog.h>
diff --git a/libksirtet/lib/mp_simple_interface.cpp b/libksirtet/lib/mp_simple_interface.cpp
index 80dfe0eb..7058b8eb 100644
--- a/libksirtet/lib/mp_simple_interface.cpp
+++ b/libksirtet/lib/mp_simple_interface.cpp
@@ -1,9 +1,9 @@
#include "mp_simple_interface.h"
#include "mp_simple_interface.moc"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <tdemainwindow.h>
diff --git a/libksirtet/lib/pline.cpp b/libksirtet/lib/pline.cpp
index 86fde398..f685181a 100644
--- a/libksirtet/lib/pline.cpp
+++ b/libksirtet/lib/pline.cpp
@@ -3,7 +3,7 @@
#include <tqfont.h>
#include <tqpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "defines.h"
#define THIN_BORDER 4
diff --git a/libksirtet/lib/types.cpp b/libksirtet/lib/types.cpp
index 9d2149d8..ae91c4d5 100644
--- a/libksirtet/lib/types.cpp
+++ b/libksirtet/lib/types.cpp
@@ -1,6 +1,6 @@
#include "types.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include "version.h"
cId::cId(const TQString &_gameName, const TQString &_gameId)
diff --git a/libksirtet/lib/wizard.cpp b/libksirtet/lib/wizard.cpp
index 073e0986..68537602 100644
--- a/libksirtet/lib/wizard.cpp
+++ b/libksirtet/lib/wizard.cpp
@@ -14,8 +14,8 @@
#include <tqfile.h>
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdialogbase.h>
#include "types.h"
diff --git a/libtdegames/highscore/kexthighscore_gui.cpp b/libtdegames/highscore/kexthighscore_gui.cpp
index 1cdeb170..5b7e08c0 100644
--- a/libtdegames/highscore/kexthighscore_gui.cpp
+++ b/libtdegames/highscore/kexthighscore_gui.cpp
@@ -27,12 +27,12 @@
#include <tqvgroupbox.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurllabel.h>
#include <kopenwith.h>
#include <krun.h>
#include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdeio/netaccess.h>
#include <kiconloader.h>
diff --git a/libtdegames/highscore/kexthighscore_internal.cpp b/libtdegames/highscore/kexthighscore_internal.cpp
index 05c51562..c43fd550 100644
--- a/libtdegames/highscore/kexthighscore_internal.cpp
+++ b/libtdegames/highscore/kexthighscore_internal.cpp
@@ -27,17 +27,17 @@
#include <tqlayout.h>
#include <tqdom.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeio/netaccess.h>
#include <tdeio/job.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kmdcodec.h>
#include <kdebug.h>
#include "config.h"
#include "kexthighscore.h"
#include "kexthighscore_gui.h"
-#include "kemailsettings.h"
+#include "tdeemailsettings.h"
namespace KExtHighscore
diff --git a/libtdegames/highscore/kexthighscore_internal.h b/libtdegames/highscore/kexthighscore_internal.h
index 5c5ab53b..c1d166bb 100644
--- a/libtdegames/highscore/kexthighscore_internal.h
+++ b/libtdegames/highscore/kexthighscore_internal.h
@@ -22,7 +22,7 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include "khighscore.h"
diff --git a/libtdegames/highscore/kexthighscore_item.cpp b/libtdegames/highscore/kexthighscore_item.cpp
index c7e294c1..58a1bad1 100644
--- a/libtdegames/highscore/kexthighscore_item.cpp
+++ b/libtdegames/highscore/kexthighscore_item.cpp
@@ -20,7 +20,7 @@
#include "kexthighscore_item.h"
#include <tqlayout.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdialogbase.h>
#include <kdebug.h>
diff --git a/libtdegames/highscore/kexthighscore_tab.cpp b/libtdegames/highscore/kexthighscore_tab.cpp
index 13e32894..e48db436 100644
--- a/libtdegames/highscore/kexthighscore_tab.cpp
+++ b/libtdegames/highscore/kexthighscore_tab.cpp
@@ -29,7 +29,7 @@
#include <kdialogbase.h>
#include <tdelistview.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "kexthighscore.h"
#include "kexthighscore_internal.h"
diff --git a/libtdegames/highscore/khighscore.cpp b/libtdegames/highscore/khighscore.cpp
index 004c98fa..bfed1534 100644
--- a/libtdegames/highscore/khighscore.cpp
+++ b/libtdegames/highscore/khighscore.cpp
@@ -28,10 +28,10 @@
#include <tdeapplication.h>
#include <ksimpleconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstdguiitem.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <kstaticdeleter.h>
diff --git a/libtdegames/highscore/kscoredialog.cpp b/libtdegames/highscore/kscoredialog.cpp
index aadb3fd1..518d0084 100644
--- a/libtdegames/highscore/kscoredialog.cpp
+++ b/libtdegames/highscore/kscoredialog.cpp
@@ -34,7 +34,7 @@ this software.
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kseparator.h>
#include "kscoredialog.h"
diff --git a/libtdegames/kcarddialog.cpp b/libtdegames/kcarddialog.cpp
index a347e578..be1c7fef 100644
--- a/libtdegames/kcarddialog.cpp
+++ b/libtdegames/kcarddialog.cpp
@@ -32,7 +32,7 @@
#include <tqwmatrix.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kiconview.h>
#include <ksimpleconfig.h>
diff --git a/libtdegames/kchat.cpp b/libtdegames/kchat.cpp
index 797ee794..db35a8a0 100644
--- a/libtdegames/kchat.cpp
+++ b/libtdegames/kchat.cpp
@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kchat.h"
diff --git a/libtdegames/kchatbase.cpp b/libtdegames/kchatbase.cpp
index 386c005e..17f831a0 100644
--- a/libtdegames/kchatbase.cpp
+++ b/libtdegames/kchatbase.cpp
@@ -20,7 +20,7 @@
#include "kchatbase.h"
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
diff --git a/libtdegames/kchatbase.h b/libtdegames/kchatbase.h
index 5f6f5d85..49d41558 100644
--- a/libtdegames/kchatbase.h
+++ b/libtdegames/kchatbase.h
@@ -23,7 +23,7 @@
#include <tqstring.h>
#include <tqlistbox.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kdemacros.h>
class TQListBoxItem;
diff --git a/libtdegames/kchatdialog.cpp b/libtdegames/kchatdialog.cpp
index c4756f44..eaa6c6fc 100644
--- a/libtdegames/kchatdialog.cpp
+++ b/libtdegames/kchatdialog.cpp
@@ -21,7 +21,7 @@
#include "kchatbase.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefontdialog.h>
#include <tqlayout.h>
diff --git a/libtdegames/kgame/dialogs/kgameconnectdialog.cpp b/libtdegames/kgame/dialogs/kgameconnectdialog.cpp
index 3436d0dc..2de27a0e 100644
--- a/libtdegames/kgame/dialogs/kgameconnectdialog.cpp
+++ b/libtdegames/kgame/dialogs/kgameconnectdialog.cpp
@@ -22,7 +22,7 @@
#include "kgameconnectdialog.h"
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlineedit.h>
#include <tqcombobox.h>
diff --git a/libtdegames/kgame/dialogs/kgamedebugdialog.cpp b/libtdegames/kgame/dialogs/kgamedebugdialog.cpp
index b4de9985..1b172cf2 100644
--- a/libtdegames/kgame/dialogs/kgamedebugdialog.cpp
+++ b/libtdegames/kgame/dialogs/kgamedebugdialog.cpp
@@ -27,7 +27,7 @@
#include <tdelistview.h>
#include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
diff --git a/libtdegames/kgame/dialogs/kgamedialog.cpp b/libtdegames/kgame/dialogs/kgamedialog.cpp
index 245b70f2..a2440355 100644
--- a/libtdegames/kgame/dialogs/kgamedialog.cpp
+++ b/libtdegames/kgame/dialogs/kgamedialog.cpp
@@ -21,7 +21,7 @@
#include <tqlayout.h>
#include <tqvbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kgame.h"
#include "kplayer.h"
diff --git a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp
index 52a42151..a14abe73 100644
--- a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp
+++ b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp
@@ -25,11 +25,11 @@
#include "kgamechat.h"
#include "kgameconnectdialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kdialog.h>
#include <tdelistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqlayout.h>
#include <tqhgroupbox.h>
diff --git a/libtdegames/kgame/dialogs/kgameerrordialog.cpp b/libtdegames/kgame/dialogs/kgameerrordialog.cpp
index 8ea1a0ea..468ca7c8 100644
--- a/libtdegames/kgame/dialogs/kgameerrordialog.cpp
+++ b/libtdegames/kgame/dialogs/kgameerrordialog.cpp
@@ -18,8 +18,8 @@
Boston, MA 02110-1301, USA.
*/
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kgame.h"
diff --git a/libtdegames/kgame/kgame.cpp b/libtdegames/kgame/kgame.cpp
index 946830a6..fcd7e82b 100644
--- a/libtdegames/kgame/kgame.cpp
+++ b/libtdegames/kgame/kgame.cpp
@@ -41,7 +41,7 @@
#include <tqptrqueue.h>
#include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <krandomsequence.h>
#include <kdebug.h>
diff --git a/libtdegames/kgame/kgamechat.cpp b/libtdegames/kgame/kgamechat.cpp
index 80ca84c2..80059e7b 100644
--- a/libtdegames/kgame/kgamechat.cpp
+++ b/libtdegames/kgame/kgamechat.cpp
@@ -26,7 +26,7 @@
#include "kgameproperty.h"
#include "kgamemessage.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqmap.h>
diff --git a/libtdegames/kgame/kgameerror.cpp b/libtdegames/kgame/kgameerror.cpp
index 73145be8..500605fa 100644
--- a/libtdegames/kgame/kgameerror.cpp
+++ b/libtdegames/kgame/kgameerror.cpp
@@ -24,7 +24,7 @@
#include "kgameerror.h"
#include "kgamemessage.h"
-#include <klocale.h>
+#include <tdelocale.h>
TQByteArray KGameError::errVersion(int remoteVersion)
{
diff --git a/libtdegames/kgame/kgamemessage.cpp b/libtdegames/kgame/kgamemessage.cpp
index ba79c639..c1505011 100644
--- a/libtdegames/kgame/kgamemessage.cpp
+++ b/libtdegames/kgame/kgamemessage.cpp
@@ -23,7 +23,7 @@
#include "kgamemessage.h"
-#include <klocale.h>
+#include <tdelocale.h>
#define MESSAGE_VERSION 2
diff --git a/libtdegames/kgame/kgamepropertyhandler.cpp b/libtdegames/kgame/kgamepropertyhandler.cpp
index 39b6fcf9..732c8bde 100644
--- a/libtdegames/kgame/kgamepropertyhandler.cpp
+++ b/libtdegames/kgame/kgamepropertyhandler.cpp
@@ -28,7 +28,7 @@
#include <tqmap.h>
#include <tqptrqueue.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <typeinfo>
#define KPLAYERHANDLER_LOAD_COOKIE 6239
diff --git a/libtdegames/kgame/kplayer.cpp b/libtdegames/kgame/kplayer.cpp
index af975db1..5945f9cf 100644
--- a/libtdegames/kgame/kplayer.cpp
+++ b/libtdegames/kgame/kplayer.cpp
@@ -29,7 +29,7 @@
#include "kgamepropertyhandler.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqbuffer.h>
diff --git a/libtdegames/kgamelcd.cpp b/libtdegames/kgamelcd.cpp
index c957a0cc..5c9c1d85 100644
--- a/libtdegames/kgamelcd.cpp
+++ b/libtdegames/kgamelcd.cpp
@@ -24,7 +24,7 @@
#include <tqlabel.h>
#include <tqtimer.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
//-----------------------------------------------------------------------------
diff --git a/libtdegames/kgamemisc.cpp b/libtdegames/kgamemisc.cpp
index 97d97dab..8041ab8a 100644
--- a/libtdegames/kgamemisc.cpp
+++ b/libtdegames/kgamemisc.cpp
@@ -23,7 +23,7 @@
#include <tqstringlist.h>
#include <krandomsequence.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kgamemisc.h"
diff --git a/libtdegames/kgrid2d.h b/libtdegames/kgrid2d.h
index 8bafa7ca..1ad94a40 100644
--- a/libtdegames/kgrid2d.h
+++ b/libtdegames/kgrid2d.h
@@ -26,7 +26,7 @@
#include <tqvaluelist.h>
#include <tqvaluevector.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
//-----------------------------------------------------------------------------
diff --git a/libtdegames/kstdgameaction.cpp b/libtdegames/kstdgameaction.cpp
index 79797afd..ea963ef6 100644
--- a/libtdegames/kstdgameaction.cpp
+++ b/libtdegames/kstdgameaction.cpp
@@ -19,7 +19,7 @@
#include "kstdgameaction.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <tdestdaccel.h>
#include <tdeconfig.h>
diff --git a/lskat/lskat/lskat.cpp b/lskat/lskat/lskat.cpp
index 236c1e5d..dab5612a 100644
--- a/lskat/lskat/lskat.cpp
+++ b/lskat/lskat/lskat.cpp
@@ -20,9 +20,9 @@
// include files for TDE
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <khelpmenu.h>
#include <kstdaction.h>
diff --git a/lskat/lskat/lskatdoc.cpp b/lskat/lskat/lskatdoc.cpp
index 6862599b..24dece6e 100644
--- a/lskat/lskat/lskatdoc.cpp
+++ b/lskat/lskat/lskatdoc.cpp
@@ -26,7 +26,7 @@
// include files for TDE
-#include <klocale.h>
+#include <tdelocale.h>
// application specific includes
#include "lskatdoc.h"
diff --git a/lskat/lskat/lskatview.cpp b/lskat/lskat/lskatview.cpp
index 8a948b2a..ce1c7ec0 100644
--- a/lskat/lskat/lskatview.cpp
+++ b/lskat/lskat/lskatview.cpp
@@ -24,12 +24,12 @@
#include <tqstring.h>
#include <tqpainter.h>
#include <tqdatetime.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <math.h>
#include <stdio.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
// application specific includes
diff --git a/lskat/lskat/main.cpp b/lskat/lskat/main.cpp
index a37ded0a..77da5bfd 100644
--- a/lskat/lskat/main.cpp
+++ b/lskat/lskat/main.cpp
@@ -13,7 +13,7 @@
* *
***************************************************************************/
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include "lskat.h"
diff --git a/lskat/lskat/msgdlg.cpp b/lskat/lskat/msgdlg.cpp
index cb3e6334..c59109d3 100644
--- a/lskat/lskat/msgdlg.cpp
+++ b/lskat/lskat/msgdlg.cpp
@@ -29,7 +29,7 @@
*/
#include <tqgroupbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
#include "msgdlg.h"
diff --git a/lskat/lskat/namedlg.cpp b/lskat/lskat/namedlg.cpp
index 262631cd..3bd0cca6 100644
--- a/lskat/lskat/namedlg.cpp
+++ b/lskat/lskat/namedlg.cpp
@@ -14,7 +14,7 @@
#include <tqlayout.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#define NAME_MAX_LEN 12
diff --git a/twin4/twin4/scorewidget.cpp b/twin4/twin4/scorewidget.cpp
index 41384da4..15517fd3 100644
--- a/twin4/twin4/scorewidget.cpp
+++ b/twin4/twin4/scorewidget.cpp
@@ -24,7 +24,7 @@
#include <tqpainter.h>
#include <tqsizepolicy.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#define COL_STATUSBORDER black
#define COL_STATUSFIELD TQColor(130,130,255)
diff --git a/twin4/twin4/twin4.cpp b/twin4/twin4/twin4.cpp
index f4b90c6a..086e127e 100644
--- a/twin4/twin4/twin4.cpp
+++ b/twin4/twin4/twin4.cpp
@@ -27,9 +27,9 @@
// include files for TDE
#include <tdeapplication.h>
#include <kstdgameaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <khelpmenu.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/twin4/twin4/twin4doc.cpp b/twin4/twin4/twin4doc.cpp
index ce99ca57..4014043a 100644
--- a/twin4/twin4/twin4doc.cpp
+++ b/twin4/twin4/twin4doc.cpp
@@ -22,7 +22,7 @@
#include <tqtimer.h>
// include files for TDE
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/twin4/twin4/twin4view.cpp b/twin4/twin4/twin4view.cpp
index 6a02d6f2..71ce1eeb 100644
--- a/twin4/twin4/twin4view.cpp
+++ b/twin4/twin4/twin4view.cpp
@@ -21,7 +21,7 @@
#include <math.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kstandarddirs.h>