diff options
Diffstat (limited to 'clients/tde/src/part/companalyzer')
| -rwxr-xr-x | clients/tde/src/part/companalyzer/part.cpp | 40 | ||||
| -rw-r--r-- | clients/tde/src/part/companalyzer/part.h | 10 |
2 files changed, 25 insertions, 25 deletions
diff --git a/clients/tde/src/part/companalyzer/part.cpp b/clients/tde/src/part/companalyzer/part.cpp index 9fb56bf..8bec821 100755 --- a/clients/tde/src/part/companalyzer/part.cpp +++ b/clients/tde/src/part/companalyzer/part.cpp @@ -435,7 +435,7 @@ void CompAnalyzerWorker::wake() { void CompAnalyzerWorker::dataReceived() { if (!m_networkDataMutex->tryLock()) { - TQTimer::singleShot(0, this, TQT_SLOT(dataReceived())); + TQTimer::singleShot(0, this, TQ_SLOT(dataReceived())); } else { m_newData = true; @@ -579,12 +579,12 @@ CompAnalyzerPart::CompAnalyzerPart( TQWidget *parentWidget, const char *widgetNa m_worker = new CompAnalyzerWorker(); m_workerThread = new TQEventLoopThread(); m_worker->moveToThread(m_workerThread); - TQObject::connect(this, TQT_SIGNAL(wakeWorkerThread()), m_worker, TQT_SLOT(wake())); - TQObject::connect(m_worker, TQT_SIGNAL(outboundQueueUpdated()), this, TQT_SLOT(processOutboundQueue())); + TQObject::connect(this, TQ_SIGNAL(wakeWorkerThread()), m_worker, TQ_SLOT(wake())); + TQObject::connect(m_worker, TQ_SIGNAL(outboundQueueUpdated()), this, TQ_SLOT(processOutboundQueue())); // Create timers m_updateTimeoutTimer = new TQTimer(this); - connect(m_updateTimeoutTimer, SIGNAL(timeout()), this, SLOT(networkTimeout())); + connect(m_updateTimeoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(networkTimeout())); // Create widgets m_base = new CompAnalyzerBase(widget()); @@ -626,22 +626,22 @@ CompAnalyzerPart::CompAnalyzerPart( TQWidget *parentWidget, const char *widgetNa m_traceWidget->setCursorActiveTraceList(3, activeTraces); m_traceWidget->setZoomBoxEnabled(true); - connect(m_base->parameterASourceCombo, SIGNAL(activated(int)), this, SLOT(parameterASourceChanged(int))); - connect(m_base->parameterBSourceCombo, SIGNAL(activated(int)), this, SLOT(parameterBSourceChanged(int))); - connect(m_base->measurementFrequencyBox, SIGNAL(floatValueChanged(double)), this, SLOT(frequencyInputChanged(double))); + connect(m_base->parameterASourceCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(parameterASourceChanged(int))); + connect(m_base->parameterBSourceCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(parameterBSourceChanged(int))); + connect(m_base->measurementFrequencyBox, TQ_SIGNAL(floatValueChanged(double)), this, TQ_SLOT(frequencyInputChanged(double))); - connect(m_base->sweepStartFrequencyBox, SIGNAL(floatValueChanged(double)), this, SLOT(processLockouts())); - connect(m_base->sweepEndFrequencyBox, SIGNAL(floatValueChanged(double)), this, SLOT(processLockouts())); - connect(m_base->sweepStepFrequencyBox, SIGNAL(floatValueChanged(double)), this, SLOT(processLockouts())); + connect(m_base->sweepStartFrequencyBox, TQ_SIGNAL(floatValueChanged(double)), this, TQ_SLOT(processLockouts())); + connect(m_base->sweepEndFrequencyBox, TQ_SIGNAL(floatValueChanged(double)), this, TQ_SLOT(processLockouts())); + connect(m_base->sweepStepFrequencyBox, TQ_SIGNAL(floatValueChanged(double)), this, TQ_SLOT(processLockouts())); 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&))); - connect(m_base->sweepStartButton, SIGNAL(clicked()), this, SLOT(startSweepClicked())); - connect(m_base->sweepStopButton, SIGNAL(clicked()), this, SLOT(stopSweepClicked())); - 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->sweepStartButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(startSweepClicked())); + connect(m_base->sweepStopButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(stopSweepClicked())); + 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())); // Initialize data m_hdivs = 10; @@ -654,7 +654,7 @@ CompAnalyzerPart::CompAnalyzerPart( TQWidget *parentWidget, const char *widgetNa } updateGraticule(); - TQTimer::singleShot(0, this, TQT_SLOT(postInit())); + TQTimer::singleShot(0, this, TQ_SLOT(postInit())); } CompAnalyzerPart::~CompAnalyzerPart() { @@ -768,9 +768,9 @@ void CompAnalyzerPart::connectionFinishedCallback() { m_socket->moveToThread(m_workerThread); m_worker->appendItemToInboundQueue(CompAnalyzerEvent(Initialize, TQVariant()), true); - 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()), m_worker, SLOT(dataReceived())); + connect(m_socket, TQ_SIGNAL(newDataReceived()), m_worker, TQ_SLOT(dataReceived())); m_tickerState = 0; m_commHandlerState = 0; m_commHandlerMode = 0; @@ -779,7 +779,7 @@ void CompAnalyzerPart::connectionFinishedCallback() { // Start worker m_workerThread->start(); - TQTimer::singleShot(0, m_worker, SLOT(run())); + TQTimer::singleShot(0, m_worker, TQ_SLOT(run())); processLockouts(); networkTick(); diff --git a/clients/tde/src/part/companalyzer/part.h b/clients/tde/src/part/companalyzer/part.h index 89a03f8..5f6d77a 100644 --- a/clients/tde/src/part/companalyzer/part.h +++ b/clients/tde/src/part/companalyzer/part.h @@ -108,13 +108,13 @@ namespace RemoteLab } CompAnalyzerInstrumentLimits; #ifndef QT_NO_DATASTREAM - Q_EXPORT TQDataStream &operator<<(TQDataStream &, const CompAnalyzerMeasurement &); - Q_EXPORT TQDataStream &operator>>(TQDataStream &, CompAnalyzerMeasurement &); + TQ_EXPORT TQDataStream &operator<<(TQDataStream &, const CompAnalyzerMeasurement &); + TQ_EXPORT TQDataStream &operator>>(TQDataStream &, CompAnalyzerMeasurement &); #endif class CompAnalyzerWorker : public TQObject { - Q_OBJECT + TQ_OBJECT public: CompAnalyzerWorker(); @@ -183,10 +183,10 @@ namespace RemoteLab class CompAnalyzerPart : public KParts::RemoteInstrumentPart { - Q_OBJECT + TQ_OBJECT public: - CompAnalyzerPart( QWidget *, const char *, TQObject *, const char *, const TQStringList&); + CompAnalyzerPart( TQWidget *, const char *, TQObject *, const char *, const TQStringList&); ~CompAnalyzerPart(); virtual bool openFile() { return false; } // pure virtual in the base class |