summaryrefslogtreecommitdiffstats
path: root/kicker/applets
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
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kicker/applets')
-rw-r--r--kicker/applets/launcher/quicklauncher.cpp4
-rw-r--r--kicker/applets/media/mediaapplet.cpp4
-rw-r--r--kicker/applets/naughty/NaughtyApplet.cpp4
-rw-r--r--kicker/applets/trash/trashapplet.cpp4
4 files changed, 8 insertions, 8 deletions
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index 3f46b6b11..7c693fc8f 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -496,9 +496,9 @@ void QuickLauncher::addAppBeforeManually(TQString url, TQString sender)
void QuickLauncher::about()
{
- KAboutData about("quicklauncher", I18N_NOOP("Quick Launcher"), "2.0",
+ TDEAboutData about("quicklauncher", I18N_NOOP("Quick Launcher"), "2.0",
I18N_NOOP("A simple application launcher"),
- KAboutData::License_GPL_V2,
+ TDEAboutData::License_GPL_V2,
"(C) 2000 Bill Nagel\n(C) 2004 Dan Bullok\n(C) 2005 Fred Schaettgen");
KAboutApplication a(&about, this);
a.exec();
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",
diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp
index 3e276fe18..c7b50d4a4 100644
--- a/kicker/applets/naughty/NaughtyApplet.cpp
+++ b/kicker/applets/naughty/NaughtyApplet.cpp
@@ -156,13 +156,13 @@ NaughtyApplet::slotLoad(uint l)
void
NaughtyApplet::about()
{
- KAboutData about
+ TDEAboutData about
(
"naughtyapplet",
I18N_NOOP("Naughty applet"),
"1.0",
I18N_NOOP("Runaway process catcher"),
- KAboutData::License_GPL_V2,
+ TDEAboutData::License_GPL_V2,
"(C) 2000 Rik Hemsley (rikkus) <rik@kde.org>"
);
diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp
index d363f3879..94d8a92db 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -75,11 +75,11 @@ TrashApplet::~TrashApplet()
void TrashApplet::about()
{
- KAboutData data("trashapplet",
+ TDEAboutData data("trashapplet",
I18N_NOOP("Trash Applet"),
"1.0",
I18N_NOOP("\"trash:/\" ioslave frontend applet"),
- KAboutData::License_GPL_V2,
+ TDEAboutData::License_GPL_V2,
"(c) 2004, Kevin Ottens");
data.addAuthor("Kevin \'ervin\' Ottens",