Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 9bb714ad34
commit 00949e960f

@ -97,7 +97,7 @@ void K3bApplication::init()
TQGuardedPtr<K3bSplash> splash; TQGuardedPtr<K3bSplash> splash;
if( !isRestored() ) { if( !isRestored() ) {
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
if( generalOptions.readBoolEntry("Show splash", true) && args->isSet( "splash" ) ) { if( generalOptions.readBoolEntry("Show splash", true) && args->isSet( "splash" ) ) {
// we need the correct splash pic // we need the correct splash pic
@ -175,7 +175,7 @@ int K3bApplication::newInstance()
bool K3bApplication::processCmdLineArgs() bool K3bApplication::processCmdLineArgs()
{ {
KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
bool showTips = true; bool showTips = true;
bool dialogOpen = false; bool dialogOpen = false;

@ -132,11 +132,11 @@ int main( int argc, char* argv[] )
I18N_NOOP( "For the amazing K3b 1.0 theme." ), I18N_NOOP( "For the amazing K3b 1.0 theme." ),
"quant@trktvs.ru" ); "quant@trktvs.ru" );
KCmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options.
if( K3bApplication::start() ) { if( K3bApplication::start() ) {
KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
if( args->isSet("lang") ) if( args->isSet("lang") )
if( !KGlobal::locale()->setLanguage(args->getOption("lang")) ) if( !KGlobal::locale()->setLanguage(args->getOption("lang")) )
kdDebug() << "Unable to set to language " << args->getOption("lang") kdDebug() << "Unable to set to language " << args->getOption("lang")

Loading…
Cancel
Save