diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:43 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:43 -0600 |
commit | d41050ea3f6904e5156d35f664346b816b9e4d12 (patch) | |
tree | 7b3ff517432a631adc61a2a93080dc3bacfab604 /tdm | |
parent | c16d0f2191af1e4810391dbd1a06d7713fb38666 (diff) | |
download | tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.tar.gz tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.zip |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'tdm')
-rw-r--r-- | tdm/kfrontend/kgapp.cpp | 2 | ||||
-rw-r--r-- | tdm/kfrontend/krootimage.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index bd96766b9..707cdd372 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -195,7 +195,7 @@ void kg_main( const char *argv0 ) { static char *argv[] = { (char *)"tdmgreet", 0 }; - KCmdLineArgs::init( 1, argv, *argv, 0, 0, 0, true ); + TDECmdLineArgs::init( 1, argv, *argv, 0, 0, 0, true ); kdDebug() << timestamp() << "start" << endl; kde_have_kipc = false; diff --git a/tdm/kfrontend/krootimage.cpp b/tdm/kfrontend/krootimage.cpp index 8fac7d76a..69faf2d7c 100644 --- a/tdm/kfrontend/krootimage.cpp +++ b/tdm/kfrontend/krootimage.cpp @@ -118,10 +118,10 @@ main( int argc, char *argv[] ) KApplication::disableAutoDcopRegistration(); KLocale::setMainCatalogue( "kdesktop" ); - KCmdLineArgs::init( argc, argv, "krootimage", I18N_NOOP( "KRootImage" ), description, version ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, "krootimage", I18N_NOOP( "KRootImage" ), description, version ); + TDECmdLineArgs::addCmdLineOptions( options ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (!args->count()) args->usage(); MyApplication app( args->arg( 0 ) ); |