summaryrefslogtreecommitdiffstats
path: root/kicker/proxy/appletproxy.cpp
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 /kicker/proxy/appletproxy.cpp
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kicker/proxy/appletproxy.cpp')
-rw-r--r--kicker/proxy/appletproxy.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp
index 328cec09c..734c6ef8c 100644
--- a/kicker/proxy/appletproxy.cpp
+++ b/kicker/proxy/appletproxy.cpp
@@ -70,10 +70,10 @@ static KCmdLineOptions options[] =
extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
{
- KAboutData aboutData( "kicker", I18N_NOOP("Panel applet proxy.")
+ TDEAboutData aboutData( "kicker", I18N_NOOP("Panel applet proxy.")
, "v0.1.0"
,I18N_NOOP("Panel applet proxy.")
- , KAboutData::License_BSD
+ , TDEAboutData::License_BSD
, "(c) 2000, The KDE Developers");
TDECmdLineArgs::init(argc, argv, &aboutData );
aboutData.addAuthor("Matthias Elter",0, "elter@kde.org");