diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:43 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:43 -0600 |
commit | d41050ea3f6904e5156d35f664346b816b9e4d12 (patch) | |
tree | 7b3ff517432a631adc61a2a93080dc3bacfab604 /konqueror/konq_main.cc | |
parent | c16d0f2191af1e4810391dbd1a06d7713fb38666 (diff) | |
download | tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.tar.gz tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.zip |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/konq_main.cc')
-rw-r--r-- | konqueror/konq_main.cc | 10 |
1 files changed, 5 insertions, 5 deletions
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; |