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/keditbookmarks | |
| parent | c16d0f2191af1e4810391dbd1a06d7713fb38666 (diff) | |
| download | tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.tar.gz tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.zip | |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/keditbookmarks')
| -rw-r--r-- | konqueror/keditbookmarks/kbookmarkmerger.cpp | 6 | ||||
| -rw-r--r-- | konqueror/keditbookmarks/main.cpp | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp index d34794fdc..bea3c0e26 100644 --- a/konqueror/keditbookmarks/kbookmarkmerger.cpp +++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp @@ -66,8 +66,8 @@ int main( int argc, char**argv ) aboutData.addAuthor( "Frerich Raabe", I18N_NOOP( "Original author" ), "[email protected]" ); - KCmdLineArgs::init( argc, argv, &aboutData ); - KCmdLineArgs::addCmdLineOptions( cmdLineOptions ); + TDECmdLineArgs::init( argc, argv, &aboutData ); + TDECmdLineArgs::addCmdLineOptions( cmdLineOptions ); if ( !kdeRunning ) { KApplication::disableAutoDcopRegistration(); @@ -75,7 +75,7 @@ int main( int argc, char**argv ) KApplication app( false, false ); app.disableSessionManagement(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if ( args->count() != 1 ) { kdError() << "No directory to scan for bookmarks specified." << endl; return 1; diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index 5b238302f..b99313159 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -121,11 +121,11 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { aboutData.addAuthor("David Faure", I18N_NOOP("Initial author"), "[email protected]"); aboutData.addAuthor("Alexander Kellett", I18N_NOOP("Author"), "[email protected]"); - KCmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::init(argc, argv, &aboutData); KApplication::addCmdLineOptions(); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::addCmdLineOptions(options); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); bool isGui = !(args->isSet("exportmoz") || args->isSet("exportns") || args->isSet("exporthtml") || args->isSet("exportie") || args->isSet("exportopera") || args->isSet("importmoz") || args->isSet("importns") @@ -160,12 +160,12 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { Q_ASSERT(arg2); // TODO - maybe an xbel export??? if (got > 1) // got == 0 isn't possible as !isGui is dependant on "export.*" - KCmdLineArgs::usage(I18N_NOOP("You may only specify a single --export option.")); + TDECmdLineArgs::usage(I18N_NOOP("You may only specify a single --export option.")); TQString path = TQString::fromLocal8Bit(args->getOption(arg2)); CurrentMgr::self()->doExport(exportType, path); } else if (importType) { if (got > 1) // got == 0 isn't possible as !isGui is dependant on "import.*" - KCmdLineArgs::usage(I18N_NOOP("You may only specify a single --import option.")); + TDECmdLineArgs::usage(I18N_NOOP("You may only specify a single --import option.")); TQString path = TQString::fromLocal8Bit(args->getOption(arg2)); ImportCommand *importer = ImportCommand::importerFactory(importType); importer->import(path, true); |