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/kbookmarkmerger.cpp | |
| 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/kbookmarkmerger.cpp')
| -rw-r--r-- | konqueror/keditbookmarks/kbookmarkmerger.cpp | 6 |
1 files changed, 3 insertions, 3 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; |