From 5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:45 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- kio/misc/kfile/fileprops.cpp | 16 ++++++++-------- kio/misc/kmailservice.cpp | 6 +++--- kio/misc/ksendbugmail/main.cpp | 6 +++--- kio/misc/ktelnetservice.cpp | 6 +++--- kio/misc/uiserver.cpp | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) (limited to 'kio/misc') 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 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()) -- cgit v1.2.1