diff options
author | Timothy Pearson <[email protected]> | 2013-01-19 18:46:48 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-19 18:46:48 -0600 |
commit | 6fdacb9c2e3adb3b5da38cd8a22afc1668e1d36b (patch) | |
tree | a6a367ba18807833d8f90cb6b233e7bdb3f007cc | |
parent | ba743d360eabb06e6ffbafd2c7bc833dd985aa0c (diff) | |
download | tdeutils-6fdacb9c2e3adb3b5da38cd8a22afc1668e1d36b.tar.gz tdeutils-6fdacb9c2e3adb3b5da38cd8a22afc1668e1d36b.zip |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
-rw-r--r-- | ark/arkapp.cpp | 10 | ||||
-rw-r--r-- | ark/main.cpp | 6 | ||||
-rw-r--r-- | kcalc/kcalc.cpp | 2 | ||||
-rw-r--r-- | kcharselect/main.cc | 2 | ||||
-rw-r--r-- | kdelirc/irkick/main.cpp | 2 | ||||
-rw-r--r-- | kdessh/kdessh.cpp | 8 | ||||
-rw-r--r-- | kdf/kconftest.cpp | 2 | ||||
-rw-r--r-- | kdf/kdf.cpp | 2 | ||||
-rw-r--r-- | kdf/kwikdisk.cpp | 4 | ||||
-rw-r--r-- | kedit/kedit.cpp | 6 | ||||
-rw-r--r-- | kfloppy/main.cpp | 6 | ||||
-rw-r--r-- | kgpg/kgpg.cpp | 2 | ||||
-rw-r--r-- | kgpg/kgpg.h | 4 | ||||
-rw-r--r-- | kgpg/main.cpp | 4 | ||||
-rw-r--r-- | khexedit/main.cc | 6 | ||||
-rw-r--r-- | kjots/main.cpp | 2 | ||||
-rw-r--r-- | klaptopdaemon/laptop_check.cpp | 2 | ||||
-rw-r--r-- | kregexpeditor/main.cpp | 2 | ||||
-rw-r--r-- | kregexpeditor/test-without-dl/main.cpp | 2 | ||||
-rw-r--r-- | ktimer/main.cpp | 2 | ||||
-rw-r--r-- | kwallet/main.cpp | 6 | ||||
-rw-r--r-- | superkaramba/src/karambaapp.cpp | 2 | ||||
-rw-r--r-- | superkaramba/src/karambaapp.h | 4 | ||||
-rw-r--r-- | superkaramba/src/main.cpp | 6 | ||||
-rw-r--r-- | superkaramba/src/taskbartest.cpp | 6 |
25 files changed, 50 insertions, 50 deletions
diff --git a/ark/arkapp.cpp b/ark/arkapp.cpp index c4604e6..e9f82fa 100644 --- a/ark/arkapp.cpp +++ b/ark/arkapp.cpp @@ -120,7 +120,7 @@ ArkApplication::newInstance() // another window on startup. if (restoringSession()) return 0; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->isSet( "extract-to" ) ) { @@ -133,7 +133,7 @@ ArkApplication::newInstance() } else { - KCmdLineArgs::usage( i18n( "Wrong number of arguments specified" ) ); + TDECmdLineArgs::usage( i18n( "Wrong number of arguments specified" ) ); return 0; } } @@ -142,7 +142,7 @@ ArkApplication::newInstance() { if ( args->count() < 2 ) { - KCmdLineArgs::usage( i18n( "You need to specify at least one file to be added to the archive." ) ); + TDECmdLineArgs::usage( i18n( "You need to specify at least one file to be added to the archive." ) ); return 0; } else @@ -185,7 +185,7 @@ ArkApplication::newInstance() { if ( args->count() < 1 ) { - KCmdLineArgs::usage( i18n( "You need to specify at least one file to be added to the archive." ) ); + TDECmdLineArgs::usage( i18n( "You need to specify at least one file to be added to the archive." ) ); return 0; } else @@ -205,7 +205,7 @@ ArkApplication::newInstance() int i = 0; KURL url; bool doAutoExtract = args->isSet("extract"); - bool tempFile = KCmdLineArgs::isTempFileSet(); + bool tempFile = TDECmdLineArgs::isTempFileSet(); do { if (args->count() > 0) diff --git a/ark/main.cpp b/ark/main.cpp index 9d90256..10449c2 100644 --- a/ark/main.cpp +++ b/ark/main.cpp @@ -105,9 +105,9 @@ extern "C" KDE_EXPORT int kdemain( int argc, char *argv[] ) I18N_NOOP( "Ideas, help with the icons" ), "[email protected]" ); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( option ); - KCmdLineArgs::addTempFileOption(); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( option ); + TDECmdLineArgs::addTempFileOption(); if ( !ArkApplication::start() ) { diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp index 6161659..f6be262 100644 --- a/kcalc/kcalc.cpp +++ b/kcalc/kcalc.cpp @@ -2285,7 +2285,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) aboutData.addAuthor("Charles Samuels", 0, "[email protected]"); /* Rene Merou */ aboutData.addAuthor("Ren" "\xc3\xa9" " M" "\xc3\xa9" "rou", 0, "[email protected]"); - KCmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::init(argc, argv, &aboutData); KApplication app; #if 0 diff --git a/kcharselect/main.cc b/kcharselect/main.cc index 73bc794..5519266 100644 --- a/kcharselect/main.cc +++ b/kcharselect/main.cc @@ -27,7 +27,7 @@ int main(int argc, char **argv) aboutData.addCredit( "Ryan Cumming", I18N_NOOP( "GUI cleanup and fixes" ), "[email protected]" ); aboutData.addCredit("Benjamin C. Meyer",I18N_NOOP("XMLUI conversion"),"[email protected]"); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication app; diff --git a/kdelirc/irkick/main.cpp b/kdelirc/irkick/main.cpp index 768ac09..07e947a 100644 --- a/kdelirc/irkick/main.cpp +++ b/kdelirc/irkick/main.cpp @@ -26,7 +26,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) aboutData->addCredit("Zsolt Rizsanyi", I18N_NOOP("Random patches"), "[email protected]"); aboutData->addCredit("Antonio Larrosa Jiménez", I18N_NOOP("Ideas"), "[email protected]"); - KCmdLineArgs::init( argc, argv, aboutData ); + TDECmdLineArgs::init( argc, argv, aboutData ); KUniqueApplication::addCmdLineOptions(); KUniqueApplication app; KGlobal::locale()->insertCatalogue( "kdelirc" ); diff --git a/kdessh/kdessh.cpp b/kdessh/kdessh.cpp index 4a2a043..249bd1a 100644 --- a/kdessh/kdessh.cpp +++ b/kdessh/kdessh.cpp @@ -55,11 +55,11 @@ int main(int argc, char *argv[]) aboutData.addAuthor("Geert Jansen", I18N_NOOP("Maintainer"), "[email protected]", "http://www.stack.nl/~geertj/"); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); // Stop daemon and exit? if (args->isSet("q")) @@ -80,7 +80,7 @@ int main(int argc, char *argv[]) } if (args->count() < 2) - KCmdLineArgs::usage(i18n("No command or host specified.")); + TDECmdLineArgs::usage(i18n("No command or host specified.")); // Check if ssh is available if (KStandardDirs::findExe(TQString::fromLatin1("ssh")).isEmpty()) diff --git a/kdf/kconftest.cpp b/kdf/kconftest.cpp index 6f6c8db..ae10aee 100644 --- a/kdf/kconftest.cpp +++ b/kdf/kconftest.cpp @@ -47,7 +47,7 @@ static const char version[] = "v0.0.1"; main(int argc, char ** argv) { - KCmdLineArgs::init(argc, argv, "test", description, version); + TDECmdLineArgs::init(argc, argv, "test", description, version); KApplication app; KConfig * cfg = kapp->config(); diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp index 49c1b5a..ccaffcb 100644 --- a/kdf/kdf.cpp +++ b/kdf/kdf.cpp @@ -68,7 +68,7 @@ int main(int argc, char **argv) version, description, KAboutData::License_GPL, "(c) 1998-2001, Michael Kropfberger"); aboutData.addAuthor("Michael Kropfberger",0, "[email protected]"); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication app; diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp index a28d047..f1ca13a 100644 --- a/kdf/kwikdisk.cpp +++ b/kdf/kwikdisk.cpp @@ -329,8 +329,8 @@ int main(int argc, char **argv) about.addAuthor( "Espen Sand", I18N_NOOP("TDE 2 changes"), "" ); about.addAuthor( "Stanislav Karchebny", I18N_NOOP("TDE 3 changes"), "[email protected]" ); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; KwikDisk *mainWin = 0; diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp index bbafc7a..b88c014 100644 --- a/kedit/kedit.cpp +++ b/kedit/kedit.cpp @@ -1267,8 +1267,8 @@ extern "C" KDE_EXPORT int kdemain (int argc, char **argv) KEDITVERSION, description, KAboutData::License_GPL, "(c) 1997-2000, Bernd Johannes Wuebben"); aboutData.addAuthor("Bernd Johannes Wuebben",0, "[email protected]"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication a; //CT KIO::Job::initStatic(); @@ -1286,7 +1286,7 @@ extern "C" KDE_EXPORT int kdemain (int argc, char **argv) else { have_top_window = false; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); const TQString encoding = args->getOption("encoding"); const bool doEncoding = args->isSet("encoding") && diff --git a/kfloppy/main.cpp b/kfloppy/main.cpp index c17fb2b..749cb65 100644 --- a/kfloppy/main.cpp +++ b/kfloppy/main.cpp @@ -56,10 +56,10 @@ int main( int argc, char *argv[] ) aboutData.addCredit("Adriaan de Groot", I18N_NOOP("Add BSD support"), "[email protected]"); aboutData.addCredit("Nicolas Goutte", I18N_NOOP("Make KFloppy work again for KDE 3.4"), "[email protected]"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TQString device; if (args->count()) { device = args->arg(0); diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp index b6d9194..016988d 100644 --- a/kgpg/kgpg.cpp +++ b/kgpg/kgpg.cpp @@ -887,7 +887,7 @@ void KgpgAppletApp::wizardOver(TQString defaultKeyId) int KgpgAppletApp::newInstance() { kdDebug(2100)<<"New instance"<<endl; - args = KCmdLineArgs::parsedArgs(); + args = TDECmdLineArgs::parsedArgs(); if (running) { kdDebug(2100)<<"Already running"<<endl; kgpg_applet->show(); diff --git a/kgpg/kgpg.h b/kgpg/kgpg.h index 83395a2..2c3d682 100644 --- a/kgpg/kgpg.h +++ b/kgpg/kgpg.h @@ -141,7 +141,7 @@ private slots: void checkMenu(); }; -class KCmdLineArgs; +class TDECmdLineArgs; class KgpgAppletApp : public KUniqueApplication { @@ -157,7 +157,7 @@ public: KShortcut goHome; protected: - KCmdLineArgs *args; + TDECmdLineArgs *args; private: kgpgapplet *kgpg_applet; class listKeys *s_keyManager; diff --git a/kgpg/main.cpp b/kgpg/main.cpp index e0bce49..85bce3a 100644 --- a/kgpg/main.cpp +++ b/kgpg/main.cpp @@ -50,8 +50,8 @@ int main(int argc, char *argv[]) KAboutData about("kgpg", I18N_NOOP("KGpg"), version, description, KAboutData::License_GPL, "(C) 2003 Jean-Baptiste Mardelle"); about.addAuthor( "Jean-Baptiste Mardelle", 0, "[email protected]" ); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions(options); KUniqueApplication::addCmdLineOptions(); diff --git a/khexedit/main.cc b/khexedit/main.cc index b065c88..8c8e8ab 100644 --- a/khexedit/main.cc +++ b/khexedit/main.cc @@ -67,8 +67,8 @@ int main( int argc, char **argv ) "\n" "Edward Livingston-Blade, [email protected], has given me very good\n" "reports which removed some nasty bugs.\n")); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( option ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( option ); KApplication app; @@ -87,7 +87,7 @@ int main( int argc, char **argv ) hexEdit->show(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->isSet("offset")) { diff --git a/kjots/main.cpp b/kjots/main.cpp index 6093dfb..e607e13 100644 --- a/kjots/main.cpp +++ b/kjots/main.cpp @@ -49,7 +49,7 @@ int main( int argc, char **argv ) aboutData.addAuthor("Aaron J. Seigo", 0, "[email protected]"); aboutData.addAuthor("Stanislav Kljuhhin", 0, "[email protected]"); aboutData.addAuthor("Christoph Neerfeld", I18N_NOOP("Original author"), "[email protected]"); - KCmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::init(argc, argv, &aboutData); KUniqueApplication::addCmdLineOptions(); if (!KUniqueApplication::start()) diff --git a/klaptopdaemon/laptop_check.cpp b/klaptopdaemon/laptop_check.cpp index 9189083..5877a65 100644 --- a/klaptopdaemon/laptop_check.cpp +++ b/klaptopdaemon/laptop_check.cpp @@ -42,7 +42,7 @@ main(int argc, char **argv) version, description, KAboutData::License_GPL, "(c) 2003, Paul Campbell"); aboutData.addAuthor("Paul Campbell",0, "[email protected]"); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication a; daemon_state s; diff --git a/kregexpeditor/main.cpp b/kregexpeditor/main.cpp index 47c323c..7cd1844 100644 --- a/kregexpeditor/main.cpp +++ b/kregexpeditor/main.cpp @@ -39,7 +39,7 @@ int main( int argc, char* argv[] ) "1.0", I18N_NOOP("Editor for Regular Expressions"), KAboutData::License_GPL, "(c) 2002-2003 Jesper K. Pedersen"); - KCmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::init(argc, argv, &aboutData); KApplication myapp; #endif diff --git a/kregexpeditor/test-without-dl/main.cpp b/kregexpeditor/test-without-dl/main.cpp index ce7e084..31903dd 100644 --- a/kregexpeditor/test-without-dl/main.cpp +++ b/kregexpeditor/test-without-dl/main.cpp @@ -44,7 +44,7 @@ public: int main( int argc, char* argv[] ) { - KCmdLineArgs::init(argc, argv, "RegExp Example","",""); + TDECmdLineArgs::init(argc, argv, "RegExp Example","",""); KApplication myapp( argc, argv ); tqApp->installEventFilter( new ShootABug() ); diff --git a/ktimer/main.cpp b/ktimer/main.cpp index 5a97379..b35d8eb 100644 --- a/ktimer/main.cpp +++ b/ktimer/main.cpp @@ -34,7 +34,7 @@ int main( int argc, char **argv ) version, description, KAboutData::License_GPL, "(c) 2001, Stefan Schimanski"); aboutData.addAuthor("Stefan Schimanski",0, "[email protected]"); - KCmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::init( argc, argv, &aboutData ); KApplication app; diff --git a/kwallet/main.cpp b/kwallet/main.cpp index 32e7318..19e452d 100644 --- a/kwallet/main.cpp +++ b/kwallet/main.cpp @@ -57,8 +57,8 @@ int main(int argc, char **argv) { about.addAuthor("George Staikos", I18N_NOOP("Primary author and maintainer"), "[email protected]"); about.addAuthor("Isaac Clerencia", I18N_NOOP("Developer"), "[email protected]"); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions(options); if (!KUniqueApplication::start()) { return 0; @@ -73,7 +73,7 @@ int main(int argc, char **argv) { KGlobal::dirs()->addResourceType("kwallet", "share/apps/kwallet"); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->isSet("show")) { wm.show(); diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp index 259e3fd..ac0089e 100644 --- a/superkaramba/src/karambaapp.cpp +++ b/superkaramba/src/karambaapp.cpp @@ -252,7 +252,7 @@ void KarambaApplication::checkPreviousSession(KApplication &app, } } -void KarambaApplication::checkCommandLine(KCmdLineArgs *args, TQStringList &lst) +void KarambaApplication::checkCommandLine(TDECmdLineArgs *args, TQStringList &lst) { /****** Not a saved session - check for themes given on command line diff --git a/superkaramba/src/karambaapp.h b/superkaramba/src/karambaapp.h index da63246..f33fce8 100644 --- a/superkaramba/src/karambaapp.h +++ b/superkaramba/src/karambaapp.h @@ -30,7 +30,7 @@ class karamba; class KarambaIface; -class KCmdLineArgs; +class TDECmdLineArgs; class ThemesDlg; class dcopIface_stub; class KHelpMenu; @@ -67,7 +67,7 @@ class KarambaApplication : public KApplication void initDcopStub(TQCString app = ""); void setUpSysTray(KAboutData* about); void checkPreviousSession(KApplication &app, TQStringList &lst); - void checkCommandLine(KCmdLineArgs *args, TQStringList &lst); + void checkCommandLine(TDECmdLineArgs *args, TQStringList &lst); bool startThemes(TQStringList &lst); KarambaIface* dcopIface() { return iface; }; dcopIface_stub* dcopStub() { return dcopIfaceStub; }; diff --git a/superkaramba/src/main.cpp b/superkaramba/src/main.cpp index 00f34f3..7b31653 100644 --- a/superkaramba/src/main.cpp +++ b/superkaramba/src/main.cpp @@ -99,11 +99,11 @@ int main(int argc, char **argv) about.addAuthor("Petri Damstén", 0, "[email protected]"); about.addAuthor("Alexander Wiedenbruch", 0, "[email protected]"); about.addAuthor("Luke Kenneth Casson Leighton", 0, "[email protected]"); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions(options); KarambaSessionManaged ksm; //karamba *mainWin = 0; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TQStringList lst; int ret = 0; diff --git a/superkaramba/src/taskbartest.cpp b/superkaramba/src/taskbartest.cpp index f3bc46d..8f5dfc5 100644 --- a/superkaramba/src/taskbartest.cpp +++ b/superkaramba/src/taskbartest.cpp @@ -53,13 +53,13 @@ int main(int argc, char **argv) KAboutData about("karamba", I18N_NOOP("karamba"), version, description, KAboutData::License_GPL, "(C) 2003 Hans Karlsson", 0, 0, "[email protected]"); about.addAuthor( "Hans Karlsson", 0, "[email protected]" ); - KCmdLineArgs::init(argc, argv, &about); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; // karamba *mainWin = 0; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); // //KSGRD::SensorManager *f32 = new KSGRD::SensorManager(); // //f32->engage("localhost"); |