diff options
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/AudioVUMeter.cpp | 6 | ||||
-rw-r--r-- | src/gui/widgets/BigArrowButton.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/Fader.cpp | 38 | ||||
-rw-r--r-- | src/gui/widgets/PitchDragLabel.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/PitchDragLabel.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/PluginControl.cpp | 8 | ||||
-rw-r--r-- | src/gui/widgets/ProgressDialog.cpp | 6 | ||||
-rw-r--r-- | src/gui/widgets/QuantizeParameters.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/Rotary.cpp | 12 | ||||
-rw-r--r-- | src/gui/widgets/TimeWidget.cpp | 16 | ||||
-rw-r--r-- | src/gui/widgets/VUMeter.cpp | 2 |
11 files changed, 48 insertions, 48 deletions
diff --git a/src/gui/widgets/AudioVUMeter.cpp b/src/gui/widgets/AudioVUMeter.cpp index aacb7c2..6327e2e 100644 --- a/src/gui/widgets/AudioVUMeter.cpp +++ b/src/gui/widgets/AudioVUMeter.cpp @@ -76,11 +76,11 @@ void AudioVUMeter::paintEvent(TQPaintEvent *e) { TQPainter paint(this); - paint.setPen(tqcolorGroup().mid()); + paint.setPen(colorGroup().mid()); paint.drawRect(0, 0, width(), height()); - paint.setPen(tqcolorGroup().background()); - paint.setBrush(tqcolorGroup().background()); + paint.setPen(colorGroup().background()); + paint.setBrush(colorGroup().background()); paint.drawRect(1, 1, width() - 2, m_yoff / 2 - 1); paint.drawRect(1, 1, m_xoff / 2 - 1, height() - 2); paint.drawRect(width() - m_xoff / 2 - 1, 1, m_xoff / 2, height() - 2); diff --git a/src/gui/widgets/BigArrowButton.h b/src/gui/widgets/BigArrowButton.h index eb364e1..7adfb9b 100644 --- a/src/gui/widgets/BigArrowButton.h +++ b/src/gui/widgets/BigArrowButton.h @@ -37,7 +37,7 @@ public: KArrowButton(parent, arrow, name) { } virtual ~BigArrowButton() { } - virtual TQSize tqsizeHint() const { + virtual TQSize sizeHint() const { return TQSize(20, 20); } }; diff --git a/src/gui/widgets/Fader.cpp b/src/gui/widgets/Fader.cpp index 022f0ca..915cf6e 100644 --- a/src/gui/widgets/Fader.cpp +++ b/src/gui/widgets/Fader.cpp @@ -73,7 +73,7 @@ Fader::Fader(AudioLevel::FaderType type, m_sliderMax = width() - m_sliderMin; } - m_outlineColour = tqcolorGroup().mid(); + m_outlineColour = colorGroup().mid(); calculateGroovePixmap(); setFader(0.0); @@ -110,7 +110,7 @@ Fader::Fader(int min, int max, int deflt, m_sliderMax = width() - m_sliderMin; } - m_outlineColour = tqcolorGroup().mid(); + m_outlineColour = colorGroup().mid(); calculateGroovePixmap(); setFader(deflt); @@ -141,7 +141,7 @@ Fader::Fader(int min, int max, int deflt, m_sliderMax = width() - m_sliderMin; } - m_outlineColour = tqcolorGroup().mid(); + m_outlineColour = colorGroup().mid(); calculateGroovePixmap(); setFader(deflt); @@ -447,9 +447,9 @@ Fader::calculateGroovePixmap() delete map; map = new TQPixmap(width(), height()); - map->fill(tqcolorGroup().background()); + map->fill(colorGroup().background()); TQPainter paint(map); - paint.setBrush(tqcolorGroup().background()); + paint.setBrush(colorGroup().background()); if (m_vertical) { @@ -464,9 +464,9 @@ Fader::calculateGroovePixmap() if (position >= 0 && position < m_sliderMax - m_sliderMin) { if (dB == 0) - paint.setPen(tqcolorGroup().dark()); + paint.setPen(colorGroup().dark()); else - paint.setPen(tqcolorGroup().midlight()); + paint.setPen(colorGroup().midlight()); paint.drawLine(1, (m_sliderMax - position), width() - 2, (m_sliderMax - position)); } @@ -477,8 +477,8 @@ Fader::calculateGroovePixmap() } } - paint.setPen(tqcolorGroup().dark()); - paint.setBrush(tqcolorGroup().mid()); + paint.setPen(colorGroup().dark()); + paint.setBrush(colorGroup().mid()); paint.drawRect(width() / 2 - 3, height() - m_sliderMax, 6, m_sliderMax - m_sliderMin); paint.end(); @@ -511,48 +511,48 @@ Fader::calculateButtonPixmap() buttonWidth = width() - 2; map = new TQPixmap(buttonWidth, buttonHeight); - map->fill(tqcolorGroup().background()); + map->fill(colorGroup().background()); int x = 0; int y = 0; TQPainter paint(map); - paint.setPen(tqcolorGroup().light()); + paint.setPen(colorGroup().light()); paint.drawLine(x + 1, y, x + buttonWidth - 2, y); paint.drawLine(x, y + 1, x, y + buttonHeight - 2); - paint.setPen(tqcolorGroup().midlight()); + paint.setPen(colorGroup().midlight()); paint.drawLine(x + 1, y + 1, x + buttonWidth - 2, y + 1); paint.drawLine(x + 1, y + 1, x + 1, y + buttonHeight - 2); - paint.setPen(tqcolorGroup().mid()); + paint.setPen(colorGroup().mid()); paint.drawLine(x + 2, y + buttonHeight - 2, x + buttonWidth - 2, y + buttonHeight - 2); paint.drawLine(x + buttonWidth - 2, y + 2, x + buttonWidth - 2, y + buttonHeight - 2); - paint.setPen(tqcolorGroup().dark()); + paint.setPen(colorGroup().dark()); paint.drawLine(x + 1, y + buttonHeight - 1, x + buttonWidth - 2, y + buttonHeight - 1); paint.drawLine(x + buttonWidth - 1, y + 1, x + buttonWidth - 1, y + buttonHeight - 2); - paint.setPen(tqcolorGroup().shadow()); + paint.setPen(colorGroup().shadow()); paint.drawLine(x + 1, y + buttonHeight / 2, x + buttonWidth - 2, y + buttonHeight / 2); - paint.setPen(tqcolorGroup().mid()); + paint.setPen(colorGroup().mid()); paint.drawLine(x + 1, y + buttonHeight / 2 - 1, x + buttonWidth - 2, y + buttonHeight / 2 - 1); paint.drawPoint(x, y + buttonHeight / 2); - paint.setPen(tqcolorGroup().light()); + paint.setPen(colorGroup().light()); paint.drawLine(x + 1, y + buttonHeight / 2 + 1, x + buttonWidth - 2, y + buttonHeight / 2 + 1); - paint.setPen(tqcolorGroup().button()); - paint.setBrush(tqcolorGroup().button()); + paint.setPen(colorGroup().button()); + paint.setBrush(colorGroup().button()); paint.drawRect(x + 2, y + 2, buttonWidth - 4, buttonHeight / 2 - 4); paint.drawRect(x + 2, y + buttonHeight / 2 + 2, buttonWidth - 4, buttonHeight / 2 - 4); diff --git a/src/gui/widgets/PitchDragLabel.cpp b/src/gui/widgets/PitchDragLabel.cpp index b43c15f..507ec1b 100644 --- a/src/gui/widgets/PitchDragLabel.cpp +++ b/src/gui/widgets/PitchDragLabel.cpp @@ -202,7 +202,7 @@ PitchDragLabel::paintEvent(TQPaintEvent *) } TQSize -PitchDragLabel::tqsizeHint() const +PitchDragLabel::sizeHint() const { return TQSize(150, 135); } diff --git a/src/gui/widgets/PitchDragLabel.h b/src/gui/widgets/PitchDragLabel.h index 6f11b17..3bb0868 100644 --- a/src/gui/widgets/PitchDragLabel.h +++ b/src/gui/widgets/PitchDragLabel.h @@ -53,7 +53,7 @@ public: int getPitch() const { return m_pitch; } - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; signals: void pitchDragged(int); diff --git a/src/gui/widgets/PluginControl.cpp b/src/gui/widgets/PluginControl.cpp index 0c998f3..e1982e3 100644 --- a/src/gui/widgets/PluginControl.cpp +++ b/src/gui/widgets/PluginControl.cpp @@ -165,7 +165,7 @@ PluginControl::PluginControl(TQWidget *parent, if (!hidden) { controlTitle->show(); item = new TQWidgetItem(controlTitle); - item->tqsetAlignment(TQt::AlignRight | TQt::AlignBottom); + item->setAlignment(TQt::AlignRight | TQt::AlignBottom); m_tqlayout->addItem(item); } else { controlTitle->hide(); @@ -174,7 +174,7 @@ PluginControl::PluginControl(TQWidget *parent, if (showBounds && !hidden) { low->show(); item = new TQWidgetItem(low); - item->tqsetAlignment(TQt::AlignRight | TQt::AlignBottom); + item->setAlignment(TQt::AlignRight | TQt::AlignBottom); m_tqlayout->addItem(item); } else { low->hide(); @@ -183,7 +183,7 @@ PluginControl::PluginControl(TQWidget *parent, if (!hidden) { m_dial->show(); item = new TQWidgetItem(m_dial); - item->tqsetAlignment(TQt::AlignCenter); + item->setAlignment(TQt::AlignCenter); m_tqlayout->addItem(item); } else { m_dial->hide(); @@ -192,7 +192,7 @@ PluginControl::PluginControl(TQWidget *parent, if (showBounds && !hidden) { upp->show(); item = new TQWidgetItem(upp); - item->tqsetAlignment(TQt::AlignLeft | TQt::AlignBottom); + item->setAlignment(TQt::AlignLeft | TQt::AlignBottom); m_tqlayout->addItem(item); } else { upp->hide(); diff --git a/src/gui/widgets/ProgressDialog.cpp b/src/gui/widgets/ProgressDialog.cpp index e8ff6ee..7cef518 100644 --- a/src/gui/widgets/ProgressDialog.cpp +++ b/src/gui/widgets/ProgressDialog.cpp @@ -130,8 +130,8 @@ ProgressDialog::slotSetOperationName(TQString name) setLabel(name); // Little trick stolen from TQProgressDialog // increase resize only, never shrink - int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() ); - int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() ); + int w = TQMAX( isVisible() ? width() : 0, sizeHint().width() ); + int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() ); resize( w, h ); } @@ -199,7 +199,7 @@ void ProgressDialog::processEvents() // RG_DEBUG << "ProgressDialog::processEvents: modalVisible is " // << m_modalVisible << endl; if (m_modalVisible) { - kapp->tqprocessEvents(50); + kapp->processEvents(50); } else { rgapp->refreshGUI(50); } diff --git a/src/gui/widgets/QuantizeParameters.cpp b/src/gui/widgets/QuantizeParameters.cpp index a85e3b6..e04d9ba 100644 --- a/src/gui/widgets/QuantizeParameters.cpp +++ b/src/gui/widgets/QuantizeParameters.cpp @@ -71,7 +71,7 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent, int zero = 0; if (!preamble.isNull()) { TQLabel *label = new TQLabel(preamble, this); - label->tqsetAlignment(TQt::WordBreak); + label->setAlignment(TQt::WordBreak); m_mainLayout->addMultiCellWidget(label, 0, 0, 0, 1); zero = 1; } diff --git a/src/gui/widgets/Rotary.cpp b/src/gui/widgets/Rotary.cpp index c700e54..6327d4a 100644 --- a/src/gui/widgets/Rotary.cpp +++ b/src/gui/widgets/Rotary.cpp @@ -223,7 +223,7 @@ Rotary::paintEvent(TQPaintEvent *) paint.setBrush(TQBrush::NoBrush); - pen.setColor(tqcolorGroup().dark()); + pen.setColor(colorGroup().dark()); pen.setWidth(scale); paint.setPen(pen); @@ -253,7 +253,7 @@ Rotary::paintEvent(TQPaintEvent *) paint.setPen(pen); int shadowAngle = -720; - c = tqcolorGroup().dark(); + c = colorGroup().dark(); for (int arc = 120; arc < 2880; arc += 240) { pen.setColor(c); paint.setPen(pen); @@ -263,7 +263,7 @@ Rotary::paintEvent(TQPaintEvent *) } shadowAngle = 2160; - c = tqcolorGroup().dark(); + c = colorGroup().dark(); for (int arc = 120; arc < 2880; arc += 240) { pen.setColor(c); paint.setPen(pen); @@ -289,7 +289,7 @@ Rotary::paintEvent(TQPaintEvent *) double y = hyp + len * cos(angle); pen.setWidth(scale * 2); - pen.setColor(tqcolorGroup().dark()); + pen.setColor(colorGroup().dark()); paint.setPen(pen); paint.drawLine(int(x0), int(y0), int(x), int(y)); @@ -391,7 +391,7 @@ Rotary::mousePressEvent(TQMouseEvent *e) emit valueChanged(m_snapPosition); } - TQPoint totalPos = mapTo(tqtopLevelWidget(), TQPoint(0, 0)); + TQPoint totalPos = mapTo(topLevelWidget(), TQPoint(0, 0)); if (!_float) _float = new TextFloat(this); @@ -535,7 +535,7 @@ Rotary::wheelEvent(TQWheelEvent *e) // Reposition - we need to sum the relative positions up to the // topLevel or dialog to please move(). Move just top/right of the rotary // - TQPoint totalPos = mapTo(tqtopLevelWidget(), TQPoint(0, 0)); + TQPoint totalPos = mapTo(topLevelWidget(), TQPoint(0, 0)); _float->reparent(this); _float->move(totalPos + TQPoint(width() + 2, -height() / 2)); _float->show(); diff --git a/src/gui/widgets/TimeWidget.cpp b/src/gui/widgets/TimeWidget.cpp index 82877f8..3a2a024 100644 --- a/src/gui/widgets/TimeWidget.cpp +++ b/src/gui/widgets/TimeWidget.cpp @@ -99,7 +99,7 @@ TimeWidget::init(bool editable) if (m_isDuration) { label = new TQLabel(i18n("Note:"), frame); - label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + label->setAlignment(TQt::AlignRight | TQt::AlignVCenter); tqlayout->addWidget(label, 0, 0); if (editable) { @@ -149,7 +149,7 @@ TimeWidget::init(bool editable) } label = new TQLabel(i18n("Units:"), frame); - label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + label->setAlignment(TQt::AlignRight | TQt::AlignVCenter); tqlayout->addWidget(label, 0, 4); if (editable) { @@ -171,7 +171,7 @@ TimeWidget::init(bool editable) m_note = 0; label = new TQLabel(i18n("Time:"), frame); - label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + label->setAlignment(TQt::AlignRight | TQt::AlignVCenter); tqlayout->addWidget(label, 0, 0); if (editable) { @@ -191,7 +191,7 @@ TimeWidget::init(bool editable) } label = new TQLabel(m_isDuration ? i18n("Measures:") : i18n("Measure:"), frame); - label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + label->setAlignment(TQt::AlignRight | TQt::AlignVCenter); tqlayout->addWidget(label, 1, 0); if (editable) { @@ -210,7 +210,7 @@ TimeWidget::init(bool editable) } label = new TQLabel(m_isDuration ? i18n("beats:") : i18n("beat:"), frame); - label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + label->setAlignment(TQt::AlignRight | TQt::AlignVCenter); tqlayout->addWidget(label, 1, 2); if (editable) { @@ -231,7 +231,7 @@ TimeWidget::init(bool editable) (Note (Note::Shortest), true)), frame); - label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + label->setAlignment(TQt::AlignRight | TQt::AlignVCenter); tqlayout->addWidget(label, 1, 4); if (editable) { @@ -252,7 +252,7 @@ TimeWidget::init(bool editable) tqlayout->addWidget(m_timeSig, 1, 6); label = new TQLabel(i18n("Seconds:"), frame); - label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + label->setAlignment(TQt::AlignRight | TQt::AlignVCenter); tqlayout->addWidget(label, 2, 0); if (editable) { @@ -271,7 +271,7 @@ TimeWidget::init(bool editable) } label = new TQLabel(i18n("msec:"), frame); - label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + label->setAlignment(TQt::AlignRight | TQt::AlignVCenter); tqlayout->addWidget(label, 2, 2); if (editable) { diff --git a/src/gui/widgets/VUMeter.cpp b/src/gui/widgets/VUMeter.cpp index 2aa89e9..ee9aacc 100644 --- a/src/gui/widgets/VUMeter.cpp +++ b/src/gui/widgets/VUMeter.cpp @@ -336,7 +336,7 @@ VUMeter::paintEvent(TQPaintEvent *e) drawMeterLevel(&paint); - paint.setPen(tqcolorGroup().background()); + paint.setPen(colorGroup().background()); paint.drawPoint(0, 0); paint.drawPoint(width() - 1, 0); paint.drawPoint(0, height() - 1); |