From 1a4615a891172a58eff43f5ef0cd150b67798f4e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:03:32 -0600 Subject: [PATCH] Rename a number of libraries and executables to avoid conflicts with KDE4 --- atlantik/client/atlantik.cpp | 2 +- atlantik/client/eventlogwidget.cpp | 2 +- atlantik/client/monopigator.h | 2 +- atlantik/kio_atlantik/Makefile.am | 2 +- atlantik/kio_atlantik/kio_atlantik.cpp | 2 +- kasteroids/settings.kcfgc | 2 +- kasteroids/toplevel.cpp | 2 +- katomic/configbox.cpp | 2 +- kbackgammon/engines/fibs/kbgfibs.cpp | 2 +- kbackgammon/engines/fibs/kbgfibschat.cpp | 2 +- kbackgammon/engines/fibs/kplayerlist.cpp | 2 +- kbackgammon/engines/gnubg/kbggnubg.cpp | 2 +- kbackgammon/engines/nextgen/kbgng.cpp | 2 +- kbackgammon/engines/offline/kbgoffline.cpp | 2 +- kbackgammon/kbg.cpp | 4 ++-- kbackgammon/kbgboard.cpp | 2 +- kbackgammon/kbgtextview.cpp | 2 +- kbattleship/kbattleship/kbattleship.h | 2 +- kbattleship/kbattleship/kclientdialog.h | 2 +- kblackbox/kbbgame.cpp | 2 +- kbounce/kbounce.cpp | 2 +- kenolaba/AbTop.cpp | 2 +- kenolaba/Board.cpp | 2 +- kenolaba/EvalDlgImpl.cpp | 2 +- kenolaba/EvalScheme.cpp | 2 +- kfouleggs/prefs.kcfgc | 2 +- kgoldrunner/src/kgoldrunner.cpp | 6 +++--- kjumpingcube/kcubeboxwidget.cpp | 2 +- kjumpingcube/kjumpingcube.cpp | 6 +++--- kjumpingcube/prefs.kcfgc | 2 +- klines/klines.cpp | 2 +- klines/prefs.kcfgc | 2 +- kmahjongg/Editor.h | 2 +- kmahjongg/Preview.cpp | 2 +- kmahjongg/boardwidget.cpp | 2 +- kmahjongg/kmahjongg.cpp | 4 ++-- kmahjongg/prefs.kcfgc | 2 +- kmines/dialogs.cpp | 2 +- kmines/highscores.cpp | 2 +- kmines/main.cpp | 2 +- kmines/settings.kcfgc | 2 +- kmines/status.cpp | 6 +++--- knetwalk/src/highscores.cpp | 2 +- knetwalk/src/settings.kcfgc | 2 +- kolf/canvasitem.cpp | 2 +- kolf/floater.cpp | 2 +- kolf/game.cpp | 4 ++-- kolf/kcomboboxdialog.cpp | 2 +- kolf/kolf.cpp | 6 +++--- kolf/newgame.cpp | 4 ++-- kolf/objects/poolball/poolball.cpp | 2 +- kolf/objects/test/test.cpp | 2 +- kolf/slope.cpp | 2 +- konquest/gameenddlg.cc | 2 +- konquest/newgamedlg.cc | 2 +- kpat/cardmaps.cpp | 2 +- kpat/dealer.cpp | 2 +- kpat/gamestatsimpl.cpp | 2 +- kpat/pwidget.cpp | 4 ++-- kpoker/global.h | 2 +- kpoker/kpoker.cpp | 2 +- kpoker/newgamedlg.cpp | 2 +- kpoker/top.cpp | 2 +- kreversi/board.cpp | 2 +- kreversi/highscores.cpp | 2 +- kreversi/kreversi.cpp | 4 ++-- kreversi/prefs.kcfgc | 2 +- kreversi/qreversigameview.cpp | 2 +- ksame/KSameWidget.cpp | 4 ++-- ksame/StoneWidget.cpp | 2 +- kshisen/app.cpp | 6 +++--- kshisen/main.cpp | 2 +- kshisen/prefs.kcfgc | 2 +- ksirtet/ksirtet/prefs.kcfgc | 2 +- ksmiletris/gamewindow.cpp | 2 +- ksnake/game.cpp | 2 +- ksnake/settings.kcfgc | 2 +- ksokoban/LevelCollection.cpp | 2 +- ksokoban/LevelMap.cpp | 2 +- ksokoban/MainWindow.cpp | 6 +++--- ksokoban/PlayField.cpp | 2 +- kspaceduel/dialogs.h | 2 +- kspaceduel/mainview.cpp | 2 +- kspaceduel/options.kcfgc | 2 +- ktron/ktron.cpp | 2 +- ktron/settings.kcfgc | 2 +- ktron/tron.cpp | 4 ++-- ktuberling/toplevel.cpp | 4 ++-- libksirtet/base/baseprefs.kcfgc | 2 +- libksirtet/base/main.cpp | 2 +- libksirtet/base/settings.h | 2 +- libksirtet/common/ai.cpp | 2 +- libksirtet/common/commonprefs.kcfgc | 2 +- libksirtet/common/highscores.cpp | 2 +- libksirtet/common/main.cpp | 2 +- libksirtet/lib/wizard.h | 2 +- libtdegames/highscore/Makefile.am | 10 +++++----- libtdegames/highscore/kexthighscore_gui.cpp | 4 ++-- libtdegames/highscore/kexthighscore_internal.cpp | 4 ++-- libtdegames/highscore/kexthighscore_internal.h | 2 +- libtdegames/highscore/khighscore.cpp | 4 ++-- libtdegames/highscore/kscoredialog.cpp | 2 +- .../{kconfigrawbackend.cpp => tdeconfigrawbackend.cpp} | 4 ++-- .../{kconfigrawbackend.h => tdeconfigrawbackend.h} | 2 +- .../highscore/{kfilelock.cpp => tdefilelock.cpp} | 2 +- libtdegames/highscore/{kfilelock.h => tdefilelock.h} | 0 libtdegames/kchatbase.cpp | 2 +- libtdegames/kstdgameaction.cpp | 2 +- lskat/lskat.kdevprj | 2 +- lskat/lskat/lskat.cpp | 4 ++-- lskat/lskat/lskatdoc.h | 2 +- twin4/twin4/kspritecache.cpp | 10 +++++----- twin4/twin4/prefs.kcfgc | 2 +- twin4/twin4/twin4.cpp | 6 +++--- twin4/twin4/twin4doc.cpp | 2 +- twin4/twin4/twin4player.cpp | 2 +- twin4/twin4/twin4view.cpp | 2 +- 117 files changed, 152 insertions(+), 152 deletions(-) rename libtdegames/highscore/{kconfigrawbackend.cpp => tdeconfigrawbackend.cpp} (96%) rename libtdegames/highscore/{kconfigrawbackend.h => tdeconfigrawbackend.h} (97%) rename libtdegames/highscore/{kfilelock.cpp => tdefilelock.cpp} (98%) rename libtdegames/highscore/{kfilelock.h => tdefilelock.h} (100%) diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp index 0b3923e7..64650ba7 100644 --- a/atlantik/client/atlantik.cpp +++ b/atlantik/client/atlantik.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/atlantik/client/eventlogwidget.cpp b/atlantik/client/eventlogwidget.cpp index 6bc81b04..c6c83896 100644 --- a/atlantik/client/eventlogwidget.cpp +++ b/atlantik/client/eventlogwidget.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/atlantik/client/monopigator.h b/atlantik/client/monopigator.h index 1a16943f..c174b6f4 100644 --- a/atlantik/client/monopigator.h +++ b/atlantik/client/monopigator.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include class KExtendedSocket; diff --git a/atlantik/kio_atlantik/Makefile.am b/atlantik/kio_atlantik/Makefile.am index 69279666..39579cd8 100644 --- a/atlantik/kio_atlantik/Makefile.am +++ b/atlantik/kio_atlantik/Makefile.am @@ -12,4 +12,4 @@ kdelnk_DATA = atlantik.protocol kdelnkdir = $(kde_servicesdir) messages: - $(XGETTEXT) *.cpp -o $(podir)/kio_atlantik.pot + $(XGETTEXT) *.cpp -o $(podir)/tdeio_atlantik.pot diff --git a/atlantik/kio_atlantik/kio_atlantik.cpp b/atlantik/kio_atlantik/kio_atlantik.cpp index d999e51b..4305867b 100644 --- a/atlantik/kio_atlantik/kio_atlantik.cpp +++ b/atlantik/kio_atlantik/kio_atlantik.cpp @@ -25,7 +25,7 @@ #define KDE_3_1_FEATURES #endif #endif -#include +#include #include #include diff --git a/kasteroids/settings.kcfgc b/kasteroids/settings.kcfgc index f8d9e21d..c752b844 100644 --- a/kasteroids/settings.kcfgc +++ b/kasteroids/settings.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kasteroids.kcfg ClassName=Settings Singleton=true diff --git a/kasteroids/toplevel.cpp b/kasteroids/toplevel.cpp index dc16060e..70636311 100644 --- a/kasteroids/toplevel.cpp +++ b/kasteroids/toplevel.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "settings.h" #include "toplevel.h" diff --git a/katomic/configbox.cpp b/katomic/configbox.cpp index ad524023..0b8561d4 100644 --- a/katomic/configbox.cpp +++ b/katomic/configbox.cpp @@ -7,7 +7,7 @@ #include "configbox.h" #include #include -#include +#include #include #include #include diff --git a/kbackgammon/engines/fibs/kbgfibs.cpp b/kbackgammon/engines/fibs/kbgfibs.cpp index d729d544..4f8282b4 100644 --- a/kbackgammon/engines/fibs/kbgfibs.cpp +++ b/kbackgammon/engines/fibs/kbgfibs.cpp @@ -36,7 +36,7 @@ #include "kbgfibs.moc" #include -#include +#include #include #include #include diff --git a/kbackgammon/engines/fibs/kbgfibschat.cpp b/kbackgammon/engines/fibs/kbgfibschat.cpp index 70812d52..ece5e9ef 100644 --- a/kbackgammon/engines/fibs/kbgfibschat.cpp +++ b/kbackgammon/engines/fibs/kbgfibschat.cpp @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include #include diff --git a/kbackgammon/engines/fibs/kplayerlist.cpp b/kbackgammon/engines/fibs/kplayerlist.cpp index cf05526a..d811b1f2 100644 --- a/kbackgammon/engines/fibs/kplayerlist.cpp +++ b/kbackgammon/engines/fibs/kplayerlist.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include diff --git a/kbackgammon/engines/gnubg/kbggnubg.cpp b/kbackgammon/engines/gnubg/kbggnubg.cpp index 9bfb8ed5..ff6f6bdb 100644 --- a/kbackgammon/engines/gnubg/kbggnubg.cpp +++ b/kbackgammon/engines/gnubg/kbggnubg.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kbackgammon/engines/nextgen/kbgng.cpp b/kbackgammon/engines/nextgen/kbgng.cpp index 6f2bb5a0..72fe77ab 100644 --- a/kbackgammon/engines/nextgen/kbgng.cpp +++ b/kbackgammon/engines/nextgen/kbgng.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kbackgammon/engines/offline/kbgoffline.cpp b/kbackgammon/engines/offline/kbgoffline.cpp index c540b63f..b0b33034 100644 --- a/kbackgammon/engines/offline/kbgoffline.cpp +++ b/kbackgammon/engines/offline/kbgoffline.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kbackgammon/kbg.cpp b/kbackgammon/kbg.cpp index 10aa2655..f2fea097 100644 --- a/kbackgammon/kbg.cpp +++ b/kbackgammon/kbg.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include @@ -573,7 +573,7 @@ void KBg::setupDlg() arg(kapp->aboutData()->programName())); TQGridLayout *gle = new TQGridLayout(gbe, 1, 1, nb->spacingHint()); - KURLLabel *lab = new KURLLabel("kcmshell kcmnotify", + KURLLabel *lab = new KURLLabel("tdecmshell kcmnotify", i18n("Klick here to configure the event notification"), gbe); lab->setMaximumSize(lab->sizeHint()); diff --git a/kbackgammon/kbgboard.cpp b/kbackgammon/kbgboard.cpp index f37fb361..4f6f11a3 100644 --- a/kbackgammon/kbgboard.cpp +++ b/kbackgammon/kbgboard.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kbackgammon/kbgtextview.cpp b/kbackgammon/kbgtextview.cpp index 616d711c..0de7a040 100644 --- a/kbackgammon/kbgtextview.cpp +++ b/kbackgammon/kbgtextview.cpp @@ -23,7 +23,7 @@ #include "kbgtextview.h" #include -#include +#include #include #include #include diff --git a/kbattleship/kbattleship/kbattleship.h b/kbattleship/kbattleship/kbattleship.h index 2f4e3b89..d24abdc5 100644 --- a/kbattleship/kbattleship/kbattleship.h +++ b/kbattleship/kbattleship/kbattleship.h @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/kbattleship/kbattleship/kclientdialog.h b/kbattleship/kbattleship/kclientdialog.h index 3af24d38..ead29ee5 100644 --- a/kbattleship/kbattleship/kclientdialog.h +++ b/kbattleship/kbattleship/kclientdialog.h @@ -19,7 +19,7 @@ #define KCLIENTDIALOG_H #include -#include +#include #include #include #include diff --git a/kblackbox/kbbgame.cpp b/kblackbox/kbbgame.cpp index cf88daa6..aabdbff5 100644 --- a/kblackbox/kbbgame.cpp +++ b/kblackbox/kbbgame.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kbounce/kbounce.cpp b/kbounce/kbounce.cpp index b6051420..f8bb905d 100644 --- a/kbounce/kbounce.cpp +++ b/kbounce/kbounce.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kenolaba/AbTop.cpp b/kenolaba/AbTop.cpp index 6ec4cc0f..beec2d5a 100644 --- a/kenolaba/AbTop.cpp +++ b/kenolaba/AbTop.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff --git a/kenolaba/Board.cpp b/kenolaba/Board.cpp index d939ad09..2cf8ccb2 100644 --- a/kenolaba/Board.cpp +++ b/kenolaba/Board.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include "Board.h" diff --git a/kenolaba/EvalDlgImpl.cpp b/kenolaba/EvalDlgImpl.cpp index 453dd0ea..ead21880 100644 --- a/kenolaba/EvalDlgImpl.cpp +++ b/kenolaba/EvalDlgImpl.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/kenolaba/EvalScheme.cpp b/kenolaba/EvalScheme.cpp index 7e15bf48..dc51760c 100644 --- a/kenolaba/EvalScheme.cpp +++ b/kenolaba/EvalScheme.cpp @@ -8,7 +8,7 @@ */ #include -#include +#include #include "EvalScheme.h" diff --git a/kfouleggs/prefs.kcfgc b/kfouleggs/prefs.kcfgc index cf32e226..17a59887 100644 --- a/kfouleggs/prefs.kcfgc +++ b/kfouleggs/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kfouleggs.kcfg IncludeFiles=common/commonprefs.h Inherits=CommonPrefs diff --git a/kgoldrunner/src/kgoldrunner.cpp b/kgoldrunner/src/kgoldrunner.cpp index a33ec458..319b65fd 100644 --- a/kgoldrunner/src/kgoldrunner.cpp +++ b/kgoldrunner/src/kgoldrunner.cpp @@ -13,9 +13,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/kjumpingcube/kcubeboxwidget.cpp b/kjumpingcube/kcubeboxwidget.cpp index 76e8e2e5..3457852c 100644 --- a/kjumpingcube/kcubeboxwidget.cpp +++ b/kjumpingcube/kcubeboxwidget.cpp @@ -22,7 +22,7 @@ #include "kcubeboxwidget.h" #include -#include +#include #include #include #include diff --git a/kjumpingcube/kjumpingcube.cpp b/kjumpingcube/kjumpingcube.cpp index c8f8e66f..f6ed8a87 100644 --- a/kjumpingcube/kjumpingcube.cpp +++ b/kjumpingcube/kjumpingcube.cpp @@ -25,19 +25,19 @@ // Settings #include "settings.h" -#include +#include #include "prefs.h" #include #include -#include +#include #include #include #include #include -#include +#include #include #define ID_STATUS_TURN_TEXT 1000 diff --git a/kjumpingcube/prefs.kcfgc b/kjumpingcube/prefs.kcfgc index 95d81c69..d9489922 100644 --- a/kjumpingcube/prefs.kcfgc +++ b/kjumpingcube/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kjumpingcube.kcfg #IncludeFiles=defines.h ClassName=Prefs diff --git a/klines/klines.cpp b/klines/klines.cpp index b0bbe51f..be076db9 100644 --- a/klines/klines.cpp +++ b/klines/klines.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/klines/prefs.kcfgc b/klines/prefs.kcfgc index 6ed42a2f..44cc357c 100644 --- a/klines/prefs.kcfgc +++ b/klines/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=klines.kcfg #IncludeFiles=defines.h ClassName=Prefs diff --git a/kmahjongg/Editor.h b/kmahjongg/Editor.h index 1b1b09de..61634ae4 100644 --- a/kmahjongg/Editor.h +++ b/kmahjongg/Editor.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include "Tileset.h" #include "BoardLayout.h" diff --git a/kmahjongg/Preview.cpp b/kmahjongg/Preview.cpp index 9c6ac478..0f6af54b 100644 --- a/kmahjongg/Preview.cpp +++ b/kmahjongg/Preview.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/kmahjongg/boardwidget.cpp b/kmahjongg/boardwidget.cpp index 3e4c1033..ec4ff595 100644 --- a/kmahjongg/boardwidget.cpp +++ b/kmahjongg/boardwidget.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include /** * Constructor. diff --git a/kmahjongg/kmahjongg.cpp b/kmahjongg/kmahjongg.cpp index ff825b31..6a63abc4 100644 --- a/kmahjongg/kmahjongg.cpp +++ b/kmahjongg/kmahjongg.cpp @@ -29,13 +29,13 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include "prefs.h" #include "kmahjongg.h" diff --git a/kmahjongg/prefs.kcfgc b/kmahjongg/prefs.kcfgc index 1498936f..2cd4110d 100644 --- a/kmahjongg/prefs.kcfgc +++ b/kmahjongg/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kmahjongg.kcfg #IncludeFiles=defines.h ClassName=Prefs diff --git a/kmines/dialogs.cpp b/kmines/dialogs.cpp index 581c2ecd..08554d00 100644 --- a/kmines/dialogs.cpp +++ b/kmines/dialogs.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include diff --git a/kmines/highscores.cpp b/kmines/highscores.cpp index 931254ae..e175a926 100644 --- a/kmines/highscores.cpp +++ b/kmines/highscores.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "version.h" #include "defines.h" diff --git a/kmines/main.cpp b/kmines/main.cpp index 23f790b2..e4dd1081 100644 --- a/kmines/main.cpp +++ b/kmines/main.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "settings.h" #include "status.h" diff --git a/kmines/settings.kcfgc b/kmines/settings.kcfgc index c863f41a..a2cb3cbc 100644 --- a/kmines/settings.kcfgc +++ b/kmines/settings.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kmines.kcfg IncludeFiles=defines.h ClassName=Settings diff --git a/kmines/status.cpp b/kmines/status.cpp index 770be430..e4464655 100644 --- a/kmines/status.cpp +++ b/kmines/status.cpp @@ -29,13 +29,13 @@ #include #include -#include +#include #include #include #include -#include +#include #include -#include +#include #include #include diff --git a/knetwalk/src/highscores.cpp b/knetwalk/src/highscores.cpp index 9ab7000b..a8ed2c6e 100644 --- a/knetwalk/src/highscores.cpp +++ b/knetwalk/src/highscores.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include "defines.h" #include "highscores.h" diff --git a/knetwalk/src/settings.kcfgc b/knetwalk/src/settings.kcfgc index 6444924a..230f0ddc 100644 --- a/knetwalk/src/settings.kcfgc +++ b/knetwalk/src/settings.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=knetwalk.kcfg ClassName=Settings Singleton=true diff --git a/kolf/canvasitem.cpp b/kolf/canvasitem.cpp index 2da0ee8c..3acacba2 100644 --- a/kolf/canvasitem.cpp +++ b/kolf/canvasitem.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include "game.h" #include "canvasitem.h" diff --git a/kolf/floater.cpp b/kolf/floater.cpp index f0103595..b2a13ce6 100644 --- a/kolf/floater.cpp +++ b/kolf/floater.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include "floater.h" diff --git a/kolf/game.cpp b/kolf/game.cpp index e3d455cd..8aeb09cb 100644 --- a/kolf/game.cpp +++ b/kolf/game.cpp @@ -3,11 +3,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/kolf/kcomboboxdialog.cpp b/kolf/kcomboboxdialog.cpp index b567e74e..72fdcb57 100644 --- a/kolf/kcomboboxdialog.cpp +++ b/kolf/kcomboboxdialog.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/kolf/kolf.cpp b/kolf/kolf.cpp index 99d7bbfc..b933c333 100644 --- a/kolf/kolf.cpp +++ b/kolf/kolf.cpp @@ -1,11 +1,11 @@ #include #include -#include +#include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/kolf/newgame.cpp b/kolf/newgame.cpp index e4c653e1..6ef8d95d 100644 --- a/kolf/newgame.cpp +++ b/kolf/newgame.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/kolf/objects/poolball/poolball.cpp b/kolf/objects/poolball/poolball.cpp index a87dd301..2b5e7f98 100644 --- a/kolf/objects/poolball/poolball.cpp +++ b/kolf/objects/poolball/poolball.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/kolf/objects/test/test.cpp b/kolf/objects/test/test.cpp index 331975fc..f5ed6753 100644 --- a/kolf/objects/test/test.cpp +++ b/kolf/objects/test/test.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include "test.h" diff --git a/kolf/slope.cpp b/kolf/slope.cpp index b01385bf..c5dc9031 100644 --- a/kolf/slope.cpp +++ b/kolf/slope.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/konquest/gameenddlg.cc b/konquest/gameenddlg.cc index 6ae62cc7..270d7e30 100644 --- a/konquest/gameenddlg.cc +++ b/konquest/gameenddlg.cc @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include diff --git a/konquest/newgamedlg.cc b/konquest/newgamedlg.cc index 5e809460..6e0ca2b9 100644 --- a/konquest/newgamedlg.cc +++ b/konquest/newgamedlg.cc @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/kpat/cardmaps.cpp b/kpat/cardmaps.cpp index 5c5427f1..e38d91dd 100644 --- a/kpat/cardmaps.cpp +++ b/kpat/cardmaps.cpp @@ -23,7 +23,7 @@ #include -#include +#include #include #include "cardmaps.h" diff --git a/kpat/dealer.cpp b/kpat/dealer.cpp index 42d895c0..2867e113 100644 --- a/kpat/dealer.cpp +++ b/kpat/dealer.cpp @@ -11,7 +11,7 @@ #include #include "cardmaps.h" #include "speeds.h" -#include +#include #include "version.h" diff --git a/kpat/gamestatsimpl.cpp b/kpat/gamestatsimpl.cpp index 355768d4..e15c7674 100644 --- a/kpat/gamestatsimpl.cpp +++ b/kpat/gamestatsimpl.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include GameStatsImpl::GameStatsImpl(TQWidget* aParent, const char* aname) diff --git a/kpat/pwidget.cpp b/kpat/pwidget.cpp index f79bb4d2..791955c1 100644 --- a/kpat/pwidget.cpp +++ b/kpat/pwidget.cpp @@ -31,9 +31,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/kpoker/global.h b/kpoker/global.h index 997cfe09..f13f1678 100644 --- a/kpoker/global.h +++ b/kpoker/global.h @@ -18,7 +18,7 @@ #define __GLOBAL__H__ #include -#include +#include extern KLocale *locale; extern TDEConfig *conf; diff --git a/kpoker/kpoker.cpp b/kpoker/kpoker.cpp index 534b43b6..02a5a319 100644 --- a/kpoker/kpoker.cpp +++ b/kpoker/kpoker.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kpoker/newgamedlg.cpp b/kpoker/newgamedlg.cpp index 083e0b4f..b8f5f19c 100644 --- a/kpoker/newgamedlg.cpp +++ b/kpoker/newgamedlg.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include // own includes diff --git a/kpoker/top.cpp b/kpoker/top.cpp index 38c7be4b..56cf07bb 100644 --- a/kpoker/top.cpp +++ b/kpoker/top.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kreversi/board.cpp b/kreversi/board.cpp index 6f9c7a57..2d8e034e 100644 --- a/kreversi/board.cpp +++ b/kreversi/board.cpp @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include #include diff --git a/kreversi/highscores.cpp b/kreversi/highscores.cpp index e8aa0a94..6f34d097 100644 --- a/kreversi/highscores.cpp +++ b/kreversi/highscores.cpp @@ -20,7 +20,7 @@ #include "highscores.h" #include -#include +#include #include diff --git a/kreversi/kreversi.cpp b/kreversi/kreversi.cpp index 207e0952..c3a047e3 100644 --- a/kreversi/kreversi.cpp +++ b/kreversi/kreversi.cpp @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include #include @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kreversi/prefs.kcfgc b/kreversi/prefs.kcfgc index 173c0e55..4c6b27cd 100644 --- a/kreversi/prefs.kcfgc +++ b/kreversi/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kreversi.kcfg #IncludeFiles=defines.h ClassName=Prefs diff --git a/kreversi/qreversigameview.cpp b/kreversi/qreversigameview.cpp index ce1e3f5f..36a5345a 100644 --- a/kreversi/qreversigameview.cpp +++ b/kreversi/qreversigameview.cpp @@ -52,7 +52,7 @@ #include #include -#include +#include #include #include #include diff --git a/ksame/KSameWidget.cpp b/ksame/KSameWidget.cpp index 7d28b276..e9583ae2 100644 --- a/ksame/KSameWidget.cpp +++ b/ksame/KSameWidget.cpp @@ -33,9 +33,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/ksame/StoneWidget.cpp b/ksame/StoneWidget.cpp index e4a4bb46..0985aa48 100644 --- a/ksame/StoneWidget.cpp +++ b/ksame/StoneWidget.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/kshisen/app.cpp b/kshisen/app.cpp index bcd57195..77a96b5c 100644 --- a/kshisen/app.cpp +++ b/kshisen/app.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include @@ -68,7 +68,7 @@ App::App(TQWidget *parent, const char *name) : KMainWindow(parent, name), highscoreTable = new KHighscore(TQT_TQOBJECT(this)); // TODO? - // Would it make sense long term to have a kconfig update rather then + // Would it make sense long term to have a tdeconfig update rather then // havin both formats supported in the code? if(highscoreTable->hasTable()) readHighscore(); diff --git a/kshisen/main.cpp b/kshisen/main.cpp index db5d96d8..e71e399e 100644 --- a/kshisen/main.cpp +++ b/kshisen/main.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include "version.h" #include "app.h" diff --git a/kshisen/prefs.kcfgc b/kshisen/prefs.kcfgc index 63feff7f..81862aca 100644 --- a/kshisen/prefs.kcfgc +++ b/kshisen/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kshisen.kcfg ClassName=Prefs Singleton=true diff --git a/ksirtet/ksirtet/prefs.kcfgc b/ksirtet/ksirtet/prefs.kcfgc index 1201abb3..fab0888c 100644 --- a/ksirtet/ksirtet/prefs.kcfgc +++ b/ksirtet/ksirtet/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=ksirtet.kcfg IncludeFiles=common/commonprefs.h Inherits=CommonPrefs diff --git a/ksmiletris/gamewindow.cpp b/ksmiletris/gamewindow.cpp index 549e433c..d3bef18d 100644 --- a/ksmiletris/gamewindow.cpp +++ b/ksmiletris/gamewindow.cpp @@ -25,7 +25,7 @@ this software. #include #include -#include +#include #include #include diff --git a/ksnake/game.cpp b/ksnake/game.cpp index e2ac41d3..1b92e741 100644 --- a/ksnake/game.cpp +++ b/ksnake/game.cpp @@ -34,7 +34,7 @@ #include -#include +#include #include #include diff --git a/ksnake/settings.kcfgc b/ksnake/settings.kcfgc index cf8ee5e6..8d0d6d83 100644 --- a/ksnake/settings.kcfgc +++ b/ksnake/settings.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=ksnake.kcfg ClassName=Settings Singleton=true diff --git a/ksokoban/LevelCollection.cpp b/ksokoban/LevelCollection.cpp index 55995afa..e02acca0 100644 --- a/ksokoban/LevelCollection.cpp +++ b/ksokoban/LevelCollection.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include static inline unsigned long diff --git a/ksokoban/LevelMap.cpp b/ksokoban/LevelMap.cpp index 9d4cb408..59a2976b 100644 --- a/ksokoban/LevelMap.cpp +++ b/ksokoban/LevelMap.cpp @@ -19,7 +19,7 @@ #include "config.h" -#include +#include #include #include diff --git a/ksokoban/MainWindow.cpp b/ksokoban/MainWindow.cpp index 5c19e5e1..626aded8 100644 --- a/ksokoban/MainWindow.cpp +++ b/ksokoban/MainWindow.cpp @@ -20,18 +20,18 @@ #include #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/ksokoban/PlayField.cpp b/ksokoban/PlayField.cpp index 10c6c197..eb6a9520 100644 --- a/ksokoban/PlayField.cpp +++ b/ksokoban/PlayField.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kspaceduel/dialogs.h b/kspaceduel/dialogs.h index c772857e..4b1fc884 100644 --- a/kspaceduel/dialogs.h +++ b/kspaceduel/dialogs.h @@ -9,7 +9,7 @@ class TQSlider; class TQLCDNumber; class TQCheckBox; -#include +#include #include "defines.h" #include "structs.h" diff --git a/kspaceduel/mainview.cpp b/kspaceduel/mainview.cpp index 2486882d..09056ecc 100644 --- a/kspaceduel/mainview.cpp +++ b/kspaceduel/mainview.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include "ai.h" diff --git a/kspaceduel/options.kcfgc b/kspaceduel/options.kcfgc index d6356cc7..877a89e1 100644 --- a/kspaceduel/options.kcfgc +++ b/kspaceduel/options.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kspaceduel.kcfg ClassName=Options Singleton=true diff --git a/ktron/ktron.cpp b/ktron/ktron.cpp index 7989f6d4..6ef3c4e1 100644 --- a/ktron/ktron.cpp +++ b/ktron/ktron.cpp @@ -21,7 +21,7 @@ #include "ktron.h" -#include +#include #include #include #include diff --git a/ktron/settings.kcfgc b/ktron/settings.kcfgc index de60e440..d8403246 100644 --- a/ktron/settings.kcfgc +++ b/ktron/settings.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=ktron.kcfg ClassName=Settings Singleton=true diff --git a/ktron/tron.cpp b/ktron/tron.cpp index c17af2ee..585aedd0 100644 --- a/ktron/tron.cpp +++ b/ktron/tron.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ // Background -#include +#include #include // Normal class @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/ktuberling/toplevel.cpp b/ktuberling/toplevel.cpp index 2f3cf8ef..9593ef73 100644 --- a/ktuberling/toplevel.cpp +++ b/ktuberling/toplevel.cpp @@ -6,10 +6,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/libksirtet/base/baseprefs.kcfgc b/libksirtet/base/baseprefs.kcfgc index 41c852af..0b602d52 100644 --- a/libksirtet/base/baseprefs.kcfgc +++ b/libksirtet/base/baseprefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=libksirtet1.kcfg #IncludeFiles=defines.h ClassName=BasePrefs diff --git a/libksirtet/base/main.cpp b/libksirtet/base/main.cpp index 535af790..20856dcb 100644 --- a/libksirtet/base/main.cpp +++ b/libksirtet/base/main.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include "inter.h" #include "factory.h" diff --git a/libksirtet/base/settings.h b/libksirtet/base/settings.h index 27769e69..b0859e3f 100644 --- a/libksirtet/base/settings.h +++ b/libksirtet/base/settings.h @@ -2,7 +2,7 @@ #define BASE_SETTINGS_H #include -#include +#include class TQGridLayout; diff --git a/libksirtet/common/ai.cpp b/libksirtet/common/ai.cpp index 578c71d5..5cd470d7 100644 --- a/libksirtet/common/ai.cpp +++ b/libksirtet/common/ai.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include "commonprefs.h" diff --git a/libksirtet/common/commonprefs.kcfgc b/libksirtet/common/commonprefs.kcfgc index 8e41b16f..5ce18538 100644 --- a/libksirtet/common/commonprefs.kcfgc +++ b/libksirtet/common/commonprefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=libksirtet2.kcfg IncludeFiles=base/baseprefs.h ClassName=CommonPrefs diff --git a/libksirtet/common/highscores.cpp b/libksirtet/common/highscores.cpp index 29774d71..98073524 100644 --- a/libksirtet/common/highscores.cpp +++ b/libksirtet/common/highscores.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include "base/factory.h" diff --git a/libksirtet/common/main.cpp b/libksirtet/common/main.cpp index 4383243f..7342255b 100644 --- a/libksirtet/common/main.cpp +++ b/libksirtet/common/main.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include "inter.h" #include "factory.h" diff --git a/libksirtet/lib/wizard.h b/libksirtet/lib/wizard.h index 5aabdbb8..42a1b871 100644 --- a/libksirtet/lib/wizard.h +++ b/libksirtet/lib/wizard.h @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include "pline.h" diff --git a/libtdegames/highscore/Makefile.am b/libtdegames/highscore/Makefile.am index 6fa18cc0..3635c3b5 100644 --- a/libtdegames/highscore/Makefile.am +++ b/libtdegames/highscore/Makefile.am @@ -2,8 +2,8 @@ noinst_LTLIBRARIES = libkhighscore.la INCLUDES = $(all_includes) -libkhighscore_la_SOURCES = kconfigrawbackend.cpp \ - kfilelock.cpp khighscore.cpp kscoredialog.cpp \ +libkhighscore_la_SOURCES = tdeconfigrawbackend.cpp \ + tdefilelock.cpp khighscore.cpp kscoredialog.cpp \ kexthighscore_item.cpp kexthighscore_internal.cpp \ kexthighscore_tab.cpp kexthighscore_gui.cpp \ kexthighscore.cpp @@ -11,9 +11,9 @@ libkhighscore_la_SOURCES = kconfigrawbackend.cpp \ include_HEADERS = khighscore.h kscoredialog.h \ kexthighscore_item.h kexthighscore.h -noinst_HEADERS = kconfigrawbackend.h \ - kfilelock.h kexthighscore_internal.h kexthighscore_tab.h \ +noinst_HEADERS = tdeconfigrawbackend.h \ + tdefilelock.h kexthighscore_internal.h kexthighscore_tab.h \ kexthighscore_gui.h -METASOURCES = kconfigrawbackend.moc khighscore.moc kscoredialog.moc \ +METASOURCES = tdeconfigrawbackend.moc khighscore.moc kscoredialog.moc \ kexthighscore_tab.moc kexthighscore_gui.moc diff --git a/libtdegames/highscore/kexthighscore_gui.cpp b/libtdegames/highscore/kexthighscore_gui.cpp index fa1a1887..a66050a6 100644 --- a/libtdegames/highscore/kexthighscore_gui.cpp +++ b/libtdegames/highscore/kexthighscore_gui.cpp @@ -31,9 +31,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include "kexthighscore_internal.h" diff --git a/libtdegames/highscore/kexthighscore_internal.cpp b/libtdegames/highscore/kexthighscore_internal.cpp index dae5be91..05c51562 100644 --- a/libtdegames/highscore/kexthighscore_internal.cpp +++ b/libtdegames/highscore/kexthighscore_internal.cpp @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/libtdegames/highscore/kexthighscore_internal.h b/libtdegames/highscore/kexthighscore_internal.h index f6924662..fd690b07 100644 --- a/libtdegames/highscore/kexthighscore_internal.h +++ b/libtdegames/highscore/kexthighscore_internal.h @@ -21,7 +21,7 @@ #define KEXTHIGHSCORE_INTERNAL_H #include -#include +#include #include #include diff --git a/libtdegames/highscore/khighscore.cpp b/libtdegames/highscore/khighscore.cpp index 8a36a748..3555c76e 100644 --- a/libtdegames/highscore/khighscore.cpp +++ b/libtdegames/highscore/khighscore.cpp @@ -36,8 +36,8 @@ #include #include "khighscore.h" -#include "kconfigrawbackend.h" -#include "kfilelock.h" +#include "tdeconfigrawbackend.h" +#include "tdefilelock.h" #define GROUP "KHighscore" diff --git a/libtdegames/highscore/kscoredialog.cpp b/libtdegames/highscore/kscoredialog.cpp index 1c3d241a..8db70fee 100644 --- a/libtdegames/highscore/kscoredialog.cpp +++ b/libtdegames/highscore/kscoredialog.cpp @@ -33,7 +33,7 @@ this software. #include #include -#include +#include #include #include diff --git a/libtdegames/highscore/kconfigrawbackend.cpp b/libtdegames/highscore/tdeconfigrawbackend.cpp similarity index 96% rename from libtdegames/highscore/kconfigrawbackend.cpp rename to libtdegames/highscore/tdeconfigrawbackend.cpp index 7f75ed5d..80b4da96 100644 --- a/libtdegames/highscore/kconfigrawbackend.cpp +++ b/libtdegames/highscore/tdeconfigrawbackend.cpp @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#include "kconfigrawbackend.h" -#include "kconfigrawbackend.moc" +#include "tdeconfigrawbackend.h" +#include "tdeconfigrawbackend.moc" #include #include diff --git a/libtdegames/highscore/kconfigrawbackend.h b/libtdegames/highscore/tdeconfigrawbackend.h similarity index 97% rename from libtdegames/highscore/kconfigrawbackend.h rename to libtdegames/highscore/tdeconfigrawbackend.h index 249fa22b..53cfd174 100644 --- a/libtdegames/highscore/kconfigrawbackend.h +++ b/libtdegames/highscore/tdeconfigrawbackend.h @@ -22,7 +22,7 @@ #include -#include +#include #include diff --git a/libtdegames/highscore/kfilelock.cpp b/libtdegames/highscore/tdefilelock.cpp similarity index 98% rename from libtdegames/highscore/kfilelock.cpp rename to libtdegames/highscore/tdefilelock.cpp index 4f632f02..b5f56dfd 100644 --- a/libtdegames/highscore/kfilelock.cpp +++ b/libtdegames/highscore/tdefilelock.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include "kfilelock.h" +#include "tdefilelock.h" #include #include diff --git a/libtdegames/highscore/kfilelock.h b/libtdegames/highscore/tdefilelock.h similarity index 100% rename from libtdegames/highscore/kfilelock.h rename to libtdegames/highscore/tdefilelock.h diff --git a/libtdegames/kchatbase.cpp b/libtdegames/kchatbase.cpp index 5422c552..14395d1e 100644 --- a/libtdegames/kchatbase.cpp +++ b/libtdegames/kchatbase.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff --git a/libtdegames/kstdgameaction.cpp b/libtdegames/kstdgameaction.cpp index 8e94a908..368b26ff 100644 --- a/libtdegames/kstdgameaction.cpp +++ b/libtdegames/kstdgameaction.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include diff --git a/lskat/lskat.kdevprj b/lskat/lskat.kdevprj index 6a561dea..6d080a29 100644 --- a/lskat/lskat.kdevprj +++ b/lskat/lskat.kdevprj @@ -16,7 +16,7 @@ type=DATA [Config for BinMakefileAm] bin_program=lskat cxxflags=-O0 -g3 -Wall -ldadd=-lkfile -ltdeui -ltdecore -lqt -lXext -lX11 +ldadd=-ltdefile -ltdeui -ltdecore -lqt -lXext -lX11 ldflags= [General] author=Martin Heni diff --git a/lskat/lskat/lskat.cpp b/lskat/lskat/lskat.cpp index c2cc4392..2bd00ade 100644 --- a/lskat/lskat/lskat.cpp +++ b/lskat/lskat/lskat.cpp @@ -21,9 +21,9 @@ // include files for TDE #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/lskat/lskat/lskatdoc.h b/lskat/lskat/lskatdoc.h index 48057a40..52e29af2 100644 --- a/lskat/lskat/lskatdoc.h +++ b/lskat/lskat/lskatdoc.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include "lskat.h" #include "KEInput.h" diff --git a/twin4/twin4/kspritecache.cpp b/twin4/twin4/kspritecache.cpp index 046893cf..7068c90b 100644 --- a/twin4/twin4/kspritecache.cpp +++ b/twin4/twin4/kspritecache.cpp @@ -17,7 +17,7 @@ #include "kspritecache.h" -#include +#include #include #include #include @@ -221,7 +221,7 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(TDEConfig *config,TQString //kdDebug(11002) << " Reading " << number << " frames " << endl; TQString pixfile=config->readPathEntry(name+"file"); - TQString maskfile=config->readPathEntry(name+"mask"); + TQString mastdefile=config->readPathEntry(name+"mask"); // Load a given set of images or replace a %d by a sequence if there are // less image names than number given @@ -232,7 +232,7 @@ TQCanvasPixmapArray *KSpriteCache::createPixmapArray(TDEConfig *config,TQString { TQString tmpfile,tmpmask; tmpfile.sprintf(pixfile.latin1(),i); - tmpmask.sprintf(maskfile.latin1(),i); + tmpmask.sprintf(mastdefile.latin1(),i); pixmap=loadPixmap(tmpfile,tmpmask); if (!pixmap) kdError() << "Could not create pixmap="<1) step=(100.0-finalscale)/100.0/(double)(number-1); else step=1.0; - //kdDebug(11002) << " Scaling " << number << " pics axis="< #include -#include +#include #include #include #include