diff options
| -rw-r--r-- | src/knutmainwindow.cpp | 24 | ||||
| -rw-r--r-- | src/knutnet.cpp | 20 |
2 files changed, 3 insertions, 41 deletions
diff --git a/src/knutmainwindow.cpp b/src/knutmainwindow.cpp index 3cd00f8..45b22cc 100644 --- a/src/knutmainwindow.cpp +++ b/src/knutmainwindow.cpp @@ -748,29 +748,7 @@ void KNutMainWindow::initAction ( void ) { new TDEAction(i18n("&Running instant commands"),0,this, TQ_SLOT(slotInstComms()),actionCollection(),"instcomms"); new TDEAction(i18n("Setting R&W variables"),0,this, TQ_SLOT(slotRWVars()),actionCollection(),"rwvars"); -/////////////////// -// KStdAction::showToolbar (this, TQ_SLOT (slotShowToolBar()), actionCollection()); -// setStandardToolBarMenuEnabled(true); since KDE version 3.1 - -// since version 3.1 - #if defined (TDE_VERSION_MAJOR) - #if TDE_VERSION_MAJOR >= 3 - #if defined (TDE_VERSION_MINOR) - #if TDE_VERSION_MINOR >= 1 - setStandardToolBarMenuEnabled(true); - #else - KStdAction::showToolbar (this, TQ_SLOT (slotShowToolBar()), actionCollection()); - #endif - #else - KStdAction::showToolbar (this, TQ_SLOT (slotShowToolBar()), actionCollection()); - #endif - #else - KStdAction::showToolbar (this, TQ_SLOT (slotShowToolBar()), actionCollection()); - #endif - #else - KStdAction::showToolbar (this, TQ_SLOT (slotShowToolBar()), actionCollection()); - #endif - + setStandardToolBarMenuEnabled(true); KStdAction::showStatusbar (this, TQ_SLOT (slotShowStatusBar()), actionCollection()); diff --git a/src/knutnet.cpp b/src/knutnet.cpp index 6db0688..d2a18aa 100644 --- a/src/knutnet.cpp +++ b/src/knutnet.cpp @@ -446,15 +446,7 @@ TQString KNutNet::readEnumValueVar (const TQString name, const int valueNumber) m_error =0; if (m_state == Connected) { -// #if defined (TDE_VERSION_MAJOR) -// #if TDE_VERSION_MAJOR >= 3 - TQValueVector<upsVarDef>::const_iterator it; -// #else -// TQValueList<upsVar>::ConstIterator it; -// #endif -// #else -// TQValueList<upsVar>::ConstIterator it; -// #endif + TQValueVector<upsVarDef>::const_iterator it; for (it = m_listVars.begin(); it != m_listVars.end(); it++) { @@ -966,15 +958,7 @@ void KNutNet::upsSetType (struct upsVarDef& upsVar, const TQString name, const T void KNutNet::deleteVars (void) { -// #if defined (TDE_VERSION_MAJOR) -// #if TDE_VERSION_MAJOR >= 3 - TQValueVector<upsVarDef>::iterator it; -// #else -// TQValueList<upsVar>::Iterator it; -// #endif -// #else -// TQValueList<upsVar>::Iterator it; -// #endif + TQValueVector<upsVarDef>::iterator it; for (it = m_listVars.begin(); it != m_listVars.end(); it++) { if ((*it).upsEnumValues != 0) { (*it).upsEnumValues->clear(); |