From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:05 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- tdeui/kaboutapplication.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tdeui/kaboutapplication.cpp') diff --git a/tdeui/kaboutapplication.cpp b/tdeui/kaboutapplication.cpp index 8d5828960..4be70c48c 100644 --- a/tdeui/kaboutapplication.cpp +++ b/tdeui/kaboutapplication.cpp @@ -43,7 +43,7 @@ KAboutApplication::KAboutApplication( TQWidget *parent, const char *name, buildDialog(KGlobal::instance()->aboutData()); } -KAboutApplication::KAboutApplication( const KAboutData *aboutData, TQWidget *parent, +KAboutApplication::KAboutApplication( const TDEAboutData *aboutData, TQWidget *parent, const char *name, bool modal ) :KAboutDialog( AbtTabbed|AbtProduct, aboutData->programName(), Close, Close, parent, name, modal ) @@ -51,7 +51,7 @@ KAboutApplication::KAboutApplication( const KAboutData *aboutData, TQWidget *par buildDialog(aboutData); } -void KAboutApplication::buildDialog( const KAboutData *aboutData ) +void KAboutApplication::buildDialog( const TDEAboutData *aboutData ) { if( !aboutData ) { @@ -65,7 +65,7 @@ void KAboutApplication::buildDialog( const KAboutData *aboutData ) TQString appPageText = i18n("No information available.\n" - "The supplied KAboutData object does not exist."); + "The supplied TDEAboutData object does not exist."); TQLabel *appPageLabel = new TQLabel( "\n\n\n\n"+appPageText+"\n\n\n\n", 0 ); appPage->addWidget( appPageLabel ); return; @@ -172,7 +172,7 @@ void KAboutApplication::buildDialog( const KAboutData *aboutData ) .arg((*it).emailAddress()); } - text += KAboutData::aboutTranslationTeam() + ""; + text += TDEAboutData::aboutTranslationTeam() + ""; addTextPage( i18n("T&ranslation"), text, true); } -- cgit v1.2.1