summaryrefslogtreecommitdiffstats
path: root/kicker/applets/media/mediaapplet.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/applets/media/mediaapplet.cpp
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kicker/applets/media/mediaapplet.cpp')
-rw-r--r--kicker/applets/media/mediaapplet.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index 8f2d69ab7..61aefd673 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -89,11 +89,11 @@ MediaApplet::~MediaApplet()
void MediaApplet::about()
{
- KAboutData data("mediaapplet",
+ TDEAboutData data("mediaapplet",
I18N_NOOP("Media Applet"),
"1.0",
I18N_NOOP("\"media:/\" ioslave frontend applet"),
- KAboutData::License_GPL_V2,
+ TDEAboutData::License_GPL_V2,
"(c) 2004, Kevin Ottens");
data.addAuthor("Kevin \'ervin\' Ottens",