From 4774c021a45e818d31d522b8c235ca28b993d889 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 23:58:55 -0600 Subject: [PATCH] Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- ChangeLog | 2 +- conduits/docconduit/kpalmdoc.cpp | 4 ++-- conduits/knotes/knotes-action.cc | 2 +- conduits/popmail/popmail-conduit.cc | 2 +- kpilot/kpilot.cc | 2 +- kpilot/kpilotConfig.h | 2 +- kpilot/kpilotProbeDialog.cc | 2 +- kpilot/kroupware.cc | 2 +- kpilot/main-test.cc | 6 +++--- kpilot/pilotDaemon.cc | 4 ++-- lib/plugin.cc | 2 +- tests/exportdatebook.cc | 4 ++-- tests/importaddresses.cc | 4 ++-- tests/importdatebook.cc | 4 ++-- tests/mergecalendars.cc | 4 ++-- tests/testaddress.cc | 4 ++-- tests/testcategories.cc | 4 ++-- tests/testdatabase.cc | 4 ++-- tests/testdatebook.cc | 4 ++-- tests/testidmapper.cc | 4 ++-- 20 files changed, 33 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index 51eb911..4d97ab0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3003,7 +3003,7 @@ KPilot dialogs with something sensible made with designer. Switched around #ifdef and #ifndef. This disabled setting debug levels in code with debugging on. Duh. Getting it right then showed all kinds of bugs in the other code. Added some documentation explaining possible - crashes due to missing KApplication instance. + crashes due to missing TDEApplication instance. FINALLY did something sensible about code duplication -- added get and set methods to a subclass of KConfig for all KPilot settings. * kpilot/kpilotOptions.{h,cc} diff --git a/conduits/docconduit/kpalmdoc.cpp b/conduits/docconduit/kpalmdoc.cpp index e2924a4..f686aa4 100644 --- a/conduits/docconduit/kpalmdoc.cpp +++ b/conduits/docconduit/kpalmdoc.cpp @@ -48,9 +48,9 @@ int main(int argc, char *argv[]) "groot@kde.org", "http://www.kpilot.org/"); TDECmdLineArgs::init(argc, argv, &about); - KApplication::addCmdLineOptions(); + TDEApplication::addCmdLineOptions(); - KApplication app; + TDEApplication app; ConverterDlg *dlg=new ConverterDlg(0L, i18n("PalmDOC Converter")); dlg->show(); return app.exec(); diff --git a/conduits/knotes/knotes-action.cc b/conduits/knotes/knotes-action.cc index ca32913..c99d143 100644 --- a/conduits/knotes/knotes-action.cc +++ b/conduits/knotes/knotes-action.cc @@ -192,7 +192,7 @@ KNotesAction::KNotesAction(KPilotLink *o, FUNCTIONSETUP; /* - if (fP) fP->fDCOP = KApplication::kApplication()->dcopClient(); + if (fP) fP->fDCOP = TDEApplication::kApplication()->dcopClient(); if (fP && !fP->fDCOP) { diff --git a/conduits/popmail/popmail-conduit.cc b/conduits/popmail/popmail-conduit.cc index 8f51545..1fbaf71 100644 --- a/conduits/popmail/popmail-conduit.cc +++ b/conduits/popmail/popmail-conduit.cc @@ -186,7 +186,7 @@ int PopMailConduit::sendViaKMail() int count=0; TQString kmailOutboxName = getKMailOutbox(); - DCOPClient *dcopptr = KApplication::kApplication()->dcopClient(); + DCOPClient *dcopptr = TDEApplication::kApplication()->dcopClient(); if (!dcopptr) { WARNINGKPILOT << "Cannot get DCOP client." diff --git a/kpilot/kpilot.cc b/kpilot/kpilot.cc index ec78850..edec208 100644 --- a/kpilot/kpilot.cc +++ b/kpilot/kpilot.cc @@ -167,7 +167,7 @@ void KPilotInstaller::startDaemonIfNeeded() fDaemonWasRunning = true; } - if (!fDaemonWasRunning && KApplication::startServiceByDesktopName( + if (!fDaemonWasRunning && TDEApplication::startServiceByDesktopName( CSL1("kpilotdaemon"), TQString(), &daemonError, &daemonDCOP, &daemonPID , "0" /* no notify */ diff --git a/kpilot/kpilotConfig.h b/kpilot/kpilotConfig.h index 1827953..a3e3508 100644 --- a/kpilot/kpilotConfig.h +++ b/kpilot/kpilotConfig.h @@ -77,7 +77,7 @@ public: /** * Write the current configuration version to the standard - * location. @em Only call this after the KApplication object + * location. @em Only call this after the TDEApplication object * is created, or crashes will result. */ static void updateConfigVersion(); diff --git a/kpilot/kpilotProbeDialog.cc b/kpilot/kpilotProbeDialog.cc index e131613..e91070d 100644 --- a/kpilot/kpilotProbeDialog.cc +++ b/kpilot/kpilotProbeDialog.cc @@ -169,7 +169,7 @@ ProbeDialog::~ProbeDialog() void ProbeDialog::processEvents() { FUNCTIONSETUP; - KApplication::kApplication()->processEvents(); + TDEApplication::kApplication()->processEvents(); } void ProbeDialog::progress() diff --git a/kpilot/kroupware.cc b/kpilot/kroupware.cc index 69f50c3..161fda1 100644 --- a/kpilot/kroupware.cc +++ b/kpilot/kroupware.cc @@ -270,7 +270,7 @@ void KroupwareSync::end_syncNotesWithKMail() TQString mess; int pid; - return KApplication::startServiceByDesktopName(CSL1("kmail"), + return TDEApplication::startServiceByDesktopName(CSL1("kmail"), TQString(), error, &kmdcop, diff --git a/kpilot/main-test.cc b/kpilot/main-test.cc index 4f0aa1f..fd8614e 100644 --- a/kpilot/main-test.cc +++ b/kpilot/main-test.cc @@ -358,7 +358,7 @@ int main(int argc, char **argv) TDECmdLineArgs::addCmdLineOptions(conduitOptions, I18N_NOOP("Conduit Actions"),"conduit"); - KApplication::addCmdLineOptions(); + TDEApplication::addCmdLineOptions(); TDECmdLineArgs *p = TDECmdLineArgs::parsedArgs(); @@ -369,10 +369,10 @@ int main(int argc, char **argv) needGUI |= (p->isSet("exec")); // assume worst wrt. conduits needGUI |= (p->isSet("restore")); - KApplication a(needGUI,needGUI); + TDEApplication a(needGUI,needGUI); #ifdef DEBUG KPilotConfig::getDebugLevel(p); - DEBUGKPILOT << fname << "Created KApplication." << endl; + DEBUGKPILOT << fname << "Created TDEApplication." << endl; #endif Pilot::setupPilotCodec(KPilotSettings::encoding()); diff --git a/kpilot/pilotDaemon.cc b/kpilot/pilotDaemon.cc index a418534..70e08d0 100644 --- a/kpilot/pilotDaemon.cc +++ b/kpilot/pilotDaemon.cc @@ -804,7 +804,7 @@ static KDesktopLockStatus isKDesktopLockRunning() { if (!KPilotSettings::screenlockSecure()) return NotLocked; - DCOPClient *dcopptr = KApplication::kApplication()->dcopClient(); + DCOPClient *dcopptr = TDEApplication::kApplication()->dcopClient(); // Can't tell, very weird, err on the side of safety. if (!dcopptr || !dcopptr->isAttached()) @@ -1208,7 +1208,7 @@ void PilotDaemon::slotRunKPilot() TQCString kpilotDCOP; int kpilotPID; - if (KApplication::startServiceByDesktopName(CSL1("kpilot"), + if (TDEApplication::startServiceByDesktopName(CSL1("kpilot"), TQString(), &kpilotError, &kpilotDCOP, &kpilotPID #if (TDE_VERSION >= 220) // Startup notification added in 2.2 diff --git a/lib/plugin.cc b/lib/plugin.cc index 7ef1bb9..afa0fd5 100644 --- a/lib/plugin.cc +++ b/lib/plugin.cc @@ -681,7 +681,7 @@ TQString findArgument(const TQStringList &a, const TQString &arg) /* static */ bool isRunning(const TQCString &n) { - DCOPClient *dcop = KApplication::kApplication()->dcopClient(); + DCOPClient *dcop = TDEApplication::kApplication()->dcopClient(); QCStringList apps = dcop->registeredApplications(); return apps.contains(n); } diff --git a/tests/exportdatebook.cc b/tests/exportdatebook.cc index 24c57c5..f3c602b 100644 --- a/tests/exportdatebook.cc +++ b/tests/exportdatebook.cc @@ -58,13 +58,13 @@ int main(int argc, char **argv) { FUNCTIONSETUP; - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); KAboutData aboutData("exportdatebook","Emport Date Book","0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app( false, false ); + TDEApplication app( false, false ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/tests/importaddresses.cc b/tests/importaddresses.cc index f39e76c..c4f321e 100644 --- a/tests/importaddresses.cc +++ b/tests/importaddresses.cc @@ -59,8 +59,8 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions( options ); - // KApplication app( false, false ); - KApplication app; + // TDEApplication app( false, false ); + TDEApplication app; TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/tests/importdatebook.cc b/tests/importdatebook.cc index 2880e06..9128afc 100644 --- a/tests/importdatebook.cc +++ b/tests/importdatebook.cc @@ -55,13 +55,13 @@ static const KCmdLineOptions options[] = int main(int argc, char **argv) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); KAboutData aboutData("importdatebook","Import Date Book","0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app( false, false ); + TDEApplication app( false, false ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/tests/mergecalendars.cc b/tests/mergecalendars.cc index 916588e..04d87be 100644 --- a/tests/mergecalendars.cc +++ b/tests/mergecalendars.cc @@ -51,13 +51,13 @@ static const KCmdLineOptions options[] = int main(int argc, char **argv) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); KAboutData aboutData("mergecalendars","Merge libkcal Calendars","0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app( false, false ); + TDEApplication app( false, false ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/tests/testaddress.cc b/tests/testaddress.cc index 36ed56d..da00c65 100644 --- a/tests/testaddress.cc +++ b/tests/testaddress.cc @@ -49,13 +49,13 @@ static const KCmdLineOptions options[] = int main(int argc, char **argv) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); KAboutData aboutData("testaddress","Test Addresses","0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app( false, false ); + TDEApplication app( false, false ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/tests/testcategories.cc b/tests/testcategories.cc index 9d09c8e..83b8a7b 100644 --- a/tests/testcategories.cc +++ b/tests/testcategories.cc @@ -154,13 +154,13 @@ static const KCmdLineOptions options[] = int main(int argc, char **argv) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); KAboutData aboutData("testcategories","Test Categories","0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app( false, false ); + TDEApplication app( false, false ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/tests/testdatabase.cc b/tests/testdatabase.cc index 36dce8f..6986541 100644 --- a/tests/testdatabase.cc +++ b/tests/testdatabase.cc @@ -253,13 +253,13 @@ static const KCmdLineOptions options[] = int main(int argc, char **argv) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); KAboutData aboutData("testdatabase","Test Databases","0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app( false, false ); + TDEApplication app( false, false ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/tests/testdatebook.cc b/tests/testdatebook.cc index 137dd5f..87c9b49 100644 --- a/tests/testdatebook.cc +++ b/tests/testdatebook.cc @@ -49,13 +49,13 @@ static const KCmdLineOptions options[] = int main(int argc, char **argv) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); KAboutData aboutData("testdatebook","Test Date Book","0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app( false, false ); + TDEApplication app( false, false ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/tests/testidmapper.cc b/tests/testidmapper.cc index f25e6db..7365ccb 100644 --- a/tests/testidmapper.cc +++ b/tests/testidmapper.cc @@ -286,11 +286,11 @@ bool test7() int main(int argc, char **argv) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); KAboutData aboutData("testidmapper","Test IDMapper","0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); - KApplication app( false, false ); + TDEApplication app( false, false ); // Remove file from previous test run TQDir test( "Testing" );