diff options
Diffstat (limited to 'ksim/monitors/snmp')
| -rw-r--r-- | ksim/monitors/snmp/browsedialog.cpp | 18 | ||||
| -rw-r--r-- | ksim/monitors/snmp/browsedialogbase.ui | 4 | ||||
| -rw-r--r-- | ksim/monitors/snmp/configpage.cpp | 36 | ||||
| -rw-r--r-- | ksim/monitors/snmp/hostdialogbase.ui | 4 | ||||
| -rw-r--r-- | ksim/monitors/snmp/monitor.cpp | 2 | ||||
| -rw-r--r-- | ksim/monitors/snmp/monitorconfig.cpp | 6 | ||||
| -rw-r--r-- | ksim/monitors/snmp/monitordialogbase.ui | 4 | ||||
| -rw-r--r-- | ksim/monitors/snmp/pdu.cpp | 2 | ||||
| -rw-r--r-- | ksim/monitors/snmp/probedialog.cpp | 12 | ||||
| -rw-r--r-- | ksim/monitors/snmp/walker.cpp | 2 |
10 files changed, 45 insertions, 45 deletions
diff --git a/ksim/monitors/snmp/browsedialog.cpp b/ksim/monitors/snmp/browsedialog.cpp index 6a4381d..3aeb2b1 100644 --- a/ksim/monitors/snmp/browsedialog.cpp +++ b/ksim/monitors/snmp/browsedialog.cpp @@ -95,11 +95,11 @@ void BrowseDialog::startWalk( const Identifier &startOid ) { stopWalker(); - m_walker = new Walker( m_host, startOid, TQT_TQOBJECT(this) ); - connect( m_walker, TQT_SIGNAL( resultReady( const Walker::Result & ) ), - this, TQT_SLOT( insertBrowseItem( const Walker::Result & ) ) ); - connect( m_walker, TQT_SIGNAL( finished() ), - this, TQT_SLOT( nextWalk() ) ); + m_walker = new Walker( m_host, startOid, this ); + connect( m_walker, TQ_SIGNAL( resultReady( const Walker::Result & ) ), + this, TQ_SLOT( insertBrowseItem( const Walker::Result & ) ) ); + connect( m_walker, TQ_SIGNAL( finished() ), + this, TQ_SLOT( nextWalk() ) ); stop->setEnabled( true ); } @@ -109,10 +109,10 @@ void BrowseDialog::stopWalker() if ( !m_walker ) return; - disconnect( m_walker, TQT_SIGNAL( resultReady( const Walker::Result & ) ), - this, TQT_SLOT( insertBrowseItem( const Walker::Result & ) ) ); - disconnect( m_walker, TQT_SIGNAL( finished() ), - this, TQT_SLOT( nextWalk() ) ); + disconnect( m_walker, TQ_SIGNAL( resultReady( const Walker::Result & ) ), + this, TQ_SLOT( insertBrowseItem( const Walker::Result & ) ) ); + disconnect( m_walker, TQ_SIGNAL( finished() ), + this, TQ_SLOT( nextWalk() ) ); m_walker->deleteLater(); m_walker = 0; diff --git a/ksim/monitors/snmp/browsedialogbase.ui b/ksim/monitors/snmp/browsedialogbase.ui index 103537a..94255e7 100644 --- a/ksim/monitors/snmp/browsedialogbase.ui +++ b/ksim/monitors/snmp/browsedialogbase.ui @@ -251,11 +251,11 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot access="protected">stopAllWalks()</slot> <slot access="protected">applyFilter()</slot> <slot access="protected">objectSelected(TQListViewItem *)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in declaration">kdialog.h</include> diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp index e1dfcca..4ecd44e 100644 --- a/ksim/monitors/snmp/configpage.cpp +++ b/ksim/monitors/snmp/configpage.cpp @@ -50,24 +50,24 @@ ConfigPage::ConfigPage( Plugin *parent, const char *name ) m_page = new ConfigWidget( this ); - connect( m_page->addHost, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( addNewHost() ) ); - connect( m_page->modifyHost, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( modifyHost() ) ); - connect( m_page->removeHost, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeHost() ) ); - - connect( m_page->addMonitor, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( addNewMonitor() ) ); - connect( m_page->modifyMonitor, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( modifyMonitor() ) ); - connect( m_page->removeMonitor, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeMonitor() ) ); - - connect( m_page->hosts, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( disableOrEnableSomeWidgets() ) ); - connect( m_page->monitors, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( disableOrEnableSomeWidgets() ) ); + connect( m_page->addHost, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( addNewHost() ) ); + connect( m_page->modifyHost, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( modifyHost() ) ); + connect( m_page->removeHost, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeHost() ) ); + + connect( m_page->addMonitor, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( addNewMonitor() ) ); + connect( m_page->modifyMonitor, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( modifyMonitor() ) ); + connect( m_page->removeMonitor, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeMonitor() ) ); + + connect( m_page->hosts, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( disableOrEnableSomeWidgets() ) ); + connect( m_page->monitors, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( disableOrEnableSomeWidgets() ) ); } ConfigPage::~ConfigPage() diff --git a/ksim/monitors/snmp/hostdialogbase.ui b/ksim/monitors/snmp/hostdialogbase.ui index d02104d..650e262 100644 --- a/ksim/monitors/snmp/hostdialogbase.ui +++ b/ksim/monitors/snmp/hostdialogbase.ui @@ -508,12 +508,12 @@ <tabstop>buttonCancel</tabstop> <tabstop>communityString</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="private">showSnmpAuthenticationDetailsForVersion(const TQString &)</slot> <slot>enableDisabledAuthenticationAndPrivacyElementsForSecurityLevel(const TQString &)</slot> <slot>checkValidity()</slot> <slot access="protected">testHost()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in declaration">kdialog.h</include> diff --git a/ksim/monitors/snmp/monitor.cpp b/ksim/monitors/snmp/monitor.cpp index aa645cf..1294c10 100644 --- a/ksim/monitors/snmp/monitor.cpp +++ b/ksim/monitors/snmp/monitor.cpp @@ -32,7 +32,7 @@ Monitor::Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQ else m_timerId = -1; - TQTimer::singleShot( 0, this, TQT_SLOT( performSnmpRequest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( performSnmpRequest() ) ); } Monitor::~Monitor() diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp index 6f6575d..4e42bda 100644 --- a/ksim/monitors/snmp/monitorconfig.cpp +++ b/ksim/monitors/snmp/monitorconfig.cpp @@ -107,9 +107,9 @@ TQWidget *MonitorConfig::createMonitorWidget( TQWidget *parent, const char *name else w = new ChartMonitor( *this, parent, name ); - Monitor *monitor = new Monitor( host, id, refresh, TQT_TQOBJECT(w) ); - TQObject::connect( monitor, TQT_SIGNAL( newData( const Value & ) ), - w, TQT_SLOT( setData( const Value & ) ) ); + Monitor *monitor = new Monitor( host, id, refresh, w ); + TQObject::connect( monitor, TQ_SIGNAL( newData( const Value & ) ), + w, TQ_SLOT( setData( const Value & ) ) ); return w; } diff --git a/ksim/monitors/snmp/monitordialogbase.ui b/ksim/monitors/snmp/monitordialogbase.ui index a6d2e2d..285514f 100644 --- a/ksim/monitors/snmp/monitordialogbase.ui +++ b/ksim/monitors/snmp/monitordialogbase.ui @@ -428,10 +428,10 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">checkValues()</slot> <slot access="protected">browse()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in declaration">kdialog.h</include> diff --git a/ksim/monitors/snmp/pdu.cpp b/ksim/monitors/snmp/pdu.cpp index e06539a..9ad1110 100644 --- a/ksim/monitors/snmp/pdu.cpp +++ b/ksim/monitors/snmp/pdu.cpp @@ -48,7 +48,7 @@ PDU::~PDU() void PDU::addNullVariables( const IdentifierList &oids ) { std::for_each( oids.begin(), oids.end(), - std::bind1st( std::mem_fun( &PDU::addNullVariable ), this ) ); + std::bind( std::mem_fn( &PDU::addNullVariable ), this, std::placeholders::_1 ) ); } void PDU::addNullVariable( Identifier oid ) diff --git a/ksim/monitors/snmp/probedialog.cpp b/ksim/monitors/snmp/probedialog.cpp index 489080e..2c9e930 100644 --- a/ksim/monitors/snmp/probedialog.cpp +++ b/ksim/monitors/snmp/probedialog.cpp @@ -77,12 +77,12 @@ void ProbeDialog::probeOne() Identifier oid = m_probeOIDs.pop(); delete m_currentMonitor; - m_currentMonitor = new Monitor( m_host, oid, 0 /* no refresh */, TQT_TQOBJECT(this) ); + m_currentMonitor = new Monitor( m_host, oid, 0 /* no refresh */, this ); - connect( m_currentMonitor, TQT_SIGNAL( newData( const Identifier &, const Value & ) ), - this, TQT_SLOT( probeResult( const Identifier &, const Value & ) ) ); - connect( m_currentMonitor, TQT_SIGNAL( error( const Identifier &, const ErrorInfo & ) ), - this, TQT_SLOT( probeError( const Identifier &, const ErrorInfo & ) ) ); + connect( m_currentMonitor, TQ_SIGNAL( newData( const Identifier &, const Value & ) ), + this, TQ_SLOT( probeResult( const Identifier &, const Value & ) ) ); + connect( m_currentMonitor, TQ_SIGNAL( error( const Identifier &, const ErrorInfo & ) ), + this, TQ_SLOT( probeError( const Identifier &, const ErrorInfo & ) ) ); } void ProbeDialog::probeResult( const Identifier &oid, const Value &value ) @@ -108,7 +108,7 @@ void ProbeDialog::nextProbe() if ( m_canceled ) KProgressDialog::done( TQDialog::Rejected ); else - TQTimer::singleShot( 0, this, TQT_SLOT( probeOne() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( probeOne() ) ); } #include "probedialog.moc" diff --git a/ksim/monitors/snmp/walker.cpp b/ksim/monitors/snmp/walker.cpp index 81a36f4..c74097b 100644 --- a/ksim/monitors/snmp/walker.cpp +++ b/ksim/monitors/snmp/walker.cpp @@ -29,7 +29,7 @@ using namespace KSim::Snmp; namespace { template <class T> - struct Deleter : public std::unary_function<T, void> + struct Deleter : public std::function<void(T)> { void operator()( T arg ) { delete arg; } |
