summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/AudioFaderBox.cpp6
-rw-r--r--src/gui/widgets/AudioRouteMenu.cpp10
-rw-r--r--src/gui/widgets/AudioVUMeter.cpp6
-rw-r--r--src/gui/widgets/BigArrowButton.h2
-rw-r--r--src/gui/widgets/CollapsingFrame.cpp10
-rw-r--r--src/gui/widgets/CollapsingFrame.h2
-rw-r--r--src/gui/widgets/DiatonicPitchChooser.cpp8
-rw-r--r--src/gui/widgets/Fader.cpp50
-rw-r--r--src/gui/widgets/PitchDragLabel.cpp2
-rw-r--r--src/gui/widgets/PitchDragLabel.h2
-rw-r--r--src/gui/widgets/PluginControl.cpp32
-rw-r--r--src/gui/widgets/PluginControl.h4
-rw-r--r--src/gui/widgets/ProgressDialog.cpp6
-rw-r--r--src/gui/widgets/QuantizeParameters.cpp62
-rw-r--r--src/gui/widgets/Rotary.cpp30
-rw-r--r--src/gui/widgets/ScrollBox.cpp10
-rw-r--r--src/gui/widgets/TextFloat.cpp4
-rw-r--r--src/gui/widgets/TimeWidget.cpp104
-rw-r--r--src/gui/widgets/VUMeter.cpp20
-rw-r--r--src/gui/widgets/VUMeter.h4
20 files changed, 187 insertions, 187 deletions
diff --git a/src/gui/widgets/AudioFaderBox.cpp b/src/gui/widgets/AudioFaderBox.cpp
index 7a1161f..4c8e76c 100644
--- a/src/gui/widgets/AudioFaderBox.cpp
+++ b/src/gui/widgets/AudioFaderBox.cpp
@@ -24,7 +24,7 @@
#include "AudioFaderBox.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <klocale.h>
#include <kstddirs.h>
@@ -116,8 +116,8 @@ AudioFaderBox::AudioFaderBox(TQWidget *parent,
m_fader->setOutlineColour(GUIPalette::getColour(GUIPalette::PlaybackFaderOutline));
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
- m_monoPixmap.load(TQString("%1/misc/mono.xpm").arg(pixmapDir));
- m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").arg(pixmapDir));
+ m_monoPixmap.load(TQString("%1/misc/mono.xpm").tqarg(pixmapDir));
+ m_stereoPixmap.load(TQString("%1/misc/stereo.xpm").tqarg(pixmapDir));
m_pan = new Rotary(this, -100.0, 100.0, 1.0, 5.0, 0.0, 22,
Rotary::NoTicks, false, true);
diff --git a/src/gui/widgets/AudioRouteMenu.cpp b/src/gui/widgets/AudioRouteMenu.cpp
index 89cd416..a2f6985 100644
--- a/src/gui/widgets/AudioRouteMenu.cpp
+++ b/src/gui/widgets/AudioRouteMenu.cpp
@@ -231,24 +231,24 @@ AudioRouteMenu::getEntryText(int entry)
if (stereo) {
if (entry < recordIns) {
- return i18n("In %1").arg(entry + 1);
+ return i18n("In %1").tqarg(entry + 1);
} else if (entry == recordIns) {
return i18n("Master");
} else {
- return i18n("Sub %1").arg(entry - recordIns);
+ return i18n("Sub %1").tqarg(entry - recordIns);
}
} else {
int channel = entry % 2;
entry /= 2;
if (entry < recordIns) {
return (channel ? i18n("In %1 R") :
- i18n("In %1 L")).arg(entry + 1);
+ i18n("In %1 L")).tqarg(entry + 1);
} else if (entry == recordIns) {
return (channel ? i18n("Master R") :
i18n("Master L"));
} else {
return (channel ? i18n("Sub %1 R") :
- i18n("Sub %1 L")).arg(entry - recordIns);
+ i18n("Sub %1 L")).tqarg(entry - recordIns);
}
}
break;
@@ -258,7 +258,7 @@ AudioRouteMenu::getEntryText(int entry)
if (entry == 0)
return i18n("Master");
else
- return i18n("Sub %1").arg(entry);
+ return i18n("Sub %1").tqarg(entry);
}
return TQString();
diff --git a/src/gui/widgets/AudioVUMeter.cpp b/src/gui/widgets/AudioVUMeter.cpp
index 6327e2e..aacb7c2 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(colorGroup().mid());
+ paint.setPen(tqcolorGroup().mid());
paint.drawRect(0, 0, width(), height());
- paint.setPen(colorGroup().background());
- paint.setBrush(colorGroup().background());
+ paint.setPen(tqcolorGroup().background());
+ paint.setBrush(tqcolorGroup().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 7adfb9b..eb364e1 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 sizeHint() const {
+ virtual TQSize tqsizeHint() const {
return TQSize(20, 20);
}
};
diff --git a/src/gui/widgets/CollapsingFrame.cpp b/src/gui/widgets/CollapsingFrame.cpp
index 78404e1..56c530b 100644
--- a/src/gui/widgets/CollapsingFrame.cpp
+++ b/src/gui/widgets/CollapsingFrame.cpp
@@ -30,7 +30,7 @@
#include <kglobal.h>
#include <tqfont.h>
#include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpixmap.h>
#include <tqstring.h>
#include <tqtoolbutton.h>
@@ -47,7 +47,7 @@ CollapsingFrame::CollapsingFrame(TQString label, TQWidget *parent, const char *n
m_fill(false),
m_collapsed(false)
{
- m_layout = new TQGridLayout(this, 3, 3, 0, 0);
+ m_tqlayout = new TQGridLayout(this, 3, 3, 0, 0);
m_toggleButton = new TQToolButton(this);
m_toggleButton->setTextLabel(label);
@@ -66,7 +66,7 @@ CollapsingFrame::CollapsingFrame(TQString label, TQWidget *parent, const char *n
connect(m_toggleButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggle()));
- m_layout->addMultiCellWidget(m_toggleButton, 0, 0, 0, 2);
+ m_tqlayout->addMultiCellWidget(m_toggleButton, 0, 0, 0, 2);
}
CollapsingFrame::~CollapsingFrame()
@@ -96,9 +96,9 @@ CollapsingFrame::setWidget(TQWidget *widget)
assert(!m_widget);
m_widget = widget;
if (m_fill) {
- m_layout->addMultiCellWidget(widget, 1, 1, 0, 2);
+ m_tqlayout->addMultiCellWidget(widget, 1, 1, 0, 2);
} else {
- m_layout->addWidget(widget, 1, 1);
+ m_tqlayout->addWidget(widget, 1, 1);
}
bool expanded = true;
diff --git a/src/gui/widgets/CollapsingFrame.h b/src/gui/widgets/CollapsingFrame.h
index 8e3bdc0..6ae6feb 100644
--- a/src/gui/widgets/CollapsingFrame.h
+++ b/src/gui/widgets/CollapsingFrame.h
@@ -62,7 +62,7 @@ public slots:
void toggle();
protected:
- TQGridLayout *m_layout;
+ TQGridLayout *m_tqlayout;
TQToolButton *m_toggleButton;
TQWidget *m_widget;
bool m_fill;
diff --git a/src/gui/widgets/DiatonicPitchChooser.cpp b/src/gui/widgets/DiatonicPitchChooser.cpp
index 539a8fb..c1a800a 100644
--- a/src/gui/widgets/DiatonicPitchChooser.cpp
+++ b/src/gui/widgets/DiatonicPitchChooser.cpp
@@ -87,7 +87,7 @@ DiatonicPitchChooser::DiatonicPitchChooser(TQString title,
m_accidental->insertItem(i18n("double sharp"));
m_accidental->setCurrentItem(2); // default: natural
- m_pitchLabel = new TQLabel(TQString("%1").arg(getPitch()), hbox);
+ m_pitchLabel = new TQLabel(TQString("%1").tqarg(getPitch()), hbox);
m_pitchLabel->setMinimumWidth(40);
@@ -157,7 +157,7 @@ DiatonicPitchChooser::slotSetPitch(int pitch)
m_accidental->setCurrentItem(pitchChange + 2);
- m_pitchLabel->setText(TQString("%1").arg(pitch));
+ m_pitchLabel->setText(TQString("%1").tqarg(pitch));
update();
}
@@ -199,7 +199,7 @@ DiatonicPitchChooser::setLabelsIfNeeded()
//{
m_pitchDragLabel->slotSetPitch(getPitch(), m_octave->currentItem(), m_step->currentItem());
//}
- m_pitchLabel->setText(TQString("%1").arg(getPitch()));
+ m_pitchLabel->setText(TQString("%1").tqarg(getPitch()));
}
void
@@ -217,7 +217,7 @@ DiatonicPitchChooser::slotSetNote(int pitch, int octave, int step)
m_accidental->setCurrentItem(pitchOffset + 2);
//MidiPitchLabel pl(p);
- m_pitchLabel->setText(TQString("%1").arg(pitch));
+ m_pitchLabel->setText(TQString("%1").tqarg(pitch));
update();
}
diff --git a/src/gui/widgets/Fader.cpp b/src/gui/widgets/Fader.cpp
index 46bb75e..022f0ca 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 = colorGroup().mid();
+ m_outlineColour = tqcolorGroup().mid();
calculateGroovePixmap();
setFader(0.0);
@@ -110,7 +110,7 @@ Fader::Fader(int min, int max, int deflt,
m_sliderMax = width() - m_sliderMin;
}
- m_outlineColour = colorGroup().mid();
+ m_outlineColour = tqcolorGroup().mid();
calculateGroovePixmap();
setFader(deflt);
@@ -141,7 +141,7 @@ Fader::Fader(int min, int max, int deflt,
m_sliderMax = width() - m_sliderMin;
}
- m_outlineColour = colorGroup().mid();
+ m_outlineColour = tqcolorGroup().mid();
calculateGroovePixmap();
setFader(deflt);
@@ -397,17 +397,17 @@ Fader::showFloatText()
TQString text;
if (m_integral) {
- text = TQString("%1").arg(int(m_value));
+ text = TQString("%1").tqarg(int(m_value));
} else if (m_value == AudioLevel::DB_FLOOR) {
text = "Off";
} else {
float v = fabs(m_value);
text = TQString("%1%2.%3%4%5 dB")
- .arg(m_value < 0 ? '-' : '+')
- .arg(int(v))
- .arg(int(v * 10) % 10)
- .arg(int(v * 100) % 10)
- .arg(int(v * 1000) % 10);
+ .tqarg(m_value < 0 ? '-' : '+')
+ .tqarg(int(v))
+ .tqarg(int(v * 10) % 10)
+ .tqarg(int(v * 100) % 10)
+ .tqarg(int(v * 1000) % 10);
}
m_float->setText(text);
@@ -447,9 +447,9 @@ Fader::calculateGroovePixmap()
delete map;
map = new TQPixmap(width(), height());
- map->fill(colorGroup().background());
+ map->fill(tqcolorGroup().background());
TQPainter paint(map);
- paint.setBrush(colorGroup().background());
+ paint.setBrush(tqcolorGroup().background());
if (m_vertical) {
@@ -464,9 +464,9 @@ Fader::calculateGroovePixmap()
if (position >= 0 &&
position < m_sliderMax - m_sliderMin) {
if (dB == 0)
- paint.setPen(colorGroup().dark());
+ paint.setPen(tqcolorGroup().dark());
else
- paint.setPen(colorGroup().midlight());
+ paint.setPen(tqcolorGroup().midlight());
paint.drawLine(1, (m_sliderMax - position),
width() - 2, (m_sliderMax - position));
}
@@ -477,8 +477,8 @@ Fader::calculateGroovePixmap()
}
}
- paint.setPen(colorGroup().dark());
- paint.setBrush(colorGroup().mid());
+ paint.setPen(tqcolorGroup().dark());
+ paint.setBrush(tqcolorGroup().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(colorGroup().background());
+ map->fill(tqcolorGroup().background());
int x = 0;
int y = 0;
TQPainter paint(map);
- paint.setPen(colorGroup().light());
+ paint.setPen(tqcolorGroup().light());
paint.drawLine(x + 1, y, x + buttonWidth - 2, y);
paint.drawLine(x, y + 1, x, y + buttonHeight - 2);
- paint.setPen(colorGroup().midlight());
+ paint.setPen(tqcolorGroup().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(colorGroup().mid());
+ paint.setPen(tqcolorGroup().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(colorGroup().dark());
+ paint.setPen(tqcolorGroup().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(colorGroup().shadow());
+ paint.setPen(tqcolorGroup().shadow());
paint.drawLine(x + 1, y + buttonHeight / 2, x + buttonWidth - 2,
y + buttonHeight / 2);
- paint.setPen(colorGroup().mid());
+ paint.setPen(tqcolorGroup().mid());
paint.drawLine(x + 1, y + buttonHeight / 2 - 1, x + buttonWidth - 2,
y + buttonHeight / 2 - 1);
paint.drawPoint(x, y + buttonHeight / 2);
- paint.setPen(colorGroup().light());
+ paint.setPen(tqcolorGroup().light());
paint.drawLine(x + 1, y + buttonHeight / 2 + 1, x + buttonWidth - 2,
y + buttonHeight / 2 + 1);
- paint.setPen(colorGroup().button());
- paint.setBrush(colorGroup().button());
+ paint.setPen(tqcolorGroup().button());
+ paint.setBrush(tqcolorGroup().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 507ec1b..b43c15f 100644
--- a/src/gui/widgets/PitchDragLabel.cpp
+++ b/src/gui/widgets/PitchDragLabel.cpp
@@ -202,7 +202,7 @@ PitchDragLabel::paintEvent(TQPaintEvent *)
}
TQSize
-PitchDragLabel::sizeHint() const
+PitchDragLabel::tqsizeHint() const
{
return TQSize(150, 135);
}
diff --git a/src/gui/widgets/PitchDragLabel.h b/src/gui/widgets/PitchDragLabel.h
index 3bb0868..6f11b17 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 sizeHint() const;
+ virtual TQSize tqsizeHint() const;
signals:
void pitchDragged(int);
diff --git a/src/gui/widgets/PluginControl.cpp b/src/gui/widgets/PluginControl.cpp
index 59c6880..0c998f3 100644
--- a/src/gui/widgets/PluginControl.cpp
+++ b/src/gui/widgets/PluginControl.cpp
@@ -33,7 +33,7 @@
#include <tqfont.h>
#include <tqhbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqobject.h>
#include <tqstring.h>
#include <tqwidget.h>
@@ -44,7 +44,7 @@ namespace Rosegarden
{
PluginControl::PluginControl(TQWidget *parent,
- TQGridLayout *layout,
+ TQGridLayout *tqlayout,
ControlType type,
PluginPort *port,
AudioPluginManager *aPM,
@@ -53,7 +53,7 @@ PluginControl::PluginControl(TQWidget *parent,
bool showBounds,
bool hidden):
TQObject(parent),
- m_layout(layout),
+ m_tqlayout(tqlayout),
m_type(type),
m_port(port),
m_pluginManager(aPM),
@@ -63,7 +63,7 @@ PluginControl::PluginControl(TQWidget *parent,
plainFont.setPointSize((plainFont.pointSize() * 9 ) / 10);
TQLabel *controlTitle =
- new TQLabel(TQString("%1 ").arg(strtoqstr(port->getName())), parent);
+ new TQLabel(TQString("%1 ").tqarg(strtoqstr(port->getName())), parent);
controlTitle->setFont(plainFont);
if (type == Rotary) {
@@ -121,9 +121,9 @@ PluginControl::PluginControl(TQWidget *parent,
TQLabel *low;
if (port->getDisplayHint() &
(PluginPort::Integer | PluginPort::Toggled)) {
- low = new TQLabel(TQString("%1").arg(int(displayLower)), parent);
+ low = new TQLabel(TQString("%1").tqarg(int(displayLower)), parent);
} else {
- low = new TQLabel(TQString("%1").arg(displayLower), parent);
+ low = new TQLabel(TQString("%1").tqarg(displayLower), parent);
}
low->setFont(plainFont);
@@ -154,9 +154,9 @@ PluginControl::PluginControl(TQWidget *parent,
TQLabel *upp;
if (port->getDisplayHint() &
(PluginPort::Integer | PluginPort::Toggled)) {
- upp = new TQLabel(TQString("%1").arg(int(displayUpper)), parent);
+ upp = new TQLabel(TQString("%1").tqarg(int(displayUpper)), parent);
} else {
- upp = new TQLabel(TQString("%1").arg(displayUpper), parent);
+ upp = new TQLabel(TQString("%1").tqarg(displayUpper), parent);
}
upp->setFont(plainFont);
@@ -165,8 +165,8 @@ PluginControl::PluginControl(TQWidget *parent,
if (!hidden) {
controlTitle->show();
item = new TQWidgetItem(controlTitle);
- item->setAlignment(TQt::AlignRight | TQt::AlignBottom);
- m_layout->addItem(item);
+ item->tqsetAlignment(TQt::AlignRight | TQt::AlignBottom);
+ m_tqlayout->addItem(item);
} else {
controlTitle->hide();
}
@@ -174,8 +174,8 @@ PluginControl::PluginControl(TQWidget *parent,
if (showBounds && !hidden) {
low->show();
item = new TQWidgetItem(low);
- item->setAlignment(TQt::AlignRight | TQt::AlignBottom);
- m_layout->addItem(item);
+ item->tqsetAlignment(TQt::AlignRight | TQt::AlignBottom);
+ m_tqlayout->addItem(item);
} else {
low->hide();
}
@@ -183,8 +183,8 @@ PluginControl::PluginControl(TQWidget *parent,
if (!hidden) {
m_dial->show();
item = new TQWidgetItem(m_dial);
- item->setAlignment(TQt::AlignCenter);
- m_layout->addItem(item);
+ item->tqsetAlignment(TQt::AlignCenter);
+ m_tqlayout->addItem(item);
} else {
m_dial->hide();
}
@@ -192,8 +192,8 @@ PluginControl::PluginControl(TQWidget *parent,
if (showBounds && !hidden) {
upp->show();
item = new TQWidgetItem(upp);
- item->setAlignment(TQt::AlignLeft | TQt::AlignBottom);
- m_layout->addItem(item);
+ item->tqsetAlignment(TQt::AlignLeft | TQt::AlignBottom);
+ m_tqlayout->addItem(item);
} else {
upp->hide();
}
diff --git a/src/gui/widgets/PluginControl.h b/src/gui/widgets/PluginControl.h
index 09eb928..de90836 100644
--- a/src/gui/widgets/PluginControl.h
+++ b/src/gui/widgets/PluginControl.h
@@ -57,7 +57,7 @@ public:
} ControlType;
PluginControl(TQWidget *parent,
- TQGridLayout *layout,
+ TQGridLayout *tqlayout,
ControlType type,
PluginPort *port,
AudioPluginManager *pluginManager,
@@ -84,7 +84,7 @@ protected:
//--------------- Data members ---------------------------------
- TQGridLayout *m_layout;
+ TQGridLayout *m_tqlayout;
ControlType m_type;
PluginPort *m_port;
diff --git a/src/gui/widgets/ProgressDialog.cpp b/src/gui/widgets/ProgressDialog.cpp
index 7cef518..e8ff6ee 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, sizeHint().width() );
- int h = TQMAX( isVisible() ? height() : 0, sizeHint().height() );
+ int w = TQMAX( isVisible() ? width() : 0, tqsizeHint().width() );
+ int h = TQMAX( isVisible() ? height() : 0, tqsizeHint().height() );
resize( w, h );
}
@@ -199,7 +199,7 @@ void ProgressDialog::processEvents()
// RG_DEBUG << "ProgressDialog::processEvents: modalVisible is "
// << m_modalVisible << endl;
if (m_modalVisible) {
- kapp->processEvents(50);
+ kapp->tqprocessEvents(50);
} else {
rgapp->refreshGUI(50);
}
diff --git a/src/gui/widgets/QuantizeParameters.cpp b/src/gui/widgets/QuantizeParameters.cpp
index 84591cb..a85e3b6 100644
--- a/src/gui/widgets/QuantizeParameters.cpp
+++ b/src/gui/widgets/QuantizeParameters.cpp
@@ -24,7 +24,7 @@
#include "QuantizeParameters.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <kapplication.h>
#include <klocale.h>
@@ -71,7 +71,7 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
int zero = 0;
if (!preamble.isNull()) {
TQLabel *label = new TQLabel(preamble, this);
- label->setAlignment(TQt::WordBreak);
+ label->tqsetAlignment(TQt::WordBreak);
m_mainLayout->addMultiCellWidget(label, 0, 0, 0, 1);
zero = 1;
}
@@ -82,18 +82,18 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
m_mainLayout->addWidget(quantizerBox, zero, 0);
TQFrame *typeFrame = new TQFrame(quantizerBox);
- TQGridLayout *layout = new TQGridLayout(typeFrame, 2, 2, 5, 3);
- layout->addWidget(new TQLabel(i18n("Quantizer type:"), typeFrame), 0, 0);
+ TQGridLayout *tqlayout = new TQGridLayout(typeFrame, 2, 2, 5, 3);
+ tqlayout->addWidget(new TQLabel(i18n("Quantizer type:"), typeFrame), 0, 0);
m_typeCombo = new KComboBox(typeFrame);
m_typeCombo->insertItem(i18n("Grid quantizer"));
m_typeCombo->insertItem(i18n("Legato quantizer"));
m_typeCombo->insertItem(i18n("Heuristic notation quantizer"));
- layout->addWidget(m_typeCombo, 0, 1);
+ tqlayout->addWidget(m_typeCombo, 0, 1);
m_notationTarget = new TQCheckBox
(i18n("Quantize for notation only (leave performance unchanged)"),
typeFrame);
- layout->addMultiCellWidget(m_notationTarget, 1, 1, 0, 1);
+ tqlayout->addMultiCellWidget(m_notationTarget, 1, 1, 0, 1);
if (!showNotationOption)
m_notationTarget->hide();
@@ -104,14 +104,14 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
(1, Qt::Horizontal, i18n("Notation parameters"), parameterBox);
TQFrame *notationFrame = new TQFrame(m_notationBox);
- layout = new TQGridLayout(notationFrame, 4, 2, 5, 3);
+ tqlayout = new TQGridLayout(notationFrame, 4, 2, 5, 3);
- layout->addWidget(new TQLabel(i18n("Base grid unit:"), notationFrame),
+ tqlayout->addWidget(new TQLabel(i18n("Base grid unit:"), notationFrame),
1, 0);
m_notationUnitCombo = new KComboBox(notationFrame);
- layout->addWidget(m_notationUnitCombo, 1, 1);
+ tqlayout->addWidget(m_notationUnitCombo, 1, 1);
- layout->addWidget(new TQLabel(i18n("Complexity:"),
+ tqlayout->addWidget(new TQLabel(i18n("Complexity:"),
notationFrame), 0, 0);
m_simplicityCombo = new KComboBox(notationFrame);
@@ -120,9 +120,9 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
m_simplicityCombo->insertItem(i18n("Normal"));
m_simplicityCombo->insertItem(i18n("Low"));
m_simplicityCombo->insertItem(i18n("Very low"));
- layout->addWidget(m_simplicityCombo, 0, 1);
+ tqlayout->addWidget(m_simplicityCombo, 0, 1);
- layout->addWidget(new TQLabel(i18n("Tuplet level:"),
+ tqlayout->addWidget(new TQLabel(i18n("Tuplet level:"),
notationFrame), 2, 0);
m_maxTuplet = new KComboBox(notationFrame);
m_maxTuplet->insertItem(i18n("None"));
@@ -136,34 +136,34 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
m_maxTuplet->insertItem(i18n("8-Tuplet"));
*/
m_maxTuplet->insertItem(i18n("Any"));
- layout->addWidget(m_maxTuplet, 2, 1);
+ tqlayout->addWidget(m_maxTuplet, 2, 1);
m_counterpoint = new TQCheckBox(i18n("Permit counterpoint"), notationFrame);
- layout->addMultiCellWidget(m_counterpoint, 3, 3, 0, 1);
+ tqlayout->addMultiCellWidget(m_counterpoint, 3, 3, 0, 1);
m_gridBox = new TQGroupBox
(1, Qt::Horizontal, i18n("Grid parameters"), parameterBox);
TQFrame *gridFrame = new TQFrame(m_gridBox);
- layout = new TQGridLayout(gridFrame, 4, 2, 5, 3);
+ tqlayout = new TQGridLayout(gridFrame, 4, 2, 5, 3);
- layout->addWidget(new TQLabel(i18n("Base grid unit:"), gridFrame), 0, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Base grid unit:"), gridFrame), 0, 0);
m_gridUnitCombo = new KComboBox(gridFrame);
- layout->addWidget(m_gridUnitCombo, 0, 1);
+ tqlayout->addWidget(m_gridUnitCombo, 0, 1);
m_swingLabel = new TQLabel(i18n("Swing:"), gridFrame);
- layout->addWidget(m_swingLabel, 1, 0);
+ tqlayout->addWidget(m_swingLabel, 1, 0);
m_swingCombo = new KComboBox(gridFrame);
- layout->addWidget(m_swingCombo, 1, 1);
+ tqlayout->addWidget(m_swingCombo, 1, 1);
m_iterativeLabel = new TQLabel(i18n("Iterative amount:"), gridFrame);
- layout->addWidget(m_iterativeLabel, 2, 0);
+ tqlayout->addWidget(m_iterativeLabel, 2, 0);
m_iterativeCombo = new KComboBox(gridFrame);
- layout->addWidget(m_iterativeCombo, 2, 1);
+ tqlayout->addWidget(m_iterativeCombo, 2, 1);
m_durationCheckBox = new TQCheckBox
(i18n("Quantize durations as well as start times"), gridFrame);
- layout->addMultiCellWidget(m_durationCheckBox, 3, 3, 0, 1);
+ tqlayout->addMultiCellWidget(m_durationCheckBox, 3, 3, 0, 1);
m_postProcessingBox = new TQGroupBox
(1, Qt::Horizontal, i18n("After quantization"), this);
@@ -188,17 +188,17 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
TQFrame *postFrame = new TQFrame(m_postProcessingBox);
- layout = new TQGridLayout(postFrame, 4, 1, 5, 3);
+ tqlayout = new TQGridLayout(postFrame, 4, 1, 5, 3);
m_rebeam = new TQCheckBox(i18n("Re-beam"), postFrame);
m_articulate = new TQCheckBox
(i18n("Add articulations (staccato, tenuto, slurs)"), postFrame);
m_makeViable = new TQCheckBox(i18n("Tie notes at barlines etc"), postFrame);
m_deCounterpoint = new TQCheckBox(i18n("Split-and-tie overlapping chords"), postFrame);
- layout->addWidget(m_rebeam, 0, 0);
- layout->addWidget(m_articulate, 1, 0);
- layout->addWidget(m_makeViable, 2, 0);
- layout->addWidget(m_deCounterpoint, 3, 0);
+ tqlayout->addWidget(m_rebeam, 0, 0);
+ tqlayout->addWidget(m_articulate, 1, 0);
+ tqlayout->addWidget(m_makeViable, 2, 0);
+ tqlayout->addWidget(m_deCounterpoint, 3, 0);
TQPixmap noMap = NotePixmapFactory::toTQPixmap
(NotePixmapFactory::makeToolbarPixmap("menu-no-note"));
@@ -286,8 +286,8 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
m_gridUnitCombo->insertItem(pmap, label);
m_notationUnitCombo->insertItem(pmap, label);
} else {
- m_gridUnitCombo->insertItem(noMap, TQString("%1").arg(time));
- m_notationUnitCombo->insertItem(noMap, TQString("%1").arg(time));
+ m_gridUnitCombo->insertItem(noMap, TQString("%1").tqarg(time));
+ m_notationUnitCombo->insertItem(noMap, TQString("%1").tqarg(time));
}
if (m_standardQuantizations[i] == defaultUnit) {
@@ -298,14 +298,14 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent,
}
for (int i = -100; i <= 200; i += 10) {
- m_swingCombo->insertItem(i == 0 ? i18n("None") : TQString("%1%").arg(i));
+ m_swingCombo->insertItem(i == 0 ? i18n("None") : TQString("%1%").tqarg(i));
if (i == defaultSwing)
m_swingCombo->setCurrentItem(m_swingCombo->count() - 1);
}
for (int i = 10; i <= 100; i += 10) {
m_iterativeCombo->insertItem(i == 100 ? i18n("Full quantize") :
- TQString("%1%").arg(i));
+ TQString("%1%").tqarg(i));
if (i == defaultIterate)
m_iterativeCombo->setCurrentItem(m_iterativeCombo->count() - 1);
}
diff --git a/src/gui/widgets/Rotary.cpp b/src/gui/widgets/Rotary.cpp
index 2173a26..c700e54 100644
--- a/src/gui/widgets/Rotary.cpp
+++ b/src/gui/widgets/Rotary.cpp
@@ -31,12 +31,12 @@
#include "TextFloat.h"
#include <kapplication.h>
#include <klocale.h>
-#include <brush.h>
+#include <tqbrush.h>
#include <tqcolor.h>
#include <tqdialog.h>
#include <tqimage.h>
#include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
#include <tqpen.h>
#include <tqpixmap.h>
#include <tqpoint.h>
@@ -133,7 +133,7 @@ void
Rotary::setKnobColour(const TQColor &colour)
{
m_knobColour = colour;
- repaint();
+ tqrepaint();
}
void
@@ -223,7 +223,7 @@ Rotary::paintEvent(TQPaintEvent *)
paint.setBrush(TQBrush::NoBrush);
- pen.setColor(colorGroup().dark());
+ pen.setColor(tqcolorGroup().dark());
pen.setWidth(scale);
paint.setPen(pen);
@@ -253,7 +253,7 @@ Rotary::paintEvent(TQPaintEvent *)
paint.setPen(pen);
int shadowAngle = -720;
- c = colorGroup().dark();
+ c = tqcolorGroup().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 = colorGroup().dark();
+ c = tqcolorGroup().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(colorGroup().dark());
+ pen.setColor(tqcolorGroup().dark());
paint.setPen(pen);
paint.drawLine(int(x0), int(y0), int(x), int(y));
@@ -391,16 +391,16 @@ Rotary::mousePressEvent(TQMouseEvent *e)
emit valueChanged(m_snapPosition);
}
- TQPoint totalPos = mapTo(topLevelWidget(), TQPoint(0, 0));
+ TQPoint totalPos = mapTo(tqtopLevelWidget(), TQPoint(0, 0));
if (!_float)
_float = new TextFloat(this);
_float->reparent(this);
_float->move(totalPos + TQPoint(width() + 2, -height() / 2));
if (m_logarithmic) {
- _float->setText(TQString("%1").arg(powf(10, m_position)));
+ _float->setText(TQString("%1").tqarg(powf(10, m_position)));
} else {
- _float->setText(TQString("%1").arg(m_position));
+ _float->setText(TQString("%1").tqarg(m_position));
}
_float->show();
@@ -498,9 +498,9 @@ Rotary::mouseMoveEvent(TQMouseEvent *e)
// draw on the float text
if (m_logarithmic) {
- _float->setText(TQString("%1").arg(powf(10, m_snapPosition)));
+ _float->setText(TQString("%1").tqarg(powf(10, m_snapPosition)));
} else {
- _float->setText(TQString("%1").arg(m_snapPosition));
+ _float->setText(TQString("%1").tqarg(m_snapPosition));
}
}
}
@@ -527,15 +527,15 @@ Rotary::wheelEvent(TQWheelEvent *e)
// draw on the float text
if (m_logarithmic) {
- _float->setText(TQString("%1").arg(powf(10, m_snapPosition)));
+ _float->setText(TQString("%1").tqarg(powf(10, m_snapPosition)));
} else {
- _float->setText(TQString("%1").arg(m_snapPosition));
+ _float->setText(TQString("%1").tqarg(m_snapPosition));
}
// 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(topLevelWidget(), TQPoint(0, 0));
+ TQPoint totalPos = mapTo(tqtopLevelWidget(), TQPoint(0, 0));
_float->reparent(this);
_float->move(totalPos + TQPoint(width() + 2, -height() / 2));
_float->show();
diff --git a/src/gui/widgets/ScrollBox.cpp b/src/gui/widgets/ScrollBox.cpp
index 7deb0e0..66ecc21 100644
--- a/src/gui/widgets/ScrollBox.cpp
+++ b/src/gui/widgets/ScrollBox.cpp
@@ -123,31 +123,31 @@ void ScrollBox::setPageSize(const TQSize& s)
setFixedWidth(width);
}
- repaint();
+ tqrepaint();
}
void ScrollBox::setViewSize(const TQSize& s)
{
m_viewsize = s;
- repaint();
+ tqrepaint();
}
void ScrollBox::setViewPos(const TQPoint& pos)
{
m_viewpos = pos;
- repaint();
+ tqrepaint();
}
void ScrollBox::setViewX(int x)
{
m_viewpos = TQPoint(x, m_viewpos.y());
- repaint();
+ tqrepaint();
}
void ScrollBox::setViewY(int y)
{
m_viewpos = TQPoint(m_viewpos.x(), y);
- repaint();
+ tqrepaint();
}
void ScrollBox::setThumbnail(TQPixmap img)
diff --git a/src/gui/widgets/TextFloat.cpp b/src/gui/widgets/TextFloat.cpp
index f5221d5..d3cc9d5 100644
--- a/src/gui/widgets/TextFloat.cpp
+++ b/src/gui/widgets/TextFloat.cpp
@@ -29,7 +29,7 @@
#include "gui/general/GUIPalette.h"
#include <tqfontmetrics.h>
#include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
#include <tqpoint.h>
#include <tqrect.h>
#include <tqstring.h>
@@ -106,7 +106,7 @@ void
TextFloat::setText(const TQString &text)
{
m_text = text;
- repaint();
+ tqrepaint();
}
}
diff --git a/src/gui/widgets/TimeWidget.cpp b/src/gui/widgets/TimeWidget.cpp
index d1aedb2..82877f8 100644
--- a/src/gui/widgets/TimeWidget.cpp
+++ b/src/gui/widgets/TimeWidget.cpp
@@ -24,7 +24,7 @@
#include "TimeWidget.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <klocale.h>
#include "misc/Debug.h"
@@ -93,14 +93,14 @@ TimeWidget::init(bool editable)
editable = true;
TQFrame *frame = new TQFrame(this);
- TQGridLayout *layout = new TQGridLayout(frame, 7, 3, 5, 5);
+ TQGridLayout *tqlayout = new TQGridLayout(frame, 7, 3, 5, 5);
TQLabel *label = 0;
if (m_isDuration) {
label = new TQLabel(i18n("Note:"), frame);
- label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
- layout->addWidget(label, 0, 0);
+ label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+ tqlayout->addWidget(label, 0, 0);
if (editable) {
m_note = new TQComboBox(frame);
@@ -133,7 +133,7 @@ TimeWidget::init(bool editable)
}
connect(m_note, TQT_SIGNAL(activated(int)),
this, TQT_SLOT(slotNoteChanged(int)));
- layout->addMultiCellWidget(m_note, 0, 0, 1, 3);
+ tqlayout->addMultiCellWidget(m_note, 0, 0, 1, 3);
} else {
@@ -145,12 +145,12 @@ TimeWidget::init(bool editable)
label = i18n("<inexact>");
TQLineEdit *le = new TQLineEdit(label, frame);
le->setReadOnly(true);
- layout->addMultiCellWidget(le, 0, 0, 1, 3);
+ tqlayout->addMultiCellWidget(le, 0, 0, 1, 3);
}
label = new TQLabel(i18n("Units:"), frame);
- label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
- layout->addWidget(label, 0, 4);
+ label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+ tqlayout->addWidget(label, 0, 4);
if (editable) {
m_timeT = new TQSpinBox(frame);
@@ -158,12 +158,12 @@ TimeWidget::init(bool editable)
(Note(Note::Shortest).getDuration());
connect(m_timeT, TQT_SIGNAL(valueChanged(int)),
this, TQT_SLOT(slotTimeTChanged(int)));
- layout->addWidget(m_timeT, 0, 5);
+ tqlayout->addWidget(m_timeT, 0, 5);
} else {
m_timeT = 0;
- TQLineEdit *le = new TQLineEdit(TQString("%1").arg(m_time), frame);
+ TQLineEdit *le = new TQLineEdit(TQString("%1").tqarg(m_time), frame);
le->setReadOnly(true);
- layout->addWidget(le, 0, 5);
+ tqlayout->addWidget(le, 0, 5);
}
} else {
@@ -171,8 +171,8 @@ TimeWidget::init(bool editable)
m_note = 0;
label = new TQLabel(i18n("Time:"), frame);
- label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
- layout->addWidget(label, 0, 0);
+ label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+ tqlayout->addWidget(label, 0, 0);
if (editable) {
m_timeT = new TQSpinBox(frame);
@@ -180,19 +180,19 @@ TimeWidget::init(bool editable)
(Note(Note::Shortest).getDuration());
connect(m_timeT, TQT_SIGNAL(valueChanged(int)),
this, TQT_SLOT(slotTimeTChanged(int)));
- layout->addWidget(m_timeT, 0, 1);
- layout->addWidget(new TQLabel(i18n("units"), frame), 0, 2);
+ tqlayout->addWidget(m_timeT, 0, 1);
+ tqlayout->addWidget(new TQLabel(i18n("units"), frame), 0, 2);
} else {
m_timeT = 0;
- TQLineEdit *le = new TQLineEdit(TQString("%1").arg(m_time), frame);
+ TQLineEdit *le = new TQLineEdit(TQString("%1").tqarg(m_time), frame);
le->setReadOnly(true);
- layout->addWidget(le, 0, 2);
+ tqlayout->addWidget(le, 0, 2);
}
}
label = new TQLabel(m_isDuration ? i18n("Measures:") : i18n("Measure:"), frame);
- label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
- layout->addWidget(label, 1, 0);
+ label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+ tqlayout->addWidget(label, 1, 0);
if (editable) {
m_barLabel = 0;
@@ -201,17 +201,17 @@ TimeWidget::init(bool editable)
m_bar->setMinValue(0);
connect(m_bar, TQT_SIGNAL(valueChanged(int)),
this, TQT_SLOT(slotBarBeatOrFractionChanged(int)));
- layout->addWidget(m_bar, 1, 1);
+ tqlayout->addWidget(m_bar, 1, 1);
} else {
m_bar = 0;
m_barLabel = new TQLineEdit(frame);
m_barLabel->setReadOnly(true);
- layout->addWidget(m_barLabel, 1, 1);
+ tqlayout->addWidget(m_barLabel, 1, 1);
}
label = new TQLabel(m_isDuration ? i18n("beats:") : i18n("beat:"), frame);
- label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
- layout->addWidget(label, 1, 2);
+ label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+ tqlayout->addWidget(label, 1, 2);
if (editable) {
m_beatLabel = 0;
@@ -219,20 +219,20 @@ TimeWidget::init(bool editable)
m_beat->setMinValue(1);
connect(m_beat, TQT_SIGNAL(valueChanged(int)),
this, TQT_SLOT(slotBarBeatOrFractionChanged(int)));
- layout->addWidget(m_beat, 1, 3);
+ tqlayout->addWidget(m_beat, 1, 3);
} else {
m_beat = 0;
m_beatLabel = new TQLineEdit(frame);
m_beatLabel->setReadOnly(true);
- layout->addWidget(m_beatLabel, 1, 3);
+ tqlayout->addWidget(m_beatLabel, 1, 3);
}
- label = new TQLabel(i18n("%1:").arg(NotationStrings::getShortNoteName
+ label = new TQLabel(i18n("%1:").tqarg(NotationStrings::getShortNoteName
(Note
(Note::Shortest), true)),
frame);
- label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
- layout->addWidget(label, 1, 4);
+ label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+ tqlayout->addWidget(label, 1, 4);
if (editable) {
m_fractionLabel = 0;
@@ -240,20 +240,20 @@ TimeWidget::init(bool editable)
m_fraction->setMinValue(1);
connect(m_fraction, TQT_SIGNAL(valueChanged(int)),
this, TQT_SLOT(slotBarBeatOrFractionChanged(int)));
- layout->addWidget(m_fraction, 1, 5);
+ tqlayout->addWidget(m_fraction, 1, 5);
} else {
m_fraction = 0;
m_fractionLabel = new TQLineEdit(frame);
m_fractionLabel->setReadOnly(true);
- layout->addWidget(m_fractionLabel, 1, 5);
+ tqlayout->addWidget(m_fractionLabel, 1, 5);
}
m_timeSig = new TQLabel(frame);
- layout->addWidget(m_timeSig, 1, 6);
+ tqlayout->addWidget(m_timeSig, 1, 6);
label = new TQLabel(i18n("Seconds:"), frame);
- label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
- layout->addWidget(label, 2, 0);
+ label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+ tqlayout->addWidget(label, 2, 0);
if (editable) {
m_secLabel = 0;
@@ -262,17 +262,17 @@ TimeWidget::init(bool editable)
m_sec->setMinValue(0);
connect(m_sec, TQT_SIGNAL(valueChanged(int)),
this, TQT_SLOT(slotSecOrMSecChanged(int)));
- layout->addWidget(m_sec, 2, 1);
+ tqlayout->addWidget(m_sec, 2, 1);
} else {
m_sec = 0;
m_secLabel = new TQLineEdit(frame);
m_secLabel->setReadOnly(true);
- layout->addWidget(m_secLabel, 2, 1);
+ tqlayout->addWidget(m_secLabel, 2, 1);
}
label = new TQLabel(i18n("msec:"), frame);
- label->setAlignment(TQt::AlignRight | TQt::AlignVCenter);
- layout->addWidget(label, 2, 2);
+ label->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter);
+ tqlayout->addWidget(label, 2, 2);
if (editable) {
m_msecLabel = 0;
@@ -281,17 +281,17 @@ TimeWidget::init(bool editable)
m_msec->setLineStep(10);
connect(m_msec, TQT_SIGNAL(valueChanged(int)),
this, TQT_SLOT(slotSecOrMSecChanged(int)));
- layout->addWidget(m_msec, 2, 3);
+ tqlayout->addWidget(m_msec, 2, 3);
} else {
m_msec = 0;
m_msecLabel = new TQLineEdit(frame);
m_msecLabel->setReadOnly(true);
- layout->addWidget(m_msecLabel, 2, 3);
+ tqlayout->addWidget(m_msecLabel, 2, 3);
}
if (m_isDuration) {
m_tempo = new TQLabel(frame);
- layout->addWidget(m_tempo, 2, 6);
+ tqlayout->addWidget(m_tempo, 2, 6);
} else {
m_tempo = 0;
}
@@ -383,7 +383,7 @@ TimeWidget::populate()
}
m_bar->setValue(bars);
} else {
- m_barLabel->setText(TQString("%1").arg(bars));
+ m_barLabel->setText(TQString("%1").tqarg(bars));
}
if (m_beat) {
@@ -391,7 +391,7 @@ TimeWidget::populate()
m_beat->setMaxValue(timeSig.getBeatsPerBar() - 1);
m_beat->setValue(beats);
} else {
- m_beatLabel->setText(TQString("%1").arg(beats));
+ m_beatLabel->setText(TQString("%1").tqarg(beats));
}
if (m_fraction) {
@@ -401,10 +401,10 @@ TimeWidget::populate()
getDuration() - 1);
m_fraction->setValue(hemidemis);
} else {
- m_fractionLabel->setText(TQString("%1").arg(hemidemis));
+ m_fractionLabel->setText(TQString("%1").tqarg(hemidemis));
}
- m_timeSig->setText(i18n("(%1/%2 time)").arg(timeSig.getNumerator()).
+ m_timeSig->setText(i18n("(%1/%2 time)").tqarg(timeSig.getNumerator()).
arg(timeSig.getDenominator()));
timeT endTime = m_startTime + m_time;
@@ -422,7 +422,7 @@ TimeWidget::populate()
}
m_sec->setValue(rt.sec);
} else {
- m_secLabel->setText(TQString("%1").arg(rt.sec));
+ m_secLabel->setText(TQString("%1").tqarg(rt.sec));
}
if (m_msec) {
@@ -430,7 +430,7 @@ TimeWidget::populate()
m_msec->setMaxValue(999);
m_msec->setValue(rt.msec());
} else {
- m_msecLabel->setText(TQString("%1").arg(rt.msec()));
+ m_msecLabel->setText(TQString("%1").tqarg(rt.msec()));
}
bool change = (m_composition->getTempoChangeNumberAt(endTime) !=
@@ -507,7 +507,7 @@ TimeWidget::populate()
}
m_bar->setValue(bar + 1);
} else {
- m_barLabel->setText(TQString("%1").arg(bar + 1));
+ m_barLabel->setText(TQString("%1").tqarg(bar + 1));
}
if (m_beat) {
@@ -515,7 +515,7 @@ TimeWidget::populate()
m_beat->setMaxValue(timeSig.getBeatsPerBar());
m_beat->setValue(beat);
} else {
- m_beatLabel->setText(TQString("%1").arg(beat));
+ m_beatLabel->setText(TQString("%1").tqarg(beat));
}
if (m_fraction) {
@@ -525,10 +525,10 @@ TimeWidget::populate()
getDuration() - 1);
m_fraction->setValue(hemidemis);
} else {
- m_fractionLabel->setText(TQString("%1").arg(hemidemis));
+ m_fractionLabel->setText(TQString("%1").tqarg(hemidemis));
}
- m_timeSig->setText(i18n("(%1/%2 time)").arg(timeSig.getNumerator()).
+ m_timeSig->setText(i18n("(%1/%2 time)").tqarg(timeSig.getNumerator()).
arg(timeSig.getDenominator()));
RealTime rt = m_composition->getElapsedRealTime(m_time);
@@ -543,7 +543,7 @@ TimeWidget::populate()
}
m_sec->setValue(rt.sec);
} else {
- m_secLabel->setText(TQString("%1").arg(rt.sec));
+ m_secLabel->setText(TQString("%1").tqarg(rt.sec));
}
if (m_msec) {
@@ -551,7 +551,7 @@ TimeWidget::populate()
m_msec->setMaxValue(999);
m_msec->setValue(rt.msec());
} else {
- m_msecLabel->setText(TQString("%1").arg(rt.msec()));
+ m_msecLabel->setText(TQString("%1").tqarg(rt.msec()));
}
}
diff --git a/src/gui/widgets/VUMeter.cpp b/src/gui/widgets/VUMeter.cpp
index 62b7128..2aa89e9 100644
--- a/src/gui/widgets/VUMeter.cpp
+++ b/src/gui/widgets/VUMeter.cpp
@@ -29,7 +29,7 @@
#include "base/AudioLevel.h"
#include "gui/general/GUIPalette.h"
#include "gui/rulers/VelocityColour.h"
-#include <brush.h>
+#include <tqbrush.h>
#include <tqcolor.h>
#include <tqlabel.h>
#include <tqpainter.h>
@@ -46,13 +46,13 @@ VUMeter::VUMeter(TQWidget *parent,
bool hasRecord,
int width,
int height,
- VUAlignment alignment,
+ VUAlignment tqalignment,
const char *name):
TQLabel(parent, name),
m_originalHeight(height),
m_active(true),
m_type(type),
- m_alignment(alignment),
+ m_tqalignment(tqalignment),
m_levelLeft(0),
m_recordLevelLeft(0),
m_peakLevelLeft(0),
@@ -121,7 +121,7 @@ VUMeter::VUMeter(TQWidget *parent,
setMinimumSize(width, m_originalHeight);
setMaximumSize(width, m_originalHeight);
- if (m_alignment == Vertical)
+ if (m_tqalignment == Vertical)
m_maxLevel = height;
else
m_maxLevel = width;
@@ -336,7 +336,7 @@ VUMeter::paintEvent(TQPaintEvent *e)
drawMeterLevel(&paint);
- paint.setPen(colorGroup().background());
+ paint.setPen(tqcolorGroup().background());
paint.drawPoint(0, 0);
paint.drawPoint(width() - 1, 0);
paint.drawPoint(0, height() - 1);
@@ -381,7 +381,7 @@ VUMeter::drawColouredBar(TQPainter *paint, int channel,
int medium = m_velocityColour->getMediumKnee(),
loud = m_velocityColour->getLoudKnee();
- if (m_alignment == Vertical) {
+ if (m_tqalignment == Vertical) {
if (h > loud) {
paint->setPen(m_velocityColour->getLoudColour());
paint->setBrush(TQBrush(m_velocityColour->getLoudColour(),
@@ -397,7 +397,7 @@ VUMeter::drawColouredBar(TQPainter *paint, int channel,
}
}
- if (m_alignment == Vertical) {
+ if (m_tqalignment == Vertical) {
if (h > medium) {
paint->setPen(m_velocityColour->getMediumColour());
paint->setBrush(TQBrush(m_velocityColour->getMediumColour(),
@@ -415,7 +415,7 @@ VUMeter::drawColouredBar(TQPainter *paint, int channel,
}
}
- if (m_alignment == Vertical) {
+ if (m_tqalignment == Vertical) {
paint->setPen(m_velocityColour->getQuietColour());
paint->setBrush(TQBrush(m_velocityColour->getQuietColour(),
style));
@@ -458,7 +458,7 @@ VUMeter::drawMeterLevel(TQPainter* paint)
loud = m_velocityColour->getLoudKnee();
if (m_stereo) {
- if (m_alignment == VUMeter::Vertical) {
+ if (m_tqalignment == VUMeter::Vertical) {
int hW = width() / 2;
int midWidth = 1;
@@ -561,7 +561,7 @@ VUMeter::drawMeterLevel(TQPainter* paint)
} else {
// Paint a vertical meter according to type
//
- if (m_alignment == VUMeter::Vertical) {
+ if (m_tqalignment == VUMeter::Vertical) {
int y = height() - (m_levelLeft * height()) / m_maxLevel;
drawColouredBar(paint, 0, 0, y, width(), height());
diff --git a/src/gui/widgets/VUMeter.h b/src/gui/widgets/VUMeter.h
index c004b7e..53c90b3 100644
--- a/src/gui/widgets/VUMeter.h
+++ b/src/gui/widgets/VUMeter.h
@@ -89,7 +89,7 @@ protected:
bool hasRecord = false,
int width = 0,
int height = 0,
- VUAlignment alignment = Horizontal,
+ VUAlignment tqalignment = Horizontal,
const char *name = 0);
~VUMeter();
@@ -115,7 +115,7 @@ private:
int x, int y, int w, int h);
VUMeterType m_type;
- VUAlignment m_alignment;
+ VUAlignment m_tqalignment;
TQColor m_background;
short m_maxLevel;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 05:05:29 +0000