Rename a number of classes to enhance compatibility with KDE4

1 files changed, 9 insertions, 9 deletions

diff --git a/karm/kaccelmenuwatch.cpp b/karm/kaccelmenuwatch.cpp
index ddabb1d86..4b5952848 100644
--- a/karm/kaccelmenuwatch.cpp
+++ b/karm/kaccelmenuwatch.cpp
@@ -1,5 +1,5 @@
 /*
-* kaccelmenuwatch.cpp -- Implementation of class KAccelMenuWatch.
+* kaccelmenuwatch.cpp -- Implementation of class TDEAccelMenuWatch.
 * Author:    Sirtaj Singh Kang
 * Generated: Thu Jan  7 15:05:26 EST 1999
 */
@@ -9,7 +9,7 @@
 
 #include "kaccelmenuwatch.h"
 
-KAccelMenuWatch::KAccelMenuWatch( KAccel *accel, TQObject *parent )
+TDEAccelMenuWatch::TDEAccelMenuWatch( TDEAccel *accel, TQObject *parent )
   : TQObject( parent ),
   _accel( accel ),
   _menu ( 0 )
@@ -18,7 +18,7 @@ KAccelMenuWatch::KAccelMenuWatch( KAccel *accel, TQObject *parent )
   _menuList.setAutoDelete( false );
 }
 
-void KAccelMenuWatch::setMenu( TQPopupMenu *menu )
+void TDEAccelMenuWatch::setMenu( TQPopupMenu *menu )
 {
   assert( menu );
 
@@ -33,19 +33,19 @@ void KAccelMenuWatch::setMenu( TQPopupMenu *menu )
   _menu = menu;
 }
 
-void KAccelMenuWatch::connectAccel( int itemId, const char *action )
+void TDEAccelMenuWatch::connectAccel( int itemId, const char *action )
 {
   AccelItem *item = newAccelItem( _menu, itemId, StringAccel ) ;
   item->action  = TQString::fromLocal8Bit( action );
 }
 
-void KAccelMenuWatch::connectAccel( int itemId, KStdAccel::StdAccel accel )
+void TDEAccelMenuWatch::connectAccel( int itemId, TDEStdAccel::StdAccel accel )
 {
   AccelItem *item = newAccelItem( _menu, itemId, StdAccel ) ;
   item->stdAction  = accel;
 }
 
-void KAccelMenuWatch::updateMenus()
+void TDEAccelMenuWatch::updateMenus()
 {
   assert( _accel != 0 );
 
@@ -60,7 +60,7 @@ void KAccelMenuWatch::updateMenus()
         item->menu->setAccel( _accel->shortcut( item->action ).keyCodeQt(), item->itemId );
         break;
       case StdAccel:
-        item->menu->setAccel( KStdAccel::shortcut( item->stdAction ).keyCodeQt(), item->itemId );
+        item->menu->setAccel( TDEStdAccel::shortcut( item->stdAction ).keyCodeQt(), item->itemId );
         break;
       default:
         break;
@@ -69,7 +69,7 @@ void KAccelMenuWatch::updateMenus()
 
 }
 
-void KAccelMenuWatch::removeDeadMenu()
+void TDEAccelMenuWatch::removeDeadMenu()
 {
   TQPopupMenu *sdr = (TQPopupMenu *) sender();
   assert( sdr );
@@ -96,7 +96,7 @@ loop:
   return;
 }
 
-KAccelMenuWatch::AccelItem *KAccelMenuWatch::newAccelItem( TQPopupMenu *,
+TDEAccelMenuWatch::AccelItem *TDEAccelMenuWatch::newAccelItem( TQPopupMenu *,
     int itemId, AccelType type )
 {
   AccelItem *item = new AccelItem;