summaryrefslogtreecommitdiffstats
path: root/karbon/karbon_aboutdata.h
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 19:55:40 -0600
committerTimothy Pearson <[email protected]>2013-01-22 19:55:40 -0600
commit73ff676f11662d6178c8854a7832ebffe2ae409d (patch)
tree9e89ea7d87940087d2d3c5db9b378ef989dd1346 /karbon/karbon_aboutdata.h
parentc2ba2f56121c21a762619faf195e8332ef5b224f (diff)
downloadkoffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz
koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'karbon/karbon_aboutdata.h')
-rw-r--r--karbon/karbon_aboutdata.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/karbon/karbon_aboutdata.h b/karbon/karbon_aboutdata.h
index 8d8e5217..c293baaf 100644
--- a/karbon/karbon_aboutdata.h
+++ b/karbon/karbon_aboutdata.h
@@ -10,14 +10,14 @@ static const char* version=VERSION;
// This is all implemented here so that the executable and the part can share it
// without sharing an object file.
-KAboutData * newKarbonAboutData()
+TDEAboutData * newKarbonAboutData()
{
- KAboutData * aboutData = new KAboutData(
+ TDEAboutData * aboutData = new TDEAboutData(
"karbon",
I18N_NOOP( "Karbon14" ),
version,
description,
- KAboutData::License_GPL,
+ TDEAboutData::License_GPL,
I18N_NOOP( "(c) 2001-2006, The Karbon Developers" ),
I18N_NOOP( "You are invited to participate in any way." ),
"http://www.koffice.org/karbon/");