diff options
author | Timothy Pearson <[email protected]> | 2013-01-19 18:46:43 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-19 18:46:43 -0600 |
commit | d41050ea3f6904e5156d35f664346b816b9e4d12 (patch) | |
tree | 7b3ff517432a631adc61a2a93080dc3bacfab604 /kcminit | |
parent | c16d0f2191af1e4810391dbd1a06d7713fb38666 (diff) | |
download | tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.tar.gz tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.zip |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'kcminit')
-rw-r--r-- | kcminit/main.cpp | 8 | ||||
-rw-r--r-- | kcminit/main.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kcminit/main.cpp b/kcminit/main.cpp index b1fa455c9..93eb84a9e 100644 --- a/kcminit/main.cpp +++ b/kcminit/main.cpp @@ -126,7 +126,7 @@ void KCMInit::runModules( int phase ) } } -KCMInit::KCMInit( KCmdLineArgs* args ) +KCMInit::KCMInit( TDECmdLineArgs* args ) : DCOPObject( "kcminit" ) { TQCString arg; @@ -238,13 +238,13 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) "", I18N_NOOP("KCMInit - runs startups initialization for Control Modules.")); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. KApplication app; app.dcopClient()->registerAs( "kcminit", false ); KLocale::setMainCatalogue(0); - KCMInit kcminit( KCmdLineArgs::parsedArgs()); + KCMInit kcminit( TDECmdLineArgs::parsedArgs()); return 0; } diff --git a/kcminit/main.h b/kcminit/main.h index 0efa0c10c..9651a8516 100644 --- a/kcminit/main.h +++ b/kcminit/main.h @@ -23,7 +23,7 @@ #include <dcopobject.h> #include <kservice.h> -class KCmdLineArgs; +class TDECmdLineArgs; class KCMInit : public TQObject, public DCOPObject { @@ -33,7 +33,7 @@ class KCMInit : public TQObject, public DCOPObject void runPhase1(); void runPhase2(); public: - KCMInit( KCmdLineArgs* args ); + KCMInit( TDECmdLineArgs* args ); virtual ~KCMInit(); private: bool runModule(const TQString &libName, KService::Ptr service); |