From 5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 6 Feb 2013 19:44:17 -0600 Subject: Rename KCmd to avoid conflicts with KDE4 --- konqueror/client/kfmclient.cc | 4 ++-- konqueror/keditbookmarks/kbookmarkmerger.cpp | 4 ++-- konqueror/keditbookmarks/main.cpp | 4 ++-- konqueror/konq_main.cc | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'konqueror') diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index f5586af62..ca61d80e4 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -59,13 +59,13 @@ TQCString clientApp::startup_id_str; bool clientApp::m_ok = true; bool s_interactive = true; -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "noninteractive", I18N_NOOP("Non interactive use: no message boxes"), 0}, { "commands", I18N_NOOP("Show available commands"), 0}, { "+command", I18N_NOOP("Command (see --commands)"), 0}, { "+[URL(s)]", I18N_NOOP("Arguments for command"), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp index 1fbcd6c03..6d7357bb6 100644 --- a/konqueror/keditbookmarks/kbookmarkmerger.cpp +++ b/konqueror/keditbookmarks/kbookmarkmerger.cpp @@ -37,10 +37,10 @@ #include -static const KCmdLineOptions cmdLineOptions[] = +static const TDECmdLineOptions cmdLineOptions[] = { { "+directory", I18N_NOOP( "Directory to scan for extra bookmarks" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; // The code for this function was taken from kdesktop/kcheckrunning.cpp diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index 97e7ec0e2..956573280 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -40,7 +40,7 @@ #include #include -static KCmdLineOptions options[] = { +static TDECmdLineOptions options[] = { {"importmoz ", I18N_NOOP("Import bookmarks from a file in Mozilla format"), 0}, {"importns ", I18N_NOOP("Import bookmarks from a file in Netscape (4.x and earlier) format"), 0}, {"importie ", I18N_NOOP("Import bookmarks from a file in Internet Explorer's Favorites format"), 0}, @@ -56,7 +56,7 @@ static KCmdLineOptions options[] = { {"customcaption ", I18N_NOOP("Set the user readable caption for example \"Konsole\""), 0}, {"nobrowser", I18N_NOOP("Hide all browser related functions"), 0}, {"+[file]", I18N_NOOP("File to edit"), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; static void continueInWindow(TQString _wname) { diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc index 9edb00a1b..c166315e8 100644 --- a/konqueror/konq_main.cc +++ b/konqueror/konq_main.cc @@ -36,7 +36,7 @@ #include -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "silent", I18N_NOOP("Start without a default window"), 0 }, { "preload", I18N_NOOP("Preload for later use"), 0 }, @@ -45,7 +45,7 @@ static const KCmdLineOptions options[] = { "mimetype ", I18N_NOOP("Mimetype to use for this URL (e.g. text/html or inode/directory)"), 0 }, { "select", I18N_NOOP("For URLs that point to files, opens the directory and selects the file, instead of opening the actual file"), 0 }, { "+[URL]", I18N_NOOP("Location to open"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) -- cgit v1.2.1