From a0ecb16bd8b535b21f93568d7ebac09c11b0d365 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 17 Dec 2023 20:55:11 +0900 Subject: [PATCH] Replace various '#define' strings - part 6 Signed-off-by: Michele Calgaro --- src/knutmainwindow.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/knutmainwindow.cpp b/src/knutmainwindow.cpp index e9ebfec..2f2537f 100644 --- a/src/knutmainwindow.cpp +++ b/src/knutmainwindow.cpp @@ -728,7 +728,7 @@ void KNutMainWindow::initToolBar ( void ) { TQLabel *upsNazev = new TQLabel ("UPS : ",toolBar("mainToolBar")); // upsNazev is connected on toolBaar, dosn't need to call desctructor toolBar ("mainToolBar")->insertWidget (0,upsNazev->sizeHint().width(),upsNazev); - toolBar ("mainToolBar")->insertCombo("",1,false, TQT_SIGNAL (activated (const TQString &)),TQT_TQOBJECT(this), TQT_SLOT (slotChangeUPS (const TQString &))); + toolBar ("mainToolBar")->insertCombo("",1,false, TQT_SIGNAL (activated (const TQString &)),this, TQT_SLOT (slotChangeUPS (const TQString &))); // bude se pouze vybirat-------------------^^^ KComboBox *combo = toolBar("mainToolBar")->getCombo(1); combo->clear(); @@ -741,16 +741,16 @@ void KNutMainWindow::initToolBar ( void ) { void KNutMainWindow::initAction ( void ) { // TDEAction and KStdAction must be to make before command createGUI, function initToolBar is runed after create GUI - m_quit = KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT (slotCloseKnutClient()), actionCollection()); + m_quit = KStdAction::quit (this, TQT_SLOT (slotCloseKnutClient()), actionCollection()); m_quit->setStatusText(i18n("Quits the application")); - m_preferencesUps = KStdAction::preferences (TQT_TQOBJECT(this), TQT_SLOT (slotPreferencesUps()), actionCollection(),"options_configure"); - new TDEAction(i18n("&Showing UPS variables and commands"),0,TQT_TQOBJECT(this), TQT_SLOT(slotPrintUPSVars()),actionCollection(),"printupsvars"); - new TDEAction(i18n("&Running instant commands"),0,TQT_TQOBJECT(this), TQT_SLOT(slotInstComms()),actionCollection(),"instcomms"); - new TDEAction(i18n("Setting R&W variables"),0,TQT_TQOBJECT(this), TQT_SLOT(slotRWVars()),actionCollection(),"rwvars"); + m_preferencesUps = KStdAction::preferences (this, TQT_SLOT (slotPreferencesUps()), actionCollection(),"options_configure"); + new TDEAction(i18n("&Showing UPS variables and commands"),0,this, TQT_SLOT(slotPrintUPSVars()),actionCollection(),"printupsvars"); + new TDEAction(i18n("&Running instant commands"),0,this, TQT_SLOT(slotInstComms()),actionCollection(),"instcomms"); + new TDEAction(i18n("Setting R&W variables"),0,this, TQT_SLOT(slotRWVars()),actionCollection(),"rwvars"); /////////////////// -// KStdAction::showToolbar (TQT_TQOBJECT(this), TQT_SLOT (slotShowToolBar()), actionCollection()); +// KStdAction::showToolbar (this, TQT_SLOT (slotShowToolBar()), actionCollection()); // setStandardToolBarMenuEnabled(true); since KDE version 3.1 // since version 3.1 @@ -760,25 +760,25 @@ void KNutMainWindow::initAction ( void ) { #if TDE_VERSION_MINOR >= 1 setStandardToolBarMenuEnabled(true); #else - KStdAction::showToolbar (TQT_TQOBJECT(this), TQT_SLOT (slotShowToolBar()), actionCollection()); + KStdAction::showToolbar (this, TQT_SLOT (slotShowToolBar()), actionCollection()); #endif #else - KStdAction::showToolbar (TQT_TQOBJECT(this), TQT_SLOT (slotShowToolBar()), actionCollection()); + KStdAction::showToolbar (this, TQT_SLOT (slotShowToolBar()), actionCollection()); #endif #else - KStdAction::showToolbar (TQT_TQOBJECT(this), TQT_SLOT (slotShowToolBar()), actionCollection()); + KStdAction::showToolbar (this, TQT_SLOT (slotShowToolBar()), actionCollection()); #endif #else - KStdAction::showToolbar (TQT_TQOBJECT(this), TQT_SLOT (slotShowToolBar()), actionCollection()); + KStdAction::showToolbar (this, TQT_SLOT (slotShowToolBar()), actionCollection()); #endif - KStdAction::showStatusbar (TQT_TQOBJECT(this), TQT_SLOT (slotShowStatusBar()), actionCollection()); + KStdAction::showStatusbar (this, TQT_SLOT (slotShowStatusBar()), actionCollection()); - m_descriptionAction = new TDEToggleAction(i18n("&Using descriptions"),0,TQT_TQOBJECT(this), TQT_SLOT(slotDescription()),actionCollection(),"use_description"); + m_descriptionAction = new TDEToggleAction(i18n("&Using descriptions"),0,this, TQT_SLOT(slotDescription()),actionCollection(),"use_description"); - KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()),actionCollection()); - new TDEAction (i18n("Reconnect"),"reload",Key_F5,TQT_TQOBJECT(this), TQT_SLOT(slotRefreshConnection()),actionCollection(),"reconnect"); + KStdAction::keyBindings( this, TQT_SLOT(slotConfigureKeys()),actionCollection()); + new TDEAction (i18n("Reconnect"),"reload",Key_F5,this, TQT_SLOT(slotRefreshConnection()),actionCollection(),"reconnect"); } void KNutMainWindow::initVars ( void ) {