summaryrefslogtreecommitdiffstats
path: root/clients/tde/src/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'clients/tde/src/widgets')
-rw-r--r--clients/tde/src/widgets/floatspinbox.cpp6
-rw-r--r--clients/tde/src/widgets/floatspinbox.h4
-rw-r--r--clients/tde/src/widgets/sevensegment.h6
-rw-r--r--clients/tde/src/widgets/tracewidget.cpp46
-rw-r--r--clients/tde/src/widgets/tracewidget.h16
5 files changed, 39 insertions, 39 deletions
diff --git a/clients/tde/src/widgets/floatspinbox.cpp b/clients/tde/src/widgets/floatspinbox.cpp
index 9bcff87..3dbf346 100644
--- a/clients/tde/src/widgets/floatspinbox.cpp
+++ b/clients/tde/src/widgets/floatspinbox.cpp
@@ -34,13 +34,13 @@
FloatSpinBox::FloatSpinBox(double fmin, double fmax, double fvalue, TQWidget *parent) : TQSpinBox(parent) {
init(fmin, fmax, fvalue);
- connect( this, SIGNAL(valueChanged(int)), SLOT(acceptValueChanged(int)) );
+ connect( this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(acceptValueChanged(int)) );
}
FloatSpinBox::FloatSpinBox(TQWidget *parent , const char* name) : TQSpinBox(parent, name) {
init(0, 0, 0);
- connect( this, SIGNAL(valueChanged(int)), SLOT(acceptValueChanged(int)) );
+ connect( this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(acceptValueChanged(int)) );
}
void FloatSpinBox::init(double fmin, double fmax, double fvalue, int precision) {
@@ -120,4 +120,4 @@ FloatSpinBox::~FloatSpinBox()
//
}
-#include "floatspinbox.moc" \ No newline at end of file
+#include "floatspinbox.moc"
diff --git a/clients/tde/src/widgets/floatspinbox.h b/clients/tde/src/widgets/floatspinbox.h
index 102584f..deefe06 100644
--- a/clients/tde/src/widgets/floatspinbox.h
+++ b/clients/tde/src/widgets/floatspinbox.h
@@ -32,7 +32,7 @@
class FloatSpinBox : public TQSpinBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
FloatSpinBox(TQWidget *parent = 0, const char* name = 0);
@@ -67,4 +67,4 @@ class FloatSpinBox : public TQSpinBox
double value;
};
-#endif // FLOATSPINBOX_H \ No newline at end of file
+#endif // FLOATSPINBOX_H
diff --git a/clients/tde/src/widgets/sevensegment.h b/clients/tde/src/widgets/sevensegment.h
index 62b3b00..c568a72 100644
--- a/clients/tde/src/widgets/sevensegment.h
+++ b/clients/tde/src/widgets/sevensegment.h
@@ -30,7 +30,7 @@ class Display7SegmentPrivate;
class TQ_EXPORT Display7Segment : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
TQ_ENUMS(SegmentStyle)
TQ_PROPERTY(SegmentStyle segmentStyle READ segmentStyle WRITE setSegmentStyle)
@@ -69,7 +69,7 @@ class TQ_EXPORT Display7Segment : public TQFrame
class TQ_EXPORT Display7SegmentArray : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
TQ_ENUMS(SegmentStyle)
TQ_PROPERTY(SegmentStyle segmentStyle READ segmentStyle WRITE setSegmentStyle)
@@ -96,4 +96,4 @@ class TQ_EXPORT Display7SegmentArray : public TQFrame
void init();
};
-#endif \ No newline at end of file
+#endif
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;
diff --git a/clients/tde/src/widgets/tracewidget.h b/clients/tde/src/widgets/tracewidget.h
index aed6189..0e5befb 100644
--- a/clients/tde/src/widgets/tracewidget.h
+++ b/clients/tde/src/widgets/tracewidget.h
@@ -71,7 +71,7 @@ class TQRectF
class TraceWidgetPushButton : public TQPushButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
TraceWidgetPushButton(TQWidget *parent, const char* name=0);
@@ -87,7 +87,7 @@ typedef TQValueList<int> TraceNumberList;
class TraceData : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
TraceData(TraceWidget* parent, TQWidget* labelParent=0);
@@ -150,7 +150,7 @@ typedef TQMemArray<TraceData*> TraceList;
class CursorData : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
CursorData(TraceWidget* parent, TQWidget* labelParent=0);
@@ -193,7 +193,7 @@ typedef TQMemArray<CursorData*> CursorList;
class GraticuleWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
GraticuleWidget(TraceWidget*, const char* = 0);
@@ -242,7 +242,7 @@ class GraticuleWidget : public TQWidget
class TraceWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum TextDisplayType {
@@ -400,7 +400,7 @@ class TraceWidget : public TQWidget
class TraceScrollView : public TQScrollView
{
- Q_OBJECT
+ TQ_OBJECT
public:
TraceScrollView(TQWidget* = 0, const char* = 0);
@@ -419,7 +419,7 @@ class TraceScrollView : public TQScrollView
class TraceScrollWidget : public TQVBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
TraceScrollWidget(TQWidget* = 0, const char* = 0);
@@ -439,4 +439,4 @@ class TraceScrollWidget : public TQVBox
TQScrollView::ScrollBarMode m_horizScrollBarMode;
};
-#endif \ No newline at end of file
+#endif
generated by cgit v1.2.3 (git 2.46.0) at 2025-09-23 19:28:08 +0000