diff options
Diffstat (limited to 'clients/tde/src/widgets/tracewidget.cpp')
-rw-r--r-- | clients/tde/src/widgets/tracewidget.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/clients/tde/src/widgets/tracewidget.cpp b/clients/tde/src/widgets/tracewidget.cpp index f4a7c7d..14d2df8 100644 --- a/clients/tde/src/widgets/tracewidget.cpp +++ b/clients/tde/src/widgets/tracewidget.cpp @@ -637,10 +637,10 @@ TraceData::TraceData(TraceWidget* parent, TQWidget* labelParent) : TQObject(), p singleDecrBtn->hide(); posResetBtn->hide(); posSetBtn->hide(); - connect(singleIncrBtn, SIGNAL(clicked()), this, SLOT(movePosOneTick())); - connect(singleDecrBtn, SIGNAL(clicked()), this, SLOT(moveNegOneTick())); - connect(posResetBtn, SIGNAL(clicked()), this, SLOT(resetVPosition())); - connect(posSetBtn, SIGNAL(clicked()), this, SLOT(setVPosition())); + connect(singleIncrBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(movePosOneTick())); + connect(singleDecrBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveNegOneTick())); + connect(posResetBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(resetVPosition())); + connect(posSetBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(setVPosition())); } else { paramLabel = NULL; @@ -698,10 +698,10 @@ void TraceData::drawTrace(TQPainter* p, int graticule_width, int graticule_heigh for (n=leftEdgeIndex; n<numberOfSamples-incr; n=n+incr) { // Detect invalid samples and skip drawing of those samples // This avoids ugly drawing artifacts when not all sample data is available - if ( isnan(positionArray[n]) || isinf(positionArray[n]) - || isnan(positionArray[n+incr]) || isinf(positionArray[n+incr]) - || isnan(sampleArray[n]) || isinf(sampleArray[n]) - || isnan(sampleArray[n+incr]) || isinf(sampleArray[n+incr])) { + if ( std::isnan(positionArray[n]) || std::isinf(positionArray[n]) + || std::isnan(positionArray[n+incr]) || std::isinf(positionArray[n+incr]) + || std::isnan(sampleArray[n]) || std::isinf(sampleArray[n]) + || std::isnan(sampleArray[n+incr]) || std::isinf(sampleArray[n+incr])) { continue; } @@ -898,10 +898,10 @@ CursorData::CursorData(TraceWidget* parent, TQWidget* labelParent) : TQObject(), singleDecrBtn->installEventFilter(this); multiIncrBtn->installEventFilter(this); multiDecrBtn->installEventFilter(this); - connect(singleIncrBtn, SIGNAL(clicked()), this, SLOT(movePosOneTick())); - connect(singleDecrBtn, SIGNAL(clicked()), this, SLOT(moveNegOneTick())); - connect(multiIncrBtn, SIGNAL(clicked()), this, SLOT(movePosMultiTicks())); - connect(multiDecrBtn, SIGNAL(clicked()), this, SLOT(moveNegMultiTicks())); + connect(singleIncrBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(movePosOneTick())); + connect(singleDecrBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveNegOneTick())); + connect(multiIncrBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(movePosMultiTicks())); + connect(multiDecrBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveNegMultiTicks())); } else { paramLabel = NULL; @@ -1066,7 +1066,7 @@ GraticuleWidget::GraticuleWidget(TraceWidget* parent, const char* name) : TQWidg setPaletteBackgroundColor(TQt::black); setPaletteForegroundColor(TQColor(0,128,0)); setMouseTracking(true); - setCursor(tqcrossCursor); + setCursor(crossCursor); } GraticuleWidget::~GraticuleWidget() { @@ -1209,7 +1209,7 @@ void GraticuleWidget::mousePressEvent(TQMouseEvent *e) { if (m_base->m_zoomBoxEnabled) { m_middleMouseDown = true; m_prevDownPos = e->pos(); - setCursor(tqsizeAllCursor); + setCursor(sizeAllCursor); } } } @@ -1288,7 +1288,7 @@ void GraticuleWidget::mouseReleaseEvent(TQMouseEvent *e) { // Reset original zoom box m_base->setZoomCursorBox(m_prevCursorRect); } - setCursor(tqcrossCursor); + setCursor(crossCursor); } } @@ -1339,10 +1339,10 @@ void GraticuleWidget::mouseMoveEvent(TQMouseEvent *e) { if (m_closestCursor >= 0) { if (m_closestCursorDistance <= CURSOR_MOVE_CAPTURE_DISTANCE) { if (m_base->m_cursorArray[m_closestCursor]->orientation == TQt::Horizontal) { - setCursor(tqsizeVerCursor); + setCursor(sizeVerCursor); } else { - setCursor(tqsizeHorCursor); + setCursor(sizeHorCursor); } if (!m_base->m_cursorArray[m_closestCursor]->highlighted) { cursorHighlightChanged = true; @@ -1350,7 +1350,7 @@ void GraticuleWidget::mouseMoveEvent(TQMouseEvent *e) { m_base->m_cursorArray[m_closestCursor]->highlighted = true; } else { - setCursor(tqcrossCursor); + setCursor(crossCursor); if (m_base->m_cursorArray[m_closestCursor]->highlighted) { cursorHighlightChanged = true; } @@ -1358,7 +1358,7 @@ void GraticuleWidget::mouseMoveEvent(TQMouseEvent *e) { } } else { - setCursor(tqcrossCursor); + setCursor(crossCursor); } } @@ -1502,7 +1502,7 @@ TraceWidget::TraceWidget(TQWidget* parent, const char* name) : TQWidget(parent, m_primaryLayout = new TQGridLayout(this); m_graticuleWidget = new GraticuleWidget(this); - connect(m_graticuleWidget, SIGNAL(cursorPositionChanged(uint, double)), this, SLOT(processChangedCursor(uint, double))); + connect(m_graticuleWidget, TQ_SIGNAL(cursorPositionChanged(uint, double)), this, TQ_SLOT(processChangedCursor(uint, double))); m_primaryLayout->addMultiCellWidget(m_graticuleWidget, 0, 253, 1, 254); m_primaryLayout->setAlignment(TQt::AlignTop); m_rightPaneLayout = new TQGridLayout; @@ -2560,7 +2560,7 @@ void TraceWidget::resizeTraceArray(uint newsize) { m_traceArray.resize(newsize); for (uint i=oldcount;i<newsize;i++) { m_traceArray[i] = new TraceData(this, this); - connect(m_traceArray[i], SIGNAL(offsetChanged(double)), this, SLOT(processChangedOffset(double))); + connect(m_traceArray[i], TQ_SIGNAL(offsetChanged(double)), this, TQ_SLOT(processChangedOffset(double))); if (m_traceArray[i]->paramLabel) { m_traceLabelLayout->addMultiCellWidget(m_traceArray[i]->paramLabel, 0, 2, i*2, i*2); m_traceLabelLayout->addWidget(m_traceArray[i]->singleIncrBtn, 0, (i*2)+1); @@ -2601,7 +2601,7 @@ void TraceWidget::resizeCursorArray(uint newsize) { m_cursorArray.resize(newsize); for (uint i=oldcount;i<newsize;i++) { m_cursorArray[i] = new CursorData(this, this); - connect(m_cursorArray[i], SIGNAL(positionChanged(double)), this, SLOT(processChangedCusorPosition(double))); + connect(m_cursorArray[i], TQ_SIGNAL(positionChanged(double)), this, TQ_SLOT(processChangedCusorPosition(double))); if (m_cursorArray[i]->paramLabel) { m_cursorLabelLayout->addMultiCellWidget(m_cursorArray[i]->paramLabel, i*2, i*2, 0, 3); m_cursorLabelLayout->addMultiCellWidget(m_cursorArray[i]->multiIncrBtn, (i*2)+1, (i*2)+1, 0, 0, TQt::AlignHCenter); @@ -2664,7 +2664,7 @@ TraceScrollWidget::TraceScrollWidget(TQWidget* parent, const char* name) : TQVBo m_traceScrollView = new TraceScrollView(this); m_horizScrollBar = new TQScrollBar(this); m_traceScrollView->m_traceWidget->m_horizScrollBar = m_horizScrollBar; - connect(m_horizScrollBar, TQT_SIGNAL(valueChanged(int)), m_traceScrollView->m_traceWidget->m_graticuleWidget, TQT_SLOT(horizScrollValueChanged(int))); + connect(m_horizScrollBar, TQ_SIGNAL(valueChanged(int)), m_traceScrollView->m_traceWidget->m_graticuleWidget, TQ_SLOT(horizScrollValueChanged(int))); m_traceScrollView->setHScrollBarMode(TQScrollView::AlwaysOff); m_horizScrollBar->setOrientation(TQt::Horizontal); m_horizScrollBarMode = TQScrollView::AlwaysOff; |