summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-07 10:53:44 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-07 10:53:44 -0600
commit90222446a456ca01bc2a57bba00002154673a5c6 (patch)
tree19900b45f4298ed05c5b239a6e81da79419ef785
parentd4eae1867a21f1631dbf5b85a292166185ebfe17 (diff)
downloadamarok-90222446a456ca01bc2a57bba00002154673a5c6.tar.gz
amarok-90222446a456ca01bc2a57bba00002154673a5c6.zip
Rename KAbout to avoid conflicts with KDE4
-rw-r--r--ChangeLog2
-rw-r--r--amarok/src/scriptmanager.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f25be08d..cf8a52db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1356,7 +1356,7 @@ VERSION 1.3.4:
if you set a filter.
* Podcast settings "download on request" and "stream on request" have
been merged.
- * About button in script manager now uses a KAboutDialog and supports
+ * About button in script manager now uses a TDEAboutDialog and supports
rich text format in the README file. (BR 110961)
* After filtering the collection browser, if only a single item is left
visible, it will automatically be expanded.
diff --git a/amarok/src/scriptmanager.cpp b/amarok/src/scriptmanager.cpp
index a2101c37..05983c7f 100644
--- a/amarok/src/scriptmanager.cpp
+++ b/amarok/src/scriptmanager.cpp
@@ -670,7 +670,7 @@ ScriptManager::slotAboutScript()
return;
}
- KAboutDialog* about = new KAboutDialog( KAboutDialog::AbtTabbed|KAboutDialog::AbtProduct,
+ TDEAboutDialog* about = new TDEAboutDialog( TDEAboutDialog::AbtTabbed|TDEAboutDialog::AbtProduct,
TQString(),
KDialogBase::Ok, KDialogBase::Ok, this );
kapp->setTopWidget( about );