summaryrefslogtreecommitdiffstats
path: root/clients/tde/src/part/sensormonitor
diff options
context:
space:
mode:
Diffstat (limited to 'clients/tde/src/part/sensormonitor')
-rw-r--r--clients/tde/src/part/sensormonitor/part.cpp46
-rw-r--r--clients/tde/src/part/sensormonitor/part.h8
2 files changed, 27 insertions, 27 deletions
diff --git a/clients/tde/src/part/sensormonitor/part.cpp b/clients/tde/src/part/sensormonitor/part.cpp
index 48e23f3..13c952e 100644
--- a/clients/tde/src/part/sensormonitor/part.cpp
+++ b/clients/tde/src/part/sensormonitor/part.cpp
@@ -87,7 +87,7 @@ K_EXPORT_COMPONENT_FACTORY(libremotelab_sensormonitor, RemoteLab::Factory)
TQValueTimer::TQValueTimer(TQObject *parent, const char *name)
: TQTimer(parent, name)
{
- connect(this, SIGNAL(timeout()), this, SLOT(timeoutHandler()));
+ connect(this, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutHandler()));
}
TQValueTimer::~TQValueTimer() {
@@ -117,7 +117,7 @@ TraceControlWidget::TraceControlWidget(TQWidget *parent, const char *name)
m_primaryLayout = new TQGridLayout(m_groupBox->layout(), 1, 1, KDialog::spacingHint());
m_channelEnabledCheckBox = new TQCheckBox(m_groupBox);
- connect(m_channelEnabledCheckBox, SIGNAL(clicked()), this, SLOT(enableClicked()));
+ connect(m_channelEnabledCheckBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableClicked()));
m_channelEnabledCheckBox->setText(i18n("Enable"));
m_primaryLayout->addMultiCellWidget(m_channelEnabledCheckBox, 0, 0, 0, 2);
@@ -138,7 +138,7 @@ TraceControlWidget::TraceControlWidget(TQWidget *parent, const char *name)
m_timestepSpinBox = new FloatSpinBox(m_groupBox);
m_timestepSpinBox->setFloatMax(60*60*24); // 1 day
- connect(m_timestepSpinBox, SIGNAL(floatValueChanged(double)), this, SLOT(timestepChanged(double)));
+ connect(m_timestepSpinBox, TQ_SIGNAL(floatValueChanged(double)), this, TQ_SLOT(timestepChanged(double)));
m_primaryLayout->addMultiCellWidget(m_timestepSpinBox, 3, 3, 1, 1);
m_timestepSpinBox->hide();
@@ -149,13 +149,13 @@ TraceControlWidget::TraceControlWidget(TQWidget *parent, const char *name)
m_clearPushButton = new TQPushButton(m_groupBox);
m_clearPushButton->setText(i18n("Erase Existing Data"));
- connect(m_clearPushButton, SIGNAL(clicked()), this, SLOT(clearTraceDataClicked()));
+ connect(m_clearPushButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearTraceDataClicked()));
m_primaryLayout->addMultiCellWidget(m_clearPushButton, 5, 5, 0, 2);
m_clearPushButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum));
m_clearPushButton->hide();
m_sampleTimer = new TQTimer();
- connect(m_sampleTimer, SIGNAL(timeout()), this, SIGNAL(newSampleDesired()));
+ connect(m_sampleTimer, TQ_SIGNAL(timeout()), this, TQ_SIGNAL(newSampleDesired()));
}
TraceControlWidget::~TraceControlWidget() {
@@ -266,11 +266,11 @@ SensorMonitorPart::SensorMonitorPart(TQWidget *parentWidget, const char *widgetN
// Create timers
m_forcedUpdateTimer = new TQTimer(this);
- connect(m_forcedUpdateTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+ connect(m_forcedUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
m_updateTimeoutTimer = new TQTimer(this);
- connect(m_updateTimeoutTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+ connect(m_updateTimeoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
m_pingDelayTimer = new TQTimer(this);
- connect(m_pingDelayTimer, SIGNAL(timeout()), this, SLOT(mainEventLoop()));
+ connect(m_pingDelayTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(mainEventLoop()));
// Initialize data
m_hdivs = 10;
@@ -318,16 +318,16 @@ SensorMonitorPart::SensorMonitorPart(TQWidget *parentWidget, const char *widgetN
m_traceWidget->setZoomBoxEnabled(true);
m_base->traceZoomWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
- connect(m_traceWidget, SIGNAL(zoomBoxChanged(const TQRectF&)), this, SLOT(updateZoomWidgetLimits(const TQRectF&)));
+ connect(m_traceWidget, TQ_SIGNAL(zoomBoxChanged(const TQRectF&)), this, TQ_SLOT(updateZoomWidgetLimits(const TQRectF&)));
// Initialize widgets
- connect(m_base->runControlStartButton, SIGNAL(clicked()), this, SLOT(acquisitionStartButtonClicked()));
- connect(m_base->runControlStopButton, SIGNAL(clicked()), this, SLOT(acquisitionStopButtonClicked()));
- connect(m_base->waveformSave, SIGNAL(clicked()), this, SLOT(saveWaveforms()));
- connect(m_base->waveformRecall, SIGNAL(clicked()), this, SLOT(recallWaveforms()));
- connect(m_base->autoSave, SIGNAL(clicked()), this, SLOT(processLockouts()));
+ connect(m_base->runControlStartButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(acquisitionStartButtonClicked()));
+ connect(m_base->runControlStopButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(acquisitionStopButtonClicked()));
+ connect(m_base->waveformSave, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveWaveforms()));
+ connect(m_base->waveformRecall, TQ_SIGNAL(clicked()), this, TQ_SLOT(recallWaveforms()));
+ connect(m_base->autoSave, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts()));
- TQTimer::singleShot(0, this, TQT_SLOT(postInit()));
+ TQTimer::singleShot(0, this, TQ_SLOT(postInit()));
}
SensorMonitorPart::~SensorMonitorPart() {
@@ -403,9 +403,9 @@ void SensorMonitorPart::disconnectFromServerCallback() {
}
void SensorMonitorPart::connectionFinishedCallback() {
- connect(m_socket, SIGNAL(readyRead()), m_socket, SLOT(processPendingData()));
+ connect(m_socket, TQ_SIGNAL(readyRead()), m_socket, TQ_SLOT(processPendingData()));
m_socket->processPendingData();
- connect(m_socket, SIGNAL(newDataReceived()), this, SLOT(mainEventLoop()));
+ connect(m_socket, TQ_SIGNAL(newDataReceived()), this, TQ_SLOT(mainEventLoop()));
m_tickerState = 0;
m_commHandlerState = ModeIdle_StateSensorListRequest;
m_commHandlerMode = ModeIdle;
@@ -622,7 +622,7 @@ void SensorMonitorPart::mainEventLoop() {
positionArray.resize(m_samplesInTrace[m_sampleRequestIndex]);
sampleArray[m_samplesInTrace[m_sampleRequestIndex]-1] = newValue;
positionArray[m_samplesInTrace[m_sampleRequestIndex]-1] = (timestamp.toTime_t()+(timestamp.time().msec()*1.0e-3));
-
+
m_traceWidget->setSamples(m_sampleRequestIndex, sampleArray);
m_traceWidget->setPositions(m_sampleRequestIndex, positionArray);
m_base->traceZoomWidget->setSamples(m_sampleRequestIndex, sampleArray);
@@ -630,7 +630,7 @@ void SensorMonitorPart::mainEventLoop() {
m_traceControlWidgetList[m_sampleRequestIndex]->setCurrentSampleValue(newValue, m_sensorList[m_sampleRequestIndex].units);
m_traceControlWidgetList[m_sampleRequestIndex]->setCurrentSampleTimestamp(timestamp);
-
+
updateGraticule();
m_traceWidget->repaint(false);
m_base->traceZoomWidget->repaint(false);
@@ -724,9 +724,9 @@ void SensorMonitorPart::updateTraceControlWidgets() {
for (i=0; i<m_maxNumberOfTraces;i++) {
if (!m_traceControlWidgetList[i]) {
m_traceControlWidgetList[i] = new TraceControlWidget(m_base->traceControlLayoutWidget);
- connect(m_traceControlWidgetList[i], SIGNAL(enableChanged(bool)), this, SLOT(traceControlEnableChanged(bool)));
- connect(m_traceControlWidgetList[i], SIGNAL(newSampleDesired()), this, SLOT(processNewSampleRequest()));
- connect(m_traceControlWidgetList[i], SIGNAL(clearTraceRequested()), this, SLOT(traceControlClearRequested()));
+ connect(m_traceControlWidgetList[i], TQ_SIGNAL(enableChanged(bool)), this, TQ_SLOT(traceControlEnableChanged(bool)));
+ connect(m_traceControlWidgetList[i], TQ_SIGNAL(newSampleDesired()), this, TQ_SLOT(processNewSampleRequest()));
+ connect(m_traceControlWidgetList[i], TQ_SIGNAL(clearTraceRequested()), this, TQ_SLOT(traceControlClearRequested()));
m_traceControlWidgetGrid->addMultiCellWidget(m_traceControlWidgetList[i], i, i, 0, 0);
m_traceControlWidgetList[i]->setTraceName(i18n("Sensor %1").arg(m_sensorList[i].name));
m_traceControlWidgetList[i]->show();
@@ -845,7 +845,7 @@ void SensorMonitorPart::processNewSampleRequest(int channel) {
if ((!stopTraceUpdate) && (m_commHandlerState != ModeIdle_StateProcessReset) && (m_commHandlerState != ModeIdle_StateResetRequest)) {
TQValueTimer* timer = new TQValueTimer;
timer->setValue(channel);
- connect(timer, SIGNAL(valueTimeout(int)), this, SLOT(processNewSampleRequest(int)));
+ connect(timer, TQ_SIGNAL(valueTimeout(int)), this, TQ_SLOT(processNewSampleRequest(int)));
timer->start(10, TRUE);
}
}
diff --git a/clients/tde/src/part/sensormonitor/part.h b/clients/tde/src/part/sensormonitor/part.h
index 94e3fb9..12fb128 100644
--- a/clients/tde/src/part/sensormonitor/part.h
+++ b/clients/tde/src/part/sensormonitor/part.h
@@ -58,9 +58,9 @@ class SensorMonitorBase;
namespace RemoteLab
{
- class Q_EXPORT TQValueTimer : public TQTimer
+ class TQ_EXPORT TQValueTimer : public TQTimer
{
- Q_OBJECT
+ TQ_OBJECT
public:
TQValueTimer(TQObject *parent=0, const char *name=0);
@@ -80,7 +80,7 @@ namespace RemoteLab
class TraceControlWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
TraceControlWidget(TQWidget *parent=0, const char *name=0);
@@ -125,7 +125,7 @@ namespace RemoteLab
class SensorMonitorPart : public KParts::RemoteInstrumentPart
{
- Q_OBJECT
+ TQ_OBJECT
public:
SensorMonitorPart(TQWidget *, const char *, TQObject *, const char *, const TQStringList&);