diff options
| author | Timothy Pearson <[email protected]> | 2013-01-19 18:46:25 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-19 18:46:25 -0600 |
| commit | 00949e960fd4e243dc958be5130e0d1cd92a52ff (patch) | |
| tree | 114e54073265353649b53d53065a37447dbbb231 | |
| parent | 9bb714ad341cd01124fa6cb9e808221716de1705 (diff) | |
| download | k3b-00949e960fd4e243dc958be5130e0d1cd92a52ff.tar.gz k3b-00949e960fd4e243dc958be5130e0d1cd92a52ff.zip | |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
| -rw-r--r-- | src/k3bapplication.cpp | 4 | ||||
| -rw-r--r-- | src/main.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/k3bapplication.cpp b/src/k3bapplication.cpp index 3e119af..1fa5d3f 100644 --- a/src/k3bapplication.cpp +++ b/src/k3bapplication.cpp @@ -97,7 +97,7 @@ void K3bApplication::init() TQGuardedPtr<K3bSplash> splash; if( !isRestored() ) { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if( generalOptions.readBoolEntry("Show splash", true) && args->isSet( "splash" ) ) { // we need the correct splash pic @@ -175,7 +175,7 @@ int K3bApplication::newInstance() bool K3bApplication::processCmdLineArgs() { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bool showTips = true; bool dialogOpen = false; diff --git a/src/main.cpp b/src/main.cpp index 8de9317..2fcdda3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -132,11 +132,11 @@ int main( int argc, char* argv[] ) I18N_NOOP( "For the amazing K3b 1.0 theme." ), "[email protected]" ); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. if( K3bApplication::start() ) { - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); if( args->isSet("lang") ) if( !KGlobal::locale()->setLanguage(args->getOption("lang")) ) kdDebug() << "Unable to set to language " << args->getOption("lang") |