summaryrefslogtreecommitdiffstats
path: root/kcontrol/kthememanager
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
commit1d061b286a8b183b39be60fe531f2b1c2915f03a (patch)
tree0a4c6ee79918e366077094fb59e9c1196d7f4156 /kcontrol/kthememanager
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kthememanager')
-rw-r--r--kcontrol/kthememanager/kthememanager.cpp4
-rw-r--r--kcontrol/kthememanager/kthememanager.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index 47070ab02..4a3f21644 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -46,10 +46,10 @@ kthememanager::kthememanager( TQWidget *parent, const char *name )
: KCModule( parent, name ), m_theme( 0 ), m_origTheme( 0 )
{
- KAboutData *about = new KAboutData("kthememanager", I18N_NOOP("TDE Theme Manager"),
+ TDEAboutData *about = new TDEAboutData("kthememanager", I18N_NOOP("TDE Theme Manager"),
"0.4", I18N_NOOP("This control module handles installing, removing and "
"creating visual TDE themes."),
- KAboutData::License_GPL, "(c) 2003, 2004, 2006 Lukáš Tinkl", 0,
+ TDEAboutData::License_GPL, "(c) 2003, 2004, 2006 Lukáš Tinkl", 0,
"http://developer.kde.org/~lukas/kthememanager");
setAboutData( about );
diff --git a/kcontrol/kthememanager/kthememanager.h b/kcontrol/kthememanager/kthememanager.h
index fba803ec5..0d7059729 100644
--- a/kcontrol/kthememanager/kthememanager.h
+++ b/kcontrol/kthememanager/kthememanager.h
@@ -29,7 +29,7 @@
class TQString;
-class KAboutData;
+class TDEAboutData;
#define ORIGINAL_THEME "original" // no i18n() here!!!