From 90222446a456ca01bc2a57bba00002154673a5c6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 7 Feb 2013 10:53:44 -0600 Subject: [PATCH] Rename KAbout to avoid conflicts with KDE4 --- ChangeLog | 2 +- amarok/src/scriptmanager.cpp | 2 +- 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 );