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/khelpmenu.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tdeui/khelpmenu.cpp') diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp index 071db1248..670439444 100644 --- a/tdeui/khelpmenu.cpp +++ b/tdeui/khelpmenu.cpp @@ -59,7 +59,7 @@ public: delete mSwitchApplicationLanguage; } - const KAboutData *mAboutData; + const TDEAboutData *mAboutData; KSwitchLanguageDialog *mSwitchApplicationLanguage; }; @@ -74,7 +74,7 @@ KHelpMenu::KHelpMenu( TQWidget *parent, const TQString &aboutAppText, d->mAboutData = 0; } -KHelpMenu::KHelpMenu( TQWidget *parent, const KAboutData *aboutData, +KHelpMenu::KHelpMenu( TQWidget *parent, const TDEAboutData *aboutData, bool showWhatsThis, KActionCollection *actions ) : TQObject(parent), mMenu(0), mAboutApp(0), mAboutKDE(0), mBugReport(0), d(new KHelpMenuPrivate) @@ -118,7 +118,7 @@ KPopupMenu* KHelpMenu::menu() // I use hardcoded menu id's here. Reason is to stay backward // compatible. // - const KAboutData *aboutData = d->mAboutData ? d->mAboutData : KGlobal::instance()->aboutData(); + const TDEAboutData *aboutData = d->mAboutData ? d->mAboutData : KGlobal::instance()->aboutData(); TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(tqApp->name()); mMenu = new KPopupMenu(); -- cgit v1.2.1