summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-07 11:03:51 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-07 11:03:51 -0600
commitf241831d4fdc5012a428ec46868bb9f6a7ee8575 (patch)
treee320fba96274c16ccbb2295388b7c349557e0259
parentdd42a9fb94d315140072a6fb51e7987cf54783df (diff)
downloadtdeaddons-f241831d4fdc5012a428ec46868bb9f6a7ee8575.tar.gz
tdeaddons-f241831d4fdc5012a428ec46868bb9f6a7ee8575.zip
Rename KAbout to avoid conflicts with KDE4
-rw-r--r--kicker-applets/kolourpicker/kolourpicker.cpp2
-rw-r--r--kicker-applets/mediacontrol/mediacontrol.cpp2
-rw-r--r--konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp2
-rw-r--r--konq-plugins/sidebar/newsticker/nsstacktabwidget.h4
4 files changed, 5 insertions, 5 deletions
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index f2f4cbd..027aa0f 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -116,7 +116,7 @@ int KolourPicker::widthForHeight(int height) const
void KolourPicker::about()
{
- KAboutApplication dlg(m_instance->aboutData());
+ TDEAboutApplication dlg(m_instance->aboutData());
dlg.exec();
}
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index 23cfd83..fbd289c 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -303,7 +303,7 @@ void MediaControl::slotPrefsDialogClosing()
void MediaControl::about()
{
- KAboutApplication aboutDlg(mAboutData);
+ TDEAboutApplication aboutDlg(mAboutData);
aboutDlg.exec();
}
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
index f06c876..340d455 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
@@ -75,7 +75,7 @@ namespace KSB_News {
I18N_NOOP("Idea and former maintainer"),
"jowenn@kde.org");
m_aboutdata->setProductName("konqueror/sidebar newsticker");
- m_about = new KAboutApplication(m_aboutdata, this);
+ m_about = new TDEAboutApplication(m_aboutdata, this);
// bugreport dialog
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
index a1d6783..adb0b0e 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
@@ -37,7 +37,7 @@ class TQPushButton;
class TQStringList;
class TDEPopupMenu;
class TDEAboutData;
-class KAboutApplication;
+class TDEAboutApplication;
class KBugReport;
class TDEConfigDialog;
@@ -78,7 +78,7 @@ namespace KSB_News {
TQWidget *currentPage;
TDEPopupMenu *popup, *helpmenu;
TDEAboutData *m_aboutdata;
- KAboutApplication *m_about;
+ TDEAboutApplication *m_about;
KBugReport *m_bugreport;
TQPushButton *m_last_button_rightclicked;
TDEConfigDialog *m_confdlg;