diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:45 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:45 -0600 |
commit | 5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 (patch) | |
tree | d074ed35245d0d44f04cd625c1cafacdc15a13ae /kio | |
parent | 6e8a7cc94c1eb8b67e91e6dc2f864dfeec51d9cc (diff) | |
download | tdelibs-5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0.tar.gz tdelibs-5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0.zip |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'kio')
-rw-r--r-- | kio/kfile/kfiledialog.cpp | 2 | ||||
-rw-r--r-- | kio/kioexec/main.cpp | 8 | ||||
-rw-r--r-- | kio/misc/kfile/fileprops.cpp | 16 | ||||
-rw-r--r-- | kio/misc/kmailservice.cpp | 6 | ||||
-rw-r--r-- | kio/misc/ksendbugmail/main.cpp | 6 | ||||
-rw-r--r-- | kio/misc/ktelnetservice.cpp | 6 | ||||
-rw-r--r-- | kio/misc/uiserver.cpp | 4 | ||||
-rw-r--r-- | kio/tests/jobtest.cpp | 2 | ||||
-rw-r--r-- | kio/tests/kacltest.cpp | 2 | ||||
-rw-r--r-- | kio/tests/kdirwatchtest.cpp | 6 | ||||
-rw-r--r-- | kio/tests/kionetrctest.cpp | 6 | ||||
-rw-r--r-- | kio/tests/kiopassdlgtest.cpp | 2 | ||||
-rw-r--r-- | kio/tests/kioslavetest.cpp | 10 | ||||
-rw-r--r-- | kio/tests/kmimefromext.cpp | 6 | ||||
-rw-r--r-- | kio/tests/kpropsdlgtest.cpp | 8 | ||||
-rw-r--r-- | kio/tests/kprotocolinfotest.cpp | 2 | ||||
-rw-r--r-- | kio/tests/ktradertest.cpp | 8 | ||||
-rw-r--r-- | kio/tests/kurifiltertest.cpp | 6 | ||||
-rw-r--r-- | kio/tests/kurlcompletiontest.cpp | 2 | ||||
-rw-r--r-- | kio/tests/metatest.cpp | 6 | ||||
-rw-r--r-- | kio/tests/speed.cpp | 6 |
21 files changed, 60 insertions, 60 deletions
diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp index 1d364e9b7..1decc462e 100644 --- a/kio/kfile/kfiledialog.cpp +++ b/kio/kfile/kfiledialog.cpp @@ -2322,7 +2322,7 @@ KURL KFileDialog::getStartURL( const TQString& startDir, } else { - ret = KCmdLineArgs::makeURL( TQFile::encodeName(startDir) ); + ret = TDECmdLineArgs::makeURL( TQFile::encodeName(startDir) ); // If we won't be able to list it (e.g. http), then use default if ( !KProtocolInfo::supportsListing( ret ) ) useDefaultStartDir = true; diff --git a/kio/kioexec/main.cpp b/kio/kioexec/main.cpp index 63f1164dd..772c27f73 100644 --- a/kio/kioexec/main.cpp +++ b/kio/kioexec/main.cpp @@ -68,9 +68,9 @@ KIOExec::KIOExec() jobList = new TQPtrList<KIO::Job>; jobList->setAutoDelete( false ); // jobs autodelete themselves - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->count() < 1) - KCmdLineArgs::usage(i18n("'command' expected.\n")); + TDECmdLineArgs::usage(i18n("'command' expected.\n")); tempfiles = args->isSet("tempfiles"); if ( args->isSet( "suggestedfilename" ) ) @@ -280,8 +280,8 @@ int main( int argc, char **argv ) aboutData.addAuthor("Waldo Bastian",0, "bastian@kde.org"); aboutData.addAuthor("Oswald Buddenhagen",0, "ossi@kde.org"); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; diff --git a/kio/misc/kfile/fileprops.cpp b/kio/misc/kfile/fileprops.cpp index 396a8dcdf..ac9954563 100644 --- a/kio/misc/kfile/fileprops.cpp +++ b/kio/misc/kfile/fileprops.cpp @@ -280,7 +280,7 @@ static void printSupportedMimeTypes() } // caller needs to delete the returned list! -static KFileItemList * fileItemList( const KCmdLineArgs *args ) +static KFileItemList * fileItemList( const TDECmdLineArgs *args ) { KFileItemList * items = new KFileItemList(); items->setAutoDelete( true ); @@ -291,14 +291,14 @@ static KFileItemList * fileItemList( const KCmdLineArgs *args ) return items; } -static void showPropertiesDialog( const KCmdLineArgs *args ) +static void showPropertiesDialog( const TDECmdLineArgs *args ) { KFileItemList *items = fileItemList( args ); new KPropertiesDialog( *items, 0L, "props dialog", true ); delete items; } -static void printMimeTypes( const KCmdLineArgs *args ) +static void printMimeTypes( const TDECmdLineArgs *args ) { for ( int i = 0; i < args->count(); i++ ) { @@ -318,7 +318,7 @@ static void printList( const TQStringList& list ) } static void processMetaDataOptions( const TQPtrList<FileProps> propList, - KCmdLineArgs *args ) + TDECmdLineArgs *args ) { // kfile --mimetype --supportedMimetypes --listsupported --listavailable --listpreferred --listwritable --getValue "key" --setValue "key=value" --allValues --preferredValues --dialog --quiet file [file...] // "key" may be a list of keys, separated by commas @@ -416,11 +416,11 @@ int main( int argc, char **argv ) about.addAuthor( "Carsten Pfeiffer", 0, "pfeiffer@kde.org", "http://devel-home.kde.org/~pfeiffer/" ); - KCmdLineArgs::init( argc, argv, &about ); + TDECmdLineArgs::init( argc, argv, &about ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bool useGUI = args->isSet( "dialog" ); KApplication app( useGUI, useGUI ); @@ -435,7 +435,7 @@ int main( int argc, char **argv ) int files = args->count(); if ( files == 0 ) - KCmdLineArgs::usage( i18n("No files specified") ); // exit()s + TDECmdLineArgs::usage( i18n("No files specified") ); // exit()s if ( args->isSet( "dialog" ) ) { diff --git a/kio/misc/kmailservice.cpp b/kio/misc/kmailservice.cpp index 4413911a8..a9f59ca36 100644 --- a/kio/misc/kmailservice.cpp +++ b/kio/misc/kmailservice.cpp @@ -29,12 +29,12 @@ static const KCmdLineOptions options[] = int main( int argc, char **argv ) { KLocale::setMainCatalogue("tdelibs"); - KCmdLineArgs::init( argc, argv, "kmailservice", I18N_NOOP("KMailService"), I18N_NOOP("Mail service"), "unknown" ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, "kmailservice", I18N_NOOP("KMailService"), I18N_NOOP("Mail service"), "unknown" ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication a( false, false ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->count() != 1 ) return 1; diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp index fbcaec7b6..1f900426f 100644 --- a/kio/misc/ksendbugmail/main.cpp +++ b/kio/misc/ksendbugmail/main.cpp @@ -64,9 +64,9 @@ int main(int argc, char **argv) { KAboutData::License_GPL, "(c) 2000 Stephan Kulow"); d.addAuthor("Stephan Kulow", I18N_NOOP("Author"), "coolo@kde.org"); - KCmdLineArgs::init(argc, argv, &d); - KCmdLineArgs::addCmdLineOptions(options); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs::init(argc, argv, &d); + TDECmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KApplication a(false, false); diff --git a/kio/misc/ktelnetservice.cpp b/kio/misc/ktelnetservice.cpp index 4b21ef799..d0f93aaf1 100644 --- a/kio/misc/ktelnetservice.cpp +++ b/kio/misc/ktelnetservice.cpp @@ -38,13 +38,13 @@ static const KCmdLineOptions options[] = int main(int argc, char **argv) { KLocale::setMainCatalogue("tdelibs"); - KCmdLineArgs::init(argc, argv, "ktelnetservice", I18N_NOOP("telnet service"), + TDECmdLineArgs::init(argc, argv, "ktelnetservice", I18N_NOOP("telnet service"), I18N_NOOP("telnet protocol handler"), "unknown"); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::addCmdLineOptions(options); KApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->count() != 1) return 1; diff --git a/kio/misc/uiserver.cpp b/kio/misc/uiserver.cpp index 32130c159..919676fc4 100644 --- a/kio/misc/uiserver.cpp +++ b/kio/misc/uiserver.cpp @@ -1387,8 +1387,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) aboutdata.addAuthor("David Faure",I18N_NOOP("Developer"),"faure@kde.org"); aboutdata.addAuthor("Matej Koss",I18N_NOOP("Developer"),"koss@miesto.sk"); - KCmdLineArgs::init( argc, argv, &aboutdata ); - // KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, &aboutdata ); + // TDECmdLineArgs::addCmdLineOptions( options ); KUniqueApplication::addCmdLineOptions(); if (!KUniqueApplication::start()) diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp index 463c464d3..34fe93677 100644 --- a/kio/tests/jobtest.cpp +++ b/kio/tests/jobtest.cpp @@ -65,7 +65,7 @@ static bool check(const TQString& txt, TQString a, TQString b) int main(int argc, char *argv[]) { KApplication::disableAutoDcopRegistration(); - KCmdLineArgs::init(argc,argv,"jobtest", 0, 0, 0, 0); + TDECmdLineArgs::init(argc,argv,"jobtest", 0, 0, 0, 0); KApplication app; JobTest test; diff --git a/kio/tests/kacltest.cpp b/kio/tests/kacltest.cpp index e97f7c110..b4bfc9f07 100644 --- a/kio/tests/kacltest.cpp +++ b/kio/tests/kacltest.cpp @@ -68,7 +68,7 @@ static bool check(const TQString& txt, T a, T b) int main(int argc, char *argv[]) { KApplication::disableAutoDcopRegistration(); - KCmdLineArgs::init(argc,argv,"kacltest", 0, 0, 0, 0); + TDECmdLineArgs::init(argc,argv,"kacltest", 0, 0, 0, 0); KApplication app; KACLTest test; diff --git a/kio/tests/kdirwatchtest.cpp b/kio/tests/kdirwatchtest.cpp index 48bc59a14..20676ee49 100644 --- a/kio/tests/kdirwatchtest.cpp +++ b/kio/tests/kdirwatchtest.cpp @@ -25,13 +25,13 @@ static const KCmdLineOptions options[] = int main (int argc, char **argv) { - KCmdLineArgs::init(argc, argv, "KDirWatchTest", + TDECmdLineArgs::init(argc, argv, "KDirWatchTest", "Test for KDirWatch", "1.0"); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication::addCmdLineOptions(); KApplication a; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); myTest testObject; diff --git a/kio/tests/kionetrctest.cpp b/kio/tests/kionetrctest.cpp index 852a06453..95b0cf61a 100644 --- a/kio/tests/kionetrctest.cpp +++ b/kio/tests/kionetrctest.cpp @@ -44,9 +44,9 @@ int main(int argc, char **argv) KCmdLineLastOption }; - KCmdLineArgs::init( argc, argv, "kionetrctest", description, version ); - KCmdLineArgs::addCmdLineOptions( options ); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs::init( argc, argv, "kionetrctest", description, version ); + TDECmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); int count = args->count(); KApplication app; diff --git a/kio/tests/kiopassdlgtest.cpp b/kio/tests/kiopassdlgtest.cpp index 2e8894108..f1dd1a9b0 100644 --- a/kio/tests/kiopassdlgtest.cpp +++ b/kio/tests/kiopassdlgtest.cpp @@ -9,7 +9,7 @@ int main ( int argc, char** argv ) { KAboutData aboutData("kiopassdlgtest", "KIO Password Dialog Test", "1.0"); - KCmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::init(argc, argv, &aboutData); KApplication app; TQString usr, pass, comment, label; diff --git a/kio/tests/kioslavetest.cpp b/kio/tests/kioslavetest.cpp index 0db23457d..2e7e398e4 100644 --- a/kio/tests/kioslavetest.cpp +++ b/kio/tests/kioslavetest.cpp @@ -494,11 +494,11 @@ static KCmdLineOptions options[] = }; int main(int argc, char **argv) { - KCmdLineArgs::init( argc, argv, "kioslavetest", description, version ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init( argc, argv, "kioslavetest", description, version ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TQString src = args->getOption("src"); TQString dest = args->getOption("dest"); @@ -529,7 +529,7 @@ int main(int argc, char **argv) { op = KioslaveTest::Shred; } else if ( tmps == "mkdir") { op = KioslaveTest::Mkdir; - } else KCmdLineArgs::usage("unknown operation"); + } else TDECmdLineArgs::usage("unknown operation"); tmps = args->getOption("progress"); if ( tmps == "none") { @@ -538,7 +538,7 @@ int main(int argc, char **argv) { pr = KioslaveTest::ProgressDefault; } else if ( tmps == "status") { pr = KioslaveTest::ProgressStatus; - } else KCmdLineArgs::usage("unknown progress mode"); + } else TDECmdLineArgs::usage("unknown progress mode"); args->clear(); // Free up memory diff --git a/kio/tests/kmimefromext.cpp b/kio/tests/kmimefromext.cpp index 248407f95..bde2ff5ff 100644 --- a/kio/tests/kmimefromext.cpp +++ b/kio/tests/kmimefromext.cpp @@ -31,13 +31,13 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KCmdLineArgs::init( argc, argv, "kmimefromext", "A mimetype testing tool, gives the mimetype for a given filename", "0.0" ); + TDECmdLineArgs::init( argc, argv, "kmimefromext", "A mimetype testing tool, gives the mimetype for a given filename", "0.0" ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TQString fileName = args->arg( 0 ); // The "true" here means only the filename will be looked at. diff --git a/kio/tests/kpropsdlgtest.cpp b/kio/tests/kpropsdlgtest.cpp index 5f9e6ae3b..5d01384f6 100644 --- a/kio/tests/kpropsdlgtest.cpp +++ b/kio/tests/kpropsdlgtest.cpp @@ -14,14 +14,14 @@ static KCmdLineOptions options[] = int main ( int argc, char** argv ) { KAboutData aboutData("kpropertiesdialogtest", "KIO Properties Dialog Test", "1.0"); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->count() < 1 ) - KCmdLineArgs::usage(); + TDECmdLineArgs::usage(); KURL u = args->url( 0 ); // This is the test for the KPropertiesDialog constructor that is now diff --git a/kio/tests/kprotocolinfotest.cpp b/kio/tests/kprotocolinfotest.cpp index b0fe392f2..e8fd7850d 100644 --- a/kio/tests/kprotocolinfotest.cpp +++ b/kio/tests/kprotocolinfotest.cpp @@ -29,7 +29,7 @@ int main(int argc, char **argv) { KAboutData aboutData("kprotocolinfotest", "KProtocolinfo Test", "1.0"); - KCmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::init(argc, argv, &aboutData); KApplication app; KURL url; diff --git a/kio/tests/ktradertest.cpp b/kio/tests/ktradertest.cpp index 34ce8e3bc..d2ceb4c00 100644 --- a/kio/tests/ktradertest.cpp +++ b/kio/tests/ktradertest.cpp @@ -33,16 +33,16 @@ static KCmdLineOptions options[] = int main( int argc, char **argv ) { - KCmdLineArgs::init( argc, argv, "ktradertest", "KTradertest", "A KTrader testing tool", "0.0" ); + TDECmdLineArgs::init( argc, argv, "ktradertest", "KTradertest", "A KTrader testing tool", "0.0" ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app( false, false ); // no GUI - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->count() < 1 ) - KCmdLineArgs::usage(); + TDECmdLineArgs::usage(); TQString query = TQString::fromLocal8Bit( args->arg( 0 ) ); diff --git a/kio/tests/kurifiltertest.cpp b/kio/tests/kurifiltertest.cpp index 7f448c541..6eb661c70 100644 --- a/kio/tests/kurifiltertest.cpp +++ b/kio/tests/kurifiltertest.cpp @@ -159,14 +159,14 @@ int main(int argc, char **argv) setenv( "TDE_FORK_SLAVES", "yes", true ); // simpler, for the final cleanup KAboutData aboutData(appName, programName, version, description); - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; app.disableAutoDcopRegistration(); // Allow testing of the search engine using both delimiters... - char delimiter = KCmdLineArgs::parsedArgs()->isSet("s") ? ' ' : ':'; + char delimiter = TDECmdLineArgs::parsedArgs()->isSet("s") ? ' ' : ':'; // Many tests check the "default search engine" feature. // There is no default search engine by default (since it was annoying when making typos), diff --git a/kio/tests/kurlcompletiontest.cpp b/kio/tests/kurlcompletiontest.cpp index cd1919def..d777fe0df 100644 --- a/kio/tests/kurlcompletiontest.cpp +++ b/kio/tests/kurlcompletiontest.cpp @@ -165,7 +165,7 @@ void KURLCompletionTest::testLocalURL() int main( int argc, char **argv ) { KApplication::disableAutoDcopRegistration(); - KCmdLineArgs::init(argc,argv,"kurlcompletiontest", 0, 0, 0, 0); + TDECmdLineArgs::init(argc,argv,"kurlcompletiontest", 0, 0, 0, 0); KApplication app; { diff --git a/kio/tests/metatest.cpp b/kio/tests/metatest.cpp index 54b87b6a0..f450c46c1 100644 --- a/kio/tests/metatest.cpp +++ b/kio/tests/metatest.cpp @@ -181,17 +181,17 @@ void removeGroup(KFileMetaInfo& info, TQString group) int main( int argc, char **argv ) { // Initialize command line args - KCmdLineArgs::init(argc, argv, "kfilemetatest", "testing kfilmetainfo", "X"); + TDECmdLineArgs::init(argc, argv, "kfilemetatest", "testing kfilmetainfo", "X"); // Tell which options are supported - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); // Add options from other components KApplication::addCmdLineOptions(); KApplication app; - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); TQCString ov; ov = args->getOption("mimetypeinfo"); diff --git a/kio/tests/speed.cpp b/kio/tests/speed.cpp index d8ddae20a..77cf13764 100644 --- a/kio/tests/speed.cpp +++ b/kio/tests/speed.cpp @@ -65,13 +65,13 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KCmdLineArgs::init( argc, argv, "speedapp", "A KIO::listRecursive testing tool", "0.0" ); + TDECmdLineArgs::init( argc, argv, "speedapp", "A KIO::listRecursive testing tool", "0.0" ); - KCmdLineArgs::addCmdLineOptions( options ); + TDECmdLineArgs::addCmdLineOptions( options ); KApplication app; - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KURL url; if ( args->count() == 1 ) |