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/konq_main.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'konqueror/konq_main.cc') diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc index 6e98bf104..7e7a11ae4 100644 --- a/konqueror/konq_main.cc +++ b/konqueror/konq_main.cc @@ -50,10 +50,10 @@ static const KCmdLineOptions options[] = extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) { - KCmdLineArgs::init( argc, argv, KonqFactory::aboutData() ); + TDECmdLineArgs::init( argc, argv, KonqFactory::aboutData() ); - KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. - KCmdLineArgs::addTempFileOption(); + TDECmdLineArgs::addCmdLineOptions( options ); // Add our own options. + TDECmdLineArgs::addTempFileOption(); KonquerorApplication app; @@ -65,7 +65,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) KGlobal::locale()->insertCatalogue("libkonq"); // needed for apps using libkonq KImageIO::registerFormats(); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KTempFile crashlog_file(locateLocal("tmp", "konqueror-crash-"), ".log"); KonqMainWindow::s_crashlog_file = crashlog_file.file(); @@ -191,7 +191,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) urlToOpen.setFileName(""); } } - const bool tempFile = KCmdLineArgs::isTempFileSet(); + const bool tempFile = TDECmdLineArgs::isTempFileSet(); mainwin = KonqMisc::createNewWindow( urlToOpen, urlargs, false, filesToSelect, tempFile ); } else urlList += urlToOpen; -- cgit v1.2.1