summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-06 19:48:39 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-06 19:48:39 -0600
commit2e05692480ffca7ce2043180e9377619c233ee66 (patch)
tree5088d7b6bbb2a9ddd2cf47b53bde45e72f2529d7
parent2f859f842a79ef5cf5b6df6ffcdbe47f5e0bcf24 (diff)
downloadtdevelop-2e05692480ffca7ce2043180e9377619c233ee66.tar.gz
tdevelop-2e05692480ffca7ce2043180e9377619c233ee66.zip
Rename KCmd to avoid conflicts with KDE4
-rw-r--r--buildtools/lib/parsers/qmake/tests/runner.cpp2
-rw-r--r--kdevdesigner/src/main.cpp4
-rw-r--r--languages/cpp/app_templates/dcopservice/main.cpp4
-rw-r--r--languages/cpp/app_templates/kapp/main.cpp4
-rw-r--r--languages/cpp/app_templates/kde4app/main.cpp2
-rw-r--r--languages/cpp/app_templates/kdedcop/main.cpp4
-rw-r--r--languages/cpp/app_templates/khello/main.cpp4
-rw-r--r--languages/cpp/app_templates/khello2/main.cpp4
-rw-r--r--languages/cpp/app_templates/kmake/app.cpp4
-rw-r--r--languages/cpp/app_templates/kofficepart/main.cpp4
-rw-r--r--languages/cpp/app_templates/kpartapp/main.cpp4
-rw-r--r--languages/cpp/app_templates/kscons_kxt/main.cpp4
-rw-r--r--languages/cpp/app_templates/kscons_tdemdi/main.cpp4
-rw-r--r--languages/cpp/app_templates/kxt/main.cpp4
-rw-r--r--languages/cpp/app_templates/tdeconfig35/main.cpp4
-rw-r--r--parts/documentation/tools/htdig/htdigindex.cpp4
-rw-r--r--src/Mainpage.dox2
-rw-r--r--src/main.cpp2
-rw-r--r--src/main_assistant.cpp2
-rw-r--r--src/profileengine/editor/main.cpp4
20 files changed, 35 insertions, 35 deletions
diff --git a/buildtools/lib/parsers/qmake/tests/runner.cpp b/buildtools/lib/parsers/qmake/tests/runner.cpp
index 489dd754..1ddcac63 100644
--- a/buildtools/lib/parsers/qmake/tests/runner.cpp
+++ b/buildtools/lib/parsers/qmake/tests/runner.cpp
@@ -30,7 +30,7 @@
#include <kcmdlineargs.h>
#include <kurl.h>
-static const KCmdLineOptions options[] =
+static const TDECmdLineOptions options[] =
{
{"silent", "Enable Parser debug output", 0},
{"!debug", "Disable output of the generated AST", 0},
diff --git a/kdevdesigner/src/main.cpp b/kdevdesigner/src/main.cpp
index 58094d1b..1c3921ea 100644
--- a/kdevdesigner/src/main.cpp
+++ b/kdevdesigner/src/main.cpp
@@ -32,10 +32,10 @@ static const char description[] =
static const char version[] = "0.2";
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
{ "+[URL]", I18N_NOOP( "Document to open" ), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
int main(int argc, char **argv)
diff --git a/languages/cpp/app_templates/dcopservice/main.cpp b/languages/cpp/app_templates/dcopservice/main.cpp
index e1c41044..78aac7c8 100644
--- a/languages/cpp/app_templates/dcopservice/main.cpp
+++ b/languages/cpp/app_templates/dcopservice/main.cpp
@@ -13,9 +13,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/languages/cpp/app_templates/kapp/main.cpp b/languages/cpp/app_templates/kapp/main.cpp
index 7ebd68a8..ba2e08fa 100644
--- a/languages/cpp/app_templates/kapp/main.cpp
+++ b/languages/cpp/app_templates/kapp/main.cpp
@@ -12,10 +12,10 @@ static const char description[] =
static const char version[] = "%{VERSION}";
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
{ "+[URL]", I18N_NOOP( "Document to open" ), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
int main(int argc, char **argv)
diff --git a/languages/cpp/app_templates/kde4app/main.cpp b/languages/cpp/app_templates/kde4app/main.cpp
index 4c37bd4b..f376b31f 100644
--- a/languages/cpp/app_templates/kde4app/main.cpp
+++ b/languages/cpp/app_templates/kde4app/main.cpp
@@ -18,7 +18,7 @@ int main(int argc, char **argv)
about.addAuthor( ki18n("%{AUTHOR}"), KLocalizedString(), "%{EMAIL}" );
TDECmdLineArgs::init(argc, argv, &about);
- KCmdLineOptions options;
+ TDECmdLineOptions options;
options.add("+[URL]", ki18n( "Document to open" ));
TDECmdLineArgs::addCmdLineOptions(options);
TDEApplication app;
diff --git a/languages/cpp/app_templates/kdedcop/main.cpp b/languages/cpp/app_templates/kdedcop/main.cpp
index 15b3c3f0..7164b7bb 100644
--- a/languages/cpp/app_templates/kdedcop/main.cpp
+++ b/languages/cpp/app_templates/kdedcop/main.cpp
@@ -11,10 +11,10 @@ static const char description[] =
static const char version[] = "0.1";
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
// { "+[URL]", I18N_NOOP( "Document to open" ), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
int main(int argc, char **argv)
diff --git a/languages/cpp/app_templates/khello/main.cpp b/languages/cpp/app_templates/khello/main.cpp
index 5e1dfd1d..8722d845 100644
--- a/languages/cpp/app_templates/khello/main.cpp
+++ b/languages/cpp/app_templates/khello/main.cpp
@@ -11,10 +11,10 @@ static const char description[] =
static const char version[] = "%{VERSION}";
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
// { "+[URL]", I18N_NOOP( "Document to open" ), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
int main(int argc, char **argv)
diff --git a/languages/cpp/app_templates/khello2/main.cpp b/languages/cpp/app_templates/khello2/main.cpp
index 31799020..354de69f 100644
--- a/languages/cpp/app_templates/khello2/main.cpp
+++ b/languages/cpp/app_templates/khello2/main.cpp
@@ -11,10 +11,10 @@ static const char description[] =
static const char version[] = "%{VERSION}";
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
// { "+[URL]", I18N_NOOP( "Document to open" ), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
int main(int argc, char **argv)
diff --git a/languages/cpp/app_templates/kmake/app.cpp b/languages/cpp/app_templates/kmake/app.cpp
index d0d1eecb..e057db20 100644
--- a/languages/cpp/app_templates/kmake/app.cpp
+++ b/languages/cpp/app_templates/kmake/app.cpp
@@ -9,10 +9,10 @@ static const char description[] = I18N_NOOP("A TDE Application");
static const char version[] = "%{VERSION}";
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
{ "+[URL]", I18N_NOOP( "Document to open" ), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
diff --git a/languages/cpp/app_templates/kofficepart/main.cpp b/languages/cpp/app_templates/kofficepart/main.cpp
index 01fa0c3d..b2621a03 100644
--- a/languages/cpp/app_templates/kofficepart/main.cpp
+++ b/languages/cpp/app_templates/kofficepart/main.cpp
@@ -12,10 +12,10 @@
#include "%{APPNAMELC}_aboutdata.h"
-static const KCmdLineOptions options[]=
+static const TDECmdLineOptions options[]=
{
{"+[file]", I18N_NOOP("File to open"),0},
- KCmdLineLastOption
+ TDECmdLineLastOption
};
int main( int argc, char **argv )
diff --git a/languages/cpp/app_templates/kpartapp/main.cpp b/languages/cpp/app_templates/kpartapp/main.cpp
index 416d18ca..d951ad29 100644
--- a/languages/cpp/app_templates/kpartapp/main.cpp
+++ b/languages/cpp/app_templates/kpartapp/main.cpp
@@ -10,10 +10,10 @@ static const char description[] =
static const char version[] = "%{VERSION}";
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
{ "+[URL]", I18N_NOOP( "Document to open" ), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
int main(int argc, char **argv)
diff --git a/languages/cpp/app_templates/kscons_kxt/main.cpp b/languages/cpp/app_templates/kscons_kxt/main.cpp
index 45d9cf8f..510803cd 100644
--- a/languages/cpp/app_templates/kscons_kxt/main.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/main.cpp
@@ -11,10 +11,10 @@ static const char description[] =
static const char version[] = "%{VERSION}";
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
{ "+[URL]", I18N_NOOP( "Document to open" ), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
int main(int argc, char **argv)
diff --git a/languages/cpp/app_templates/kscons_tdemdi/main.cpp b/languages/cpp/app_templates/kscons_tdemdi/main.cpp
index ccfc4fac..d3e49880 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/main.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/main.cpp
@@ -13,10 +13,10 @@ I18N_NOOP("A simple tdemdi app");
static const char version[] = "0.0.1";
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
{ "+[URL]", I18N_NOOP( "Document to open" ), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
int main(int argc, char **argv)
diff --git a/languages/cpp/app_templates/kxt/main.cpp b/languages/cpp/app_templates/kxt/main.cpp
index 3c912936..7174b8ac 100644
--- a/languages/cpp/app_templates/kxt/main.cpp
+++ b/languages/cpp/app_templates/kxt/main.cpp
@@ -11,10 +11,10 @@ static const char description[] =
static const char version[] = "%{VERSION}";
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
{ "+[URL]", I18N_NOOP( "Document to open" ), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
int main(int argc, char **argv)
diff --git a/languages/cpp/app_templates/tdeconfig35/main.cpp b/languages/cpp/app_templates/tdeconfig35/main.cpp
index 3c912936..7174b8ac 100644
--- a/languages/cpp/app_templates/tdeconfig35/main.cpp
+++ b/languages/cpp/app_templates/tdeconfig35/main.cpp
@@ -11,10 +11,10 @@ static const char description[] =
static const char version[] = "%{VERSION}";
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
{ "+[URL]", I18N_NOOP( "Document to open" ), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
int main(int argc, char **argv)
diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp
index 57dde9ee..4213ffd1 100644
--- a/parts/documentation/tools/htdig/htdigindex.cpp
+++ b/parts/documentation/tools/htdig/htdigindex.cpp
@@ -443,11 +443,11 @@ void ProgressDialog::okClicked()
int main(int argc, char *argv[])
{
- static const KCmdLineOptions options[] =
+ static const TDECmdLineOptions options[] =
{
{ "c", I18N_NOOP( "Update user's htdig configuration file only" ), 0 },
{ "i", I18N_NOOP( "-c and generate index" ), 0 },
- KCmdLineLastOption
+ TDECmdLineLastOption
};
TDEAboutData aboutData("tdevelop-htdig", I18N_NOOP("TDevelop ht://Dig Indexer"),
diff --git a/src/Mainpage.dox b/src/Mainpage.dox
index 12599626..77b1b015 100644
--- a/src/Mainpage.dox
+++ b/src/Mainpage.dox
@@ -33,7 +33,7 @@ Example:
#include "myappextension.h"
- static KCmdLineOptions options[] =
+ static TDECmdLineOptions options[] =
{
{ "profile <profile>", I18N_NOOP("Profile to load"), 0 },
{ 0,0,0 }
diff --git a/src/main.cpp b/src/main.cpp
index 5ba3f13d..d8103e3a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,7 +20,7 @@
#include "kdevideextension.h"
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
{ "profile <profile>", I18N_NOOP("Profile to load"), 0 },
{ "+file(s)", I18N_NOOP("Files to load"), 0 },
diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp
index 13e4ea9b..cce003f0 100644
--- a/src/main_assistant.cpp
+++ b/src/main_assistant.cpp
@@ -20,7 +20,7 @@
#include "kdevassistantextension.h"
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
{ "profile <profile>", I18N_NOOP("Profile to load"), 0 },
/* { "+file(s)", I18N_NOOP("Files to load"), 0 },*/
diff --git a/src/profileengine/editor/main.cpp b/src/profileengine/editor/main.cpp
index 4ffe6f92..c004b421 100644
--- a/src/profileengine/editor/main.cpp
+++ b/src/profileengine/editor/main.cpp
@@ -23,9 +23,9 @@
#include "profileeditor.h"
-static KCmdLineOptions options[] =
+static TDECmdLineOptions options[] =
{
- KCmdLineLastOption
+ TDECmdLineLastOption
};
int main(int argc, char **argv)