diff options
Diffstat (limited to 'ksim/monitors')
70 files changed, 138 insertions, 238 deletions
diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp index af6074c..68d720b 100644 --- a/ksim/monitors/cpu/ksimcpu.cpp +++ b/ksim/monitors/cpu/ksimcpu.cpp @@ -126,7 +126,7 @@ CpuView::CpuView(KSim::PluginObject *parent, const char *name) addDisplay(); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(updateView())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(updateView())); m_timer->start(CPU_SPEED); updateView(); } @@ -372,8 +372,8 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name) m_listView->addColumn(i18n("Chart Format")); m_listView->setAllColumnsShowFocus(true); m_listView->setSelectionMode(TQListView::Single); - connect( m_listView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( modify( TQListViewItem * ) ) ); + connect( m_listView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( modify( TQListViewItem * ) ) ); mainLayout->addWidget( m_listView ); @@ -386,12 +386,12 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name) m_modify = new TQPushButton( this ); m_modify->setText( i18n( "Modify..." ) ); - connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) ); + connect( m_modify, TQ_SIGNAL( clicked() ), TQ_SLOT( modify() ) ); layout->addWidget( m_modify ); mainLayout->addLayout( layout ); m_legendBox = new TQGroupBox(this); - m_legendBox->setColumnLayout(0, Qt::Vertical); + m_legendBox->setColumnLayout(0, TQt::Vertical); m_legendBox->setTitle(i18n("Chart Legend")); m_legendBox->layout()->setSpacing(0); m_legendBox->layout()->setMargin(0); diff --git a/ksim/monitors/cpu/ksimcpu.h b/ksim/monitors/cpu/ksimcpu.h index 1ca3fca..9f9dd99 100644 --- a/ksim/monitors/cpu/ksimcpu.h +++ b/ksim/monitors/cpu/ksimcpu.h @@ -51,7 +51,7 @@ class CpuPlugin : public KSim::PluginObject class CpuView : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: CpuView(KSim::PluginObject *parent, const char *name); @@ -200,7 +200,7 @@ class CpuView : public KSim::PluginView class CpuConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: CpuConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp index d3a3827..fe278b5 100644 --- a/ksim/monitors/disk/ksimdisk.cpp +++ b/ksim/monitors/disk/ksimdisk.cpp @@ -126,7 +126,7 @@ DiskView::DiskView(KSim::PluginObject *parent, const char *name) init(); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(updateDisplay())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(updateDisplay())); m_timer->start(DISK_SPEED); updateDisplay(); } @@ -491,12 +491,12 @@ DiskConfig::DiskConfig(KSim::PluginObject *parent, const char *name) m_add = new TQPushButton(this); m_add->setText(i18n("Add...")); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(addItem())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(addItem())); layout->addWidget(m_add); m_remove = new TQPushButton(this); m_remove->setText(i18n("Remove")); - connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem())); + connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(removeItem())); layout->addWidget(m_remove); m_layout->addLayout(layout); diff --git a/ksim/monitors/disk/ksimdisk.h b/ksim/monitors/disk/ksimdisk.h index 3cf62d1..079efbe 100644 --- a/ksim/monitors/disk/ksimdisk.h +++ b/ksim/monitors/disk/ksimdisk.h @@ -54,7 +54,7 @@ class DiskPlugin : public KSim::PluginObject class DiskView : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: DiskView(KSim::PluginObject *parent, const char *name); @@ -131,7 +131,7 @@ class DiskView : public KSim::PluginView class DiskConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: DiskConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp index 2fb77e1..21aebff 100644 --- a/ksim/monitors/filesystem/filesystemwidget.cpp +++ b/ksim/monitors/filesystem/filesystemwidget.cpp @@ -141,7 +141,7 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e) while ((filesystem = it.current()) != 0) { ++it; - if (TQT_BASE_OBJECT(filesystem->display()) == TQT_BASE_OBJECT(o)) { + if (filesystem->display() == o) { progressBar = filesystem->display(); break; } @@ -149,15 +149,15 @@ bool FilesystemWidget::eventFilter(TQObject *o, TQEvent *e) ++i; } - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(progressBar) && e->type() == TQEvent::MouseButtonPress) + if (o == progressBar && e->type() == TQEvent::MouseButtonPress) { - switch(TQT_TQMOUSEEVENT(e)->button()) { - case Qt::RightButton: + switch(static_cast<TQMouseEvent*>(e)->button()) { + case TQt::RightButton: showMenu(i); break; default: break; - case Qt::LeftButton: + case TQt::LeftButton: if (parentWidget()->inherits("KSim::PluginView")) static_cast<KSim::PluginView *>(parentWidget())->doCommand(); break; @@ -200,11 +200,11 @@ void FilesystemWidget::createProcess(const TQString &command, const TQString &po { m_process = new TDEProcess(); connect(m_process, - TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - TQT_SLOT(receivedStderr(TDEProcess *, char *, int))); + TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + TQ_SLOT(receivedStderr(TDEProcess *, char *, int))); connect(m_process, - TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(processExited(TDEProcess *))); + TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(processExited(TDEProcess *))); (*m_process) << command << point; void(m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr)); diff --git a/ksim/monitors/filesystem/filesystemwidget.h b/ksim/monitors/filesystem/filesystemwidget.h index 2a8f116..6e7f330 100644 --- a/ksim/monitors/filesystem/filesystemwidget.h +++ b/ksim/monitors/filesystem/filesystemwidget.h @@ -29,7 +29,7 @@ class TQVBoxLayout; class FilesystemWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: FilesystemWidget(TQWidget *parent, const char *name); diff --git a/ksim/monitors/filesystem/fsystemconfig.h b/ksim/monitors/filesystem/fsystemconfig.h index fe37957..8322bcd 100644 --- a/ksim/monitors/filesystem/fsystemconfig.h +++ b/ksim/monitors/filesystem/fsystemconfig.h @@ -32,7 +32,7 @@ class TQListBoxItem; class FsystemConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: FsystemConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp index 278a891..262ae93 100644 --- a/ksim/monitors/filesystem/ksimfsystem.cpp +++ b/ksim/monitors/filesystem/ksimfsystem.cpp @@ -100,7 +100,7 @@ Fsystem::Fsystem(KSim::PluginObject *parent, const char *name) createFreeInfo(); m_updateTimer = new TQTimer(this); - connect(m_updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateFS())); + connect(m_updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateFS())); m_updateTimer->start(config()->readNumEntry("updateValue", 60) * 1000); } @@ -193,7 +193,7 @@ Fsystem::MountEntryList Fsystem::makeList(const TQStringList &list) const TQStringList::ConstIterator it; for (it = list.begin(); it != list.end(); ++it) { splitList = TQStringList::split(":", (*it)); - newList.append(tqMakePair(splitList[0], splitList[1])); + newList.append(qMakePair(splitList[0], splitList[1])); } return newList; diff --git a/ksim/monitors/filesystem/ksimfsystem.h b/ksim/monitors/filesystem/ksimfsystem.h index 1583ba1..63e192c 100644 --- a/ksim/monitors/filesystem/ksimfsystem.h +++ b/ksim/monitors/filesystem/ksimfsystem.h @@ -47,7 +47,7 @@ class PluginModule : public KSim::PluginObject class Fsystem : public KSim::PluginView, public FsystemIface { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp index 979c682..556f15c 100644 --- a/ksim/monitors/i8k/ksimi8k.cpp +++ b/ksim/monitors/i8k/ksimi8k.cpp @@ -121,7 +121,7 @@ void I8KView::openStream() { m_procStream = new TQTextIStream( m_procFile ); disconnect( m_timer, 0, 0, 0 ); - connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateView() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateView() ) ); m_timer->start( m_interval*1000 ); kdDebug( 2003 ) << "i8k: Success" << endl; @@ -130,7 +130,7 @@ void I8KView::openStream() { // i8k module is not loaded. Try again after 30 secs. disconnect( m_timer, 0, 0, 0 ); - connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( openStream() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( openStream() ) ); m_timer->start( 30*1000 ); kdDebug( 2003 ) << "i8k: Failed...retry after 30 secs" << endl; } @@ -252,6 +252,3 @@ void I8TDEConfig::saveConfig() } #include "ksimi8k.moc" - -/* vim: et sw=2 ts=2 -*/ diff --git a/ksim/monitors/i8k/ksimi8k.h b/ksim/monitors/i8k/ksimi8k.h index 9c1ce1a..492af64 100644 --- a/ksim/monitors/i8k/ksimi8k.h +++ b/ksim/monitors/i8k/ksimi8k.h @@ -49,7 +49,7 @@ class I8KPlugin : public KSim::PluginObject class I8KView : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: I8KView(KSim::PluginObject *parent, const char *name); @@ -81,7 +81,7 @@ class I8KView : public KSim::PluginView class I8TDEConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: I8TDEConfig(KSim::PluginObject *parent, const char *name); @@ -99,6 +99,3 @@ class I8TDEConfig : public KSim::PluginPage }; #endif // KSIMI8K_H - -/* vim: et sw=2 ts=2 -*/ diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp index 9514bc5..e920df9 100644 --- a/ksim/monitors/lm_sensors/ksimsensors.cpp +++ b/ksim/monitors/lm_sensors/ksimsensors.cpp @@ -77,8 +77,8 @@ SensorsView::SensorsView(KSim::PluginObject *parent, const char *name) config()->setGroup("Sensors"); (new TQVBoxLayout(this))->setAutoAdd(true); - connect(SensorBase::self(), TQT_SIGNAL(updateSensors(const SensorList &)), - this, TQT_SLOT(updateSensors(const SensorList &))); + connect(SensorBase::self(), TQ_SIGNAL(updateSensors(const SensorList &)), + this, TQ_SLOT(updateSensors(const SensorList &))); insertSensors(); } diff --git a/ksim/monitors/lm_sensors/ksimsensors.h b/ksim/monitors/lm_sensors/ksimsensors.h index 9c1e801..f53082d 100644 --- a/ksim/monitors/lm_sensors/ksimsensors.h +++ b/ksim/monitors/lm_sensors/ksimsensors.h @@ -47,7 +47,7 @@ class PluginModule : public KSim::PluginObject class SensorsView : public KSim::PluginView, public KSimSensorsIface { - Q_OBJECT + TQ_OBJECT public: SensorsView(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp index c81ad56..0584870 100644 --- a/ksim/monitors/lm_sensors/sensorbase.cpp +++ b/ksim/monitors/lm_sensors/sensorbase.cpp @@ -76,7 +76,7 @@ SensorBase::SensorBase() : TQObject() } m_updateTimer = new TQTimer(this); - connect(m_updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(update())); + connect(m_updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(update())); } SensorBase::~SensorBase() diff --git a/ksim/monitors/lm_sensors/sensorbase.h b/ksim/monitors/lm_sensors/sensorbase.h index 948a09b..8882920 100644 --- a/ksim/monitors/lm_sensors/sensorbase.h +++ b/ksim/monitors/lm_sensors/sensorbase.h @@ -90,7 +90,7 @@ class SensorList : public TQValueList<SensorInfo> class SensorBase : public TQObject { - Q_OBJECT + TQ_OBJECT public: static SensorBase *self(); diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp index 1a1f4a1..e8afb88 100644 --- a/ksim/monitors/lm_sensors/sensorsconfig.cpp +++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp @@ -67,18 +67,18 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name) m_sensorView->setColumnWidth(1, 60); m_sensorView->setColumnWidth(2, 80); m_sensorView->setAllColumnsShowFocus(true); - connect(m_sensorView, TQT_SIGNAL(contextMenu(TDEListView *, - TQListViewItem *, const TQPoint &)), this, TQT_SLOT(menu(TDEListView *, + connect(m_sensorView, TQ_SIGNAL(contextMenu(TDEListView *, + TQListViewItem *, const TQPoint &)), this, TQ_SLOT(menu(TDEListView *, TQListViewItem *, const TQPoint &))); - connect( m_sensorView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( modify( TQListViewItem * ) ) ); + connect( m_sensorView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( modify( TQListViewItem * ) ) ); m_layout->addMultiCellWidget(m_sensorView, 1, 1, 0, 3); m_modify = new TQPushButton( this ); m_modify->setText( i18n( "Modify..." ) ); - connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) ); + connect( m_modify, TQ_SIGNAL( clicked() ), TQ_SLOT( modify() ) ); m_layout->addMultiCellWidget( m_modify, 2, 2, 3, 3 ); m_fahrenBox = new TQCheckBox(i18n("Display Fahrenheit"), this); diff --git a/ksim/monitors/lm_sensors/sensorsconfig.h b/ksim/monitors/lm_sensors/sensorsconfig.h index dff799e..7922433 100644 --- a/ksim/monitors/lm_sensors/sensorsconfig.h +++ b/ksim/monitors/lm_sensors/sensorsconfig.h @@ -35,7 +35,7 @@ class TQTimer; class SensorsConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: SensorsConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp index 942397b..fdfc977 100644 --- a/ksim/monitors/mail/ksimmail.cpp +++ b/ksim/monitors/mail/ksimmail.cpp @@ -93,7 +93,7 @@ MailLabel::MailLabel( TQWidget* parent ) // label->setPixmap( KSim::ThemeLoader::self().current().krellMail() ); configureObject( false ); TQTimer* timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL( timeout() ), TQT_SLOT( animation() ) ); + connect( timer, TQ_SIGNAL( timeout() ), TQ_SLOT( animation() ) ); timer->start( 100 ); } @@ -156,5 +156,3 @@ void MailConfig::saveConfig() void MailConfig::readConfig() { } - -// vim: ts=4 sw=4 noet diff --git a/ksim/monitors/mail/ksimmail.h b/ksim/monitors/mail/ksimmail.h index 8f9dc9c..1d1ff80 100644 --- a/ksim/monitors/mail/ksimmail.h +++ b/ksim/monitors/mail/ksimmail.h @@ -38,7 +38,7 @@ public: class MailView : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: MailView( KSim::PluginObject* parent, const char* name ); @@ -52,7 +52,7 @@ private slots: class MailLabel : public KSim::Label { - Q_OBJECT + TQ_OBJECT public: MailLabel( TQWidget* parent ); @@ -78,7 +78,7 @@ private: class MailConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: MailConfig( KSim::PluginObject* parent, const char* name ); @@ -89,5 +89,3 @@ public: }; #endif - -// vim: ts=4 sw=4 noet diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp index 065797d..2167abe 100644 --- a/ksim/monitors/net/ksimnet.cpp +++ b/ksim/monitors/net/ksimnet.cpp @@ -119,11 +119,11 @@ NetView::NetView(KSim::PluginObject *parent, const char *name) addDisplay(); m_netTimer = new TQTimer(this); - connect(m_netTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateGraph())); + connect(m_netTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateGraph())); m_netTimer->start(NET_UPDATE); m_lightTimer = new TQTimer(this); - connect(m_lightTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateLights())); + connect(m_lightTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateLights())); m_lightTimer->start(LED_UPDATE); updateGraph(); @@ -444,10 +444,10 @@ TQPopupMenu *NetView::addPopupMenu(const TQString &device, int value) { TQPopupMenu *popup = new TQPopupMenu(this); popup->insertItem(SmallIcon("network"), i18n("Connect"), this, - TQT_SLOT(runConnectCommand(int)), 0, 1); + TQ_SLOT(runConnectCommand(int)), 0, 1); popup->setItemParameter(1, value); popup->insertItem(SmallIcon("network"), i18n("Disconnect"), this, - TQT_SLOT(runDisconnectCommand(int)), 0, 2); + TQ_SLOT(runDisconnectCommand(int)), 0, 2); popup->setItemParameter(2, value); menu()->insertItem(device, popup, 100 + value); return popup; @@ -632,7 +632,7 @@ bool NetView::eventFilter( TQObject * o, TQEvent * e ) Network::List::Iterator it; for ( it = m_networkList.begin(); it != m_networkList.end(); ++it ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(( *it ).chart()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(( *it ).label()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(( *it ).led()) ) + if ( o == ( *it ).chart() || o == ( *it ).label() || o == ( *it ).led() ) { break; } @@ -642,7 +642,7 @@ bool NetView::eventFilter( TQObject * o, TQEvent * e ) if ( e->type() == TQEvent::MouseButtonPress ) { - if ( TQT_TQMOUSEEVENT( e )->button() == Qt::RightButton ) + if ( static_cast<TQMouseEvent*>( e )->button() == TQt::RightButton ) { showMenu(i); } diff --git a/ksim/monitors/net/ksimnet.h b/ksim/monitors/net/ksimnet.h index 5da4165..c699112 100644 --- a/ksim/monitors/net/ksimnet.h +++ b/ksim/monitors/net/ksimnet.h @@ -42,7 +42,7 @@ class NetPlugin : public KSim::PluginObject class NetView : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: NetView(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp index eb2c1a3..2cfc1af 100644 --- a/ksim/monitors/net/netconfig.cpp +++ b/ksim/monitors/net/netconfig.cpp @@ -49,11 +49,11 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name) usingBox ->addColumn(i18n("Commands")); usingBox->setAllColumnsShowFocus(true); - connect(usingBox, TQT_SIGNAL(contextMenu(TDEListView *, + connect(usingBox, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), - TQT_SLOT(menu(TDEListView *, TQListViewItem *, const TQPoint &))); - connect(usingBox, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - TQT_SLOT(modifyItem(TQListViewItem *))); + TQ_SLOT(menu(TDEListView *, TQListViewItem *, const TQPoint &))); + connect(usingBox, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + TQ_SLOT(modifyItem(TQListViewItem *))); mainLayout->addWidget(usingBox); layout = new TQHBoxLayout; @@ -65,17 +65,17 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name) insertButton = new TQPushButton(this); insertButton->setText(i18n("Add...")); - connect(insertButton, TQT_SIGNAL(clicked()), TQT_SLOT(showNetDialog())); + connect(insertButton, TQ_SIGNAL(clicked()), TQ_SLOT(showNetDialog())); layout->addWidget(insertButton); modifyButton = new TQPushButton(this); modifyButton->setText(i18n("Modify...")); - connect(modifyButton, TQT_SIGNAL(clicked()), TQT_SLOT(modifyCurrent())); + connect(modifyButton, TQ_SIGNAL(clicked()), TQ_SLOT(modifyCurrent())); layout->addWidget(modifyButton); removeButton = new TQPushButton(this); removeButton->setText(i18n("Remove")); - connect(removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeCurrent())); + connect(removeButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeCurrent())); layout->addWidget(removeButton); mainLayout->addLayout(layout); diff --git a/ksim/monitors/net/netconfig.h b/ksim/monitors/net/netconfig.h index 2a62158..6e43933 100644 --- a/ksim/monitors/net/netconfig.h +++ b/ksim/monitors/net/netconfig.h @@ -32,7 +32,7 @@ class TQListViewItem; class NetConfig : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: NetConfig(KSim::PluginObject *parent, const char *name); diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp index 21d6236..39ea761 100644 --- a/ksim/monitors/net/netdialog.cpp +++ b/ksim/monitors/net/netdialog.cpp @@ -85,7 +85,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_timerBox = new TQGroupBox(m_generalTab); m_timerBox->setTitle(i18n("Timer")); - m_timerBox->setColumnLayout(0, Qt::Vertical); + m_timerBox->setColumnLayout(0, TQt::Vertical); m_timerBox->layout()->setSpacing(0); m_timerBox->layout()->setMargin(0); m_timerBoxLayout = new TQVBoxLayout(m_timerBox->layout()); @@ -99,8 +99,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_showTimer = new TQCheckBox(m_timerBox); m_showTimer->setText(i18n("Show timer")); - connect(m_showTimer, TQT_SIGNAL(toggled(bool)), - m_timerEdit, TQT_SLOT(setEnabled(bool))); + connect(m_showTimer, TQ_SIGNAL(toggled(bool)), + m_timerEdit, TQ_SLOT(setEnabled(bool))); m_timerBoxLayout->addWidget(m_showTimer); m_timerBoxLayout->addWidget(m_timerEdit); @@ -138,8 +138,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_connectRequester = new KURLRequester(m_commandTab); m_connectRequester->setMinimumSize(145, 0); m_connectRequester->setEnabled(false); - connect(m_enableCommands, TQT_SIGNAL(toggled(bool)), - m_connectRequester, TQT_SLOT(setEnabled(bool))); + connect(m_enableCommands, TQ_SIGNAL(toggled(bool)), + m_connectRequester, TQ_SLOT(setEnabled(bool))); m_commandLayout->addMultiCellWidget(m_connectRequester, 1, 1, 1, 2); m_dCommand = new TQLabel(m_commandTab); @@ -149,8 +149,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_disconnectRequester = new KURLRequester(m_commandTab); m_disconnectRequester->setMinimumSize(145, 0); m_disconnectRequester->setEnabled(false); - connect(m_enableCommands, TQT_SIGNAL(toggled(bool)), - m_disconnectRequester, TQT_SLOT(setEnabled(bool))); + connect(m_enableCommands, TQ_SIGNAL(toggled(bool)), + m_disconnectRequester, TQ_SLOT(setEnabled(bool))); m_commandLayout->addMultiCellWidget(m_disconnectRequester, 2, 2, 1, 2); TQSpacerItem *commandSpacer = new TQSpacerItem(20, 20, @@ -160,7 +160,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) setOkButton(KStdGuiItem::ok().text()); setCancelButton(KStdGuiItem::cancel().text()); - connect(this, TQT_SIGNAL(applyButtonPressed()), TQT_SLOT(sendClicked())); + connect(this, TQ_SIGNAL(applyButtonPressed()), TQ_SLOT(sendClicked())); } NetDialog::~NetDialog() diff --git a/ksim/monitors/net/netdialog.h b/ksim/monitors/net/netdialog.h index 1c6cd85..f75692a 100644 --- a/ksim/monitors/net/netdialog.h +++ b/ksim/monitors/net/netdialog.h @@ -34,7 +34,7 @@ class KURLRequester; class NetDialog : public TQTabDialog { - Q_OBJECT + TQ_OBJECT public: NetDialog(TQWidget *parent, const char *name = 0); diff --git a/ksim/monitors/snmp/browsedialog.cpp b/ksim/monitors/snmp/browsedialog.cpp index 8627c59..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; @@ -143,5 +143,3 @@ void BrowseDialog::applyFilter( TQListViewItem *item ) } #include "browsedialog.moc" -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/browsedialog.h b/ksim/monitors/snmp/browsedialog.h index 1bd641f..910a3e0 100644 --- a/ksim/monitors/snmp/browsedialog.h +++ b/ksim/monitors/snmp/browsedialog.h @@ -38,7 +38,7 @@ namespace Snmp class BrowseDialog : public BrowseDialogBase { - Q_OBJECT + TQ_OBJECT public: BrowseDialog( const HostConfig &hostConfig, const TQString ¤tOid, TQWidget *parent, const char *name = 0 ); @@ -68,5 +68,3 @@ private: } #endif // BROWSEDIALOG_H -/* vim: et sw=4 ts=4 - */ 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/chartmonitor.cpp b/ksim/monitors/snmp/chartmonitor.cpp index 5b8438f..a13be36 100644 --- a/ksim/monitors/snmp/chartmonitor.cpp +++ b/ksim/monitors/snmp/chartmonitor.cpp @@ -78,6 +78,3 @@ TQ_UINT64 ChartMonitor::convertToInt( const Value &data ) } #include "chartmonitor.moc" - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/chartmonitor.h b/ksim/monitors/snmp/chartmonitor.h index 803f97e..c128de3 100644 --- a/ksim/monitors/snmp/chartmonitor.h +++ b/ksim/monitors/snmp/chartmonitor.h @@ -30,7 +30,7 @@ namespace Snmp class ChartMonitor : public KSim::Chart { - Q_OBJECT + TQ_OBJECT public: ChartMonitor( const MonitorConfig &config, TQWidget *parent, const char *name = 0 ); @@ -51,5 +51,3 @@ private: } #endif // CHARTMONITOR_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp index d1f24a5..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() @@ -309,5 +309,3 @@ TQStringList ConfigPage::monitorsForHost( const HostConfig &host ) const } #include "configpage.moc" -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/configpage.h b/ksim/monitors/snmp/configpage.h index b0d1331..03246f9 100644 --- a/ksim/monitors/snmp/configpage.h +++ b/ksim/monitors/snmp/configpage.h @@ -78,7 +78,7 @@ class Plugin; class ConfigPage : public KSim::PluginPage { - Q_OBJECT + TQ_OBJECT public: ConfigPage( Plugin *parent, const char *name ); @@ -117,5 +117,3 @@ private: } #endif // CONFIGPAGE_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/hostconfig.cpp b/ksim/monitors/snmp/hostconfig.cpp index 844bee5..51f6b01 100644 --- a/ksim/monitors/snmp/hostconfig.cpp +++ b/ksim/monitors/snmp/hostconfig.cpp @@ -147,6 +147,3 @@ TQStringList HostConfigMap::save( TDEConfigBase &config ) const return hostList; } - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/hostconfig.h b/ksim/monitors/snmp/hostconfig.h index 3726eb5..bf704cd 100644 --- a/ksim/monitors/snmp/hostconfig.h +++ b/ksim/monitors/snmp/hostconfig.h @@ -82,5 +82,3 @@ struct HostConfigMap : public TQMap< TQString, HostConfig > } #endif // HOSTCONFIG_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/hostdialog.cpp b/ksim/monitors/snmp/hostdialog.cpp index 0712e54..0f32df9 100644 --- a/ksim/monitors/snmp/hostdialog.cpp +++ b/ksim/monitors/snmp/hostdialog.cpp @@ -188,6 +188,3 @@ void HostDialog::loadSettingsFromHostConfig( const HostConfig &src ) } #include "hostdialog.moc" - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/hostdialog.h b/ksim/monitors/snmp/hostdialog.h index 5a856e8..3b5cb6c 100644 --- a/ksim/monitors/snmp/hostdialog.h +++ b/ksim/monitors/snmp/hostdialog.h @@ -32,7 +32,7 @@ namespace Snmp class HostDialog : public HostDialogBase { - Q_OBJECT + TQ_OBJECT public: HostDialog( TQWidget *parent, const char *name = 0 ); @@ -56,5 +56,3 @@ private: } #endif // HOSTDIALOG_H -/* vim: et sw=4 ts=4 - */ 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/identifier.cpp b/ksim/monitors/snmp/identifier.cpp index 355f019..b867757 100644 --- a/ksim/monitors/snmp/identifier.cpp +++ b/ksim/monitors/snmp/identifier.cpp @@ -124,6 +124,3 @@ bool Identifier::isNull() const { return d->length == 0; } - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/identifier.h b/ksim/monitors/snmp/identifier.h index e14e58a..8415d31 100644 --- a/ksim/monitors/snmp/identifier.h +++ b/ksim/monitors/snmp/identifier.h @@ -68,5 +68,3 @@ typedef TQMap<Identifier, Value> ValueMap; } #endif // IDENTIFIER_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/labelmonitor.cpp b/ksim/monitors/snmp/labelmonitor.cpp index 2245a09..7738401 100644 --- a/ksim/monitors/snmp/labelmonitor.cpp +++ b/ksim/monitors/snmp/labelmonitor.cpp @@ -40,6 +40,3 @@ void LabelMonitor::setData( const Value &data ) } #include "labelmonitor.moc" - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/labelmonitor.h b/ksim/monitors/snmp/labelmonitor.h index ef7f91b..73a54d5 100644 --- a/ksim/monitors/snmp/labelmonitor.h +++ b/ksim/monitors/snmp/labelmonitor.h @@ -32,7 +32,7 @@ namespace Snmp class LabelMonitor : public KSim::Label { - Q_OBJECT + TQ_OBJECT public: LabelMonitor( const MonitorConfig &config, TQWidget *parent, const char *name = 0 ); @@ -49,5 +49,3 @@ private: } #endif // LABELMONITOR_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/monitor.cpp b/ksim/monitors/snmp/monitor.cpp index 052d2c0..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() @@ -91,6 +91,3 @@ bool Monitor::performSyncSnmpRequest( Value &data, ErrorInfo *errorInfo ) } #include "monitor.moc" - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/monitor.h b/ksim/monitors/snmp/monitor.h index f2eb1b9..e56f81c 100644 --- a/ksim/monitors/snmp/monitor.h +++ b/ksim/monitors/snmp/monitor.h @@ -33,7 +33,7 @@ namespace Snmp class Monitor : public TQObject, public TQThread { - Q_OBJECT + TQ_OBJECT public: Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQObject *parent = 0, const char *name = 0 ); @@ -74,5 +74,3 @@ private: } #endif // MONITOR_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp index d2dee45..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; } @@ -178,6 +178,3 @@ TQStringList MonitorConfigMap::save( TDEConfigBase &config ) const return names; } - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/monitorconfig.h b/ksim/monitors/snmp/monitorconfig.h index 5ad6a32..5ff6c35 100644 --- a/ksim/monitors/snmp/monitorconfig.h +++ b/ksim/monitors/snmp/monitorconfig.h @@ -80,5 +80,3 @@ TQStringList allDisplayTypes(); } #endif // MONITORCONFIG_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/monitordialog.cpp b/ksim/monitors/snmp/monitordialog.cpp index bed4798..e9b3234 100644 --- a/ksim/monitors/snmp/monitordialog.cpp +++ b/ksim/monitors/snmp/monitordialog.cpp @@ -174,5 +174,3 @@ HostConfig MonitorDialog::currentHost() const } #include "monitordialog.moc" -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/monitordialog.h b/ksim/monitors/snmp/monitordialog.h index 9f962e5..bbb1ecb 100644 --- a/ksim/monitors/snmp/monitordialog.h +++ b/ksim/monitors/snmp/monitordialog.h @@ -31,7 +31,7 @@ namespace Snmp class MonitorDialog : public MonitorDialogBase { - Q_OBJECT + TQ_OBJECT public: MonitorDialog( const HostConfigMap &hosts, TQWidget *parent, const char *name = 0 ); @@ -57,5 +57,3 @@ private: } #endif // MONITORDIALOG_H -/* vim: et sw=4 ts=4 - */ 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 1619086..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 ) @@ -93,6 +93,3 @@ ValueMap PDU::variables() const return result; } - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/pdu.h b/ksim/monitors/snmp/pdu.h index 2e648d4..21d8c74 100644 --- a/ksim/monitors/snmp/pdu.h +++ b/ksim/monitors/snmp/pdu.h @@ -56,5 +56,3 @@ private: } #endif // PDU_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/plugin.cpp b/ksim/monitors/snmp/plugin.cpp index 90683a2..f79832d 100644 --- a/ksim/monitors/snmp/plugin.cpp +++ b/ksim/monitors/snmp/plugin.cpp @@ -47,6 +47,3 @@ KSim::PluginPage *Plugin::createConfigPage( const char *name ) void Plugin::showAbout() { } - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/plugin.h b/ksim/monitors/snmp/plugin.h index 3e0fb66..9bf741c 100644 --- a/ksim/monitors/snmp/plugin.h +++ b/ksim/monitors/snmp/plugin.h @@ -45,5 +45,3 @@ public: } #endif // KSIM_PLUGIN_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/probedialog.cpp b/ksim/monitors/snmp/probedialog.cpp index 435ec9e..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,10 +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" - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/probedialog.h b/ksim/monitors/snmp/probedialog.h index 7f8d0ab..b307435 100644 --- a/ksim/monitors/snmp/probedialog.h +++ b/ksim/monitors/snmp/probedialog.h @@ -37,7 +37,7 @@ class Monitor; class ProbeDialog : public KProgressDialog { - Q_OBJECT + TQ_OBJECT public: ProbeDialog( const HostConfig &hostConfig, TQWidget *parent, const char *name = 0 ); @@ -84,5 +84,3 @@ private: } #endif // PROBEDIALOG_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/proberesultdialog.cpp b/ksim/monitors/snmp/proberesultdialog.cpp index 7550447..d24577d 100644 --- a/ksim/monitors/snmp/proberesultdialog.cpp +++ b/ksim/monitors/snmp/proberesultdialog.cpp @@ -50,6 +50,3 @@ void ProbeResultDialog::addResultItem( const ProbeDialog::ProbeResult &result ) } #include "proberesultdialog.moc" - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/proberesultdialog.h b/ksim/monitors/snmp/proberesultdialog.h index 9d4884c..47a758c 100644 --- a/ksim/monitors/snmp/proberesultdialog.h +++ b/ksim/monitors/snmp/proberesultdialog.h @@ -32,7 +32,7 @@ namespace Snmp class ProbeResultDialog : public ProbeResultDialogBase { - Q_OBJECT + TQ_OBJECT public: ProbeResultDialog( const HostConfig &hostConfig, const ProbeDialog::ProbeResultList &probeResults, @@ -46,5 +46,3 @@ private: } #endif // PROBERESULTDIALOG_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/session.cpp b/ksim/monitors/snmp/session.cpp index 6d63fab..b52fe5c 100644 --- a/ksim/monitors/snmp/session.cpp +++ b/ksim/monitors/snmp/session.cpp @@ -186,9 +186,16 @@ bool Session::initialize( ErrorInfo *error ) } switch ( source.privacy.protocol ) { + case AESPrivacy: { + d->defaultSession.securityPrivProto = usmAESPrivProtocol; + d->defaultSession.securityPrivProtoLen = USM_PRIV_PROTO_AES_LEN; + break; + } case DESPrivacy: { +#ifndef NETSNMP_DISABLE_DES d->defaultSession.securityPrivProto = usmDESPrivProtocol; d->defaultSession.securityPrivProtoLen = USM_PRIV_PROTO_DES_LEN; +#endif break; } default: assert( false ); @@ -278,6 +285,3 @@ Session::~Session() SnmpLib::self()->snmp_close( d->session ); delete d; } - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/session.h b/ksim/monitors/snmp/session.h index b34bc68..6af8e1d 100644 --- a/ksim/monitors/snmp/session.h +++ b/ksim/monitors/snmp/session.h @@ -60,5 +60,3 @@ private: } #endif // SESSION_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/snmp.cpp b/ksim/monitors/snmp/snmp.cpp index ae04b67..1256228 100644 --- a/ksim/monitors/snmp/snmp.cpp +++ b/ksim/monitors/snmp/snmp.cpp @@ -48,7 +48,8 @@ static const struct EnumStringMapInfo { MD5Auth, "MD5", 0 }, { SHA1Auth, "SHA1", 0 }, { 0, 0, 0 } -}, privacyProtocolStrings[ 2 ] = { +}, privacyProtocolStrings[ 3 ] = { + { AESPrivacy, "AES", 0 }, { DESPrivacy, "DES", 0 }, { 0, 0, 0 } }; @@ -315,6 +316,3 @@ ErrorInfo::ErrorInfo( ErrorType error ) if ( error != NoError && error != ErrUnknown ) m_errorMessage = messageForErrorCode( convertErrorInfoToSnmpLibError( error ) ); } - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/snmp.h b/ksim/monitors/snmp/snmp.h index 213fa22..4b1e4fb 100644 --- a/ksim/monitors/snmp/snmp.h +++ b/ksim/monitors/snmp/snmp.h @@ -46,7 +46,10 @@ TQStringList allAuthenticationProtocols(); TQString authenticationProtocolToString( AuthenticationProtocol proto ); AuthenticationProtocol stringToAuthenticationProtocol( TQString string, bool *ok = 0 ); -enum PrivacyProtocol { DESPrivacy }; +enum PrivacyProtocol { + AESPrivacy, + DESPrivacy +}; TQStringList allPrivacyProtocols(); TQString privacyProtocolToString( PrivacyProtocol proto ); PrivacyProtocol stringToPrivacyProtocol( TQString string, bool *ok = 0 ); @@ -161,5 +164,3 @@ private: } #endif // KSIMSNMP_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/snmp_p.h b/ksim/monitors/snmp/snmp_p.h index 9d96868..a44fc6e 100644 --- a/ksim/monitors/snmp/snmp_p.h +++ b/ksim/monitors/snmp/snmp_p.h @@ -55,5 +55,3 @@ struct Identifier::Data } #endif // SNMP_P_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/snmplib.cpp b/ksim/monitors/snmp/snmplib.cpp index b042c7f..ee091bc 100644 --- a/ksim/monitors/snmp/snmplib.cpp +++ b/ksim/monitors/snmp/snmplib.cpp @@ -146,6 +146,3 @@ int SnmpLib::generate_Ku( const oid * hashtype, u_int hashtype_len, { return ::generate_Ku( hashtype, hashtype_len, P, pplen, Ku, kulen ); } - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/snmplib.h b/ksim/monitors/snmp/snmplib.h index 388c918..2498e06 100644 --- a/ksim/monitors/snmp/snmplib.h +++ b/ksim/monitors/snmp/snmplib.h @@ -138,6 +138,3 @@ private: #endif // SNMPLIB_H -/* vim: et sw=4 ts=4 - */ - diff --git a/ksim/monitors/snmp/value.cpp b/ksim/monitors/snmp/value.cpp index bb5b0c4..724082b 100644 --- a/ksim/monitors/snmp/value.cpp +++ b/ksim/monitors/snmp/value.cpp @@ -328,6 +328,3 @@ TQString Value::formatTimeTicks( int ticks, int conversionFlags ) return result; } - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/value.h b/ksim/monitors/snmp/value.h index d1461d8..921ce5f 100644 --- a/ksim/monitors/snmp/value.h +++ b/ksim/monitors/snmp/value.h @@ -102,5 +102,3 @@ private: } #endif // VALUE_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/value_p.h b/ksim/monitors/snmp/value_p.h index 4ff2d8f..0727174 100644 --- a/ksim/monitors/snmp/value_p.h +++ b/ksim/monitors/snmp/value_p.h @@ -59,5 +59,3 @@ struct ValueImpl } #endif // VALUE_P_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/view.cpp b/ksim/monitors/snmp/view.cpp index d109139..5456aa6 100644 --- a/ksim/monitors/snmp/view.cpp +++ b/ksim/monitors/snmp/view.cpp @@ -75,6 +75,3 @@ void View::reparseConfig() } #include "view.moc" - -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/view.h b/ksim/monitors/snmp/view.h index d40d44d..6ddae38 100644 --- a/ksim/monitors/snmp/view.h +++ b/ksim/monitors/snmp/view.h @@ -34,7 +34,7 @@ class Plugin; class View : public KSim::PluginView { - Q_OBJECT + TQ_OBJECT public: View( Plugin *parent, const char *name ); @@ -52,5 +52,3 @@ private: } #endif // VIEW_H -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/walker.cpp b/ksim/monitors/snmp/walker.cpp index 0aa6c0a..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; } @@ -117,5 +117,3 @@ void Walker::customEvent( TQCustomEvent * ) } #include "walker.moc" -/* vim: et sw=4 ts=4 - */ diff --git a/ksim/monitors/snmp/walker.h b/ksim/monitors/snmp/walker.h index cda0ad8..64052cf 100644 --- a/ksim/monitors/snmp/walker.h +++ b/ksim/monitors/snmp/walker.h @@ -35,7 +35,7 @@ namespace Snmp class Walker : public TQObject, public TQThread { - Q_OBJECT + TQ_OBJECT public: Walker( const HostConfig &host, const Identifier &startOid, TQObject *parent, const char *name = 0 ); @@ -79,5 +79,3 @@ private: } #endif // WALKER_H -/* vim: et sw=4 ts=4 - */ |