From d41050ea3f6904e5156d35f664346b816b9e4d12 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 18:46:43 -0600 Subject: Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4 --- konqueror/keditbookmarks/kbookmarkmerger.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'konqueror/keditbookmarks/kbookmarkmerger.cpp') 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" ), "raabe@kde.org" ); - 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; -- cgit v1.2.1