From 92ac6833a97641f981e900805d1997f9a2192147 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:18:33 -0600 Subject: [PATCH] Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- blinken/src/main.cpp | 2 +- kalzium/src/main.cpp | 2 +- kanagram/src/main.cpp | 2 +- kbruch/src/kbruch.cpp | 2 +- keduca/keduca/main.cpp | 2 +- keduca/keducabuilder/main.cpp | 2 +- kgeography/src/main.cpp | 2 +- khangman/khangman/main.cpp | 2 +- kig/kig/kig.cpp | 2 +- kiten/main.cpp | 2 +- klatin/klatin/main.cpp | 2 +- klettres/klettres/main.cpp | 2 +- kmplot/kmplot/MainDlg.cpp | 6 +++--- kmplot/kmplot/View.cpp | 10 +++++----- kmplot/kmplot/kmplot.cpp | 6 +++--- kmplot/kmplot/main.cpp | 2 +- kpercentage/kpercentage/main.cpp | 2 +- kstars/kstars/finddialog.cpp | 2 +- kstars/kstars/main.cpp | 2 +- ktouch/src/main.cpp | 2 +- kturtle/src/executer.cpp | 2 +- kturtle/src/main.cpp | 2 +- kverbos/kverbos/kverbos.h | 4 ++-- kverbos/kverbos/kverbosdoc.h | 2 +- kverbos/kverbos/main.cpp | 2 +- kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp | 4 ++-- kvoctrain/kvoctrain/kva_config.cpp | 4 ++-- kvoctrain/kvoctrain/kvoctrain.h | 2 +- kvoctrain/kvoctrain/kvoctraintable.cpp | 8 ++++---- kvoctrain/kvoctrain/kvoctrainview.h | 2 +- kvoctrain/kvoctrain/main.cpp | 2 +- kvoctrain/kvoctrain/spotlight2kvtml.cpp | 2 +- kwordquiz/src/kwordquiz.h | 4 ++-- kwordquiz/src/kwordquizdoc.h | 2 +- kwordquiz/src/main.cpp | 2 +- libtdeedu/extdate/main.cpp | 2 +- 36 files changed, 51 insertions(+), 51 deletions(-) diff --git a/blinken/src/main.cpp b/blinken/src/main.cpp index 06f9b21d..42104631 100644 --- a/blinken/src/main.cpp +++ b/blinken/src/main.cpp @@ -23,7 +23,7 @@ int main(int argc, char *argv[]) about.addAuthor("Danny Allen", I18N_NOOP("Design, Graphics and Sounds"), "danny@dannyallen.co.uk"); about.addCredit("Steve Jordi", I18N_NOOP("GPL'ed his 'Steve' font so that we could use it"), "steve@sjordi.com"); TDECmdLineArgs::init(argc, argv, &about); - KApplication app; + TDEApplication app; app.connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit())); TQFont f("Steve", 12, TQFont::Normal, true); diff --git a/kalzium/src/main.cpp b/kalzium/src/main.cpp index 6a8f0920..96056429 100644 --- a/kalzium/src/main.cpp +++ b/kalzium/src/main.cpp @@ -67,7 +67,7 @@ int main(int argc, char **argv) about.addCredit( "Inge Wallin", I18N_NOOP( "Code cleaning, the molecule parser and a lot of smaller improvements" )); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; Kalzium *mainWin = 0; if (app.isRestored()) diff --git a/kanagram/src/main.cpp b/kanagram/src/main.cpp index 71452cdf..c2ba7220 100644 --- a/kanagram/src/main.cpp +++ b/kanagram/src/main.cpp @@ -34,7 +34,7 @@ int main(int argc, char *argv[]) about.addAuthor("Danny Allen", I18N_NOOP("Design, Graphics and many Vocabularies"), "danny@dannyallen.co.uk"); about.addCredit("Artemiy Pavlov", I18N_NOOP("Sound effects"), 0, "http://artemiolabs.com"); TDECmdLineArgs::init(argc, argv, &about); - KApplication app; + TDEApplication app; app.connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit())); KanagramSettings::setJustGotFont(false); diff --git a/kbruch/src/kbruch.cpp b/kbruch/src/kbruch.cpp index 769b771b..85d083d0 100644 --- a/kbruch/src/kbruch.cpp +++ b/kbruch/src/kbruch.cpp @@ -46,7 +46,7 @@ int main(int argc, char * argv[]) aboutData.addAuthor("Sebastian Stein",0, "seb.kde@hpfsc.de"); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication kbruch; + TDEApplication kbruch; MainQtWidget * kbruchApp = new MainQtWidget(); kbruch.setMainWidget(kbruchApp); diff --git a/keduca/keduca/main.cpp b/keduca/keduca/main.cpp index fdffd318..63ec70b9 100644 --- a/keduca/keduca/main.cpp +++ b/keduca/keduca/main.cpp @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KApplication a; + TDEApplication a; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); // start as KEduca TestMaster diff --git a/keduca/keducabuilder/main.cpp b/keduca/keducabuilder/main.cpp index 5fc0d052..eef58a77 100644 --- a/keduca/keducabuilder/main.cpp +++ b/keduca/keducabuilder/main.cpp @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KApplication a; + TDEApplication a; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); // start as KEduca Builder diff --git a/kgeography/src/main.cpp b/kgeography/src/main.cpp index 4597ad2f..5a6d867b 100644 --- a/kgeography/src/main.cpp +++ b/kgeography/src/main.cpp @@ -29,7 +29,7 @@ int main(int argc, char *argv[]) about.addCredit("Yann Verley", I18N_NOOP("Contributed some maps and map generation tools"), "yann.verley@free.fr"); about.addCredit(I18N_NOOP("Sodipodi flags collection"), I18N_NOOP("Got some flags from it"), 0, "http://www.sodipodi.com/index.php3?section=clipart/flags"); TDECmdLineArgs::init(argc, argv, &about); - KApplication app; + TDEApplication app; app.setTopWidget(new kgeography()); diff --git a/khangman/khangman/main.cpp b/khangman/khangman/main.cpp index 18dcd2ed..5da07791 100644 --- a/khangman/khangman/main.cpp +++ b/khangman/khangman/main.cpp @@ -112,7 +112,7 @@ int main(int argc, char **argv) I18N_NOOP("Code cleaning"), "inge@lysator.liu.se"); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; KHangMan *mainWin = 0; TQFont f("Domestic Manners", 12, TQFont::Normal, true); diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp index 332018ab..4b37b8e1 100644 --- a/kig/kig/kig.cpp +++ b/kig/kig/kig.cpp @@ -86,7 +86,7 @@ Kig::Kig() // if we couldn't find our Part, we exit since the Shell by // itself can't do anything useful KMessageBox::error(this, i18n( "Could not find the necessary Kig library, check your installation." ) ); - KApplication::exit(); + TDEApplication::exit(); return; } diff --git a/kiten/main.cpp b/kiten/main.cpp index 378545f4..af73bbd3 100644 --- a/kiten/main.cpp +++ b/kiten/main.cpp @@ -52,7 +52,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init(argc, argv, &aboutData); TDECmdLineArgs::addCmdLineOptions(options); // Add our own options. - KApplication a; + TDEApplication a; // a.installKDEPropertyMap(); // TQSqlPropertyMap *map = TQSqlPropertyMap::defaultMap(); // map->insert("MyStringList", "value"); diff --git a/klatin/klatin/main.cpp b/klatin/klatin/main.cpp index 9df9afa3..cc256152 100644 --- a/klatin/klatin/main.cpp +++ b/klatin/klatin/main.cpp @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KApplication a; + TDEApplication a; KLatin *klatin = new KLatin(); diff --git a/klettres/klettres/main.cpp b/klettres/klettres/main.cpp index d4ec18fa..837fe00d 100644 --- a/klettres/klettres/main.cpp +++ b/klettres/klettres/main.cpp @@ -92,7 +92,7 @@ int main(int argc, char **argv) I18N_NOOP("Timer setting widgets"), "michael.goettsche AT kdemail.net"); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; // see if we are starting with session management if (app.isRestored()) diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp index 90e9c54a..eb45c929 100644 --- a/kmplot/kmplot/MainDlg.cpp +++ b/kmplot/kmplot/MainDlg.cpp @@ -369,7 +369,7 @@ void MainDlg::slotOpenRecent( const KURL &url ) TQByteArray data; TQDataStream stream(data, IO_WriteOnly); stream << url; - KApplication::kApplication()->dcopClient()->send(KApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","openFileInNewWindow(KURL)", data); + TDEApplication::kApplication()->dcopClient()->send(TDEApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","openFileInNewWindow(KURL)", data); return; } @@ -752,12 +752,12 @@ void MainDlg::setReadOnlyStatusBarText(const TQString &text) void MainDlg::optionsConfigureKeys() { - KApplication::kApplication()->dcopClient()->send(KApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","optionsConfigureKeys()", TQByteArray()); + TDEApplication::kApplication()->dcopClient()->send(TDEApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","optionsConfigureKeys()", TQByteArray()); } void MainDlg::optionsConfigureToolbars() { - KApplication::kApplication()->dcopClient()->send(KApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","optionsConfigureToolbars()", TQByteArray()); + TDEApplication::kApplication()->dcopClient()->send(TDEApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","optionsConfigureToolbars()", TQByteArray()); } void MainDlg::resetZoom() diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp index d9d88613..c72ba6da 100644 --- a/kmplot/kmplot/View.cpp +++ b/kmplot/kmplot/View.cpp @@ -56,7 +56,7 @@ double View::xmin = 0; double View::xmax = 0; -View::View(bool const r, bool &mo, KPopupMenu *p, TQWidget* parent, const char* name ) : DCOPObject("View"), TQWidget( parent, name , WStaticContents ), buffer( width(), height() ), m_popupmenu(p), m_modified(mo), m_readonly(r), m_dcop_client(KApplication::kApplication()->dcopClient()) +View::View(bool const r, bool &mo, KPopupMenu *p, TQWidget* parent, const char* name ) : DCOPObject("View"), TQWidget( parent, name , WStaticContents ), buffer( width(), height() ), m_popupmenu(p), m_modified(mo), m_readonly(r), m_dcop_client(TDEApplication::kApplication()->dcopClient()) { csmode = csparam = -1; cstype = 0; @@ -346,7 +346,7 @@ void View::plotfkt(Ufkt *ufkt, TQPainter *pDC) y = m_parser->euler_method(x, ufkt); if ( int(x*100)%2==0) { - KApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function + TDEApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function increaseProgressBar(); } break; @@ -1283,7 +1283,7 @@ void View::findMinMaxValue(Ufkt *ufkt, char p_mode, bool minimum, double &dmin, y = m_parser->euler_method(x, ufkt); if ( int(x*100)%2==0) { - KApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function + TDEApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function increaseProgressBar(); } break; @@ -1416,7 +1416,7 @@ void View::getYValue(Ufkt *ufkt, char p_mode, double x, double &y, const TQStri y = m_parser->euler_method( x, ufkt ); if ( int(x*100)%2==0) { - KApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function + TDEApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function increaseProgressBar(); } @@ -1716,7 +1716,7 @@ void View::areaUnderGraph( Ufkt *ufkt, char const p_mode, double &dmin, double y = m_parser->euler_method(x, ufkt); if ( int(x*100)%2==0) { - KApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function + TDEApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function increaseProgressBar(); } break; diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp index 1f33bb66..47161609 100644 --- a/kmplot/kmplot/kmplot.cpp +++ b/kmplot/kmplot/kmplot.cpp @@ -171,8 +171,8 @@ void KmPlot::fileNew() // says that it should open a new window if the document is _not_ // in its initial state. This is what we do here.. if ( !m_part->url().isEmpty() || isModified() ) - //KApplication::startServiceByDesktopName("kmplot"); - KApplication::tdeinitExec("kmplot"); + //TDEApplication::startServiceByDesktopName("kmplot"); + TDEApplication::tdeinitExec("kmplot"); } bool KmPlot::stopProgressBar() @@ -258,7 +258,7 @@ void KmPlot::fileOpen(const KURL &url) void KmPlot::openFileInNewWindow(const KURL url) { - KApplication::startServiceByDesktopName("kmplot",url.url()); + TDEApplication::startServiceByDesktopName("kmplot",url.url()); } bool KmPlot::checkModified() diff --git a/kmplot/kmplot/main.cpp b/kmplot/kmplot/main.cpp index 60d8c239..5db19c03 100644 --- a/kmplot/kmplot/main.cpp +++ b/kmplot/kmplot/main.cpp @@ -72,7 +72,7 @@ int main( int argc, char **argv ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KApplication ka; + TDEApplication ka; TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); KmPlot *w = new KmPlot( args ); w->show(); diff --git a/kpercentage/kpercentage/main.cpp b/kpercentage/kpercentage/main.cpp index 10b11c3f..74e80dfa 100644 --- a/kpercentage/kpercentage/main.cpp +++ b/kpercentage/kpercentage/main.cpp @@ -57,7 +57,7 @@ int main( int argc, char *argv[] ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KApplication a; + TDEApplication a; KPercentage *kpercentage = new KPercentage( "kpercentage" ); a.setMainWidget( kpercentage ); diff --git a/kstars/kstars/finddialog.cpp b/kstars/kstars/finddialog.cpp index 46283def..eeeb177c 100644 --- a/kstars/kstars/finddialog.cpp +++ b/kstars/kstars/finddialog.cpp @@ -126,7 +126,7 @@ void FindDialog::filter() { //Filter the list of names with the string in the S if ( name->text().lower().startsWith( searchFor ) ) { new SkyObjectNameListItem ( SearchList, name ); /* if ( i++ >= 5000 ) { //Every 5000 name insertions, - kapp->processEvents ( 50 ); //spend 50 msec processing KApplication events + kapp->processEvents ( 50 ); //spend 50 msec processing TDEApplication events i = 0; }*/ } diff --git a/kstars/kstars/main.cpp b/kstars/kstars/main.cpp index d37f2355..8bb200e0 100644 --- a/kstars/kstars/main.cpp +++ b/kstars/kstars/main.cpp @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - KApplication a; + TDEApplication a; if ( args->isSet( "dump" ) ) { kdDebug() << i18n( "Dumping sky image" ) << endl; diff --git a/ktouch/src/main.cpp b/ktouch/src/main.cpp index 53d0f41a..9f5fe183 100644 --- a/ktouch/src/main.cpp +++ b/ktouch/src/main.cpp @@ -44,7 +44,7 @@ int main(int argc, char **argv) about.addCredit( "All the creators of training and keyboard files", 0, 0); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; KTouch *mainWin = 0; if (app.isRestored()) { diff --git a/kturtle/src/executer.cpp b/kturtle/src/executer.cpp index e50c64a5..dd8ae8f2 100644 --- a/kturtle/src/executer.cpp +++ b/kturtle/src/executer.cpp @@ -894,7 +894,7 @@ void Executer::execRandom(TreeNode* node) if ( !checkParameterType(node, numberValue, 5060) ) return; double x = nodeX->getValue().Number(); double y = nodeY->getValue().Number(); - double r = (double)( KApplication::random() ) / RAND_MAX; + double r = (double)( TDEApplication::random() ) / RAND_MAX; node->setValue( r * ( y - x ) + x ); } diff --git a/kturtle/src/main.cpp b/kturtle/src/main.cpp index d5810c6b..dd795c6d 100644 --- a/kturtle/src/main.cpp +++ b/kturtle/src/main.cpp @@ -89,7 +89,7 @@ int main(int argc, char **argv) "astals11 # terra.es"); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; MainWindow *mainwindow = 0; if ( app.isRestored() ) diff --git a/kverbos/kverbos/kverbos.h b/kverbos/kverbos/kverbos.h index 45414d28..9b92f056 100644 --- a/kverbos/kverbos/kverbos.h +++ b/kverbos/kverbos/kverbos.h @@ -48,7 +48,7 @@ class KFeederControl; * KVerbosApp reimplements the methods that KMainWindow provides for main window handling and supports * full session management as well as using KActions. * @see KMainWindow - * @see KApplication + * @see TDEApplication * @see KConfig * * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team. @@ -113,7 +113,7 @@ class KVerbosApp : 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 KTMainWindow#saveProperties */ virtual void saveProperties(KConfig *_cfg); diff --git a/kverbos/kverbos/kverbosdoc.h b/kverbos/kverbos/kverbosdoc.h index 7d1fca3a..f4087933 100644 --- a/kverbos/kverbos/kverbosdoc.h +++ b/kverbos/kverbos/kverbosdoc.h @@ -41,7 +41,7 @@ class KVerbosUser; * * The KVerbosDoc class provides a document object that can be used in conjunction with * the classes KVerbosApp and KVerbosView to create a document-view model for standard KDE - * applications based on KApplication and KMainWindow. Thereby, the document object + * applications based on TDEApplication and KMainWindow. Thereby, the document object * is created by the KVerbosApp instance and contains the document structure with the * according methods for manipulation of the document data by KVerbosView objects. Also, * KVerbosDoc contains the methods for serialization of the document data from and to files. diff --git a/kverbos/kverbos/main.cpp b/kverbos/kverbos/main.cpp index fd82b647..91dd6c71 100644 --- a/kverbos/kverbos/main.cpp +++ b/kverbos/kverbos/main.cpp @@ -43,7 +43,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KApplication app; + TDEApplication app; if (app.isRestored()) { diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp index f3568543..49f12597 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp @@ -800,13 +800,13 @@ void LanguageOptions::enableLangWidgets() //kdDebug() << "enabled? " << enabled << endl; - if (enabled && KApplication::dcopClient()->isApplicationRegistered("kxkb")) + if (enabled && TDEApplication::dcopClient()->isApplicationRegistered("kxkb")) { TQByteArray data; TQCString replyType; TQByteArray replyData; - if (!KApplication::dcopClient()->call("kxkb", "kxkb", "getLayoutsList()", data, replyType, replyData)) + if (!TDEApplication::dcopClient()->call("kxkb", "kxkb", "getLayoutsList()", data, replyType, replyData)) { //kdDebug() << "kxkb dcop error" << endl; } diff --git a/kvoctrain/kvoctrain/kva_config.cpp b/kvoctrain/kvoctrain/kva_config.cpp index a04ed0ca..ba88b13e 100644 --- a/kvoctrain/kvoctrain/kva_config.cpp +++ b/kvoctrain/kvoctrain/kva_config.cpp @@ -34,7 +34,7 @@ void kvoctrainApp::saveOptions() { - KConfig *config = KApplication::kApplication()->config(); + KConfig *config = TDEApplication::kApplication()->config(); fileOpenRecent->saveEntries(config, "Recent Files"); if (view) @@ -75,7 +75,7 @@ void kvoctrainApp::saveLanguages() void kvoctrainApp::readOptions() { - KConfig *config = KApplication::kApplication()->config(); + KConfig *config = TDEApplication::kApplication()->config(); fileOpenRecent->loadEntries(config, "Recent Files"); /* int ls = Prefs::numPreSetting(); diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h index 9c046c50..c67347c2 100644 --- a/kvoctrain/kvoctrain/kvoctrain.h +++ b/kvoctrain/kvoctrain/kvoctrain.h @@ -100,7 +100,7 @@ public: void readLanguages(); /** 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* ); diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp index e8fad704..d432ab1b 100644 --- a/kvoctrain/kvoctrain/kvoctraintable.cpp +++ b/kvoctrain/kvoctrain/kvoctraintable.cpp @@ -78,7 +78,7 @@ void KVocTrainTable::setCurrentItem(int row) /* TQWidget* KVocTrainTable::beginEdit(int row, int col, bool replace) { - if (KApplication::dcopClient()->isApplicationRegistered("kxkb")) + if (TDEApplication::dcopClient()->isApplicationRegistered("kxkb")) { if (m_doc) { @@ -95,7 +95,7 @@ TQWidget* KVocTrainTable::beginEdit(int row, int col, bool replace) TQDataStream arg(data, IO_WriteOnly); arg << kbLayout; - if (!KApplication::dcopClient()->call("kxkb", "kxkb", "setLayout(TQString)", data, replyType, replyData)) + if (!TDEApplication::dcopClient()->call("kxkb", "kxkb", "setLayout(TQString)", data, replyType, replyData)) { kdDebug() << "kxkb dcop error: beginEdit()" << endl; } @@ -575,7 +575,7 @@ void KVocTrainTable::activateNextCell() void KVocTrainTable::slotCurrentChanged(int row, int col) { Q_UNUSED(row); - if (KApplication::dcopClient()->isApplicationRegistered("kxkb")) + if (TDEApplication::dcopClient()->isApplicationRegistered("kxkb")) { if (m_doc) { @@ -592,7 +592,7 @@ void KVocTrainTable::slotCurrentChanged(int row, int col) TQDataStream arg(data, IO_WriteOnly); arg << kbLayout; - if (!KApplication::dcopClient()->call("kxkb", "kxkb", "setLayout(TQString)", data, replyType, replyData)) + if (!TDEApplication::dcopClient()->call("kxkb", "kxkb", "setLayout(TQString)", data, replyType, replyData)) { kdDebug() << "kxkb dcop error: beginEdit()" << endl; } diff --git a/kvoctrain/kvoctrain/kvoctrainview.h b/kvoctrain/kvoctrain/kvoctrainview.h index e1259f1a..9630ffee 100644 --- a/kvoctrain/kvoctrain/kvoctrainview.h +++ b/kvoctrain/kvoctrain/kvoctrainview.h @@ -33,7 +33,7 @@ class TQGridLayout; class TQFrame; -class KApplication; +class TDEApplication; class KPrinter; class kvoctrainExpr; class KVocTrainTable; diff --git a/kvoctrain/kvoctrain/main.cpp b/kvoctrain/kvoctrain/main.cpp index 9d4519f8..d0eba568 100644 --- a/kvoctrain/kvoctrain/main.cpp +++ b/kvoctrain/kvoctrain/main.cpp @@ -94,7 +94,7 @@ static const char version[] = KVOCTRAIN_VERSION_STRING; TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; kvoctrainApp *kva = 0; if (app.isRestored()) { diff --git a/kvoctrain/kvoctrain/spotlight2kvtml.cpp b/kvoctrain/kvoctrain/spotlight2kvtml.cpp index 1f722230..99017a6a 100644 --- a/kvoctrain/kvoctrain/spotlight2kvtml.cpp +++ b/kvoctrain/kvoctrain/spotlight2kvtml.cpp @@ -301,7 +301,7 @@ void writeToKvtml(TQTextStream &os, TQString month, TQString year) int main(int argc, char **argv) { // use i18n-strings from kvoctrain - KApplication app(argc,argv, "kvoctrain"); + TDEApplication app(argc,argv, "kvoctrain"); if (argc != 4) { cerr << i18n("usage: spotlight2kvtml spotfile month year\n\n").local8Bit().data(); diff --git a/kwordquiz/src/kwordquiz.h b/kwordquiz/src/kwordquiz.h index 5d3b7b61..36cc270b 100644 --- a/kwordquiz/src/kwordquiz.h +++ b/kwordquiz/src/kwordquiz.h @@ -51,7 +51,7 @@ class KWQNewStuff; * KWordQuizApp reimplements the methods that KMainWindow provides for main window handling and supports * full session management as well as using KActions. * @see KMainWindow - * @see KApplication + * @see TDEApplication * @see KConfig * * @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team. @@ -114,7 +114,7 @@ class KWordQuizApp : 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 KTMainWindow#saveProperties */ virtual void saveProperties(KConfig *_cfg); diff --git a/kwordquiz/src/kwordquizdoc.h b/kwordquiz/src/kwordquizdoc.h index 56445330..07fbf3f5 100644 --- a/kwordquiz/src/kwordquizdoc.h +++ b/kwordquiz/src/kwordquizdoc.h @@ -33,7 +33,7 @@ class KWordQuizView; /** KWordQuizDoc provides a document object for a document-view model. * * The KWordQuizDoc class provides a document object that can be used in conjunction with the classes KWordQuizApp and KWordQuizView - * to create a document-view model for standard TDE applications based on KApplication and KMainWindow. Thereby, the document object + * to create a document-view model for standard TDE applications based on TDEApplication and KMainWindow. Thereby, the document object * is created by the KWordQuizApp instance and contains the document structure with the according methods for manipulation of the document * data by KWordQuizView objects. Also, KWordQuizDoc contains the methods for serialization of the document data from and to files. * diff --git a/kwordquiz/src/main.cpp b/kwordquiz/src/main.cpp index 7ec393e3..dc1e8b15 100644 --- a/kwordquiz/src/main.cpp +++ b/kwordquiz/src/main.cpp @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KApplication app; + TDEApplication app; if (app.isRestored()) { diff --git a/libtdeedu/extdate/main.cpp b/libtdeedu/extdate/main.cpp index 0b833a9a..31b0f805 100644 --- a/libtdeedu/extdate/main.cpp +++ b/libtdeedu/extdate/main.cpp @@ -22,7 +22,7 @@ int main( int argc, char *argv[] ) TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication a; + TDEApplication a; TestWidget *t = new TestWidget(0,0); t->show(); TQObject::connect(kapp, TQT_SIGNAL(lastWindowClosed()), kapp, TQT_SLOT(quit()));