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 --- drkonqi/crashtest.cpp | 4 ++-- drkonqi/main.cpp | 4 ++-- kappfinder/main.cpp | 4 ++-- kate/app/katemain.cpp | 4 ++-- kate/app/kwritemain.cpp | 4 ++-- kcminit/main.cpp | 4 ++-- kcontrol/filetypes/keditfiletype.cpp | 4 ++-- kcontrol/randr/main.cpp | 4 ++-- kcontrol/tdefontinst/viewpart/FontViewerApp.cpp | 4 ++-- kdcop/kdcop.cpp | 4 ++-- kdebugdialog/main.cpp | 4 ++-- kdepasswd/kdepasswd.cpp | 4 ++-- kdesktop/kwebdesktop/kwebdesktop.cpp | 4 ++-- kdesktop/kxdglauncher.cpp | 4 ++-- kdesktop/lock/main.cc | 4 ++-- kdesktop/main.cc | 4 ++-- kdialog/kdialog.cpp | 4 ++-- kfind/main.cpp | 4 ++-- khelpcenter/application.cpp | 4 ++-- khelpcenter/htmlsearch/index.cpp | 4 ++-- khelpcenter/khc_indexbuilder.cpp | 4 ++-- khotkeys/update/update.cpp | 4 ++-- kicker/extensions/kasbar/kasbarapp.cpp | 4 ++-- kicker/proxy/appletproxy.cpp | 4 ++-- kicker/proxy/extensiondebugger.cpp | 4 ++-- kicker/proxy/extensionproxy.cpp | 4 ++-- kmenuedit/main.cpp | 4 ++-- konqueror/client/kfmclient.cc | 4 ++-- konqueror/keditbookmarks/kbookmarkmerger.cpp | 4 ++-- konqueror/keditbookmarks/main.cpp | 4 ++-- konqueror/konq_main.cc | 4 ++-- konsole/konsole/main.cpp | 4 ++-- kpager/main.cpp | 4 ++-- kpersonalizer/main.cpp | 4 ++-- kreadconfig/kreadconfig.cpp | 4 ++-- kreadconfig/kwriteconfig.cpp | 4 ++-- krootbacking/main.cpp | 4 ++-- ksmserver/main.cpp | 4 ++-- ksplashml/main.cpp | 4 ++-- kstart/kstart.cpp | 4 ++-- ksysguard/gui/ksysguard.cc | 4 ++-- ksystraycmd/main.cpp | 4 ++-- nsplugins/pluginscan.cpp | 4 ++-- tdeinit/displayconfig.cpp | 4 ++-- tdeinit/phase1.cpp | 4 ++-- tdeioslave/home/tdeio_home.cpp | 4 ++-- tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp | 4 ++-- tdeioslave/media/tdeio_media.cpp | 4 ++-- tdeioslave/remote/tdeio_remote.cpp | 4 ++-- tdeioslave/system/tdeio_system.cpp | 4 ++-- tdeioslave/trash/ktrash.cpp | 4 ++-- tdeioslave/trash/tdeio_trash.cpp | 4 ++-- tdeprint/kjobviewer/main.cpp | 4 ++-- tdeprint/kprinter/main.cpp | 4 ++-- tdeprint/tdeprintfax/main.cpp | 4 ++-- tdescreensaver/random.cpp | 4 ++-- tdesu/tdesu/tdesu.cpp | 4 ++-- tdm/kfrontend/krootimage.cpp | 4 ++-- twin/clients/kwmtheme/cli_installer/main.cpp | 4 ++-- twin/kcmtwin/twinrules/main.cpp | 4 ++-- twin/killer/killer.cpp | 4 ++-- twin/main.cpp | 4 ++-- twin/resumer/resumer.cpp | 4 ++-- twin/tools/decobenchmark/main.cpp | 2 +- 64 files changed, 127 insertions(+), 127 deletions(-) diff --git a/drkonqi/crashtest.cpp b/drkonqi/crashtest.cpp index 57f055420..19fee84b6 100644 --- a/drkonqi/crashtest.cpp +++ b/drkonqi/crashtest.cpp @@ -6,10 +6,10 @@ #include #include -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+crash|malloc|div0|assert", "Type of crash.", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; enum CrashType { Crash, Malloc, Div0, Assert }; diff --git a/drkonqi/main.cpp b/drkonqi/main.cpp index e65c63632..c745381e7 100644 --- a/drkonqi/main.cpp +++ b/drkonqi/main.cpp @@ -42,7 +42,7 @@ static const char version[] = "1.0"; static const char description[] = I18N_NOOP( "TDE crash handler gives the user feedback if a program crashed" ); -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { {"signal ", I18N_NOOP("The signal number that was caught"), 0}, {"appname ", I18N_NOOP("Name of the program"), 0}, @@ -54,7 +54,7 @@ static const KCmdLineOptions options[] = {"startupid ", I18N_NOOP("Startup ID of the program"), 0}, {"tdeinit", I18N_NOOP("The program was started by tdeinit"), 0}, {"safer", I18N_NOOP("Disable arbitrary disk access"), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; int main( int argc, char* argv[] ) diff --git a/kappfinder/main.cpp b/kappfinder/main.cpp index 35338bc9c..3c73c71bf 100644 --- a/kappfinder/main.cpp +++ b/kappfinder/main.cpp @@ -26,9 +26,9 @@ static const char description[] = I18N_NOOP( "TDE's application finder" ); -static KCmdLineOptions options[] = { +static TDECmdLineOptions options[] = { { "dir ", I18N_NOOP( "Install .desktop files into directory " ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main( int argc, char *argv[] ) diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp index fb389131d..59d1e0100 100644 --- a/kate/app/katemain.cpp +++ b/kate/app/katemain.cpp @@ -35,7 +35,7 @@ #include -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "s", 0 , 0 }, { "start ", I18N_NOOP("Start Kate with a given session"), 0 }, @@ -52,7 +52,7 @@ static KCmdLineOptions options[] = { "i", 0, 0 }, { "stdin", I18N_NOOP("Read the contents of stdin"), 0 }, { "+[URL]", I18N_NOOP("Document to open"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index 58a6368d1..8da1e7e20 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -526,14 +526,14 @@ void KWrite::restore() } } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "stdin", I18N_NOOP("Read the contents of stdin"), 0}, { "encoding ", I18N_NOOP("Set encoding for the file to open"), 0 }, { "line ", I18N_NOOP("Navigate to this line"), 0 }, { "column ", I18N_NOOP("Navigate to this column"), 0 }, { "+[URL]", I18N_NOOP("Document to open"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" KDE_EXPORT int kdemain(int argc, char **argv) diff --git a/kcminit/main.cpp b/kcminit/main.cpp index f03afc395..62f80cdfc 100644 --- a/kcminit/main.cpp +++ b/kcminit/main.cpp @@ -37,11 +37,11 @@ #include -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "list", I18N_NOOP("List modules that are run at startup"), 0 }, { "+module", I18N_NOOP("Configuration module to run"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; static int ready[ 2 ]; diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp index e186096be..8bb69e88c 100644 --- a/kcontrol/filetypes/keditfiletype.cpp +++ b/kcontrol/filetypes/keditfiletype.cpp @@ -101,11 +101,11 @@ void FileTypeDialog::slotDatabaseChanged() #include "keditfiletype.moc" -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "parent ", I18N_NOOP("Makes the dialog transient for the window specified by winid"), 0 }, { "+mimetype", I18N_NOOP("File type to edit (e.g. text/html)"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char ** argv) diff --git a/kcontrol/randr/main.cpp b/kcontrol/randr/main.cpp index d606940fc..dba4ddfba 100644 --- a/kcontrol/randr/main.cpp +++ b/kcontrol/randr/main.cpp @@ -27,10 +27,10 @@ #include "tderandrapp.h" static const char tderandrtrayVersion[] = "0.5"; -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "login", I18N_NOOP("Application is being auto-started at TDE session start"), 0L }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp index 7df50ac8f..3b921d902 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp @@ -106,10 +106,10 @@ CFontViewerApp::CFontViewerApp() } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[URL]", I18N_NOOP("URL to open"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; static TDEAboutData aboutData("tdefontview", I18N_NOOP("Font Viewer"), 0, I18N_NOOP("Simple font viewer"), diff --git a/kdcop/kdcop.cpp b/kdcop/kdcop.cpp index 8a347c26c..b73905800 100644 --- a/kdcop/kdcop.cpp +++ b/kdcop/kdcop.cpp @@ -10,9 +10,9 @@ #include "kdcopwindow.h" -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { - KCmdLineLastOption + TDECmdLineLastOption }; int main( int argc, char ** argv ) diff --git a/kdebugdialog/main.cpp b/kdebugdialog/main.cpp index 1cc085a0c..235ac0771 100644 --- a/kdebugdialog/main.cpp +++ b/kdebugdialog/main.cpp @@ -67,12 +67,12 @@ TQStringList readAreaList() return lst; } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "fullmode", I18N_NOOP("Show the fully-fledged dialog instead of the default list dialog"), 0 }, { "on ", /*I18N_NOOP TODO*/ "Turn area on", 0 }, { "off ", /*I18N_NOOP TODO*/ "Turn area off", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char ** argv) diff --git a/kdepasswd/kdepasswd.cpp b/kdepasswd/kdepasswd.cpp index 47dbab6de..e09725c5b 100644 --- a/kdepasswd/kdepasswd.cpp +++ b/kdepasswd/kdepasswd.cpp @@ -19,10 +19,10 @@ #include "passwd.h" #include "passwddlg.h" -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[user]", I18N_NOOP("Change password of this user"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp index cf1f4c6f4..5aae0c465 100644 --- a/kdesktop/kwebdesktop/kwebdesktop.cpp +++ b/kdesktop/kwebdesktop/kwebdesktop.cpp @@ -38,13 +38,13 @@ #include "kwebdesktop.moc" -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+width", I18N_NOOP("Width of the image to create"), 0 }, { "+height", I18N_NOOP("Height of the image to create"), 0 }, { "+file", I18N_NOOP("File sname where to dump the output in png format"), 0 }, { "+[URL]", I18N_NOOP("URL to open (if not specified, it is read from kwebdesktoprc)"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; KWebDesktopRun::KWebDesktopRun( KWebDesktop* webDesktop, const KURL & url ) diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp index 4433ef367..0848f40a7 100644 --- a/kdesktop/kxdglauncher.cpp +++ b/kdesktop/kxdglauncher.cpp @@ -81,11 +81,11 @@ TQString getDocumentPath() return s_documentPath; } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "xdgname ", I18N_NOOP("XDG variable name to open"), 0 }, { "getpath", I18N_NOOP("Do not launch Konqueror; instead print path to directory if it exists)"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main( int argc, char **argv) diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index 5481468f7..ae7500d1d 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -153,14 +153,14 @@ bool MyApp::x11EventFilter( XEvent *ev ) } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "forcelock", I18N_NOOP("Force session locking"), 0 }, { "dontlock", I18N_NOOP("Only start screensaver"), 0 }, { "securedialog", I18N_NOOP("Launch the secure dialog"), 0 }, { "blank", I18N_NOOP("Only use the blank screensaver"), 0 }, { "internal ", I18N_NOOP("TDE internal command for background process loading"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; void restore_hidden_override_redirect_windows() { diff --git a/kdesktop/main.cc b/kdesktop/main.cc index e0f7d98d9..ce4b8115d 100644 --- a/kdesktop/main.cc +++ b/kdesktop/main.cc @@ -59,7 +59,7 @@ static const char description[] = static const char version[] = VERSION; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "x-root", I18N_NOOP("Use this if the desktop window appears as a real window"), 0 }, { "noautostart", I18N_NOOP("Obsolete"), 0 }, @@ -67,7 +67,7 @@ static KCmdLineOptions options[] = #ifdef COMPOSITE { "bg-transparency", I18N_NOOP("Enable background transparency"), 0 }, #endif - KCmdLineLastOption + TDECmdLineLastOption }; bool argb_visual = false; diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index 674333190..14180b208 100644 --- a/kdialog/kdialog.cpp +++ b/kdialog/kdialog.cpp @@ -60,7 +60,7 @@ using namespace std; extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); } #endif // Q_WS_X11 -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "yesno ", I18N_NOOP("Question message box with yes/no buttons"), 0 }, { "yesnocancel ", I18N_NOOP("Question message box with yes/no/cancel buttons"), 0 }, @@ -98,7 +98,7 @@ static KCmdLineOptions options[] = { "dontagain ", I18N_NOOP("Config file and option name for saving the \"dont-show/ask-again\" state"), 0 }, { "+[arg]", I18N_NOOP("Arguments - depending on main option"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; // this class hooks into the eventloop and outputs the id diff --git a/kfind/main.cpp b/kfind/main.cpp index 995dea8b9..54aac4a69 100644 --- a/kfind/main.cpp +++ b/kfind/main.cpp @@ -13,10 +13,10 @@ static const char description[] = I18N_NOOP("TDE file find utility"); -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[searchpath]", I18N_NOOP("Path(s) to search"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main( int argc, char ** argv ) diff --git a/khelpcenter/application.cpp b/khelpcenter/application.cpp index 6fa5aeca5..ba21ad639 100644 --- a/khelpcenter/application.cpp +++ b/khelpcenter/application.cpp @@ -52,10 +52,10 @@ int Application::newInstance() return KUniqueApplication::newInstance(); } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[url]", I18N_NOOP("URL to display"), "" }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" int KDE_EXPORT kdemain( int argc, char **argv ) diff --git a/khelpcenter/htmlsearch/index.cpp b/khelpcenter/htmlsearch/index.cpp index 3cc356d52..319c94e0d 100644 --- a/khelpcenter/htmlsearch/index.cpp +++ b/khelpcenter/htmlsearch/index.cpp @@ -6,10 +6,10 @@ #include "htmlsearch.h" -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "lang ", I18N_NOOP("The language to index"), "en" }, - KCmdLineLastOption // End of options. + TDECmdLineLastOption // End of options. }; diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp index 9d084f0d4..c1ef425e9 100644 --- a/khelpcenter/khc_indexbuilder.cpp +++ b/khelpcenter/khc_indexbuilder.cpp @@ -161,11 +161,11 @@ void IndexBuilder::quit() } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+cmdfile", I18N_NOOP("Document to be indexed"), 0 }, { "+indexdir", I18N_NOOP("Index directory"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main( int argc, char **argv ) diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp index 2ed07c991..a5abba826 100644 --- a/khotkeys/update/update.cpp +++ b/khotkeys/update/update.cpp @@ -25,11 +25,11 @@ using namespace KHotKeys; -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { // no need for I18N_NOOP(), this is not supposed to be used directly { "id ", "Id of the script to add to khotkeysrc.", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main( int argc, char* argv[] ) diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp index f35fc997b..51e0be9b6 100644 --- a/kicker/extensions/kasbar/kasbarapp.cpp +++ b/kicker/extensions/kasbar/kasbarapp.cpp @@ -67,10 +67,10 @@ #include "version.h" -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "test", "Test the basic kasbar code", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main( int argc, char **argv ) diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index 6c15e55ac..d9c92a9e0 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -60,12 +60,12 @@ KPanelApplet::Position directionToPosition( int d ) } } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+desktopfile", I18N_NOOP("The applet's desktop file"), 0 }, { "configfile ", I18N_NOOP("The config file to be used"), 0 }, { "callbackid ", I18N_NOOP("DCOP callback id of the applet container"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp index 8c63fd7a8..94998c571 100644 --- a/kicker/proxy/extensiondebugger.cpp +++ b/kicker/proxy/extensiondebugger.cpp @@ -42,10 +42,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+desktopfile", I18N_NOOP("The extensions desktop file"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; KPanelExtension* loadExtension(const AppletInfo& info) diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index 7f8835d5f..fb7254d4d 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -46,12 +46,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+desktopfile", I18N_NOOP("The extension's desktop file"), 0 }, { "configfile ", I18N_NOOP("The config file to be used"), 0 }, { "callbackid ", I18N_NOOP("DCOP callback id of the extension container"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" KDE_EXPORT int kdemain( int argc, char ** argv ) diff --git a/kmenuedit/main.cpp b/kmenuedit/main.cpp index 1addbbcaa..86d9b5760 100644 --- a/kmenuedit/main.cpp +++ b/kmenuedit/main.cpp @@ -31,11 +31,11 @@ static const char description[] = I18N_NOOP("TDE menu editor"); static const char version[] = "0.7"; -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "+[menu]", I18N_NOOP("Sub menu to pre-select"), 0 }, { "+[menu-id]", I18N_NOOP("Menu entry to pre-select"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; static KMenuEdit *menuEdit = 0; 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 ) diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp index 90144532a..e0fbf7662 100644 --- a/konsole/konsole/main.cpp +++ b/konsole/konsole/main.cpp @@ -61,7 +61,7 @@ static const char description[] = I18N_NOOP("X terminal for use with TDE."); // { "T ", 0, 0 }, -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "name <name>", I18N_NOOP("Set window class"), 0 }, { "ls", I18N_NOOP("Start login shell"), 0 }, @@ -91,7 +91,7 @@ static KCmdLineOptions options[] = { "!e <command>", I18N_NOOP("Execute 'command' instead of shell"), 0 }, // WABA: All options after -e are treated as arguments. { "+[args]", I18N_NOOP("Arguments for 'command'"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; static bool has_noxft = false; diff --git a/kpager/main.cpp b/kpager/main.cpp index b13ec7b0c..6210761c2 100644 --- a/kpager/main.cpp +++ b/kpager/main.cpp @@ -32,10 +32,10 @@ #include "kpager.h" -static KCmdLineOptions pagerOpts[] = +static TDECmdLineOptions pagerOpts[] = { { "hidden", I18N_NOOP("Create pager but keep the window hidden"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; bool closed_by_sm = false; diff --git a/kpersonalizer/main.cpp b/kpersonalizer/main.cpp index 807c7512a..5a07d9bab 100644 --- a/kpersonalizer/main.cpp +++ b/kpersonalizer/main.cpp @@ -26,11 +26,11 @@ static const char description[] = I18N_NOOP("KPersonalizer"); -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "r", I18N_NOOP("Personalizer is restarted by itself"), 0 }, { "before-session", I18N_NOOP("Personalizer is running before Trinity session"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char *argv[]) diff --git a/kreadconfig/kreadconfig.cpp b/kreadconfig/kreadconfig.cpp index f0b0c22dd..398b8fe54 100644 --- a/kreadconfig/kreadconfig.cpp +++ b/kreadconfig/kreadconfig.cpp @@ -32,14 +32,14 @@ #include <kaboutdata.h> #include <stdio.h> -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "file <file>", I18N_NOOP("Use <file> instead of global config"), 0 }, { "group <group>", I18N_NOOP("Group to look in"), "TDE" }, { "key <key>", I18N_NOOP("Key to look for"), 0 }, { "default <default>", I18N_NOOP("Default value"), 0 }, { "type <type>", I18N_NOOP("Type of variable"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) { diff --git a/kreadconfig/kwriteconfig.cpp b/kreadconfig/kwriteconfig.cpp index d554483bc..381589ad0 100644 --- a/kreadconfig/kwriteconfig.cpp +++ b/kreadconfig/kwriteconfig.cpp @@ -14,14 +14,14 @@ #include <kaboutdata.h> #include <stdio.h> -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "file <file>", I18N_NOOP("Use <file> instead of global config"), 0 }, { "group <group>", I18N_NOOP("Group to look in"), "TDE" }, { "key <key>", I18N_NOOP("Key to look for"), 0 }, { "type <type>", I18N_NOOP("Type of variable. Use \"bool\" for a boolean, otherwise it is treated as a string"), 0 }, { "+value", I18N_NOOP( "The value to write. Mandatory, on a shell use '' for empty" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) { diff --git a/krootbacking/main.cpp b/krootbacking/main.cpp index 1e9c42835..012e07936 100644 --- a/krootbacking/main.cpp +++ b/krootbacking/main.cpp @@ -39,9 +39,9 @@ static const char description[] = static const char version[] = "0.1"; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index 942c2fade..30a9ec1a3 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -29,7 +29,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> static const char version[] = "0.4"; static const char description[] = I18N_NOOP( "The reliable TDE session manager that talks the standard X11R6 \nsession management protocol (XSMP)." ); -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "r", 0, 0 }, { "restore", I18N_NOOP("Restores the saved user session if available"), 0}, @@ -37,7 +37,7 @@ static const KCmdLineOptions options[] = { "windowmanager <wm>", I18N_NOOP("Starts 'wm' in case no other window manager is \nparticipating in the session. Default is 'twin'"), 0}, { "windowmanageraddargs <wm>", I18N_NOOP("Pass additional arguments to the window manager. Default is ''"), 0}, { "nolocal", I18N_NOOP("Also allow remote connections"), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; extern KSMServer* the_server; diff --git a/ksplashml/main.cpp b/ksplashml/main.cpp index 8dd826d40..ecbbe9eea 100644 --- a/ksplashml/main.cpp +++ b/ksplashml/main.cpp @@ -27,14 +27,14 @@ #include "wndmain.h" -static KCmdLineOptions options[] = { +static TDECmdLineOptions options[] = { { "managed", I18N_NOOP("Execute KSplash in MANAGED mode"),0 }, { "test", I18N_NOOP("Run in test mode"), 0 }, { "nofork", I18N_NOOP("Do not fork into the background"), 0 }, { "theme <argument>", I18N_NOOP("Override theme"), "" }, { "nodcop", I18N_NOOP("Do not attempt to start DCOP server"),0 }, { "steps <number>", I18N_NOOP("Number of steps"), "7" }, - KCmdLineLastOption + TDECmdLineLastOption }; int main( int argc, char **argv ) diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp index 61961a390..baaed4997 100644 --- a/kstart/kstart.cpp +++ b/kstart/kstart.cpp @@ -250,7 +250,7 @@ void KStart::applyStyle(WId w ) { } // David, 05/03/2000 -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "!+command", I18N_NOOP("Command to execute"), 0 }, // "!" means: all options after command are treated as arguments to the command @@ -280,7 +280,7 @@ static KCmdLineOptions options[] = { "skiptaskbar", I18N_NOOP("The window does not get an entry in the taskbar"), 0 }, { "skippager", I18N_NOOP("The window does not get an entry on the pager"), 0 }, { "tosystray", I18N_NOOP("The window is sent to the system tray in Kicker"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main( int argc, char *argv[] ) diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc index e942e9548..2ab100137 100644 --- a/ksysguard/gui/ksysguard.cc +++ b/ksysguard/gui/ksysguard.cc @@ -511,10 +511,10 @@ void TopLevel::setSwapInfo( long used, long free, const TQString &unit ) statusBar()->changeItem( msg, 2 ); } -static const KCmdLineOptions options[] = { +static const TDECmdLineOptions options[] = { { "showprocesses", I18N_NOOP( "Show only process list of local host" ), 0 }, { "+[worksheet]", I18N_NOOP( "Optional worksheet files to load" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; /* diff --git a/ksystraycmd/main.cpp b/ksystraycmd/main.cpp index da279d1ae..19f7e501d 100644 --- a/ksystraycmd/main.cpp +++ b/ksystraycmd/main.cpp @@ -20,7 +20,7 @@ const int XFocusIn = FocusIn; #undef KeyRelease -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "!+command", I18N_NOOP("Command to execute"), 0 }, // "!" means: all options after command are treated as arguments to the command @@ -43,7 +43,7 @@ static KCmdLineOptions options[] = "This has no effect unless startonshow is specified and implies keeprunning." ), 0 }, /* { "menuitem <item>", I18N_NOOP( "Adds a custom entry to the tray icon menu\n" "The item should have the form text:command." ), 0 },*/ - KCmdLineLastOption + TDECmdLineLastOption }; int main( int argc, char *argv[] ) diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp index f5da34fd1..a0a24452e 100644 --- a/nsplugins/pluginscan.cpp +++ b/nsplugins/pluginscan.cpp @@ -516,10 +516,10 @@ void sigChildHandler(int) errno = saved_errno; } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "verbose", I18N_NOOP("Show progress output for GUI"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; diff --git a/tdeinit/displayconfig.cpp b/tdeinit/displayconfig.cpp index 215d763e2..1c7f262b6 100644 --- a/tdeinit/displayconfig.cpp +++ b/tdeinit/displayconfig.cpp @@ -42,9 +42,9 @@ static const char description[] = I18N_NOOP("TDE Initialization Display Configur static const char version[] = "0.1"; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) diff --git a/tdeinit/phase1.cpp b/tdeinit/phase1.cpp index f1004759f..dee8f2a3a 100644 --- a/tdeinit/phase1.cpp +++ b/tdeinit/phase1.cpp @@ -38,9 +38,9 @@ static const char description[] = I18N_NOOP("TDE Initialization Phase 1"); static const char version[] = "0.1"; -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char **argv) diff --git a/tdeioslave/home/tdeio_home.cpp b/tdeioslave/home/tdeio_home.cpp index 23d78778b..4352ad8b0 100644 --- a/tdeioslave/home/tdeio_home.cpp +++ b/tdeioslave/home/tdeio_home.cpp @@ -29,12 +29,12 @@ #include "tdeio_home.h" -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "+protocol", I18N_NOOP( "Protocol name" ), 0 }, { "+pool", I18N_NOOP( "Socket name" ), 0 }, { "+app", I18N_NOOP( "Socket name" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" { diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp index 2e4761f82..4427f919f 100644 --- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp +++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp @@ -249,7 +249,7 @@ void MountHelper::slotCancel() exit(0); } -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "d", I18N_NOOP("Decrypt given URL"), 0 }, { "u", I18N_NOOP("Unmount given URL"), 0 }, @@ -257,7 +257,7 @@ static KCmdLineOptions options[] = { "e", I18N_NOOP("Eject given URL via kdeeject"), 0}, { "s", I18N_NOOP("Unmount and Eject given URL (necessary for some USB devices)"), 0}, {"!+URL", I18N_NOOP("media:/ URL to mount/unmount/eject/remove"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; diff --git a/tdeioslave/media/tdeio_media.cpp b/tdeioslave/media/tdeio_media.cpp index c8af18133..51467420f 100644 --- a/tdeioslave/media/tdeio_media.cpp +++ b/tdeioslave/media/tdeio_media.cpp @@ -31,12 +31,12 @@ #include "tdeio_media.h" -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "+protocol", I18N_NOOP( "Protocol name" ), 0 }, { "+pool", I18N_NOOP( "Socket name" ), 0 }, { "+app", I18N_NOOP( "Socket name" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" { diff --git a/tdeioslave/remote/tdeio_remote.cpp b/tdeioslave/remote/tdeio_remote.cpp index d4522de3e..e1ba451f5 100644 --- a/tdeioslave/remote/tdeio_remote.cpp +++ b/tdeioslave/remote/tdeio_remote.cpp @@ -29,12 +29,12 @@ #include "tdeio_remote.h" -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "+protocol", I18N_NOOP( "Protocol name" ), 0 }, { "+pool", I18N_NOOP( "Socket name" ), 0 }, { "+app", I18N_NOOP( "Socket name" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" { diff --git a/tdeioslave/system/tdeio_system.cpp b/tdeioslave/system/tdeio_system.cpp index 3e48e85f5..30cacecad 100644 --- a/tdeioslave/system/tdeio_system.cpp +++ b/tdeioslave/system/tdeio_system.cpp @@ -30,12 +30,12 @@ #include "tdeio_system.h" -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "+protocol", I18N_NOOP( "Protocol name" ), 0 }, { "+pool", I18N_NOOP( "Socket name" ), 0 }, { "+app", I18N_NOOP( "Socket name" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" { diff --git a/tdeioslave/trash/ktrash.cpp b/tdeioslave/trash/ktrash.cpp index b899e7947..9e020e67c 100644 --- a/tdeioslave/trash/ktrash.cpp +++ b/tdeioslave/trash/ktrash.cpp @@ -25,14 +25,14 @@ #include <kdirnotify_stub.h> #include <kdebug.h> -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "empty", I18N_NOOP( "Empty the contents of the trash" ), 0 }, //{ "migrate", I18N_NOOP( "Migrate contents of old trash" ), 0 }, { "restore <file>", I18N_NOOP( "Restore a trashed file to its original location" ), 0 }, // This hack is for the servicemenu on trash.desktop which uses Exec=ktrash -empty. %f is implied... { "+[ignored]", I18N_NOOP( "Ignored" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main(int argc, char *argv[]) diff --git a/tdeioslave/trash/tdeio_trash.cpp b/tdeioslave/trash/tdeio_trash.cpp index 29fbfa778..6840ab10e 100644 --- a/tdeioslave/trash/tdeio_trash.cpp +++ b/tdeioslave/trash/tdeio_trash.cpp @@ -41,12 +41,12 @@ #include <sys/stat.h> #include <stdlib.h> -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "+protocol", I18N_NOOP( "Protocol name" ), 0 }, { "+pool", I18N_NOOP( "Socket name" ), 0 }, { "+app", I18N_NOOP( "Socket name" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" { diff --git a/tdeprint/kjobviewer/main.cpp b/tdeprint/kjobviewer/main.cpp index a0671e5bc..59bf0e1c0 100644 --- a/tdeprint/kjobviewer/main.cpp +++ b/tdeprint/kjobviewer/main.cpp @@ -25,11 +25,11 @@ #include <klocale.h> #include <stdlib.h> -static KCmdLineOptions options[] = { +static TDECmdLineOptions options[] = { { "d <printer-name>", I18N_NOOP("The printer for which jobs are requested"), 0 }, { "noshow", I18N_NOOP("Show job viewer at startup"), 0}, { "all", I18N_NOOP("Show jobs for all printers"), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; diff --git a/tdeprint/kprinter/main.cpp b/tdeprint/kprinter/main.cpp index 7381f53b9..a7694638e 100644 --- a/tdeprint/kprinter/main.cpp +++ b/tdeprint/kprinter/main.cpp @@ -24,7 +24,7 @@ #include <kcmdlineargs.h> #include <klocale.h> -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "c", I18N_NOOP("Make an internal copy of the files to print"), 0}, { "P", 0, 0 }, @@ -39,7 +39,7 @@ static KCmdLineOptions options[] = { "stdin", I18N_NOOP("Allow printing from STDIN" ), 0}, { "nodialog", I18N_NOOP("Do not show the print dialog (print directly)"), 0}, { "+file(s)", I18N_NOOP("Files to load" ), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" int KDE_EXPORT kdemain(int argc, char *argv[]) diff --git a/tdeprint/tdeprintfax/main.cpp b/tdeprint/tdeprintfax/main.cpp index 82a07e97d..cdf7607c4 100644 --- a/tdeprint/tdeprintfax/main.cpp +++ b/tdeprint/tdeprintfax/main.cpp @@ -34,13 +34,13 @@ static const char description[] = // INSERT A DESCRIPTION FOR YOUR APPLICATION HERE -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "phone ", I18N_NOOP("Phone number to fax to"), 0 }, { "immediate", I18N_NOOP("Send fax immediately"), 0 }, { "batch", I18N_NOOP("Exit after sending"), 0 }, { "+[file]", I18N_NOOP("File to fax (added to the file list)"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption // INSERT YOUR COMMANDLINE OPTIONS HERE }; diff --git a/tdescreensaver/random.cpp b/tdescreensaver/random.cpp index 37b3eece4..c214f54c6 100644 --- a/tdescreensaver/random.cpp +++ b/tdescreensaver/random.cpp @@ -50,13 +50,13 @@ static const char description[] = I18N_NOOP("Start a random TDE screen saver"); static const char version[] = "2.0.0"; -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { { "setup", I18N_NOOP("Setup screen saver"), 0 }, { "window-id wid", I18N_NOOP("Run in the specified XWindow"), 0 }, { "root", I18N_NOOP("Run in the root XWindow"), 0 }, // { "+-- [options]", I18N_NOOP("Options to pass to the screen saver"), 0 } - KCmdLineLastOption + TDECmdLineLastOption }; //---------------------------------------------------------------------------- diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp index ec3da142d..611c3ab59 100644 --- a/tdesu/tdesu/tdesu.cpp +++ b/tdesu/tdesu/tdesu.cpp @@ -52,7 +52,7 @@ const char *Version = "1.0"; // NOTE: if you change the position of the -u switch, be sure to adjust it // at the beginning of main() -static KCmdLineOptions options[] = { +static TDECmdLineOptions options[] = { { "+command", I18N_NOOP("Specifies the command to run"), 0 }, { "c <command>", I18N_NOOP("Specifies the command to run"), "" }, { "f <file>", I18N_NOOP("Run command under target uid if <file> is not writable"), "" }, @@ -67,7 +67,7 @@ static KCmdLineOptions options[] = { { "noignorebutton", I18N_NOOP("Do not display ignore button"), 0 }, { "i <icon name>", I18N_NOOP("Specify icon to use in the password dialog"), 0}, { "d", I18N_NOOP("Do not show the command to be run in the dialog"), 0}, - KCmdLineLastOption + TDECmdLineLastOption }; diff --git a/tdm/kfrontend/krootimage.cpp b/tdm/kfrontend/krootimage.cpp index 0c1018f77..92d4de28f 100644 --- a/tdm/kfrontend/krootimage.cpp +++ b/tdm/kfrontend/krootimage.cpp @@ -39,9 +39,9 @@ static const char description[] = static const char version[] = "v2.0"; -static KCmdLineOptions options[] = { +static TDECmdLineOptions options[] = { { "+config", I18N_NOOP( "Name of the configuration file" ), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; static Atom prop_root; diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp index 4e5166c2e..b69803f21 100644 --- a/twin/clients/kwmtheme/cli_installer/main.cpp +++ b/twin/clients/kwmtheme/cli_installer/main.cpp @@ -11,10 +11,10 @@ static const char description[] = I18N_NOOP("Installs a KWM theme"); -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+[file]", I18N_NOOP("Path to a theme config file"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; void copy(const TQString &src, const TQString &dest) diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp index 188c22f77..23806b3ba 100644 --- a/twin/kcmtwin/twinrules/main.cpp +++ b/twin/kcmtwin/twinrules/main.cpp @@ -264,12 +264,12 @@ static int edit( Window wid, bool whole_app ) } // namespace -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { // no need for I18N_NOOP(), this is not supposed to be used directly { "wid <wid>", "WId of the window for special window settings.", 0 }, { "whole-app", "Whether the settings should affect all windows of the application.", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" diff --git a/twin/killer/killer.cpp b/twin/killer/killer.cpp index 0904653a2..75b80c9e5 100644 --- a/twin/killer/killer.cpp +++ b/twin/killer/killer.cpp @@ -31,7 +31,7 @@ DEALINGS IN THE SOFTWARE. #include <twin.h> #include <X11/Xlib.h> -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { // no need for I18N_NOOP(), this is not supposed to be used directly { "pid <pid>", "PID of the application to terminate.", 0 }, @@ -40,7 +40,7 @@ static const KCmdLineOptions options[] = { "applicationname <name>", "Name of the application to be terminated.", 0 }, { "wid <id>", "ID of resource belonging to the application.", 0 }, { "timestamp <time>", "Time of user action causing killing.", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main( int argc, char* argv[] ) diff --git a/twin/main.cpp b/twin/main.cpp index b21540db0..4ee1346e2 100644 --- a/twin/main.cpp +++ b/twin/main.cpp @@ -230,11 +230,11 @@ static void sighandler(int) static const char version[] = "3.0"; static const char description[] = I18N_NOOP( "TDE window manager" ); -static KCmdLineOptions args[] = +static TDECmdLineOptions args[] = { { "lock", I18N_NOOP("Disable configuration options"), 0 }, { "replace", I18N_NOOP("Replace already-running ICCCM2.0-compliant window manager"), 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; extern "C" diff --git a/twin/resumer/resumer.cpp b/twin/resumer/resumer.cpp index b9c3a587d..7f77e25dc 100644 --- a/twin/resumer/resumer.cpp +++ b/twin/resumer/resumer.cpp @@ -31,7 +31,7 @@ DEALINGS IN THE SOFTWARE. #include <twin.h> #include <X11/Xlib.h> -static const KCmdLineOptions options[] = +static const TDECmdLineOptions options[] = { // no need for I18N_NOOP(), this is not supposed to be used directly { "pid <pid>", "PID of the application to resume.", 0 }, @@ -39,7 +39,7 @@ static const KCmdLineOptions options[] = { "windowname <caption>", "Caption of the window to be resumed.", 0 }, { "applicationname <name>", "Name of the application to be resumed.", 0 }, { "wid <id>", "ID of resource belonging to the application.", 0 }, - KCmdLineLastOption + TDECmdLineLastOption }; int main( int argc, char* argv[] ) diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp index e69ce5932..5ef1008b5 100644 --- a/twin/tools/decobenchmark/main.cpp +++ b/twin/tools/decobenchmark/main.cpp @@ -37,7 +37,7 @@ #include "preview.h" #include "main.h" -static KCmdLineOptions options[] = +static TDECmdLineOptions options[] = { { "+decoration", "Decoration library to use, such as twin3_plastik.", 0 }, { "+tests", "Which test should be executed ('all', 'repaint', 'caption', 'resize', 'recreation')", 0 }, -- cgit v1.2.3