1 files changed, 25 insertions, 25 deletions

diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp
index 071db1248..08755b860 100644
--- a/tdeui/khelpmenu.cpp
+++ b/tdeui/khelpmenu.cpp
@@ -27,19 +27,19 @@
 #include <tqwhatsthis.h>
 #include <tqwidget.h>
 
-#include <kaboutapplication.h>
-#include <kaboutdata.h>
-#include <kaboutkde.h>
-#include <kaction.h>
-#include <kapplication.h>
+#include <tdeaboutapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeabouttde.h>
+#include <tdeaction.h>
+#include <tdeapplication.h>
 #include <kbugreport.h>
 #include <kdialogbase.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kpopupmenu.h>
-#include <kstdaccel.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdepopupmenu.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
 
@@ -59,7 +59,7 @@ public:
         delete mSwitchApplicationLanguage;
     }
 
-    const KAboutData *mAboutData;
+    const TDEAboutData *mAboutData;
     KSwitchLanguageDialog *mSwitchApplicationLanguage;
 };
 
@@ -74,8 +74,8 @@ KHelpMenu::KHelpMenu( TQWidget *parent, const TQString &aboutAppText,
   d->mAboutData = 0;
 }
 
-KHelpMenu::KHelpMenu( TQWidget *parent, const KAboutData *aboutData,
-		      bool showWhatsThis, KActionCollection *actions )
+KHelpMenu::KHelpMenu( TQWidget *parent, const TDEAboutData *aboutData,
+		      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 )
   {
@@ -118,23 +118,23 @@ 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 : 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),
+      mMenu->insertItem( BarIcon( "contents", TDEIcon::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() ) );
@@ -196,7 +196,7 @@ void KHelpMenu::aboutApplication()
   {
     if( !mAboutApp )
     {
-      mAboutApp = new KAboutApplication( d->mAboutData, mParent, "about", false );
+      mAboutApp = new TDEAboutApplication( d->mAboutData, mParent, "about", false );
       connect( mAboutApp, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) );
     }
     mAboutApp->show();
@@ -238,7 +238,7 @@ void KHelpMenu::aboutKDE()
 {
   if( !mAboutKDE )
   {
-    mAboutKDE = new KAboutKDE( mParent, "aboutkde", false );
+    mAboutKDE = new TDEAboutKDE( mParent, "aboutkde", false );
     connect( mAboutKDE, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) );
   }
   mAboutKDE->show();