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 --- kcontrol/filetypes/keditfiletype.cpp | 4 ++-- kcontrol/randr/main.cpp | 4 ++-- kcontrol/tdefontinst/viewpart/FontViewerApp.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'kcontrol') 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"), -- cgit v1.2.1