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 /konqueror/client | |
parent | c16d0f2191af1e4810391dbd1a06d7713fb38666 (diff) | |
download | tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.tar.gz tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.zip |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/client')
-rw-r--r-- | konqueror/client/kfmclient.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index f8533ef17..dd7e385e3 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -70,16 +70,16 @@ static const KCmdLineOptions options[] = extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) { - KCmdLineArgs::init(argc, argv, appName, programName, description, version, false); + TDECmdLineArgs::init(argc, argv, appName, programName, description, version, false); - KCmdLineArgs::addCmdLineOptions( options ); - KCmdLineArgs::addTempFileOption(); + TDECmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addTempFileOption(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->isSet("commands") ) { - KCmdLineArgs::enable_i18n(); + TDECmdLineArgs::enable_i18n(); puts(i18n("\nSyntax:\n").local8Bit()); puts(i18n(" kfmclient openURL 'url' ['mimetype']\n" " # Opens a window showing 'url'.\n" @@ -445,7 +445,7 @@ static void checkArgumentCount(int count, int min, int max) bool clientApp::doIt() { - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); int argc = args->count(); checkArgumentCount(argc, 1, 0); @@ -466,7 +466,7 @@ bool clientApp::doIt() KApplication::dcopClient()->attach(); } checkArgumentCount(argc, 1, 3); - bool tempFile = KCmdLineArgs::isTempFileSet(); + bool tempFile = TDECmdLineArgs::isTempFileSet(); if ( argc == 1 ) { KURL url; |