summaryrefslogtreecommitdiffstats
path: root/languages/cpp/app_templates/kscons_kmdi
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:23:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:23:50 -0600
commit3a044decb0a5d7be822c888b2d5374573d7df96e (patch)
treeddf4681e0233c25203fc927596aa7b3bdb5f2efa /languages/cpp/app_templates/kscons_kmdi
parent5c0390ebaa2be82d8684af5a6bc2b16740f4cc1b (diff)
downloadtdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.tar.gz
tdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'languages/cpp/app_templates/kscons_kmdi')
-rw-r--r--languages/cpp/app_templates/kscons_kmdi/app_part.cpp4
-rw-r--r--languages/cpp/app_templates/kscons_kmdi/app_part.h4
-rw-r--r--languages/cpp/app_templates/kscons_kmdi/main.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
index 06a6409c..70f13d98 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp
@@ -49,11 +49,11 @@ K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory );
{
}
-KAboutData *%{APPNAMELC}Part::createAboutData()
+TDEAboutData *%{APPNAMELC}Part::createAboutData()
{
// The non-i18n name here must be the same as the directory in
// which the part's rc file is installed
- KAboutData *aboutData = new KAboutData("%{APPNAMELC}part", I18N_NOOP("%{APPNAMELC}Part"), "0.0.1");
+ TDEAboutData *aboutData = new TDEAboutData("%{APPNAMELC}part", I18N_NOOP("%{APPNAMELC}Part"), "0.0.1");
aboutData->addAuthor("%{AUTHOR}", 0, "%{EMAIL}");
return aboutData;
}
diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.h b/languages/cpp/app_templates/kscons_kmdi/app_part.h
index 1c9e4d14..42d1b22c 100644
--- a/languages/cpp/app_templates/kscons_kmdi/app_part.h
+++ b/languages/cpp/app_templates/kscons_kmdi/app_part.h
@@ -10,7 +10,7 @@ class TQMultiLineEdit;
class TQWidget;
class TQPainter;
class KURL;
-class KAboutData;
+class TDEAboutData;
/**
* This is a "Part". It that does all the real work in a KPart
@@ -51,7 +51,7 @@ public:
/**
* About data for the part
*/
- static KAboutData *createAboutData();
+ static TDEAboutData *createAboutData();
protected:
/**
diff --git a/languages/cpp/app_templates/kscons_kmdi/main.cpp b/languages/cpp/app_templates/kscons_kmdi/main.cpp
index 5795feb9..dca1e7a6 100644
--- a/languages/cpp/app_templates/kscons_kmdi/main.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/main.cpp
@@ -21,8 +21,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv)
{
- KAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
- KAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}" );
+ TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description,
+ TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}" );
about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" );
// warning, utf-8 char