summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-07 11:06:00 -0600
committerTimothy Pearson <[email protected]>2013-02-07 11:06:00 -0600
commite0602f96ec0eea1dab12e83b5fcd598c9a400c65 (patch)
tree9a7594d505b915f4bcb1030449f6b29d95c06db5
parent5e664c2e4a7b9dcaf2660f8db94a632d1021e2dd (diff)
downloadtdebase-e0602f96ec0eea1dab12e83b5fcd598c9a400c65.tar.gz
tdebase-e0602f96ec0eea1dab12e83b5fcd598c9a400c65.zip
Rename KAbout to avoid conflicts with KDE4
-rw-r--r--kcontrol/kcontrol/toplevel.cpp2
-rw-r--r--kfind/kfinddlg.cpp2
-rw-r--r--kicker/applets/launcher/quictdelauncher.cpp2
-rw-r--r--kicker/applets/media/mediaapplet.cpp2
-rw-r--r--kicker/applets/naughty/NaughtyApplet.cpp2
-rw-r--r--kicker/applets/trash/trashapplet.cpp2
-rw-r--r--klipper/applet.cpp2
7 files changed, 7 insertions, 7 deletions
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index 13c7a6f56..0c30446a6 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -508,7 +508,7 @@ void TopLevel::reportBug()
void TopLevel::aboutModule()
{
- KAboutApplication dlg(_active->aboutData());
+ TDEAboutApplication dlg(_active->aboutData());
dlg.exec();
}
diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp
index bee2c062b..7abe4236f 100644
--- a/kfind/kfinddlg.cpp
+++ b/kfind/kfinddlg.cpp
@@ -230,7 +230,7 @@ void KfindDlg::copySelection()
void KfindDlg::about ()
{
- KAboutApplication dlg(this, "about", true);
+ TDEAboutApplication dlg(this, "about", true);
dlg.exec ();
}
diff --git a/kicker/applets/launcher/quictdelauncher.cpp b/kicker/applets/launcher/quictdelauncher.cpp
index 8a1c1c9dc..1ba3544ab 100644
--- a/kicker/applets/launcher/quictdelauncher.cpp
+++ b/kicker/applets/launcher/quictdelauncher.cpp
@@ -500,7 +500,7 @@ void QuickLauncher::about()
I18N_NOOP("A simple application launcher"),
TDEAboutData::License_GPL_V2,
"(C) 2000 Bill Nagel\n(C) 2004 Dan Bullok\n(C) 2005 Fred Schaettgen");
- KAboutApplication a(&about, this);
+ TDEAboutApplication a(&about, this);
a.exec();
}
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index f2aa6be2b..12565f07d 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -105,7 +105,7 @@ void MediaApplet::about()
I18N_NOOP("Good mentor, patient and helpful. Thanks for all!"),
- KAboutApplication dialog(&data);
+ TDEAboutApplication dialog(&data);
dialog.exec();
}
diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp
index c953ec637..c3138e447 100644
--- a/kicker/applets/naughty/NaughtyApplet.cpp
+++ b/kicker/applets/naughty/NaughtyApplet.cpp
@@ -166,7 +166,7 @@ NaughtyApplet::about()
"(C) 2000 Rik Hemsley (rikkus) <[email protected]>"
);
- KAboutApplication a(&about, this);
+ TDEAboutApplication a(&about, this);
a.exec();
}
diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp
index 3b7ae419a..c0675583e 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -87,7 +87,7 @@ void TrashApplet::about()
"ervin ipsquad net",
"http://ervin.ipsquad.net");
- KAboutApplication dialog(&data);
+ TDEAboutApplication dialog(&data);
dialog.exec();
}
diff --git a/klipper/applet.cpp b/klipper/applet.cpp
index c6c1a0b7d..0d30aad3c 100644
--- a/klipper/applet.cpp
+++ b/klipper/applet.cpp
@@ -96,7 +96,7 @@ void KlipperApplet::help()
void KlipperApplet::about()
{
- KAboutApplication about(this, 0);
+ TDEAboutApplication about(this, 0);
about.exec();
}