summaryrefslogtreecommitdiffstats
path: root/kcontrol
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-06 19:44:17 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-06 19:44:17 -0600
commit5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd (patch)
treea5eb4cb7c4754e533de65c5adee17d783e426425 /kcontrol
parent98eb308fc180d9bea71f448b262ab796353ac904 (diff)
downloadtdebase-5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd.tar.gz
tdebase-5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd.zip
Rename KCmd to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol')
-rw-r--r--kcontrol/filetypes/keditfiletype.cpp4
-rw-r--r--kcontrol/randr/main.cpp4
-rw-r--r--kcontrol/tdefontinst/viewpart/FontViewerApp.cpp4
3 files changed, 6 insertions, 6 deletions
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 <winid>", 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"),