Rename TDEApplication::kApplication() to TDEApplication::tdeApplication() and kapp to tdeApp.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 11 insertions, 11 deletions

diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp
index ad9c4d102..eaa9f244a 100644
--- a/tdeui/tdeactionclasses.cpp
+++ b/tdeui/tdeactionclasses.cpp
@@ -142,7 +142,7 @@ int TDEToggleAction::plug( TQWidget* widget, int index )
     kdWarning() << "Can not plug TDEToggleAction in " << widget->className() << endl;
     return -1;
   }
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
 
   int _index = TDEAction::plug( widget, index );
@@ -638,7 +638,7 @@ void TDESelectAction::updateItems( int id )
 
 int TDESelectAction::plug( TQWidget *widget, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
   kdDebug(129) << "TDESelectAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
   if ( ::tqt_cast<TQPopupMenu *>( widget) )
@@ -1268,7 +1268,7 @@ void TDERecentFilesAction::menuAboutToShow()
 
 int TDERecentFilesAction::plug( TQWidget *widget, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
   // This is very related to TDEActionMenu::plug.
   // In fact this class could be an interesting base class for TDEActionMenu
@@ -1524,7 +1524,7 @@ void TDEFontAction::setFont( const TQString &family )
 
 int TDEFontAction::plug( TQWidget *w, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
   if ( ::tqt_cast<TDEToolBar *>( w ) )
   {
@@ -1793,7 +1793,7 @@ void TDEActionMenu::setStickyMenu(bool sticky) {
 
 int TDEActionMenu::plug( TQWidget* widget, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
   kdDebug(129) << "TDEActionMenu::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
   if ( ::tqt_cast<TQPopupMenu *>( widget ) )
@@ -1939,7 +1939,7 @@ void TDEToolBarPopupAction::setStickyMenu(bool sticky) {
 
 int TDEToolBarPopupAction::plug( TQWidget *widget, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
   // This is very related to TDEActionMenu::plug.
   // In fact this class could be an interesting base class for TDEActionMenu
@@ -2018,7 +2018,7 @@ TDEToggleToolBarAction::~TDEToggleToolBarAction()
 
 int TDEToggleToolBarAction::plug( TQWidget* w, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
       return -1;
 
   if ( !m_toolBar ) {
@@ -2150,7 +2150,7 @@ void KWidgetAction::setAutoSized( bool autoSized )
 
 int KWidgetAction::plug( TQWidget* w, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
       return -1;
 
   if ( !::tqt_cast<TDEToolBar *>( w ) ) {
@@ -2283,7 +2283,7 @@ void TDEPasteTextAction::setMixedMode(bool mode)
 
 int TDEPasteTextAction::plug( TQWidget *widget, int index )
 {
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
   if ( ::tqt_cast<TDEToolBar *>( widget ) )
   {
@@ -2320,7 +2320,7 @@ void TDEPasteTextAction::menuAboutToShow()
 {
     m_popup->clear();
     TQStringList list;
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     if (client->isAttached() && client->isApplicationRegistered("klipper")) {
       DCOPRef klipper("klipper","klipper");
       DCOPReply reply = klipper.call("getClipboardHistoryMenu");
@@ -2346,7 +2346,7 @@ void TDEPasteTextAction::menuAboutToShow()
 
 void TDEPasteTextAction::menuItemActivated( int id)
 {
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     if (client->isAttached() && client->isApplicationRegistered("klipper")) {
       DCOPRef klipper("klipper","klipper");
       DCOPReply reply = klipper.call("getClipboardHistoryItem(int)", m_popup->indexOf(id));