summaryrefslogtreecommitdiffstats
path: root/kcminit
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 /kcminit
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcminit')
-rw-r--r--kcminit/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/kcminit/main.cpp b/kcminit/main.cpp
index eb40e77c0..52fe79d98 100644
--- a/kcminit/main.cpp
+++ b/kcminit/main.cpp
@@ -234,7 +234,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
startup = ( strcmp( argv[ 0 ], "kcminit_startup" ) == 0 ); // started from starttde?
KLocale::setMainCatalogue("kcontrol");
- KAboutData aboutData( "kcminit", I18N_NOOP("KCMInit"),
+ TDEAboutData aboutData( "kcminit", I18N_NOOP("KCMInit"),
"",
I18N_NOOP("KCMInit - runs startups initialization for Control Modules."));