From 2e384e286e5ec2f884ceab9a360f90f544554066 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:19:04 -0600 Subject: [PATCH] Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- atlantik/client/main.cpp | 4 ++-- kasteroids/main.cpp | 2 +- katomic/main.cpp | 2 +- kbackgammon/main.cpp | 2 +- kbattleship/kbattleship/kbaiplayer.cpp | 2 +- kbattleship/kbattleship/kbchooserstrategy.cpp | 2 +- kbattleship/kbattleship/main.cpp | 2 +- kblackbox/main.cpp | 2 +- kbounce/main.cpp | 2 +- kenolaba/Ball.cpp | 2 +- kenolaba/kenolaba.cpp | 2 +- kgoldrunner/src/kgoldrunner.cpp | 2 +- kgoldrunner/src/main.cpp | 2 +- kjumpingcube/main.cpp | 2 +- klines/main.cpp | 2 +- kmahjongg/main.cpp | 2 +- kmines/main.cpp | 2 +- knetwalk/src/main.cpp | 2 +- kolf/main.cpp | 2 +- konquest/Konquest.cc | 2 +- kpat/CHANGES | 2 +- kpat/main.cpp | 2 +- kpoker/main.cpp | 2 +- kreversi/main.cpp | 2 +- ksame/main.cpp | 4 ++-- kshisen/main.cpp | 2 +- kshisen/tileset.cpp | 2 +- ksmiletris/main.cpp | 2 +- ksnake/main.cpp | 2 +- ksokoban/LevelCollection.cpp | 6 +++--- ksokoban/MainWindow.cpp | 12 ++++++------ ksokoban/ModalLabel.cpp | 2 +- ksokoban/PlayField.cpp | 6 +++--- ksokoban/main.cpp | 2 +- kspaceduel/main.cpp | 2 +- kspaceduel/mainview.cpp | 2 +- ktron/main.cpp | 2 +- ktuberling/main.cpp | 2 +- ktuberling/toplevel.cpp | 4 ++-- libksirtet/base/factory.cpp | 2 +- libtdegames/highscore/khighscore.h | 2 +- libtdegames/kcarddialog.cpp | 4 ++-- lskat/lskat/lskat.h | 6 +++--- lskat/lskat/lskatdoc.h | 2 +- lskat/lskat/main.cpp | 2 +- twin4/twin4/main.cpp | 2 +- 46 files changed, 61 insertions(+), 61 deletions(-) diff --git a/atlantik/client/main.cpp b/atlantik/client/main.cpp index 4c158239..cd810aea 100644 --- a/atlantik/client/main.cpp +++ b/atlantik/client/main.cpp @@ -60,8 +60,8 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions (options); - KApplication::addCmdLineOptions(); - KApplication kapplication; + TDEApplication::addCmdLineOptions(); + TDEApplication kapplication; KGlobal::locale()->insertCatalogue("libtdegames"); if (kapplication.isRestored()) diff --git a/kasteroids/main.cpp b/kasteroids/main.cpp index 978ea63c..504e7ebb 100644 --- a/kasteroids/main.cpp +++ b/kasteroids/main.cpp @@ -29,7 +29,7 @@ int main( int argc, char *argv[] ) aboutData.addAuthor("Martin R. Jones",0, "mjones@kde.org"); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication app; + TDEApplication app; KGlobal::locale()->insertCatalogue("libtdegames"); KGlobal::dirs()->addResourceType("sprite", KStandardDirs::kde_default("data") + "kasteroids/sprites/"); KGlobal::dirs()->addResourceType("sounds", KStandardDirs::kde_default("data") + "kasteroids/sounds/"); diff --git a/katomic/main.cpp b/katomic/main.cpp index 86b270a2..dc2f81de 100644 --- a/katomic/main.cpp +++ b/katomic/main.cpp @@ -53,7 +53,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init( argc, argv, &aboutData ); TQApplication::setColorSpec(TQApplication::ManyColor); - KApplication a; + TDEApplication a; KGlobal::locale()->insertCatalogue("libtdegames"); if ( a.isRestored() ) diff --git a/kbackgammon/main.cpp b/kbackgammon/main.cpp index 94919eea..21ce90b3 100644 --- a/kbackgammon/main.cpp +++ b/kbackgammon/main.cpp @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init(argc, argv, &about); - KApplication app; + TDEApplication app; KGlobal::locale()->insertCatalogue("libtdegames"); if (app.isRestored()) diff --git a/kbattleship/kbattleship/kbaiplayer.cpp b/kbattleship/kbattleship/kbaiplayer.cpp index 3381c00c..0a30913a 100644 --- a/kbattleship/kbattleship/kbaiplayer.cpp +++ b/kbattleship/kbattleship/kbaiplayer.cpp @@ -29,7 +29,7 @@ KBAIPlayer::KBAIPlayer() m_ownShipList = 0; m_battleField = 0; m_masterStrategy = 0; - m_randomSeq = new KRandomSequence(KApplication::random()); + m_randomSeq = new KRandomSequence(TDEApplication::random()); } KBAIPlayer::~KBAIPlayer() diff --git a/kbattleship/kbattleship/kbchooserstrategy.cpp b/kbattleship/kbattleship/kbchooserstrategy.cpp index 6473e73b..723c2932 100644 --- a/kbattleship/kbattleship/kbchooserstrategy.cpp +++ b/kbattleship/kbattleship/kbchooserstrategy.cpp @@ -32,7 +32,7 @@ KBChooserStrategy::KBChooserStrategy(KBStrategy *parent) : KBStrategy(parent) m_child = 0; - m_random = new KRandomSequence(KApplication::random()); + m_random = new KRandomSequence(TDEApplication::random()); } KBChooserStrategy::~KBChooserStrategy() diff --git a/kbattleship/kbattleship/main.cpp b/kbattleship/kbattleship/main.cpp index b003851e..79fd5574 100644 --- a/kbattleship/kbattleship/main.cpp +++ b/kbattleship/kbattleship/main.cpp @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KApplication app; + TDEApplication app; KGlobal::locale()->insertCatalogue("libtdegames"); TQString picDirCheck = locate("data", "kbattleship/pictures/"); diff --git a/kblackbox/main.cpp b/kblackbox/main.cpp index 63f877d6..411b4f52 100644 --- a/kblackbox/main.cpp +++ b/kblackbox/main.cpp @@ -32,7 +32,7 @@ int main( int argc, char **argv ) aboutData.addAuthor("Robert Cimrman",0, "cimrman3@students.zcu.cz"); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication a; + TDEApplication a; KGlobal::locale()->insertCatalogue("libtdegames"); if (a.isRestored()) diff --git a/kbounce/main.cpp b/kbounce/main.cpp index f5cdfe72..915115c5 100644 --- a/kbounce/main.cpp +++ b/kbounce/main.cpp @@ -55,7 +55,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init( argc, argv, &aboutData ); TQApplication::setColorSpec(TQApplication::ManyColor); - KApplication a; + TDEApplication a; KGlobal::locale()->insertCatalogue("libtdegames"); ExtManager manager; diff --git a/kenolaba/Ball.cpp b/kenolaba/Ball.cpp index 392a61c5..1c97ca84 100644 --- a/kenolaba/Ball.cpp +++ b/kenolaba/Ball.cpp @@ -480,7 +480,7 @@ int main(int argc, char *argv[]) flip=.85; limit=.75; - KApplication app(argc, argv, "BallTest"); + TDEApplication app(argc, argv, "BallTest"); BallTest top; app.setMainWidget( &top ); diff --git a/kenolaba/kenolaba.cpp b/kenolaba/kenolaba.cpp index 6f05ffb8..4e9d5f42 100644 --- a/kenolaba/kenolaba.cpp +++ b/kenolaba/kenolaba.cpp @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KApplication app; + TDEApplication app; KGlobal::locale()->insertCatalogue("libtdegames"); /* command line handling */ diff --git a/kgoldrunner/src/kgoldrunner.cpp b/kgoldrunner/src/kgoldrunner.cpp index 54726d8f..9497a7ef 100644 --- a/kgoldrunner/src/kgoldrunner.cpp +++ b/kgoldrunner/src/kgoldrunner.cpp @@ -100,7 +100,7 @@ KGoldrunner::KGoldrunner() #ifdef QT3 // Base size of playing-area and widgets on the monitor resolution. - int dw = KApplication::desktop()->width(); + int dw = TDEApplication::desktop()->width(); if (dw > 800) { // More than 800x600. view->changeSize (+1); // Scale 1.25:1. } diff --git a/kgoldrunner/src/main.cpp b/kgoldrunner/src/main.cpp index f7058c20..5c6c0b9d 100644 --- a/kgoldrunner/src/main.cpp +++ b/kgoldrunner/src/main.cpp @@ -28,7 +28,7 @@ int main (int argc, char **argv) TDECmdLineArgs::init (argc, argv, &about); - KApplication app; + TDEApplication app; // Register as a DCOP client. app.dcopClient()->registerAs (app.name(), false); diff --git a/kjumpingcube/main.cpp b/kjumpingcube/main.cpp index 4ae3490f..32e37f36 100644 --- a/kjumpingcube/main.cpp +++ b/kjumpingcube/main.cpp @@ -43,7 +43,7 @@ int main(int argc, char *argv[]) aboutData.addAuthor("Benjamin Meyer",I18N_NOOP("Various improvements"), "ben+kjumpingcube@meyerhome.net"); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication app; + TDEApplication app; KGlobal::locale()->insertCatalogue("libtdegames"); // All session management is handled in the RESTORE macro diff --git a/klines/main.cpp b/klines/main.cpp index 3a81563b..4cc6c932 100644 --- a/klines/main.cpp +++ b/klines/main.cpp @@ -42,7 +42,7 @@ int main( int argc, char **argv ) aboutData.addAuthor("Roman Razilov", I18N_NOOP("Rewrite and Extension"), "Roman.Razilov@gmx.de"); TDECmdLineArgs::init(argc, argv, &aboutData); - KApplication a; + TDEApplication a; KGlobal::locale()->insertCatalogue("libtdegames"); if (a.isRestored()) diff --git a/kmahjongg/main.cpp b/kmahjongg/main.cpp index 3a8eefc7..bc8cb58f 100644 --- a/kmahjongg/main.cpp +++ b/kmahjongg/main.cpp @@ -22,7 +22,7 @@ int main( int argc, char** argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication a; + TDEApplication a; KGlobal::locale()->insertCatalogue("libtdegames"); KImageIO::registerFormats(); diff --git a/kmines/main.cpp b/kmines/main.cpp index 7696b350..1c01d730 100644 --- a/kmines/main.cpp +++ b/kmines/main.cpp @@ -247,7 +247,7 @@ int main(int argc, char **argv) aboutData.addCredit("Thomas Capricelli", I18N_NOOP("Magic reveal mode")); TDECmdLineArgs::init(argc, argv, &aboutData); - KApplication a; + TDEApplication a; KGlobal::locale()->insertCatalogue("libtdegames"); KExtHighscore::ExtManager manager; diff --git a/knetwalk/src/main.cpp b/knetwalk/src/main.cpp index 4099d4ab..b5c4b82f 100644 --- a/knetwalk/src/main.cpp +++ b/knetwalk/src/main.cpp @@ -48,7 +48,7 @@ int main(int argc, char ** argv) TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; KGlobal::locale()->insertCatalogue("libtdegames"); diff --git a/kolf/main.cpp b/kolf/main.cpp index 9dd9d225..46240859 100644 --- a/kolf/main.cpp +++ b/kolf/main.cpp @@ -71,7 +71,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) } TQApplication::setColorSpec(TQApplication::ManyColor); - KApplication a; + TDEApplication a; KGlobal::locale()->insertCatalogue("libtdegames"); Kolf *top = new Kolf; diff --git a/konquest/Konquest.cc b/konquest/Konquest.cc index 9a23ed89..bcfcf067 100644 --- a/konquest/Konquest.cc +++ b/konquest/Konquest.cc @@ -18,7 +18,7 @@ main(int argc, char **argv) aboutData.addAuthor("Russ Steffen",0, "rsteffen@bayarea.net"); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication a; + TDEApplication a; TQApplication::setGlobalMouseTracking( true ); KGlobal::locale()->insertCatalogue("libtdegames"); diff --git a/kpat/CHANGES b/kpat/CHANGES index 2480f12e..208b9819 100644 --- a/kpat/CHANGES +++ b/kpat/CHANGES @@ -120,7 +120,7 @@ since kpat-0.4 since kpat-0.3 - - kpat is a KApplication now (Matthias) + - kpat is a TDEApplication now (Matthias) since kpat-0.2 diff --git a/kpat/main.cpp b/kpat/main.cpp index b1536e7d..110046c8 100644 --- a/kpat/main.cpp +++ b/kpat/main.cpp @@ -57,7 +57,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::addCmdLineOptions (options); TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); - KApplication a; + TDEApplication a; KGlobal::locale()->insertCatalogue("libtdegames"); if (a.isRestored()) diff --git a/kpoker/main.cpp b/kpoker/main.cpp index 9ec661a7..1d75def3 100644 --- a/kpoker/main.cpp +++ b/kpoker/main.cpp @@ -40,7 +40,7 @@ int main( int argc, char *argv[] ) I18N_NOOP("Original author"), "whynot@mabi.de"); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication myApp; + TDEApplication myApp; KGlobal::locale()->insertCatalogue("libtdegames"); if (myApp.isRestored()) diff --git a/kreversi/main.cpp b/kreversi/main.cpp index d60d1576..f8c92bf9 100644 --- a/kreversi/main.cpp +++ b/kreversi/main.cpp @@ -66,7 +66,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication a; + TDEApplication a; KGlobal::locale()->insertCatalogue("libtdegames"); // used for loading background pixmaps diff --git a/ksame/main.cpp b/ksame/main.cpp index 936d6207..4971b2db 100644 --- a/ksame/main.cpp +++ b/ksame/main.cpp @@ -39,8 +39,8 @@ int main( int argc, char **argv ) { aboutData.addAuthor("Marcus Kreutzberger", 0, "kreutzbe@informatik.mu-luebeck.de"); TDECmdLineArgs::init(argc, argv, &aboutData); - KApplication::setColorSpec(TQApplication::ManyColor+TQApplication::CustomColor); - KApplication a; + TDEApplication::setColorSpec(TQApplication::ManyColor+TQApplication::CustomColor); + TDEApplication a; KGlobal::locale()->insertCatalogue("libtdegames"); KSameWidget *w = new KSameWidget; diff --git a/kshisen/main.cpp b/kshisen/main.cpp index 099bb702..d492e01c 100644 --- a/kshisen/main.cpp +++ b/kshisen/main.cpp @@ -62,7 +62,7 @@ int main(int argc, char **argv) aboutData.addCredit(0, I18N_NOOP("Thanks also to everyone who should be listed here but isn't!"), 0); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication a; + TDEApplication a; KGlobal::locale()->insertCatalogue("libtdegames"); App *app = new App(); diff --git a/kshisen/tileset.cpp b/kshisen/tileset.cpp index e9b50c43..4ca6319d 100644 --- a/kshisen/tileset.cpp +++ b/kshisen/tileset.cpp @@ -40,7 +40,7 @@ TileSet::TileSet() : scaledTiles(nTiles) if(tileset.isNull()) { KMessageBox::sorry(0, i18n("Cannot load tiles pixmap!")); - KApplication::exit(1); + TDEApplication::exit(1); } // split into individual tiles diff --git a/ksmiletris/main.cpp b/ksmiletris/main.cpp index e7bd7ceb..689803f4 100644 --- a/ksmiletris/main.cpp +++ b/ksmiletris/main.cpp @@ -43,7 +43,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication app; + TDEApplication app; KGlobal::locale()->insertCatalogue("libtdegames"); GameWindow *w = new GameWindow; diff --git a/ksnake/main.cpp b/ksnake/main.cpp index b5925902..7e475ed3 100644 --- a/ksnake/main.cpp +++ b/ksnake/main.cpp @@ -43,7 +43,7 @@ int main( int argc, char **argv ) aboutData.addCredit("Benjamin Meyer", I18N_NOOP("Improvements"), "ben+ksnake@meyerhome.net"); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication app; + TDEApplication app; KGlobal::locale()->insertCatalogue("libtdegames"); Game *ksnake = new Game(); diff --git a/ksokoban/LevelCollection.cpp b/ksokoban/LevelCollection.cpp index a562fb35..62b99384 100644 --- a/ksokoban/LevelCollection.cpp +++ b/ksokoban/LevelCollection.cpp @@ -143,7 +143,7 @@ LevelCollection::indexTextCollection() { void LevelCollection::loadPrefs() { if (id_ >= 0) { - KConfig *cfg=(KApplication::kApplication())->config(); + KConfig *cfg=(TDEApplication::kApplication())->config(); cfg->setGroup("settings"); TQString key; @@ -240,7 +240,7 @@ LevelCollection::LevelCollection(const TQString &_path, const TQString &_name, LevelCollection::~LevelCollection() { if (id_ >= 0) { - KConfig *cfg=(KApplication::kApplication())->config(); + KConfig *cfg=(TDEApplication::kApplication())->config(); cfg->setGroup ("settings"); TQString key; @@ -271,7 +271,7 @@ LevelCollection::levelCompleted() { TQString key; key.sprintf("status%d", id_); - KConfig *cfg=(KApplication::kApplication())->config(); + KConfig *cfg=(TDEApplication::kApplication())->config(); cfg->setGroup("settings"); cfg->writeEntry(key, x, true, false, false); cfg->sync(); diff --git a/ksokoban/MainWindow.cpp b/ksokoban/MainWindow.cpp index d65073f6..cae4b8af 100644 --- a/ksokoban/MainWindow.cpp +++ b/ksokoban/MainWindow.cpp @@ -57,7 +57,7 @@ MainWindow::createCollectionMenu() { } checkedCollection_ = 0; - KConfig *cfg=(KApplication::kApplication())->config(); + KConfig *cfg=(TDEApplication::kApplication())->config(); cfg->setGroup("settings"); int id = cfg->readNumEntry("collection", 10); @@ -76,7 +76,7 @@ MainWindow::MainWindow() : KMainWindow(0), externalCollection_(0) { setEraseColor(TQColor(0,0,0)); - KConfig *cfg=(KApplication::kApplication())->config(); + KConfig *cfg=(TDEApplication::kApplication())->config(); cfg->setGroup("Geometry"); int width = cfg->readNumEntry("width", 750); int height = cfg->readNumEntry("height", 562); @@ -107,7 +107,7 @@ MainWindow::MainWindow() : KMainWindow(0), externalCollection_(0) { game_->insertItem(TQIconSet(pixmap), i18n("&Redo"), playField_, TQT_SLOT(redo()), TQKeySequence( (KStdAccel::redo()).toString())); game_->insertSeparator(); pixmap = SmallIcon("exit"); - game_->insertItem(TQIconSet(pixmap), i18n("&Quit"), KApplication::kApplication(), TQT_SLOT(closeAllWindows()), TQKeySequence( (KStdAccel::quit()).toString())); + game_->insertItem(TQIconSet(pixmap), i18n("&Quit"), TDEApplication::kApplication(), TQT_SLOT(closeAllWindows()), TQKeySequence( (KStdAccel::quit()).toString())); menu_->insertItem(i18n("&Game"), game_); animation_ = new TQPopupMenu(0,"animation menu"); @@ -190,7 +190,7 @@ MainWindow::MainWindow() : KMainWindow(0), externalCollection_(0) { MainWindow::~MainWindow() { - KConfig *cfg=(KApplication::kApplication())->config(); + KConfig *cfg=(TDEApplication::kApplication())->config(); cfg->setGroup("Geometry"); cfg->writeEntry("width", width()); @@ -297,7 +297,7 @@ MainWindow::changeCollection(int id) void MainWindow::loadLevels() { - KConfig *cfg=(KApplication::kApplication())->config(); + KConfig *cfg=(TDEApplication::kApplication())->config(); cfg->setGroup("settings"); TQString lastFile = cfg->readPathEntry("lastLevelFile"); @@ -309,7 +309,7 @@ MainWindow::loadLevels() { void MainWindow::openURL(KURL _url) { - KConfig *cfg=(KApplication::kApplication())->config(); + KConfig *cfg=(TDEApplication::kApplication())->config(); // int namepos = _url.path().findRev('/') + 1; // NOTE: findRev can return -1 // TQString levelName = _url.path().mid(namepos); diff --git a/ksokoban/ModalLabel.cpp b/ksokoban/ModalLabel.cpp index 6d8b40d9..3fd244ee 100644 --- a/ksokoban/ModalLabel.cpp +++ b/ksokoban/ModalLabel.cpp @@ -108,7 +108,7 @@ ModalLabel::eventFilter (TQObject *, TQEvent *e) { void ModalLabel::message (const TQString &text, TQWidget *parent) { - KApplication *app = KApplication::kApplication (); + TDEApplication *app = TDEApplication::kApplication (); ModalLabel cl (text, parent); while (!cl.completed_) app->processOneEvent (); diff --git a/ksokoban/PlayField.cpp b/ksokoban/PlayField.cpp index fb95fcc1..4fa12157 100644 --- a/ksokoban/PlayField.cpp +++ b/ksokoban/PlayField.cpp @@ -61,7 +61,7 @@ PlayField::PlayField(TQWidget *parent, const char *name, WFlags f) highlightX_ = highlightY_ = 0; - KConfig *cfg = (KApplication::kApplication())->config(); + KConfig *cfg = (TDEApplication::kApplication())->config(); cfg->setGroup("settings"); imageData_ = new StaticImage; @@ -82,7 +82,7 @@ PlayField::PlayField(TQWidget *parent, const char *name, WFlags f) } PlayField::~PlayField() { - KConfig *cfg = (KApplication::kApplication())->config(); + KConfig *cfg = (TDEApplication::kApplication())->config(); cfg->setGroup("settings"); cfg->writeEntry("animDelay", animDelay_, true, false, false); @@ -586,7 +586,7 @@ PlayField::keyPressEvent(TQKeyEvent * e) { break; case Key_Q: - KApplication::kApplication()->closeAllWindows(); + TDEApplication::kApplication()->closeAllWindows(); break; case Key_Backspace: diff --git a/ksokoban/main.cpp b/ksokoban/main.cpp index dcd5be72..0cc11057 100644 --- a/ksokoban/main.cpp +++ b/ksokoban/main.cpp @@ -63,7 +63,7 @@ main (int argc, char **argv) TQApplication::setColorSpec(TQApplication::ManyColor); // KUniqueApplication app; - KApplication app; + TDEApplication app; // KImageIO::registerFormats(); MainWindow *widget = new MainWindow(); diff --git a/kspaceduel/main.cpp b/kspaceduel/main.cpp index d470c7f6..f8d3ead1 100644 --- a/kspaceduel/main.cpp +++ b/kspaceduel/main.cpp @@ -15,7 +15,7 @@ int main(int argc,char **argv) aboutData.addAuthor("Andreas Zehender",0, "az@azweb.de"); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication myapplication; + TDEApplication myapplication; MyTopLevelWidget* top = new MyTopLevelWidget( ); myapplication.setMainWidget(top); top->show(); diff --git a/kspaceduel/mainview.cpp b/kspaceduel/mainview.cpp index 5b02fc75..04bc7e4f 100644 --- a/kspaceduel/mainview.cpp +++ b/kspaceduel/mainview.cpp @@ -186,7 +186,7 @@ void MyMainView::readConfig() void MyMainView::writeConfig() { KConfig *cfg; - cfg=KApplication::kApplication()->config(); + cfg=TDEApplication::kApplication()->config(); cfg->setGroup("Game"); cfg->writeEntry("gravity",customConfig.gravity); diff --git a/ktron/main.cpp b/ktron/main.cpp index 5e9bf2d1..1de16460 100644 --- a/ktron/main.cpp +++ b/ktron/main.cpp @@ -40,7 +40,7 @@ int main(int argc, char* argv[]) aboutData.addAuthor("Benjamin Meyer",I18N_NOOP("Various improvements"), "ben+ktron@meyerhome.net"); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication a; + TDEApplication a; KGlobal::locale()->insertCatalogue("libtdegames"); // used for loading background pixmaps diff --git a/ktuberling/main.cpp b/ktuberling/main.cpp index 482902e5..fd8fc1de 100644 --- a/ktuberling/main.cpp +++ b/ktuberling/main.cpp @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; KGlobal::locale()->insertCatalogue("libtdegames"); KImageIO::registerFormats(); diff --git a/ktuberling/toplevel.cpp b/ktuberling/toplevel.cpp index 8f480dc3..cec08987 100644 --- a/ktuberling/toplevel.cpp +++ b/ktuberling/toplevel.cpp @@ -215,7 +215,7 @@ void TopLevel::readOptions() KConfig *config; TQString option; - config = KApplication::kApplication()->config(); + config = TDEApplication::kApplication()->config(); config->setGroup("General"); option = config->readEntry("Sound", "on"); @@ -238,7 +238,7 @@ void TopLevel::writeOptions() { KConfig *config; - config = KApplication::kApplication()->config(); + config = TDEApplication::kApplication()->config(); config->setGroup("General"); config->writeEntry("Sound", soundEnabled? "on": "off"); diff --git a/libksirtet/base/factory.cpp b/libksirtet/base/factory.cpp index 3458a46b..f87ad942 100644 --- a/libksirtet/base/factory.cpp +++ b/libksirtet/base/factory.cpp @@ -28,7 +28,7 @@ BaseFactory::BaseFactory(const MainData &md, const BaseBoardInfo &bi) void BaseFactory::init(int argc, char **argv) { TDECmdLineArgs::init(argc, argv, _aboutData); - (void)new KApplication; + (void)new TDEApplication; KGlobal::locale()->insertCatalogue("libtdegames"); KGlobal::locale()->insertCatalogue("libksirtet"); } diff --git a/libtdegames/highscore/khighscore.h b/libtdegames/highscore/khighscore.h index 6929cb23..81ee562e 100644 --- a/libtdegames/highscore/khighscore.h +++ b/libtdegames/highscore/khighscore.h @@ -117,7 +117,7 @@ public: * effective group id is completely dropped afterwards. * * Note: this method should be called in main() before creating a - * KApplication and doing anything else (KApplication checks that the + * TDEApplication and doing anything else (TDEApplication checks that the * program is not suid/sgid and will exit the program for security * reason if it is the case). */ diff --git a/libtdegames/kcarddialog.cpp b/libtdegames/kcarddialog.cpp index 542fb5f8..937eb26b 100644 --- a/libtdegames/kcarddialog.cpp +++ b/libtdegames/kcarddialog.cpp @@ -579,7 +579,7 @@ TQString KCardDialog::getRandomDeck() if (list.isEmpty()) return TQString(); - int d = KApplication::random() % list.count(); + int d = TDEApplication::random() % list.count(); return getDeckName(*list.at(d)); } @@ -591,7 +591,7 @@ TQString KCardDialog::getRandomCardDir() if (list.isEmpty()) return TQString(); - int d = KApplication::random() % list.count(); + int d = TDEApplication::random() % list.count(); TQString entry = *list.at(d); return entry.left(entry.length() - strlen("index.desktop")); } diff --git a/lskat/lskat/lskat.h b/lskat/lskat/lskat.h index 351fbb44..85b2a4c4 100644 --- a/lskat/lskat/lskat.h +++ b/lskat/lskat/lskat.h @@ -59,7 +59,7 @@ class LSkatView; * LSkatApp reimplements the methods that KMainWindow provides for main window handling and supports * full session management as well as keyboard accelerator configuration by using KAccel. * @see KMainWindow - * @see KApplication + * @see TDEApplication * @see KConfig * @see KAccel * @@ -103,7 +103,7 @@ class LSkatApp : public KMainWindow void ExtractGame(KEMessage *msg); /** initGUI creates the menubar and inserts the menupopups as well as creating the helpMenu. - * @see KApplication#getHelpMenu + * @see TDEApplication#getHelpMenu */ void initGUI(); /** Checks all menus..usually done on init programm */ @@ -136,7 +136,7 @@ class LSkatApp : public KMainWindow */ virtual bool queryExit(); /** saves the window properties for each open window during session end to the session config file, including saving the currently - * opened file by a temporary filename provided by KApplication. + * opened file by a temporary filename provided by TDEApplication. * @see KMainWindow#saveProperties */ virtual void saveProperties(KConfig *_cfg); diff --git a/lskat/lskat/lskatdoc.h b/lskat/lskat/lskatdoc.h index 5dac8334..190c0daf 100644 --- a/lskat/lskat/lskatdoc.h +++ b/lskat/lskat/lskatdoc.h @@ -37,7 +37,7 @@ class LSkatView; /** LSkatDoc provides a document object for a document-view model. * * The LSkatDoc class provides a document object that can be used in conjunction with the classes LSkatApp and LSkatView - * to create a document-view model for standard TDE applications based on KApplication and KTMainWindow. Thereby, the document object + * to create a document-view model for standard TDE applications based on TDEApplication and KTMainWindow. Thereby, the document object * is created by the LSkatApp instance and contains the document structure with the according methods for manipulation of the document * data by LSkatView objects. Also, LSkatDoc contains the methods for serialization of the document data from and to files. * diff --git a/lskat/lskat/main.cpp b/lskat/lskat/main.cpp index 7631b8ad..72b3ee34 100644 --- a/lskat/lskat/main.cpp +++ b/lskat/lskat/main.cpp @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) } args->clear(); - KApplication app; + TDEApplication app; if (app.isRestored()) { diff --git a/twin4/twin4/main.cpp b/twin4/twin4/main.cpp index f6b32c10..703fffe7 100644 --- a/twin4/twin4/main.cpp +++ b/twin4/twin4/main.cpp @@ -56,7 +56,7 @@ int main(int argc, char *argv[]) kdDebug(12010) << "Debug level set to " << global_debug << endl; } args->clear(); - KApplication app(argc, argv); + TDEApplication app(argc, argv); KGlobal::locale()->insertCatalogue("libtdegames"); if (app.isRestored())