Replace various '#define' strings - part 6

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

2 files changed, 16 insertions, 16 deletions

diff --git a/kandy/src/kandy.cpp b/kandy/src/kandy.cpp
index 13bd4ff6b..47c16d7d8 100644
--- a/kandy/src/kandy.cpp
+++ b/kandy/src/kandy.cpp
@@ -123,25 +123,25 @@ void Kandy::save(const TQString & filename)
 
 void Kandy::setupActions()
 {
-  KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
-  KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection());
-  KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection());
-//  KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(filePrint()), actionCollection());
-  KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+  KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
+  KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection());
+  KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection());
+//  KStdAction::print(this, TQT_SLOT(filePrint()), actionCollection());
+  KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
 
   createStandardStatusBarAction();
   setStandardToolBarMenuEnabled(true);
     
-  KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
-  KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
-  KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection());
+  KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
+  KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+  KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
 
-  new TDEAction(i18n("Mobile GUI"),0,TQT_TQOBJECT(this),TQT_SLOT(showMobileGui()),
+  new TDEAction(i18n("Mobile GUI"),0,this,TQT_SLOT(showMobileGui()),
               actionCollection(),"show_mobilegui");
 
-  mConnectAction = new TDEAction(i18n("Connect"),0,TQT_TQOBJECT(this),TQT_SLOT(modemConnect()),
+  mConnectAction = new TDEAction(i18n("Connect"),0,this,TQT_SLOT(modemConnect()),
                                actionCollection(),"modem_connect");
-  mDisconnectAction = new TDEAction(i18n("Disconnect"),0,TQT_TQOBJECT(this),
+  mDisconnectAction = new TDEAction(i18n("Disconnect"),0,this,
                                   TQT_SLOT(modemDisconnect()),actionCollection(),
                                   "modem_disconnect");
 
diff --git a/kandy/src/mobilemain.cpp b/kandy/src/mobilemain.cpp
index 33da5f56e..497a3ec42 100644
--- a/kandy/src/mobilemain.cpp
+++ b/kandy/src/mobilemain.cpp
@@ -71,17 +71,17 @@ MobileMain::~MobileMain()
 
 void MobileMain::setupActions()
 {
-  KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
+  KStdAction::quit(this, TQT_SLOT(close()), actionCollection());
 
-  new TDEAction(i18n("Terminal"),0,TQT_TQOBJECT(this),TQT_SLOT(showTerminal()),
+  new TDEAction(i18n("Terminal"),0,this,TQT_SLOT(showTerminal()),
               actionCollection(),"show_terminal");
 
   createStandardStatusBarAction();
   setStandardToolBarMenuEnabled(true);
    
-  KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
-  KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
-  KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection());
+  KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
+  KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+  KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
 
   createGUI("kandymobileui.rc");
 }