summaryrefslogtreecommitdiffstats
path: root/kcmshell/main.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:05 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:05 -0600
commitb19ddece21e102b8e4b292037ca7578f60b128fe (patch)
tree6572ca25aba80849cdfa7578bbbc9121d23afbc3 /kcmshell/main.cpp
parente729c6d549f12e27b358a1dad04ff254c033ac71 (diff)
downloadtdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz
tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcmshell/main.cpp')
-rw-r--r--kcmshell/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kcmshell/main.cpp b/kcmshell/main.cpp
index 4453cac0d..7196c0e0a 100644
--- a/kcmshell/main.cpp
+++ b/kcmshell/main.cpp
@@ -198,10 +198,10 @@ static void setIcon(TQWidget *w, const TQString &iconName)
extern "C" KDE_EXPORT int kdemain(int _argc, char *_argv[])
{
- KAboutData aboutData( "kcmshell", I18N_NOOP("TDE Control Module"),
+ TDEAboutData aboutData( "kcmshell", I18N_NOOP("TDE Control Module"),
0,
I18N_NOOP("A tool to start single TDE control modules"),
- KAboutData::License_GPL,
+ TDEAboutData::License_GPL,
I18N_NOOP("(c) 1999-2004, The KDE Developers") );
aboutData.addAuthor("Frans Englich", I18N_NOOP("Maintainer"), "frans.englich@kde.org");