From c2706b1db2ea2dfa0fb0a3d552dda773b497412a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 7 Feb 2013 10:58:00 -0600 Subject: Rename KAbout to avoid conflicts with KDE4 --- tderadio3/src/aboutwidget.cpp | 42 +++++++++++++++++------------------ tderadio3/src/include/aboutwidget.h | 12 +++++----- tderadio3/src/include/pluginmanager.h | 2 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/tderadio3/src/aboutwidget.cpp b/tderadio3/src/aboutwidget.cpp index e013b4d..5c82481 100644 --- a/tderadio3/src/aboutwidget.cpp +++ b/tderadio3/src/aboutwidget.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -/* Unfortunately KDE doesn't provide the class KAboutContainerBase +/* Unfortunately KDE doesn't provide the class TDEAboutContainerBase to public programming, so we have to copy most of that code into an own class :( */ @@ -39,7 +39,7 @@ #include // copied (and renamed) from kaboutdialog.cpp -// original: KAboutTabWidget +// original: TDEAboutTabWidget class TDERadioAboutTabWidget : public TQTabWidget { @@ -52,7 +52,7 @@ public: // copied (renamed and extended) from kaboutdialog.cpp -// original: KAboutContainerBase +// original: TDEAboutContainerBase TDERadioAboutWidget::TDERadioAboutWidget(const TDEAboutData &aboutData, int layoutType, TQWidget *_parent, char *_name ) @@ -273,7 +273,7 @@ TQFrame *TDERadioAboutWidget::addLicensePage( const TQString &title, } -KAboutContainer *TDERadioAboutWidget::addContainerPage( const TQString &title, +TDEAboutContainer *TDERadioAboutWidget::addContainerPage( const TQString &title, int childAlignment, int innerAlignment ) { @@ -283,7 +283,7 @@ KAboutContainer *TDERadioAboutWidget::addContainerPage( const TQString &title, return 0; } - KAboutContainer *container = new KAboutContainer( mPageTab, "container", + TDEAboutContainer *container = new TDEAboutContainer( mPageTab, "container", KDialog::spacingHint(), KDialog::spacingHint(), childAlignment, innerAlignment ); mPageTab->addTab( container, title ); @@ -302,7 +302,7 @@ KAboutContainer *TDERadioAboutWidget::addContainerPage( const TQString &title, } -KAboutContainer *TDERadioAboutWidget::addScrolledContainerPage( +TDEAboutContainer *TDERadioAboutWidget::addScrolledContainerPage( const TQString &title, int childAlignment, int innerAlignment ) @@ -319,7 +319,7 @@ KAboutContainer *TDERadioAboutWidget::addScrolledContainerPage( scrollView->viewport()->setBackgroundMode( PaletteBackground ); vbox->addWidget( scrollView ); - KAboutContainer *container = new KAboutContainer( scrollView, "container", + TDEAboutContainer *container = new TDEAboutContainer( scrollView, "container", KDialog::spacingHint(), KDialog::spacingHint(), childAlignment, innerAlignment ); scrollView->addChild( container ); @@ -350,10 +350,10 @@ TQFrame *TDERadioAboutWidget::addEmptyPage( const TQString &title ) } -KAboutContainer *TDERadioAboutWidget::addContainer( int childAlignment, +TDEAboutContainer *TDERadioAboutWidget::addContainer( int childAlignment, int innerAlignment ) { - KAboutContainer *container = new KAboutContainer( this, "container", + TDEAboutContainer *container = new TDEAboutContainer( this, "container", 0, KDialog::spacingHint(), childAlignment, innerAlignment ); mTopLayout->addWidget( container, 0, childAlignment ); @@ -487,7 +487,7 @@ void TDERadioAboutWidget::slotMailClick( const TQString &/*_name*/, // copied (and renamed) from kaboutapplication.cpp -// original: KAboutApplication::buildDialog +// original: TDEAboutApplication::buildDialog void TDERadioAboutWidget::setAboutData(const TDEAboutData &_aboutData) { @@ -505,7 +505,7 @@ void TDERadioAboutWidget::setAboutData(const TDEAboutData &_aboutData) if (!aboutData->copyrightStatement().isEmpty()) appPageText += "\n" + aboutData->copyrightStatement()+"\n"; - KAboutContainer *appPage = addContainerPage( i18n("&About")); + TDEAboutContainer *appPage = addContainerPage( i18n("&About")); TQLabel *appPageLabel = new TQLabel( appPageText, 0 ); appPage->addWidget( appPageLabel ); @@ -525,9 +525,9 @@ void TDERadioAboutWidget::setAboutData(const TDEAboutData &_aboutData) if (authorCount) { TQString authorPageTitle = authorCount == 1 ? i18n("A&uthor") : i18n("A&uthors"); - KAboutContainer *authorPage = addScrolledContainerPage( authorPageTitle ); - TQValueList::ConstIterator it = aboutData->authors().begin(); - TQValueList::ConstIterator end = aboutData->authors().end(); + TDEAboutContainer *authorPage = addScrolledContainerPage( authorPageTitle ); + TQValueList::ConstIterator it = aboutData->authors().begin(); + TQValueList::ConstIterator end = aboutData->authors().end(); for (; it != end; ++it) { authorPage->addPerson( (*it).name(), (*it).emailAddress(), (*it).webAddress(), (*it).task() ); @@ -537,24 +537,24 @@ void TDERadioAboutWidget::setAboutData(const TDEAboutData &_aboutData) int creditsCount = aboutData->credits().count(); if (creditsCount) { - KAboutContainer *creditsPage = + TDEAboutContainer *creditsPage = addScrolledContainerPage( i18n("&Thanks To") ); - TQValueList::ConstIterator it = aboutData->credits().begin(); - TQValueList::ConstIterator end = aboutData->credits().end(); + TQValueList::ConstIterator it = aboutData->credits().begin(); + TQValueList::ConstIterator end = aboutData->credits().end(); for (; it != end; ++it) { creditsPage->addPerson( (*it).name(), (*it).emailAddress(), (*it).webAddress(), (*it).task() ); } } - const TQValueList translatorList = aboutData->translators(); + const TQValueList translatorList = aboutData->translators(); if(translatorList.count() > 0) { - KAboutContainer *translatorPage = + TDEAboutContainer *translatorPage = addScrolledContainerPage( i18n("T&ranslation") ); - TQValueList::ConstIterator it = translatorList.begin(); - TQValueList::ConstIterator end = translatorList.end(); + TQValueList::ConstIterator it = translatorList.begin(); + TQValueList::ConstIterator end = translatorList.end(); for(; it != end; ++it) { translatorPage->addPerson((*it).name(), (*it).emailAddress(), 0,0); diff --git a/tderadio3/src/include/aboutwidget.h b/tderadio3/src/include/aboutwidget.h index 4636868..a0b3fe7 100644 --- a/tderadio3/src/include/aboutwidget.h +++ b/tderadio3/src/include/aboutwidget.h @@ -25,13 +25,13 @@ #include -/* Unfortunately KDE doesn't provide the class KAboutContainerBase +/* Unfortunately KDE doesn't provide the class TDEAboutContainerBase to public programming, so we have to copy most of that code into an own class :( */ class TQFrame; -class KAboutContainer; +class TDEAboutContainer; class TQTabWidget; class TQVBoxLayout; class TDEAboutData; @@ -69,7 +69,7 @@ class TDERadioImageTrackLabel : public TQLabel }; // copied (and renamed) from kaboutdialog_private.h -// original: KAboutContainerBase +// original: TDEAboutContainerBase class TDERadioAboutWidget : public TQWidget { @@ -109,14 +109,14 @@ class TDERadioAboutWidget : public TQWidget bool richText=false, int numLines=10 ); TQFrame *addLicensePage( const TQString &title, const TQString &text, int numLines=10 ); - KAboutContainer *addContainerPage( const TQString &title, + TDEAboutContainer *addContainerPage( const TQString &title, int childAlignment = AlignCenter, int innerAlignment = AlignCenter ); - KAboutContainer *addScrolledContainerPage( const TQString &title, + TDEAboutContainer *addScrolledContainerPage( const TQString &title, int childAlignment = AlignCenter, int innerAlignment = AlignCenter ); TQFrame *addEmptyPage( const TQString &title ); - KAboutContainer *addContainer( int childAlignment, int innerAlignment ); + TDEAboutContainer *addContainer( int childAlignment, int innerAlignment ); public slots: virtual void slotMouseTrack( int mode, const TQMouseEvent *e ); diff --git a/tderadio3/src/include/pluginmanager.h b/tderadio3/src/include/pluginmanager.h index 106b884..3bf13f4 100644 --- a/tderadio3/src/include/pluginmanager.h +++ b/tderadio3/src/include/pluginmanager.h @@ -34,7 +34,7 @@ class PluginManagerConfiguration; class TQWidget; class TDEConfig; class TQFrame; -class KAboutDialog; +class TDEAboutDialog; class KDialogBase; struct ConfigPageInfo; -- cgit v1.2.3