summaryrefslogtreecommitdiffstats
path: root/clients/tde/src/part/scope
diff options
context:
space:
mode:
Diffstat (limited to 'clients/tde/src/part/scope')
-rw-r--r--clients/tde/src/part/scope/part.cpp76
-rw-r--r--clients/tde/src/part/scope/part.h12
2 files changed, 44 insertions, 44 deletions
diff --git a/clients/tde/src/part/scope/part.cpp b/clients/tde/src/part/scope/part.cpp
index efa05a0..e0aec7c 100644
--- a/clients/tde/src/part/scope/part.cpp
+++ b/clients/tde/src/part/scope/part.cpp
@@ -113,12 +113,12 @@ 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, 0);
m_voltsDivComboBox = new TQComboBox(m_groupBox);
- connect(m_voltsDivComboBox, SIGNAL(activated(int)), this, SLOT(vdivChanged(int)));
+ connect(m_voltsDivComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(vdivChanged(int)));
m_primaryLayout->addMultiCellWidget(m_voltsDivComboBox, 0, 0, 1, 1);
TQLabel* label = new TQLabel(m_groupBox);
@@ -127,7 +127,7 @@ TraceControlWidget::TraceControlWidget(TQWidget *parent, const char *name)
m_setTriggerChannelButton = new TQPushButton(m_groupBox);
m_setTriggerChannelButton->setText(i18n("TRIG"));
- connect(m_setTriggerChannelButton, SIGNAL(clicked()), this, SLOT(triggerRequested()));
+ connect(m_setTriggerChannelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(triggerRequested()));
m_primaryLayout->addMultiCellWidget(m_setTriggerChannelButton, 0, 0, 3, 3);
}
@@ -202,7 +202,7 @@ TracePostProcessControlWidget::TracePostProcessControlWidget(TQWidget *parent, c
m_primaryLayout = new TQGridLayout(m_groupBox->layout(), 1, 1, KDialog::spacingHint());
m_postProcessEnabledCheckBox = new TQCheckBox(m_groupBox);
- connect(m_postProcessEnabledCheckBox, SIGNAL(clicked()), this, SLOT(enableClicked()));
+ connect(m_postProcessEnabledCheckBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableClicked()));
m_postProcessEnabledCheckBox->setText(i18n("Enable"));
m_primaryLayout->addMultiCellWidget(m_postProcessEnabledCheckBox, 0, 0, 0, 0);
@@ -210,7 +210,7 @@ TracePostProcessControlWidget::TracePostProcessControlWidget(TQWidget *parent, c
m_voltsMultiplierSpinBox->setFloatMax(1000);
m_voltsMultiplierSpinBox->setFloatMin(-1000);
m_voltsMultiplierSpinBox->setFloatValue(1.0);
- connect(m_voltsMultiplierSpinBox, SIGNAL(floatValueChanged(double)), this, SLOT(vMultChanged(double)));
+ connect(m_voltsMultiplierSpinBox, TQ_SIGNAL(floatValueChanged(double)), this, TQ_SLOT(vMultChanged(double)));
m_voltsMultiplierSpinBox->setEnabled(false);
m_primaryLayout->addMultiCellWidget(m_voltsMultiplierSpinBox, 0, 0, 1, 1);
@@ -259,12 +259,12 @@ MathTraceControlWidget::MathTraceControlWidget(TQWidget *parent, const char *nam
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, 0);
m_voltsDivComboBox = new TQComboBox(m_groupBox);
- connect(m_voltsDivComboBox, SIGNAL(activated(int)), this, SLOT(vdivChanged(int)));
+ connect(m_voltsDivComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(vdivChanged(int)));
m_primaryLayout->addMultiCellWidget(m_voltsDivComboBox, 0, 0, 1, 1);
m_verticalUnitsLabel = new TQLabel(m_groupBox);
@@ -272,15 +272,15 @@ MathTraceControlWidget::MathTraceControlWidget(TQWidget *parent, const char *nam
m_primaryLayout->addMultiCellWidget(m_verticalUnitsLabel, 0, 0, 2, 2);
m_operandFirstComboBox = new TQComboBox(m_groupBox);
- connect(m_operandFirstComboBox, SIGNAL(activated(int)), this, SLOT(operandFirstChanged(int)));
+ connect(m_operandFirstComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(operandFirstChanged(int)));
m_primaryLayout->addMultiCellWidget(m_operandFirstComboBox, 1, 1, 0, 0);
m_operandSecondComboBox = new TQComboBox(m_groupBox);
- connect(m_operandSecondComboBox, SIGNAL(activated(int)), this, SLOT(operandSecondChanged(int)));
+ connect(m_operandSecondComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(operandSecondChanged(int)));
m_primaryLayout->addMultiCellWidget(m_operandSecondComboBox, 1, 1, 2, 2);
m_operatorComboBox = new TQComboBox(m_groupBox);
- connect(m_operatorComboBox, SIGNAL(activated(int)), this, SLOT(operatorChanged(int)));
+ connect(m_operatorComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(operatorChanged(int)));
m_primaryLayout->addMultiCellWidget(m_operatorComboBox, 1, 1, 1, 1);
}
@@ -466,7 +466,7 @@ TimebaseControlWidget::TimebaseControlWidget(TQWidget *parent, const char *name)
m_primaryLayout = new TQGridLayout(m_groupBox->layout(), 1, 1, KDialog::spacingHint());
m_secondsDivComboBox = new TQComboBox(m_groupBox);
- connect(m_secondsDivComboBox, SIGNAL(activated(int)), this, SLOT(sdivChanged(int)));
+ connect(m_secondsDivComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(sdivChanged(int)));
m_primaryLayout->addMultiCellWidget(m_secondsDivComboBox, 0, 0, 0, 0);
TQLabel* label = new TQLabel(m_groupBox);
@@ -526,11 +526,11 @@ ScopePart::ScopePart( TQWidget *parentWidget, const char *widgetName, TQObject *
// 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_controlWidgetViewFixupTimer = new TQTimer(this);
- connect(m_controlWidgetViewFixupTimer, SIGNAL(timeout()), this, SLOT(controlWidgetViewSetWidth()));
+ connect(m_controlWidgetViewFixupTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(controlWidgetViewSetWidth()));
m_controlWidgetViewFixupTimer->start(100, FALSE);
// Initialize data
@@ -591,10 +591,10 @@ ScopePart::ScopePart( TQWidget *parentWidget, const char *widgetName, TQObject *
m_mathTraceControlWidgetGrid = new TQGridLayout(m_base->mathTraceControlLayoutWidget);
m_timebaseControlWidgetGrid = new TQGridLayout(m_base->timebaseControlLayoutWidget);
m_timebaseControlWidget = new TimebaseControlWidget(m_base->timebaseControlLayoutWidget);
- connect(m_timebaseControlWidget, SIGNAL(secondsPerDivChanged(double)), this, SLOT(traceControlSDivChanged(double)));
+ connect(m_timebaseControlWidget, TQ_SIGNAL(secondsPerDivChanged(double)), this, TQ_SLOT(traceControlSDivChanged(double)));
m_timebaseControlWidgetGrid->addMultiCellWidget(m_timebaseControlWidget, 0, 0, 0, 0);
m_traceWidget = m_base->traceScrollWidget->traceWidget();
- connect(m_traceWidget, SIGNAL(cursorDragged(uint, double)), this, SLOT(cursorLevelChanged(uint, double)));
+ connect(m_traceWidget, TQ_SIGNAL(cursorDragged(uint, double)), this, TQ_SLOT(cursorLevelChanged(uint, double)));
m_base->traceScrollWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
m_base->traceScrollWidget->setResizePolicy(TQScrollView::AutoOneFit);
m_base->traceScrollWidget->setHScrollBarMode(TQScrollView::AlwaysOff);
@@ -635,19 +635,19 @@ ScopePart::ScopePart( TQWidget *parentWidget, const char *widgetName, TQObject *
m_base->traceZoomWidget->setHorizontalRangeModeAbsolute(false);
m_base->traceZoomWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
- connect(m_traceWidget, SIGNAL(zoomBoxChanged(const TQRectF&)), this, SLOT(updateZoomWidgetLimits(const TQRectF&)));
- connect(m_traceWidget, SIGNAL(offsetChanged(uint, double)), m_base->traceZoomWidget, SLOT(setTraceOffset(uint, double)));
+ connect(m_traceWidget, TQ_SIGNAL(zoomBoxChanged(const TQRectF&)), this, TQ_SLOT(updateZoomWidgetLimits(const TQRectF&)));
+ connect(m_traceWidget, TQ_SIGNAL(offsetChanged(uint, double)), m_base->traceZoomWidget, TQ_SLOT(setTraceOffset(uint, double)));
- connect(m_base->dumpSamples, SIGNAL(clicked()), this, SLOT(dumpSamples()));
- connect(m_base->acqStart, SIGNAL(clicked()), this, SLOT(startDAQ()));
- connect(m_base->acqStop, SIGNAL(clicked()), this, SLOT(stopDAQ()));
- connect(m_base->runControlStartButton, SIGNAL(clicked()), this, SLOT(startScope()));
- connect(m_base->runControlStopButton, SIGNAL(clicked()), this, SLOT(stopScope()));
+ connect(m_base->dumpSamples, TQ_SIGNAL(clicked()), this, TQ_SLOT(dumpSamples()));
+ connect(m_base->acqStart, TQ_SIGNAL(clicked()), this, TQ_SLOT(startDAQ()));
+ connect(m_base->acqStop, TQ_SIGNAL(clicked()), this, TQ_SLOT(stopDAQ()));
+ connect(m_base->runControlStartButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(startScope()));
+ connect(m_base->runControlStopButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(stopScope()));
- connect(m_base->waveformSave, SIGNAL(clicked()), this, SLOT(saveWaveforms()));
- connect(m_base->waveformRecall, SIGNAL(clicked()), this, SLOT(recallWaveforms()));
+ connect(m_base->waveformSave, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveWaveforms()));
+ connect(m_base->waveformRecall, TQ_SIGNAL(clicked()), this, TQ_SLOT(recallWaveforms()));
- TQTimer::singleShot(0, this, TQT_SLOT(postInit()));
+ TQTimer::singleShot(0, this, TQ_SLOT(postInit()));
}
ScopePart::~ScopePart() {
@@ -731,9 +731,9 @@ void ScopePart::disconnectFromServerCallback() {
}
void ScopePart::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 = 0;
m_commHandlerMode = 0;
@@ -2458,17 +2458,17 @@ void ScopePart::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(voltsPerDivChanged(double)), this, SLOT(traceControlVDivChanged(double)));
- connect(m_traceControlWidgetList[i], SIGNAL(triggerChannelChangeRequested()), this, SLOT(processTriggerButtons()));
+ connect(m_traceControlWidgetList[i], TQ_SIGNAL(enableChanged(bool)), this, TQ_SLOT(traceControlEnableChanged(bool)));
+ connect(m_traceControlWidgetList[i], TQ_SIGNAL(voltsPerDivChanged(double)), this, TQ_SLOT(traceControlVDivChanged(double)));
+ connect(m_traceControlWidgetList[i], TQ_SIGNAL(triggerChannelChangeRequested()), this, TQ_SLOT(processTriggerButtons()));
m_traceControlWidgetGrid->addMultiCellWidget(m_traceControlWidgetList[i], i, i, 0, 0);
m_traceControlWidgetList[i]->setTraceName(i18n("Channel %1").arg(i+1));
m_traceControlWidgetList[i]->show();
}
if (!m_tracePostProcessControlWidgetList[i]) {
m_tracePostProcessControlWidgetList[i] = new TracePostProcessControlWidget(m_base->postProcessTraceControlLayoutWidget);
- connect(m_tracePostProcessControlWidgetList[i], SIGNAL(enableChanged(bool)), this, SLOT(tracePostProcessControlEnableChanged(bool)));
- connect(m_tracePostProcessControlWidgetList[i], SIGNAL(voltsMultiplierChanged(double)), this, SLOT(tracePostProcessControlVMultChanged(double)));
+ connect(m_tracePostProcessControlWidgetList[i], TQ_SIGNAL(enableChanged(bool)), this, TQ_SLOT(tracePostProcessControlEnableChanged(bool)));
+ connect(m_tracePostProcessControlWidgetList[i], TQ_SIGNAL(voltsMultiplierChanged(double)), this, TQ_SLOT(tracePostProcessControlVMultChanged(double)));
m_postProcessTraceControlWidgetGrid->addMultiCellWidget(m_tracePostProcessControlWidgetList[i], i, i, 0, 0);
m_tracePostProcessControlWidgetList[i]->setTraceName(i18n("Channel %1").arg(i+1));
m_tracePostProcessControlWidgetList[i]->show();
@@ -2487,11 +2487,11 @@ void ScopePart::updateTraceControlWidgets() {
for (i=0; i<m_maxNumberOfMathTraces;i++) {
if (!m_mathTraceControlWidgetList[i]) {
m_mathTraceControlWidgetList[i] = new MathTraceControlWidget(m_base->mathTraceControlLayoutWidget);
- connect(m_mathTraceControlWidgetList[i], SIGNAL(enableChanged(bool)), this, SLOT(mathTraceControlEnableChanged(bool)));
- connect(m_mathTraceControlWidgetList[i], SIGNAL(voltsPerDivChanged(double)), this, SLOT(mathTraceControlVDivChanged(double)));
- connect(m_mathTraceControlWidgetList[i], SIGNAL(firstMathOperandChanged(int)), this, SLOT(mathTraceControlFirstOperandChanged(int)));
- connect(m_mathTraceControlWidgetList[i], SIGNAL(secondMathOperandChanged(int)), this, SLOT(mathTraceControlSecondOperandChanged(int)));
- connect(m_mathTraceControlWidgetList[i], SIGNAL(mathOperatorChanged(TQString)), this, SLOT(mathTraceControlOperatorChanged(TQString)));
+ connect(m_mathTraceControlWidgetList[i], TQ_SIGNAL(enableChanged(bool)), this, TQ_SLOT(mathTraceControlEnableChanged(bool)));
+ connect(m_mathTraceControlWidgetList[i], TQ_SIGNAL(voltsPerDivChanged(double)), this, TQ_SLOT(mathTraceControlVDivChanged(double)));
+ connect(m_mathTraceControlWidgetList[i], TQ_SIGNAL(firstMathOperandChanged(int)), this, TQ_SLOT(mathTraceControlFirstOperandChanged(int)));
+ connect(m_mathTraceControlWidgetList[i], TQ_SIGNAL(secondMathOperandChanged(int)), this, TQ_SLOT(mathTraceControlSecondOperandChanged(int)));
+ connect(m_mathTraceControlWidgetList[i], TQ_SIGNAL(mathOperatorChanged(TQString)), this, TQ_SLOT(mathTraceControlOperatorChanged(TQString)));
m_mathTraceControlWidgetGrid->addMultiCellWidget(m_mathTraceControlWidgetList[i], i+m_maxNumberOfTraces, i+m_maxNumberOfTraces, 0, 0);
m_mathTraceControlWidgetList[i]->setTraceName(i18n("Math %1").arg(i+1));
m_mathTraceControlWidgetList[i]->show();
diff --git a/clients/tde/src/part/scope/part.h b/clients/tde/src/part/scope/part.h
index dbe4066..f9f6790 100644
--- a/clients/tde/src/part/scope/part.h
+++ b/clients/tde/src/part/scope/part.h
@@ -56,7 +56,7 @@ namespace RemoteLab
{
class TraceControlWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
TraceControlWidget(TQWidget *parent=0, const char *name=0);
@@ -91,7 +91,7 @@ namespace RemoteLab
class TracePostProcessControlWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
TracePostProcessControlWidget(TQWidget *parent=0, const char *name=0);
@@ -119,7 +119,7 @@ namespace RemoteLab
class MathTraceControlWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
MathTraceControlWidget(TQWidget *parent=0, const char *name=0);
@@ -173,7 +173,7 @@ namespace RemoteLab
class TimebaseControlWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
TimebaseControlWidget(TQWidget *parent=0, const char *name=0);
@@ -199,10 +199,10 @@ namespace RemoteLab
class ScopePart : public KParts::RemoteInstrumentPart
{
- Q_OBJECT
+ TQ_OBJECT
public:
- ScopePart( QWidget *, const char *, TQObject *, const char *, const TQStringList&);
+ ScopePart( TQWidget *, const char *, TQObject *, const char *, const TQStringList&);
~ScopePart();
virtual bool openFile() { return false; } // pure virtual in the base class