summaryrefslogtreecommitdiffstats
path: root/tdeui/khelpmenu.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:13:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:13:01 -0600
commitdeac2ca49faed824fe83066080714eb6d653615b (patch)
tree8b5bf97c5acaaf5285985b87fa76dbea0f35e4fa /tdeui/khelpmenu.cpp
parent0c9d97065a3d6ceb12d687555a1a33d90db96238 (diff)
downloadtdelibs-deac2ca49faed824fe83066080714eb6d653615b.tar.gz
tdelibs-deac2ca49faed824fe83066080714eb6d653615b.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'tdeui/khelpmenu.cpp')
-rw-r--r--tdeui/khelpmenu.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp
index 0faa137e4..33e6210ff 100644
--- a/tdeui/khelpmenu.cpp
+++ b/tdeui/khelpmenu.cpp
@@ -75,7 +75,7 @@ KHelpMenu::KHelpMenu( TQWidget *parent, const TQString &aboutAppText,
}
KHelpMenu::KHelpMenu( TQWidget *parent, const TDEAboutData *aboutData,
- bool showWhatsThis, KActionCollection *actions )
+ bool showWhatsThis, TDEActionCollection *actions )
: TQObject(parent), mMenu(0), mAboutApp(0), mAboutKDE(0), mBugReport(0),
d(new KHelpMenuPrivate)
{
@@ -109,7 +109,7 @@ KHelpMenu::~KHelpMenu()
}
-KPopupMenu* KHelpMenu::menu()
+TDEPopupMenu* KHelpMenu::menu()
{
if( !mMenu )
{
@@ -121,20 +121,20 @@ KPopupMenu* KHelpMenu::menu()
const TDEAboutData *aboutData = d->mAboutData ? d->mAboutData : TDEGlobal::instance()->aboutData();
TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(tqApp->name());
- mMenu = new KPopupMenu();
+ mMenu = new TDEPopupMenu();
connect( mMenu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(menuDestroyed()));
bool need_separator = false;
- if (kapp->authorizeKAction("help_contents"))
+ if (kapp->authorizeTDEAction("help_contents"))
{
mMenu->insertItem( BarIcon( "contents", KIcon::SizeSmall),
TQString(i18n( "%1 &Handbook" ).arg( appName)) ,menuHelpContents );
mMenu->connectItem( menuHelpContents, this, TQT_SLOT(appHelpActivated()) );
- mMenu->setAccel( KStdAccel::shortcut(KStdAccel::Help), menuHelpContents );
+ mMenu->setAccel( TDEStdAccel::shortcut(TDEStdAccel::Help), menuHelpContents );
need_separator = true;
}
- if( mShowWhatsThis && kapp->authorizeKAction("help_whats_this") )
+ if( mShowWhatsThis && kapp->authorizeTDEAction("help_whats_this") )
{
TQToolButton* wtb = TQWhatsThis::whatsThisButton(0);
mMenu->insertItem( wtb->iconSet(),i18n( "What's &This" ), menuWhatsThis);
@@ -144,7 +144,7 @@ KPopupMenu* KHelpMenu::menu()
need_separator = true;
}
- if (kapp->authorizeKAction("help_report_bug") && aboutData && !aboutData->bugAddress().isEmpty() )
+ if (kapp->authorizeTDEAction("help_report_bug") && aboutData && !aboutData->bugAddress().isEmpty() )
{
if (need_separator)
mMenu->insertSeparator();
@@ -153,7 +153,7 @@ KPopupMenu* KHelpMenu::menu()
need_separator = true;
}
- if (kapp->authorizeKAction("switch_application_language"))
+ if (kapp->authorizeTDEAction("switch_application_language"))
{
if (need_separator)
mMenu->insertSeparator();
@@ -165,14 +165,14 @@ KPopupMenu* KHelpMenu::menu()
if (need_separator)
mMenu->insertSeparator();
- if (kapp->authorizeKAction("help_about_app"))
+ if (kapp->authorizeTDEAction("help_about_app"))
{
mMenu->insertItem( kapp->miniIcon(),
TQString(i18n( "&About %1" ).arg(appName)), menuAboutApp );
mMenu->connectItem( menuAboutApp, this, TQT_SLOT( aboutApplication() ) );
}
- if (kapp->authorizeKAction("help_about_kde"))
+ if (kapp->authorizeTDEAction("help_about_kde"))
{
mMenu->insertItem( SmallIcon("about_kde"), i18n( "About &Trinity" ), menuAboutKDE );
mMenu->connectItem( menuAboutKDE, this, TQT_SLOT( aboutKDE() ) );