Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit a0ecb16bd8)
r14.1.x
Michele Calgaro 6 months ago
parent 017c57ddb9
commit 334246ae30
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -728,7 +728,7 @@ void KNutMainWindow::initToolBar ( void ) {
TQLabel *upsNazev = new TQLabel ("UPS : ",toolBar("mainToolBar")); TQLabel *upsNazev = new TQLabel ("UPS : ",toolBar("mainToolBar"));
// upsNazev is connected on toolBaar, dosn't need to call desctructor // upsNazev is connected on toolBaar, dosn't need to call desctructor
toolBar ("mainToolBar")->insertWidget (0,upsNazev->sizeHint().width(),upsNazev); 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-------------------^^^ // bude se pouze vybirat-------------------^^^
KComboBox *combo = toolBar("mainToolBar")->getCombo(1); KComboBox *combo = toolBar("mainToolBar")->getCombo(1);
combo->clear(); combo->clear();
@ -741,16 +741,16 @@ void KNutMainWindow::initToolBar ( void ) {
void KNutMainWindow::initAction ( void ) { void KNutMainWindow::initAction ( void ) {
// TDEAction and KStdAction must be to make before command createGUI, function initToolBar is runed after create GUI // 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_quit->setStatusText(i18n("Quits the application"));
m_preferencesUps = KStdAction::preferences (TQT_TQOBJECT(this), TQT_SLOT (slotPreferencesUps()), actionCollection(),"options_configure"); m_preferencesUps = KStdAction::preferences (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("&Showing UPS variables and commands"),0,this, TQT_SLOT(slotPrintUPSVars()),actionCollection(),"printupsvars");
new TDEAction(i18n("&Running instant commands"),0,TQT_TQOBJECT(this), TQT_SLOT(slotInstComms()),actionCollection(),"instcomms"); new TDEAction(i18n("&Running instant commands"),0,this, TQT_SLOT(slotInstComms()),actionCollection(),"instcomms");
new TDEAction(i18n("Setting R&W variables"),0,TQT_TQOBJECT(this), TQT_SLOT(slotRWVars()),actionCollection(),"rwvars"); 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 // setStandardToolBarMenuEnabled(true); since KDE version 3.1
// since version 3.1 // since version 3.1
@ -760,25 +760,25 @@ void KNutMainWindow::initAction ( void ) {
#if TDE_VERSION_MINOR >= 1 #if TDE_VERSION_MINOR >= 1
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);
#else #else
KStdAction::showToolbar (TQT_TQOBJECT(this), TQT_SLOT (slotShowToolBar()), actionCollection()); KStdAction::showToolbar (this, TQT_SLOT (slotShowToolBar()), actionCollection());
#endif #endif
#else #else
KStdAction::showToolbar (TQT_TQOBJECT(this), TQT_SLOT (slotShowToolBar()), actionCollection()); KStdAction::showToolbar (this, TQT_SLOT (slotShowToolBar()), actionCollection());
#endif #endif
#else #else
KStdAction::showToolbar (TQT_TQOBJECT(this), TQT_SLOT (slotShowToolBar()), actionCollection()); KStdAction::showToolbar (this, TQT_SLOT (slotShowToolBar()), actionCollection());
#endif #endif
#else #else
KStdAction::showToolbar (TQT_TQOBJECT(this), TQT_SLOT (slotShowToolBar()), actionCollection()); KStdAction::showToolbar (this, TQT_SLOT (slotShowToolBar()), actionCollection());
#endif #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()); KStdAction::keyBindings( this, TQT_SLOT(slotConfigureKeys()),actionCollection());
new TDEAction (i18n("Reconnect"),"reload",Key_F5,TQT_TQOBJECT(this), TQT_SLOT(slotRefreshConnection()),actionCollection(),"reconnect"); new TDEAction (i18n("Reconnect"),"reload",Key_F5,this, TQT_SLOT(slotRefreshConnection()),actionCollection(),"reconnect");
} }
void KNutMainWindow::initVars ( void ) { void KNutMainWindow::initVars ( void ) {

Loading…
Cancel
Save