summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/segment
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/editors/segment')
-rw-r--r--src/gui/editors/segment/ControlEditorDialog.cpp42
-rw-r--r--src/gui/editors/segment/ControlEditorDialog.h3
-rw-r--r--src/gui/editors/segment/ControlParameterEditDialog.cpp50
-rw-r--r--src/gui/editors/segment/ControlParameterEditDialog.h3
-rw-r--r--src/gui/editors/segment/ControlParameterItem.h4
-rw-r--r--src/gui/editors/segment/MarkerEditor.cpp68
-rw-r--r--src/gui/editors/segment/MarkerEditor.h3
-rw-r--r--src/gui/editors/segment/MarkerEditorViewItem.h18
-rw-r--r--src/gui/editors/segment/PlayList.cpp4
-rw-r--r--src/gui/editors/segment/PlayList.h5
-rw-r--r--src/gui/editors/segment/PlayListDialog.cpp4
-rw-r--r--src/gui/editors/segment/PlayListDialog.h3
-rw-r--r--src/gui/editors/segment/PlayListView.cpp4
-rw-r--r--src/gui/editors/segment/PlayListView.h2
-rw-r--r--src/gui/editors/segment/PlayListViewItem.cpp8
-rw-r--r--src/gui/editors/segment/PlayListViewItem.h4
-rw-r--r--src/gui/editors/segment/TrackButtons.cpp62
-rw-r--r--src/gui/editors/segment/TrackButtons.h7
-rw-r--r--src/gui/editors/segment/TrackEditor.cpp18
-rw-r--r--src/gui/editors/segment/TrackEditor.h3
-rw-r--r--src/gui/editors/segment/TrackHeader.cpp8
-rw-r--r--src/gui/editors/segment/TrackHeader.h6
-rw-r--r--src/gui/editors/segment/TrackLabel.cpp30
-rw-r--r--src/gui/editors/segment/TrackLabel.h5
-rw-r--r--src/gui/editors/segment/TrackVUMeter.cpp8
-rw-r--r--src/gui/editors/segment/TrackVUMeter.h2
-rw-r--r--src/gui/editors/segment/TriggerManagerItem.h20
-rw-r--r--src/gui/editors/segment/TriggerSegmentManager.cpp72
-rw-r--r--src/gui/editors/segment/TriggerSegmentManager.h3
-rw-r--r--src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp10
-rw-r--r--src/gui/editors/segment/segmentcanvas/AudioPreviewThread.h2
-rw-r--r--src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp4
-rw-r--r--src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h5
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionItemHelper.cpp6
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionItemImpl.cpp2
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionModel.h1
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp10
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionModelImpl.h1
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionRect.cpp2
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionRect.h2
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionView.cpp72
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionView.h3
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentEraser.cpp2
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentEraser.h1
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h4
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentJoiner.h1
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentMover.cpp6
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentMover.h1
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp10
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentPencil.h1
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp6
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentResizer.h1
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp18
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentSelector.h1
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentSplitter.cpp10
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentSplitter.h1
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentTool.cpp8
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentTool.h2
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp8
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentToolBox.h3
60 files changed, 347 insertions, 326 deletions
diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp
index 5fb1fa1..48d0f0a 100644
--- a/src/gui/editors/segment/ControlEditorDialog.cpp
+++ b/src/gui/editors/segment/ControlEditorDialog.cpp
@@ -72,10 +72,10 @@ namespace Rosegarden
const TQString notShowing(i18n("<not showing>"));
-ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
+ControlEditorDialog::ControlEditorDialog(TQWidget *tqparent,
RosegardenGUIDoc *doc,
DeviceId device):
- KMainWindow(parent, "controleditordialog"),
+ KMainWindow(tqparent, "controleditordialog"),
m_studio(&doc->getStudio()),
m_doc(doc),
m_device(device),
@@ -96,7 +96,7 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
// spacing hack!
new TQLabel("", mainFrame);
- new TQLabel(i18n(" Control Events for %1 (device %2)").arg(deviceName).
+ new TQLabel(i18n(" Control Events for %1 (device %2)").tqarg(deviceName).
arg(device), mainFrame);
new TQLabel("", mainFrame);
@@ -111,20 +111,20 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
m_listView->addColumn(i18n("Color "));
m_listView->addColumn(i18n("Position on instrument panel"));
- m_listView->setColumnAlignment(0, Qt::AlignLeft);
+ m_listView->setColumnAlignment(0, TQt::AlignLeft);
// Align remaining columns centrally
for (int i = 1; i < 9; ++i)
- m_listView->setColumnAlignment(i, Qt::AlignHCenter);
+ m_listView->setColumnAlignment(i, TQt::AlignHCenter);
m_listView->restoreLayout(kapp->config(), ControlEditorConfigGroup);
TQFrame* btnBox = new TQFrame(mainFrame);
- btnBox->setSizePolicy(
+ btnBox->tqsetSizePolicy(
TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
- TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 4, 10);
+ TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10);
m_addButton = new TQPushButton(i18n("Add"), btnBox);
m_deleteButton = new TQPushButton(i18n("Delete"), btnBox);
@@ -143,13 +143,13 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent,
(m_closeButton,
i18n("Close the Control Parameter editor"));
- layout->addStretch(10);
- layout->addWidget(m_addButton);
- layout->addWidget(m_deleteButton);
- layout->addSpacing(30);
+ tqlayout->addStretch(10);
+ tqlayout->addWidget(m_addButton);
+ tqlayout->addWidget(m_deleteButton);
+ tqlayout->addSpacing(30);
- layout->addWidget(m_closeButton);
- layout->addSpacing(5);
+ tqlayout->addWidget(m_closeButton);
+ tqlayout->addSpacing(5);
connect(m_addButton, TQT_SIGNAL(released()),
TQT_SLOT(slotAdd()));
@@ -220,7 +220,7 @@ ControlEditorDialog::slotUpdate()
if (colour == "")
colour = i18n("<default>");
- TQString position = TQString("%1").arg(it->getIPBPosition());
+ TQString position = TQString("%1").tqarg(it->getIPBPosition());
if (position.toInt() == -1)
position = notShowing;
@@ -235,9 +235,9 @@ ControlEditorDialog::slotUpdate()
strtoqstr(it->getType()),
TQString("-"),
strtoqstr(it->getDescription()),
- TQString("%1").arg(it->getMin()),
- TQString("%1").arg(it->getMax()),
- TQString("%1").arg(it->getDefault()),
+ TQString("%1").tqarg(it->getMin()),
+ TQString("%1").tqarg(it->getMax()),
+ TQString("%1").tqarg(it->getDefault()),
colour,
position);
} else {
@@ -247,9 +247,9 @@ ControlEditorDialog::slotUpdate()
strtoqstr(it->getType()),
value,
strtoqstr(it->getDescription()),
- TQString("%1").arg(it->getMin()),
- TQString("%1").arg(it->getMax()),
- TQString("%1").arg(it->getDefault()),
+ TQString("%1").tqarg(it->getMin()),
+ TQString("%1").tqarg(it->getMax()),
+ TQString("%1").tqarg(it->getDefault()),
colour,
position);
}
@@ -337,7 +337,7 @@ ControlEditorDialog::slotClose()
void
ControlEditorDialog::setupActions()
{
- KAction* close = KStdAction::close(this,
+ KAction* close = KStdAction::close(TQT_TQOBJECT(this),
TQT_SLOT(slotClose()),
actionCollection());
diff --git a/src/gui/editors/segment/ControlEditorDialog.h b/src/gui/editors/segment/ControlEditorDialog.h
index 369a9b1..e9722e5 100644
--- a/src/gui/editors/segment/ControlEditorDialog.h
+++ b/src/gui/editors/segment/ControlEditorDialog.h
@@ -50,9 +50,10 @@ class MultiViewCommandHistory;
class ControlEditorDialog : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
- ControlEditorDialog(TQWidget *parent,
+ ControlEditorDialog(TQWidget *tqparent,
RosegardenGUIDoc *doc,
DeviceId device);
diff --git a/src/gui/editors/segment/ControlParameterEditDialog.cpp b/src/gui/editors/segment/ControlParameterEditDialog.cpp
index 1f4e9fd..47f01db 100644
--- a/src/gui/editors/segment/ControlParameterEditDialog.cpp
+++ b/src/gui/editors/segment/ControlParameterEditDialog.cpp
@@ -55,10 +55,10 @@ namespace Rosegarden
const TQString notShowing(i18n("<not showing>"));
ControlParameterEditDialog::ControlParameterEditDialog(
- TQWidget *parent,
+ TQWidget *tqparent,
ControlParameter *control,
RosegardenGUIDoc *doc):
- KDialogBase(parent, 0, true,
+ KDialogBase(tqparent, 0, true,
i18n("Edit Control Parameter"), Ok | Cancel),
m_doc(doc),
m_control(control)
@@ -67,52 +67,52 @@ ControlParameterEditDialog::ControlParameterEditDialog(
TQVBox *vbox = makeVBoxMainWidget();
- TQGroupBox *groupBox = new QGroupBox
- (1, Horizontal, i18n("Control Event Properties"), vbox);
+ TQGroupBox *groupBox = new TQGroupBox
+ (1, Qt::Horizontal, i18n("Control Event Properties"), vbox);
TQFrame *frame = new TQFrame(groupBox);
- TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 10, 5);
+ TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 10, 5);
- layout->addWidget(new TQLabel(i18n("Name:"), frame), 0, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Name:"), frame), 0, 0);
m_nameEdit = new TQLineEdit(frame);
- layout->addWidget(m_nameEdit, 0, 1);
+ tqlayout->addWidget(m_nameEdit, 0, 1);
- layout->addWidget(new TQLabel(i18n("Type:"), frame), 1, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Type:"), frame), 1, 0);
m_typeCombo = new KComboBox(frame);
- layout->addMultiCellWidget(m_typeCombo, 1, 1, 1, 2);
+ tqlayout->addMultiCellWidget(m_typeCombo, 1, 1, 1, 2);
- layout->addWidget(new TQLabel(i18n("Description:"), frame), 2, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Description:"), frame), 2, 0);
m_description = new TQLineEdit(frame);
- layout->addMultiCellWidget(m_description, 2, 2, 1, 2);
+ tqlayout->addMultiCellWidget(m_description, 2, 2, 1, 2);
// hex value alongside decimal value
m_hexValue = new TQLabel(frame);
- layout->addWidget(m_hexValue, 3, 1);
+ tqlayout->addWidget(m_hexValue, 3, 1);
- layout->addWidget(new TQLabel(i18n("Control Event value:"), frame), 3, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Control Event value:"), frame), 3, 0);
m_controllerBox = new TQSpinBox(frame);
- layout->addWidget(m_controllerBox, 3, 2);
+ tqlayout->addWidget(m_controllerBox, 3, 2);
- layout->addWidget(new TQLabel(i18n("Minimum value:"), frame), 4, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Minimum value:"), frame), 4, 0);
m_minBox = new TQSpinBox(frame);
- layout->addMultiCellWidget(m_minBox, 4, 4, 1, 2);
+ tqlayout->addMultiCellWidget(m_minBox, 4, 4, 1, 2);
- layout->addWidget(new TQLabel(i18n("Maximum value:"), frame), 5, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Maximum value:"), frame), 5, 0);
m_maxBox = new TQSpinBox(frame);
- layout->addMultiCellWidget(m_maxBox, 5, 5, 1, 2);
+ tqlayout->addMultiCellWidget(m_maxBox, 5, 5, 1, 2);
- layout->addWidget(new TQLabel(i18n("Default value:"), frame), 6, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Default value:"), frame), 6, 0);
m_defaultBox = new TQSpinBox(frame);
- layout->addMultiCellWidget(m_defaultBox, 6, 6, 1, 2);
+ tqlayout->addMultiCellWidget(m_defaultBox, 6, 6, 1, 2);
- layout->addWidget(new TQLabel(i18n("Color:"), frame), 7, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Color:"), frame), 7, 0);
m_colourCombo = new KComboBox(frame);
- layout->addMultiCellWidget(m_colourCombo, 7, 7, 1, 2);
+ tqlayout->addMultiCellWidget(m_colourCombo, 7, 7, 1, 2);
- layout->addWidget(new TQLabel(i18n("Instrument Parameter Box position:"), frame), 8, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Instrument Parameter Box position:"), frame), 8, 0);
m_ipbPosition = new KComboBox(frame);
- layout->addMultiCellWidget(m_ipbPosition, 8, 8, 1, 2);
+ tqlayout->addMultiCellWidget(m_ipbPosition, 8, 8, 1, 2);
connect(m_nameEdit, TQT_SIGNAL(textChanged(const TQString&)),
TQT_SLOT(slotNameChanged(const TQString&)));
@@ -182,7 +182,7 @@ ControlParameterEditDialog::ControlParameterEditDialog(
//
m_ipbPosition->insertItem(notShowing);
for (unsigned int i = 0; i < 32; i++)
- m_ipbPosition->insertItem(TQString("%1").arg(i));
+ m_ipbPosition->insertItem(TQString("%1").tqarg(i));
if (m_control->getType() == Controller::EventType)
m_typeCombo->setCurrentItem(0);
diff --git a/src/gui/editors/segment/ControlParameterEditDialog.h b/src/gui/editors/segment/ControlParameterEditDialog.h
index 1c6bc01..289dc68 100644
--- a/src/gui/editors/segment/ControlParameterEditDialog.h
+++ b/src/gui/editors/segment/ControlParameterEditDialog.h
@@ -47,8 +47,9 @@ class RosegardenGUIDoc;
class ControlParameterEditDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- ControlParameterEditDialog(TQWidget *parent,
+ ControlParameterEditDialog(TQWidget *tqparent,
ControlParameter *control,
RosegardenGUIDoc *doc);
diff --git a/src/gui/editors/segment/ControlParameterItem.h b/src/gui/editors/segment/ControlParameterItem.h
index 7be91b3..e64b1d3 100644
--- a/src/gui/editors/segment/ControlParameterItem.h
+++ b/src/gui/editors/segment/ControlParameterItem.h
@@ -38,7 +38,7 @@ class ControlParameterItem : public KListViewItem
{
public:
ControlParameterItem(int id,
- TQListView *parent,
+ TQListView *tqparent,
TQString str1,
TQString str2,
TQString str3,
@@ -48,7 +48,7 @@ public:
TQString str7,
TQString str8,
TQString str9):
- KListViewItem(parent, str1, str2, str3, str4, str5, str6, str7, str8),
+ KListViewItem(tqparent, str1, str2, str3, str4, str5, str6, str7, str8),
m_id(id) { setText(8, str9); }
int getId() const { return m_id; }
diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index d9df8a2..dffe446 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -71,9 +71,9 @@
namespace Rosegarden
{
-MarkerEditor::MarkerEditor(TQWidget *parent,
+MarkerEditor::MarkerEditor(TQWidget *tqparent,
RosegardenGUIDoc *doc):
- KMainWindow(parent, "markereditordialog"),
+ KMainWindow(tqparent, "markereditordialog"),
m_doc(doc),
m_modified(false)
{
@@ -89,9 +89,9 @@ MarkerEditor::MarkerEditor(TQWidget *parent,
// Align centrally
for (int i = 0; i < 3; ++i)
- m_listView->setColumnAlignment(i, Qt::AlignHCenter);
+ m_listView->setColumnAlignment(i, TQt::AlignHCenter);
- TQGroupBox *posGroup = new TQGroupBox(2, Horizontal,
+ TQGroupBox *posGroup = new TQGroupBox(2, Qt::Horizontal,
i18n("Pointer position"), mainFrame);
new TQLabel(i18n("Absolute time:"), posGroup);
@@ -105,10 +105,10 @@ MarkerEditor::MarkerEditor(TQWidget *parent,
TQFrame* btnBox = new TQFrame(mainFrame);
- btnBox->setSizePolicy(
+ btnBox->tqsetSizePolicy(
TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
- TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 4, 10);
+ TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10);
m_addButton = new TQPushButton(i18n("Add"), btnBox);
m_deleteButton = new TQPushButton(i18n("Delete"), btnBox);
@@ -132,14 +132,14 @@ MarkerEditor::MarkerEditor(TQWidget *parent,
(m_closeButton,
i18n("Close the Marker Editor"));
- layout->addStretch(10);
- layout->addWidget(m_addButton);
- layout->addWidget(m_deleteButton);
- layout->addWidget(m_deleteAllButton);
- layout->addSpacing(30);
+ tqlayout->addStretch(10);
+ tqlayout->addWidget(m_addButton);
+ tqlayout->addWidget(m_deleteButton);
+ tqlayout->addWidget(m_deleteAllButton);
+ tqlayout->addSpacing(30);
- layout->addWidget(m_closeButton);
- layout->addSpacing(5);
+ tqlayout->addWidget(m_closeButton);
+ tqlayout->addSpacing(5);
connect(m_addButton, TQT_SIGNAL(released()),
TQT_SLOT(slotAdd()));
@@ -182,7 +182,7 @@ void
MarkerEditor::updatePosition()
{
timeT pos = m_doc->getComposition().getPosition();
- m_absoluteTime->setText(TQString("%1").arg(pos));
+ m_absoluteTime->setText(TQString("%1").tqarg(pos));
RealTime rT = m_doc->getComposition().getElapsedRealTime(pos);
long hours = rT.sec / (60 * 60);
@@ -192,9 +192,9 @@ MarkerEditor::updatePosition()
TQString realTime, secsStr;
if (hours)
- realTime += TQString("%1h ").arg(hours);
+ realTime += TQString("%1h ").tqarg(hours);
if (mins)
- realTime += TQString("%1m ").arg(mins);
+ realTime += TQString("%1m ").tqarg(mins);
secsStr.sprintf("%ld.%03lds", secs, msecs);
realTime += secsStr;
@@ -203,7 +203,7 @@ MarkerEditor::updatePosition()
m_realTime->setText(realTime);
TQString barTime =
- TQString("%1").arg(m_doc->getComposition().getBarNumber(pos) + 1);
+ TQString("%1").tqarg(m_doc->getComposition().getBarNumber(pos) + 1);
// again only update if needed
if (m_barTime->text() != barTime)
@@ -367,7 +367,7 @@ MarkerEditor::slotClose()
void
MarkerEditor::setupActions()
{
- KAction* close = KStdAction::close(this,
+ KAction* close = KStdAction::close(TQT_TQOBJECT(this),
TQT_SLOT(slotClose()),
actionCollection());
@@ -396,7 +396,7 @@ MarkerEditor::setupActions()
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/time-musical.png");
TQIconSet icon(pixmap);
- action = new KRadioAction(i18n("&Musical Times"), icon, 0, this,
+ action = new KRadioAction(i18n("&Musical Times"), icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotMusicalTime()),
actionCollection(), "time_musical");
action->setExclusiveGroup("timeMode");
@@ -406,7 +406,7 @@ MarkerEditor::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-real.png");
icon = TQIconSet(pixmap);
- action = new KRadioAction(i18n("&Real Times"), icon, 0, this,
+ action = new KRadioAction(i18n("&Real Times"), icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotRealTime()),
actionCollection(), "time_real");
action->setExclusiveGroup("timeMode");
@@ -416,7 +416,7 @@ MarkerEditor::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-raw.png");
icon = TQIconSet(pixmap);
- action = new KRadioAction(i18n("Ra&w Times"), icon, 0, this,
+ action = new KRadioAction(i18n("Ra&w Times"), icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotRawTime()),
actionCollection(), "time_raw");
action->setExclusiveGroup("timeMode");
@@ -530,7 +530,7 @@ MarkerEditor::slotItemClicked(TQListViewItem *item)
}
}
-QString
+TQString
MarkerEditor::makeTimeString(timeT time, int timeMode)
{
switch (timeMode) {
@@ -542,27 +542,27 @@ MarkerEditor::makeTimeString(timeT time, int timeMode)
(time, bar, beat, fraction, remainder);
++bar;
return TQString("%1%2%3-%4%5-%6%7-%8%9 ")
- .arg(bar / 100)
- .arg((bar % 100) / 10)
- .arg(bar % 10)
- .arg(beat / 10)
- .arg(beat % 10)
- .arg(fraction / 10)
- .arg(fraction % 10)
- .arg(remainder / 10)
- .arg(remainder % 10);
+ .tqarg(bar / 100)
+ .tqarg((bar % 100) / 10)
+ .tqarg(bar % 10)
+ .tqarg(beat / 10)
+ .tqarg(beat % 10)
+ .tqarg(fraction / 10)
+ .tqarg(fraction % 10)
+ .tqarg(remainder / 10)
+ .tqarg(remainder % 10);
}
case 1: // real time
{
RealTime rt =
m_doc->getComposition().getElapsedRealTime(time);
- // return TQString("%1 ").arg(rt.toString().c_str());
- return TQString("%1 ").arg(rt.toText().c_str());
+ // return TQString("%1 ").tqarg(rt.toString().c_str());
+ return TQString("%1 ").tqarg(rt.toText().c_str());
}
default:
- return TQString("%1 ").arg(time);
+ return TQString("%1 ").tqarg(time);
}
}
diff --git a/src/gui/editors/segment/MarkerEditor.h b/src/gui/editors/segment/MarkerEditor.h
index 8d6de0e..c5a1973 100644
--- a/src/gui/editors/segment/MarkerEditor.h
+++ b/src/gui/editors/segment/MarkerEditor.h
@@ -51,9 +51,10 @@ class MultiViewCommandHistory;
class MarkerEditor : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
- MarkerEditor(TQWidget *parent,
+ MarkerEditor(TQWidget *tqparent,
RosegardenGUIDoc *doc);
~MarkerEditor();
diff --git a/src/gui/editors/segment/MarkerEditorViewItem.h b/src/gui/editors/segment/MarkerEditorViewItem.h
index 9852202..03320aa 100644
--- a/src/gui/editors/segment/MarkerEditorViewItem.h
+++ b/src/gui/editors/segment/MarkerEditorViewItem.h
@@ -35,16 +35,16 @@ namespace Rosegarden {
class MarkerEditorViewItem : public KListViewItem
{
public:
- MarkerEditorViewItem(TQListView * parent, int id,
+ MarkerEditorViewItem(TQListView * tqparent, int id,
TQString label1,
- TQString label2 = TQString::null,
- TQString label3 = TQString::null,
- TQString label4 = TQString::null,
- TQString label5 = TQString::null,
- TQString label6 = TQString::null,
- TQString label7 = TQString::null,
- TQString label8 = TQString::null):
- KListViewItem(parent, label1, label2, label3, label4,
+ TQString label2 = TQString(),
+ TQString label3 = TQString(),
+ TQString label4 = TQString(),
+ TQString label5 = TQString(),
+ TQString label6 = TQString(),
+ TQString label7 = TQString(),
+ TQString label8 = TQString()):
+ KListViewItem(tqparent, label1, label2, label3, label4,
label5, label6, label7, label8),
m_rawTime(0), m_fake(false), m_id(id) { ; }
diff --git a/src/gui/editors/segment/PlayList.cpp b/src/gui/editors/segment/PlayList.cpp
index da56edc..c0154ec 100644
--- a/src/gui/editors/segment/PlayList.cpp
+++ b/src/gui/editors/segment/PlayList.cpp
@@ -47,8 +47,8 @@
namespace Rosegarden
{
-PlayList::PlayList(TQWidget *parent, const char *name)
- : TQVBox(parent, name),
+PlayList::PlayList(TQWidget *tqparent, const char *name)
+ : TQVBox(tqparent, name),
m_listView(new PlayListView(this)),
m_buttonBar(new TQFrame(this)),
m_barLayout(new TQHBoxLayout(m_buttonBar)),
diff --git a/src/gui/editors/segment/PlayList.h b/src/gui/editors/segment/PlayList.h
index 8c04553..606eecd 100644
--- a/src/gui/editors/segment/PlayList.h
+++ b/src/gui/editors/segment/PlayList.h
@@ -43,12 +43,13 @@ namespace Rosegarden
class PlayListView;
-class PlayList : public QVBox
+class PlayList : public TQVBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- PlayList(TQWidget *parent = 0, const char *name = 0);
+ PlayList(TQWidget *tqparent = 0, const char *name = 0);
~PlayList();
PlayListView* getListView() { return m_listView; }
diff --git a/src/gui/editors/segment/PlayListDialog.cpp b/src/gui/editors/segment/PlayListDialog.cpp
index b519b6e..74c386b 100644
--- a/src/gui/editors/segment/PlayListDialog.cpp
+++ b/src/gui/editors/segment/PlayListDialog.cpp
@@ -36,8 +36,8 @@ namespace Rosegarden
{
PlayListDialog::PlayListDialog(TQString caption,
- TQWidget* parent, const char* name)
- : KDialogBase(parent, name, false, caption,
+ TQWidget* tqparent, const char* name)
+ : KDialogBase(tqparent, name, false, caption,
KDialogBase::Close, // standard buttons
KDialogBase::Close, // default button
true),
diff --git a/src/gui/editors/segment/PlayListDialog.h b/src/gui/editors/segment/PlayListDialog.h
index 5130ee3..69956dd 100644
--- a/src/gui/editors/segment/PlayListDialog.h
+++ b/src/gui/editors/segment/PlayListDialog.h
@@ -43,9 +43,10 @@ class PlayList;
class PlayListDialog : public KDialogBase
{
Q_OBJECT
+ TQ_OBJECT
public:
- PlayListDialog(TQString caption, TQWidget* parent = 0, const char* name = 0);
+ PlayListDialog(TQString caption, TQWidget* tqparent = 0, const char* name = 0);
PlayList* getPlayList() { return m_playList; }
diff --git a/src/gui/editors/segment/PlayListView.cpp b/src/gui/editors/segment/PlayListView.cpp
index ff4d1c8..e83e5e6 100644
--- a/src/gui/editors/segment/PlayListView.cpp
+++ b/src/gui/editors/segment/PlayListView.cpp
@@ -29,8 +29,8 @@
namespace Rosegarden {
-PlayListView::PlayListView(TQWidget *parent, const char *name)
- : KListView(parent, name)
+PlayListView::PlayListView(TQWidget *tqparent, const char *name)
+ : KListView(tqparent, name)
{
addColumn(i18n("Title"));
addColumn(i18n("File name"));
diff --git a/src/gui/editors/segment/PlayListView.h b/src/gui/editors/segment/PlayListView.h
index 43390d0..b21551e 100644
--- a/src/gui/editors/segment/PlayListView.h
+++ b/src/gui/editors/segment/PlayListView.h
@@ -32,7 +32,7 @@ namespace Rosegarden {
class PlayListView : public KListView
{
public:
- PlayListView(TQWidget *parent=0, const char *name=0);
+ PlayListView(TQWidget *tqparent=0, const char *name=0);
TQListViewItem* previousSibling(TQListViewItem*);
diff --git a/src/gui/editors/segment/PlayListViewItem.cpp b/src/gui/editors/segment/PlayListViewItem.cpp
index ab0c25c..12d60b8 100644
--- a/src/gui/editors/segment/PlayListViewItem.cpp
+++ b/src/gui/editors/segment/PlayListViewItem.cpp
@@ -26,14 +26,14 @@
namespace Rosegarden {
-PlayListViewItem::PlayListViewItem(KListView* parent, KURL kurl)
- : KListViewItem(parent, kurl.fileName(), kurl.prettyURL()),
+PlayListViewItem::PlayListViewItem(KListView* tqparent, KURL kurl)
+ : KListViewItem(tqparent, kurl.fileName(), kurl.prettyURL()),
m_kurl(kurl)
{
}
-PlayListViewItem::PlayListViewItem(KListView* parent, TQListViewItem* after, KURL kurl)
- : KListViewItem(parent, after, kurl.fileName(), kurl.prettyURL()),
+PlayListViewItem::PlayListViewItem(KListView* tqparent, TQListViewItem* after, KURL kurl)
+ : KListViewItem(tqparent, after, kurl.fileName(), kurl.prettyURL()),
m_kurl(kurl)
{
}
diff --git a/src/gui/editors/segment/PlayListViewItem.h b/src/gui/editors/segment/PlayListViewItem.h
index a622682..aa39bb8 100644
--- a/src/gui/editors/segment/PlayListViewItem.h
+++ b/src/gui/editors/segment/PlayListViewItem.h
@@ -33,8 +33,8 @@ namespace Rosegarden {
class PlayListViewItem : public KListViewItem
{
public:
- PlayListViewItem(KListView* parent, KURL);
- PlayListViewItem(KListView* parent, TQListViewItem*, KURL);
+ PlayListViewItem(KListView* tqparent, KURL);
+ PlayListViewItem(KListView* tqparent, TQListViewItem*, KURL);
const KURL& getURL() { return m_kurl; }
diff --git a/src/gui/editors/segment/TrackButtons.cpp b/src/gui/editors/segment/TrackButtons.cpp
index 39e19d2..fba7327 100644
--- a/src/gui/editors/segment/TrackButtons.cpp
+++ b/src/gui/editors/segment/TrackButtons.cpp
@@ -72,16 +72,16 @@ TrackButtons::TrackButtons(RosegardenGUIDoc* doc,
unsigned int trackLabelWidth,
bool showTrackLabels,
int overallHeight,
- TQWidget* parent,
+ TQWidget* tqparent,
const char* name,
WFlags f)
- : TQFrame(parent, name, f),
+ : TQFrame(tqparent, name, f),
m_doc(doc),
- m_layout(new TQVBoxLayout(this)),
- m_recordSigMapper(new TQSignalMapper(this)),
- m_muteSigMapper(new TQSignalMapper(this)),
- m_clickedSigMapper(new TQSignalMapper(this)),
- m_instListSigMapper(new TQSignalMapper(this)),
+ m_tqlayout(new TQVBoxLayout(this)),
+ m_recordSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))),
+ m_muteSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))),
+ m_clickedSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))),
+ m_instListSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))),
m_tracks(doc->getComposition().getNbTracks()),
m_offset(4),
m_cellSize(trackCellHeight),
@@ -100,13 +100,13 @@ TrackButtons::TrackButtons(RosegardenGUIDoc* doc,
// Set the spacing between vertical elements
//
- m_layout->setSpacing(m_borderGap);
+ m_tqlayout->setSpacing(m_borderGap);
// Now draw the buttons and labels and meters
//
makeButtons();
- m_layout->addStretch(20);
+ m_tqlayout->addStretch(20);
connect(m_recordSigMapper, TQT_SIGNAL(mapped(int)),
this, TQT_SLOT(slotToggleRecordTrack(int)));
@@ -152,7 +152,7 @@ TrackButtons::makeButtons()
TQFrame *trackHBox = makeButton(track->getId());
if (trackHBox) {
- m_layout->addWidget(trackHBox);
+ m_tqlayout->addWidget(trackHBox);
m_trackHBoxes.push_back(trackHBox);
}
}
@@ -194,7 +194,7 @@ TrackButtons::populateButtons()
// reset track tokens
m_trackLabels[i]->setId(track->getId());
- setButtonMapping(m_trackLabels[i], track->getId());
+ setButtonMapping(TQT_TQOBJECT(m_trackLabels[i]), track->getId());
m_trackLabels[i]->setPosition(i);
}
@@ -297,7 +297,7 @@ TrackButtons::slotUpdateTracks()
if (trackHBox) {
trackHBox->show();
- m_layout->insertWidget(i, trackHBox);
+ m_tqlayout->insertWidget(i, trackHBox);
m_trackHBoxes.push_back(trackHBox);
}
} else
@@ -359,7 +359,7 @@ TrackButtons::slotUpdateTracks()
// RG_DEBUG << "TrackButtons::slotUpdateTracks - set button mapping at pos "
// << i << " to track id " << track->getId() << endl;
- setButtonMapping(m_trackLabels[i], track->getId());
+ setButtonMapping(TQT_TQOBJECT(m_trackLabels[i]), track->getId());
}
}
m_tracks = newNbTracks;
@@ -647,17 +647,17 @@ TrackButtons::populateInstrumentPopup(Instrument *thisTrackInstr, TQPopupMenu* i
KGlobal::dirs()->findResource("appdata", "pixmaps/");
connectedPixmap.load
- (TQString("%1/misc/connected.xpm").arg(pixmapDir));
+ (TQString("%1/misc/connected.xpm").tqarg(pixmapDir));
connectedUsedPixmap.load
- (TQString("%1/misc/connected-used.xpm").arg(pixmapDir));
+ (TQString("%1/misc/connected-used.xpm").tqarg(pixmapDir));
connectedSelectedPixmap.load
- (TQString("%1/misc/connected-selected.xpm").arg(pixmapDir));
+ (TQString("%1/misc/connected-selected.xpm").tqarg(pixmapDir));
unconnectedPixmap.load
- (TQString("%1/misc/unconnected.xpm").arg(pixmapDir));
+ (TQString("%1/misc/unconnected.xpm").tqarg(pixmapDir));
unconnectedUsedPixmap.load
- (TQString("%1/misc/unconnected-used.xpm").arg(pixmapDir));
+ (TQString("%1/misc/unconnected-used.xpm").tqarg(pixmapDir));
unconnectedSelectedPixmap.load
- (TQString("%1/misc/unconnected-selected.xpm").arg(pixmapDir));
+ (TQString("%1/misc/unconnected-selected.xpm").tqarg(pixmapDir));
havePixmaps = true;
}
@@ -706,7 +706,7 @@ TrackButtons::populateInstrumentPopup(Instrument *thisTrackInstr, TQPopupMenu* i
pname = strtoqstr(plugin->getDistinctiveConfigurationText());
}
if (pname != "") {
- pname = TQString("%1: %2").arg(label).arg(pname);
+ pname = TQString("%1: %2").tqarg(label).tqarg(pname);
} else {
pname = label;
}
@@ -1021,7 +1021,7 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
// Create a horizontal box for each track
//
trackHBox = new TQFrame(this);
- TQHBoxLayout *hblayout = new TQHBoxLayout(trackHBox);
+ TQHBoxLayout *hbtqlayout = new TQHBoxLayout(trackHBox);
trackHBox->setMinimumSize(labelWidth, m_cellSize * multiple - m_borderGap);
trackHBox->setFixedHeight(m_cellSize * multiple - m_borderGap);
@@ -1033,7 +1033,7 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
trackHBox->setFrameShadow(Raised);
// Insert a little gap
- hblayout->addSpacing(vuSpacing);
+ hbtqlayout->addSpacing(vuSpacing);
// Create a VU meter
vuMeter = new TrackVUMeter(trackHBox,
@@ -1044,10 +1044,10 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
m_trackMeters.push_back(vuMeter);
- hblayout->addWidget(vuMeter);
+ hbtqlayout->addWidget(vuMeter);
// Create another little gap
- hblayout->addSpacing(vuSpacing);
+ hbtqlayout->addSpacing(vuSpacing);
//
// 'mute' and 'record' leds
@@ -1056,12 +1056,12 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
mute = new KLedButton(Rosegarden::GUIPalette::getColour
(Rosegarden::GUIPalette::MuteTrackLED), trackHBox);
TQToolTip::add(mute, i18n("Mute track"));
- hblayout->addWidget(mute);
+ hbtqlayout->addWidget(mute);
record = new KLedButton(Rosegarden::GUIPalette::getColour
(Rosegarden::GUIPalette::RecordMIDITrackLED), trackHBox);
TQToolTip::add(record, i18n("Record on this track"));
- hblayout->addWidget(record);
+ hbtqlayout->addWidget(record);
record->setLook(KLed::Sunken);
mute->setLook(KLed::Sunken);
@@ -1072,8 +1072,8 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
m_recordSigMapper, TQT_SLOT(map()));
connect(mute, TQT_SIGNAL(stateChanged(bool)),
m_muteSigMapper, TQT_SLOT(map()));
- m_recordSigMapper->setMapping(record, track->getPosition());
- m_muteSigMapper->setMapping(mute, track->getPosition());
+ m_recordSigMapper->setMapping(TQT_TQOBJECT(record), track->getPosition());
+ m_muteSigMapper->setMapping(TQT_TQOBJECT(mute), track->getPosition());
// Store the KLedButton
//
@@ -1084,8 +1084,8 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
// Track label
//
trackLabel = new TrackLabel(trackId, track->getPosition(), trackHBox);
- hblayout->addWidget(trackLabel);
- hblayout->addSpacing(vuSpacing);
+ hbtqlayout->addWidget(trackLabel);
+ hbtqlayout->addSpacing(vuSpacing);
if (track->getLabel() == std::string("")) {
Rosegarden::Instrument *ins =
@@ -1111,7 +1111,7 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId)
m_trackLabels.push_back(trackLabel);
// Connect it
- setButtonMapping(trackLabel, trackId);
+ setButtonMapping(TQT_TQOBJECT(trackLabel), trackId);
connect(trackLabel, TQT_SIGNAL(changeToInstrumentList()),
m_instListSigMapper, TQT_SLOT(map()));
diff --git a/src/gui/editors/segment/TrackButtons.h b/src/gui/editors/segment/TrackButtons.h
index 7f2b5dd..050c564 100644
--- a/src/gui/editors/segment/TrackButtons.h
+++ b/src/gui/editors/segment/TrackButtons.h
@@ -51,9 +51,10 @@ class KLedButton;
class Instrument;
-class TrackButtons : public QFrame
+class TrackButtons : public TQFrame
{
Q_OBJECT
+ TQ_OBJECT
public:
TrackButtons(RosegardenGUIDoc* doc,
@@ -61,7 +62,7 @@ public:
unsigned int trackLabelWidth,
bool showTrackLabels,
int overallHeight,
- TQWidget* parent = 0,
+ TQWidget* tqparent = 0,
const char* name = 0,
WFlags f=0);
@@ -185,7 +186,7 @@ protected:
RosegardenGUIDoc *m_doc;
- TQVBoxLayout *m_layout;
+ TQVBoxLayout *m_tqlayout;
std::vector<KLedButton *> m_muteLeds;
std::vector<KLedButton *> m_recordLeds;
diff --git a/src/gui/editors/segment/TrackEditor.cpp b/src/gui/editors/segment/TrackEditor.cpp
index 9eeb21b..7381790 100644
--- a/src/gui/editors/segment/TrackEditor.cpp
+++ b/src/gui/editors/segment/TrackEditor.cpp
@@ -87,10 +87,10 @@ TrackEditor::TrackEditor(RosegardenGUIDoc* doc,
RulerScale *rulerScale,
bool showTrackLabels,
double initialUnitsPerPixel,
- TQWidget* parent, const char* name,
+ TQWidget* tqparent, const char* name,
WFlags) :
DCOPObject("TrackEditorIface"),
- TQWidget(parent, name),
+ TQWidget(tqparent, name),
m_doc(doc),
m_rulerScale(rulerScale),
m_topStandardRuler(0),
@@ -166,7 +166,7 @@ TrackEditor::init(TQWidget* rosegardenguiview)
connect(rosegardenguiview, TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
m_compositionModel, TQT_SLOT(slotInstrumentParametersChanged(InstrumentId)));
- connect(rosegardenguiview->parent(), TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
+ connect(rosegardenguiview->tqparent(), TQT_SIGNAL(instrumentParametersChanged(InstrumentId)),
m_compositionModel, TQT_SLOT(slotInstrumentParametersChanged(InstrumentId)));
m_segmentCanvas = new CompositionView(m_doc, m_compositionModel, this);
@@ -331,7 +331,7 @@ void TrackEditor::slotReadjustCanvasSize()
void TrackEditor::slotTrackButtonsWidthChanged()
{
- // We need to make sure the trackButtons geometry is fully updated
+ // We need to make sure the trackButtons tqgeometry is fully updated
//
ProgressDialog::processEvents();
@@ -360,13 +360,13 @@ int TrackEditor::getTrackCellHeight() const
bool TrackEditor::isCompositionModified()
{
- return m_doc->getComposition().getRefreshStatus
+ return m_doc->getComposition().getRefreshtqStatus
(m_compositionRefreshStatusId).needsRefresh();
}
void TrackEditor::setCompositionModified(bool c)
{
- m_doc->getComposition().getRefreshStatus
+ m_doc->getComposition().getRefreshtqStatus
(m_compositionRefreshStatusId).setNeedsRefresh(c);
}
@@ -444,7 +444,7 @@ void TrackEditor::addSegment(int track, int time, unsigned int duration)
void TrackEditor::slotSegmentOrderChanged(int section, int fromIdx, int toIdx)
{
RG_DEBUG << TQString("TrackEditor::segmentOrderChanged(section : %1, from %2, to %3)")
- .arg(section).arg(fromIdx).arg(toIdx) << endl;
+ .tqarg(section).tqarg(fromIdx).tqarg(toIdx) << endl;
//!!! how do we get here? need to involve a command
emit needUpdate();
@@ -490,7 +490,7 @@ TrackEditor::slotSetPointerPosition(timeT position)
if (distance >= 1.0) {
if (m_doc && m_doc->getSequenceManager() &&
- (m_doc->getSequenceManager()->getTransportStatus() != STOPPED)) {
+ (m_doc->getSequenceManager()->getTransporttqStatus() != STOPPED)) {
if (m_playTracking) {
getSegmentCanvas()->slotScrollHoriz(int(double(position) / ruler->getUnitsPerPixel()));
@@ -547,7 +547,7 @@ bool TrackEditor::handleAutoScroll(int currentPosition, timeT newTimePosition, d
if (moveDetected) {
if (m_doc && m_doc->getSequenceManager() &&
- (m_doc->getSequenceManager()->getTransportStatus() != STOPPED)) {
+ (m_doc->getSequenceManager()->getTransporttqStatus() != STOPPED)) {
if (m_playTracking) {
getSegmentCanvas()->slotScrollHoriz(int(double(newTimePosition) / ruler->getUnitsPerPixel()));
diff --git a/src/gui/editors/segment/TrackEditor.h b/src/gui/editors/segment/TrackEditor.h
index b2c2bd2..86e3b77 100644
--- a/src/gui/editors/segment/TrackEditor.h
+++ b/src/gui/editors/segment/TrackEditor.h
@@ -68,6 +68,7 @@ class StandardRuler;
class TrackEditor : public TQWidget, virtual public TrackEditorIface
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Create a new TrackEditor representing the document \a doc
@@ -77,7 +78,7 @@ public:
RulerScale *rulerScale,
bool showTrackLabels,
double initialUnitsPerPixel = 0,
- TQWidget* parent = 0, const char* name = 0,
+ TQWidget* tqparent = 0, const char* name = 0,
WFlags f=0);
~TrackEditor();
diff --git a/src/gui/editors/segment/TrackHeader.cpp b/src/gui/editors/segment/TrackHeader.cpp
index 367d02b..84b850b 100644
--- a/src/gui/editors/segment/TrackHeader.cpp
+++ b/src/gui/editors/segment/TrackHeader.cpp
@@ -41,8 +41,8 @@ void
TrackHeader::paintEvent(TQPaintEvent *e)
{
TQPainter p( this );
- p.setPen( colorGroup().buttonText() );
- int pos = (orientation() == Horizontal)
+ p.setPen( tqcolorGroup().buttonText() );
+ int pos = (orientation() == Qt::Horizontal)
? e->rect().left()
: e->rect().top();
int id = mapToIndex( sectionAt( pos + offset() ) );
@@ -54,8 +54,8 @@ TrackHeader::paintEvent(TQPaintEvent *e)
for ( int i = id; i < count(); i++ ) {
TQRect r = sRect( i );
paintSection( &p, i, r );
- if ( orientation() == Horizontal && r. right() >= e->rect().right() ||
- orientation() == Vertical && r. bottom() >= e->rect().bottom() )
+ if ( orientation() == Qt::Horizontal && r. right() >= e->rect().right() ||
+ orientation() == Qt::Vertical && r. bottom() >= e->rect().bottom() )
return ;
}
diff --git a/src/gui/editors/segment/TrackHeader.h b/src/gui/editors/segment/TrackHeader.h
index 91bef26..56891f4 100644
--- a/src/gui/editors/segment/TrackHeader.h
+++ b/src/gui/editors/segment/TrackHeader.h
@@ -38,14 +38,14 @@ namespace Rosegarden
-class TrackHeader : public QHeader
+class TrackHeader : public TQHeader
{
public:
TrackHeader(int number,
- TQWidget *parent=0,
+ TQWidget *tqparent=0,
const char *name=0 ):
- TQHeader(number, parent, name) {;}
+ TQHeader(number, tqparent, name) {;}
~TrackHeader();
protected:
diff --git a/src/gui/editors/segment/TrackLabel.cpp b/src/gui/editors/segment/TrackLabel.cpp
index 9df485f..53795a7 100644
--- a/src/gui/editors/segment/TrackLabel.cpp
+++ b/src/gui/editors/segment/TrackLabel.cpp
@@ -45,9 +45,9 @@ namespace Rosegarden
TrackLabel::TrackLabel(TrackId id,
int position,
- TQWidget *parent,
+ TQWidget *tqparent,
const char *name):
- TQWidgetStack(parent, name),
+ TQWidgetStack(tqparent, name),
m_instrumentLabel(new TQLabel(this)),
m_trackLabel(new TQLabel(this)),
m_id(id),
@@ -124,18 +124,18 @@ TrackLabel::setSelected(bool on)
if (on) {
m_selected = true;
- m_instrumentLabel->setPaletteBackgroundColor(colorGroup().highlight());
- m_instrumentLabel->setPaletteForegroundColor(colorGroup().highlightedText());
- m_trackLabel->setPaletteBackgroundColor(colorGroup().highlight());
- m_trackLabel->setPaletteForegroundColor(colorGroup().highlightedText());
+ m_instrumentLabel->setPaletteBackgroundColor(tqcolorGroup().highlight());
+ m_instrumentLabel->setPaletteForegroundColor(tqcolorGroup().highlightedText());
+ m_trackLabel->setPaletteBackgroundColor(tqcolorGroup().highlight());
+ m_trackLabel->setPaletteForegroundColor(tqcolorGroup().highlightedText());
} else {
m_selected = false;
- m_instrumentLabel->setPaletteBackgroundColor(colorGroup().background());
- m_trackLabel->setPaletteBackgroundColor(colorGroup().background());
- m_instrumentLabel->setPaletteForegroundColor(colorGroup().text());
- m_trackLabel->setPaletteForegroundColor(colorGroup().text());
+ m_instrumentLabel->setPaletteBackgroundColor(tqcolorGroup().background());
+ m_trackLabel->setPaletteBackgroundColor(tqcolorGroup().background());
+ m_instrumentLabel->setPaletteForegroundColor(tqcolorGroup().text());
+ m_trackLabel->setPaletteForegroundColor(tqcolorGroup().text());
}
if (visibleWidget())
visibleWidget()->update();
@@ -144,12 +144,12 @@ TrackLabel::setSelected(bool on)
void
TrackLabel::mousePressEvent(TQMouseEvent *e)
{
- if (e->button() == RightButton) {
+ if (e->button() == Qt::RightButton) {
emit clicked();
emit changeToInstrumentList();
- } else if (e->button() == LeftButton) {
+ } else if (e->button() == Qt::LeftButton) {
// start a timer on this hold
m_pressTimer->start(200, true); // 200ms, single shot
@@ -163,7 +163,7 @@ TrackLabel::mouseReleaseEvent(TQMouseEvent *e)
if (m_pressTimer->isActive())
m_pressTimer->stop();
- if (e->button() == LeftButton) {
+ if (e->button() == Qt::LeftButton) {
emit clicked();
}
}
@@ -171,7 +171,7 @@ TrackLabel::mouseReleaseEvent(TQMouseEvent *e)
void
TrackLabel::mouseDoubleClickEvent(TQMouseEvent *e)
{
- if (e->button() != LeftButton)
+ if (e->button() != Qt::LeftButton)
return ;
// Highlight this label alone and cheat using
@@ -186,7 +186,7 @@ TrackLabel::mouseDoubleClickEvent(TQMouseEvent *e)
bool ok = false;
- TQRegExpValidator validator(TQRegExp(".*"), this); // empty is OK
+ TQRegExpValidator validator(TQRegExp(".*"), TQT_TQOBJECT(this)); // empty is OK
TQString newText = KLineEditDlg::getText(i18n("Change track name"),
i18n("Enter new track name"),
diff --git a/src/gui/editors/segment/TrackLabel.h b/src/gui/editors/segment/TrackLabel.h
index b7aac70..a7b5207 100644
--- a/src/gui/editors/segment/TrackLabel.h
+++ b/src/gui/editors/segment/TrackLabel.h
@@ -47,9 +47,10 @@ namespace Rosegarden
* selectable label/label list. In conjunction with TrackButtons
* provides a framework for Track selection on the TrackCanvas.
*/
-class TrackLabel : public QWidgetStack
+class TrackLabel : public TQWidgetStack
{
Q_OBJECT
+ TQ_OBJECT
public:
enum InstrumentTrackLabels
@@ -61,7 +62,7 @@ public:
TrackLabel(TrackId id,
int position,
- TQWidget *parent,
+ TQWidget *tqparent,
const char *name=0);
~TrackLabel();
diff --git a/src/gui/editors/segment/TrackVUMeter.cpp b/src/gui/editors/segment/TrackVUMeter.cpp
index f8acbe8..5001a28 100644
--- a/src/gui/editors/segment/TrackVUMeter.cpp
+++ b/src/gui/editors/segment/TrackVUMeter.cpp
@@ -34,16 +34,16 @@
namespace Rosegarden
{
-TrackVUMeter::TrackVUMeter(TQWidget *parent,
+TrackVUMeter::TrackVUMeter(TQWidget *tqparent,
VUMeterType type,
int width,
int height,
int position,
const char *name):
- VUMeter(parent, type, false, false, width, height, VUMeter::Horizontal, name),
+ VUMeter(tqparent, type, false, false, width, height, VUMeter::Horizontal, name),
m_position(position), m_textHeight(12)
{
- setAlignment(AlignCenter);
+ tqsetAlignment(AlignCenter);
TQFont font;
font.setPointSize(font.pointSize() * 95 / 100);
@@ -67,7 +67,7 @@ TrackVUMeter::meterStop()
{
setMinimumHeight(m_textHeight);
setMaximumHeight(m_textHeight);
- setText(TQString("%1").arg(m_position + 1));
+ setText(TQString("%1").tqarg(m_position + 1));
if (m_active) {
m_active = false;
update();
diff --git a/src/gui/editors/segment/TrackVUMeter.h b/src/gui/editors/segment/TrackVUMeter.h
index dad0455..9630301 100644
--- a/src/gui/editors/segment/TrackVUMeter.h
+++ b/src/gui/editors/segment/TrackVUMeter.h
@@ -40,7 +40,7 @@ namespace Rosegarden
class TrackVUMeter: public VUMeter
{
public:
- TrackVUMeter(TQWidget *parent = 0,
+ TrackVUMeter(TQWidget *tqparent = 0,
VUMeterType type = Plain,
int width = 0,
int height = 0,
diff --git a/src/gui/editors/segment/TriggerManagerItem.h b/src/gui/editors/segment/TriggerManagerItem.h
index 7af5619..1d6a819 100644
--- a/src/gui/editors/segment/TriggerManagerItem.h
+++ b/src/gui/editors/segment/TriggerManagerItem.h
@@ -32,18 +32,18 @@
namespace Rosegarden {
-class TriggerManagerItem : public QListViewItem
+class TriggerManagerItem : public TQListViewItem
{
public:
- TriggerManagerItem(TQListView * parent, TQString label1,
- TQString label2 = TQString::null,
- TQString label3 = TQString::null,
- TQString label4 = TQString::null,
- TQString label5 = TQString::null,
- TQString label6 = TQString::null,
- TQString label7 = TQString::null,
- TQString label8 = TQString::null):
- TQListViewItem(parent, label1, label2, label3, label4,
+ TriggerManagerItem(TQListView * tqparent, TQString label1,
+ TQString label2 = TQString(),
+ TQString label3 = TQString(),
+ TQString label4 = TQString(),
+ TQString label5 = TQString(),
+ TQString label6 = TQString(),
+ TQString label7 = TQString(),
+ TQString label8 = TQString()):
+ TQListViewItem(tqparent, label1, label2, label3, label4,
label5, label6, label7, label8) { ; }
virtual int compare(TQListViewItem * i, int col, bool ascending) const;
diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp
index 76e71bf..e658cc3 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.cpp
+++ b/src/gui/editors/segment/TriggerSegmentManager.cpp
@@ -73,9 +73,9 @@
namespace Rosegarden
{
-TriggerSegmentManager::TriggerSegmentManager(TQWidget *parent,
+TriggerSegmentManager::TriggerSegmentManager(TQWidget *tqparent,
RosegardenGUIDoc *doc):
- KMainWindow(parent, "triggereditordialog"),
+ KMainWindow(tqparent, "triggereditordialog"),
m_doc(doc),
m_modified(false)
{
@@ -95,14 +95,14 @@ TriggerSegmentManager::TriggerSegmentManager(TQWidget *parent,
// Align centrally
for (int i = 0; i < 2; ++i)
- m_listView->setColumnAlignment(i, Qt::AlignHCenter);
+ m_listView->setColumnAlignment(i, TQt::AlignHCenter);
TQFrame* btnBox = new TQFrame(mainFrame);
- btnBox->setSizePolicy(
+ btnBox->tqsetSizePolicy(
TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed));
- TQHBoxLayout* layout = new TQHBoxLayout(btnBox, 4, 10);
+ TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10);
m_addButton = new TQPushButton(i18n("Add"), btnBox);
m_deleteButton = new TQPushButton(i18n("Delete"), btnBox);
@@ -126,14 +126,14 @@ TriggerSegmentManager::TriggerSegmentManager(TQWidget *parent,
(m_closeButton,
i18n("Close the Triggered Segment Manager"));
- layout->addStretch(10);
- layout->addWidget(m_addButton);
- layout->addWidget(m_deleteButton);
- layout->addWidget(m_deleteAllButton);
- layout->addSpacing(30);
+ tqlayout->addStretch(10);
+ tqlayout->addWidget(m_addButton);
+ tqlayout->addWidget(m_deleteButton);
+ tqlayout->addWidget(m_deleteAllButton);
+ tqlayout->addSpacing(30);
- layout->addWidget(m_closeButton);
- layout->addSpacing(5);
+ tqlayout->addWidget(m_closeButton);
+ tqlayout->addSpacing(5);
connect(m_addButton, TQT_SIGNAL(released()),
TQT_SLOT(slotAdd()));
@@ -246,16 +246,16 @@ TriggerSegmentManager::slotUpdate()
TQString used = i18n("%1 on 1 track",
"%1 on %n tracks",
- tracks.size()).arg(uses);
+ tracks.size()).tqarg(uses);
TQString pitch = TQString("%1 (%2)")
- .arg(MidiPitchLabel((*it)->getBasePitch()).getQString())
- .arg((*it)->getBasePitch());
+ .tqarg(MidiPitchLabel((*it)->getBasePitch()).getTQString())
+ .tqarg((*it)->getBasePitch());
- TQString velocity = TQString("%1").arg((*it)->getBaseVelocity());
+ TQString velocity = TQString("%1").tqarg((*it)->getBaseVelocity());
item = new TriggerManagerItem
- (m_listView, TQString("%1").arg(i + 1), TQString("%1").arg((*it)->getId()),
+ (m_listView, TQString("%1").tqarg(i + 1), TQString("%1").tqarg((*it)->getId()),
label, timeString, pitch, velocity, used);
item->setRawDuration(duration);
@@ -375,12 +375,12 @@ TriggerSegmentManager::slotClose()
void
TriggerSegmentManager::setupActions()
{
- KAction* close = KStdAction::close(this,
+ KAction* close = KStdAction::close(TQT_TQOBJECT(this),
TQT_SLOT(slotClose()),
actionCollection());
m_closeButton->setText(close->text());
- connect(m_closeButton, TQT_SIGNAL(released()), this, TQT_SLOT(slotClose()));
+ connect(m_closeButton, TQT_SIGNAL(released()), TQT_TQOBJECT(this), TQT_SLOT(slotClose()));
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
@@ -397,7 +397,7 @@ TriggerSegmentManager::setupActions()
actionCollection(),
KStdAction::stdName(KStdAction::Redo));
- new KAction(i18n("Pa&ste as New Triggered Segment"), CTRL + SHIFT + Key_V, this,
+ new KAction(i18n("Pa&ste as New Triggered Segment"), CTRL + SHIFT + Key_V, TQT_TQOBJECT(this),
TQT_SLOT(slotPasteAsNew()), actionCollection(),
"paste_to_trigger_segment");
@@ -409,7 +409,7 @@ TriggerSegmentManager::setupActions()
TQCanvasPixmap pixmap(pixmapDir + "/toolbar/time-musical.png");
TQIconSet icon(pixmap);
- action = new KRadioAction(i18n("&Musical Times"), icon, 0, this,
+ action = new KRadioAction(i18n("&Musical Times"), icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotMusicalTime()),
actionCollection(), "time_musical");
action->setExclusiveGroup("timeMode");
@@ -419,7 +419,7 @@ TriggerSegmentManager::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-real.png");
icon = TQIconSet(pixmap);
- action = new KRadioAction(i18n("&Real Times"), icon, 0, this,
+ action = new KRadioAction(i18n("&Real Times"), icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotRealTime()),
actionCollection(), "time_real");
action->setExclusiveGroup("timeMode");
@@ -429,7 +429,7 @@ TriggerSegmentManager::setupActions()
pixmap.load(pixmapDir + "/toolbar/time-raw.png");
icon = TQIconSet(pixmap);
- action = new KRadioAction(i18n("Ra&w Times"), icon, 0, this,
+ action = new KRadioAction(i18n("Ra&w Times"), icon, 0, TQT_TQOBJECT(this),
TQT_SLOT(slotRawTime()),
actionCollection(), "time_raw");
action->setExclusiveGroup("timeMode");
@@ -509,7 +509,7 @@ TriggerSegmentManager::slotItemClicked(TQListViewItem *item)
RG_DEBUG << "TriggerSegmentManager::slotItemClicked" << endl;
}
-QString
+TQString
TriggerSegmentManager::makeDurationString(timeT time,
timeT duration, int timeMode)
{
@@ -523,15 +523,15 @@ TriggerSegmentManager::makeDurationString(timeT time,
m_doc->getComposition().getMusicalTimeForDuration
(time, duration, bar, beat, fraction, remainder);
return TQString("%1%2%3-%4%5-%6%7-%8%9 ")
- .arg(bar / 100)
- .arg((bar % 100) / 10)
- .arg(bar % 10)
- .arg(beat / 10)
- .arg(beat % 10)
- .arg(fraction / 10)
- .arg(fraction % 10)
- .arg(remainder / 10)
- .arg(remainder % 10);
+ .tqarg(bar / 100)
+ .tqarg((bar % 100) / 10)
+ .tqarg(bar % 10)
+ .tqarg(beat / 10)
+ .tqarg(beat % 10)
+ .tqarg(fraction / 10)
+ .tqarg(fraction % 10)
+ .tqarg(remainder / 10)
+ .tqarg(remainder % 10);
}
case 1: // real time
@@ -539,12 +539,12 @@ TriggerSegmentManager::makeDurationString(timeT time,
RealTime rt =
m_doc->getComposition().getRealTimeDifference
(time, time + duration);
- // return TQString("%1 ").arg(rt.toString().c_str());
- return TQString("%1 ").arg(rt.toText().c_str());
+ // return TQString("%1 ").tqarg(rt.toString().c_str());
+ return TQString("%1 ").tqarg(rt.toText().c_str());
}
default:
- return TQString("%1 ").arg(duration);
+ return TQString("%1 ").tqarg(duration);
}
}
diff --git a/src/gui/editors/segment/TriggerSegmentManager.h b/src/gui/editors/segment/TriggerSegmentManager.h
index 4746a0e..dbe5ea0 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.h
+++ b/src/gui/editors/segment/TriggerSegmentManager.h
@@ -50,9 +50,10 @@ class MultiViewCommandHistory;
class TriggerSegmentManager : public KMainWindow
{
Q_OBJECT
+ TQ_OBJECT
public:
- TriggerSegmentManager(TQWidget *parent,
+ TriggerSegmentManager(TQWidget *tqparent,
RosegardenGUIDoc *doc);
~TriggerSegmentManager();
diff --git a/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp b/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
index b0d3f3b..786e1a4 100644
--- a/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
+++ b/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp
@@ -60,7 +60,7 @@ AudioPreviewPainter::AudioPreviewPainter(CompositionModelImpl& model,
m_image = TQImage(pixWidth, m_rect.height(), 8, 4);
m_image.setAlphaBuffer(true);
- m_penWidth = (std::max(1U, m_rect.getPen().width()) * 2);
+ m_penWidth = (std::max(1U, (uint)m_rect.getPen().width()) * 2);
m_halfRectHeight = m_model.grid().getYSnap()/2 - m_penWidth / 2 - 2;
}
@@ -276,7 +276,7 @@ void AudioPreviewPainter::paintPreviewImage()
m_segment->getStartTime()) -
m_model.grid().getRulerScale()->getXForTime(m_segment->getStartTime()));
- m_p.setPen(Qt::blue);
+ m_p.setPen(TQt::blue);
m_p.drawRect(0, m_apData->getSegmentRect().height() - 1, audioFadeInEnd, 1);
m_pb.drawRect(0, m_apData->getSegmentRect().height() - 1, audioFadeInEnd, 1);
}
@@ -291,15 +291,15 @@ void AudioPreviewPainter::finalizeCurrentSlice()
// RG_DEBUG << "AudioPreviewPainter::finalizeCurrentSlice : copying pixmap to image at " << m_sliceNb * tileWidth() << endl;
// transparent background
- m_image.setColor(0, qRgba(255, 255, 255, 0));
+ m_image.setColor(0, tqRgba(255, 255, 255, 0));
// foreground from computeSegmentPreviewColor
TQColor c = m_model.computeSegmentPreviewColor(m_segment);
- QRgb rgba = qRgba(c.red(), c.green(), c.blue(), 255);
+ TQRgb rgba = tqRgba(c.red(), c.green(), c.blue(), 255);
m_image.setColor(1, rgba);
// red for clipping
- m_image.setColor(2, qRgba(255, 0, 0, 255));
+ m_image.setColor(2, tqRgba(255, 0, 0, 255));
m_previewPixmaps.push_back(m_image.copy());
diff --git a/src/gui/editors/segment/segmentcanvas/AudioPreviewThread.h b/src/gui/editors/segment/segmentcanvas/AudioPreviewThread.h
index 0337346..2944b38 100644
--- a/src/gui/editors/segment/segmentcanvas/AudioPreviewThread.h
+++ b/src/gui/editors/segment/segmentcanvas/AudioPreviewThread.h
@@ -44,7 +44,7 @@ namespace Rosegarden
class AudioFileManager;
-class AudioPreviewThread : public QThread
+class AudioPreviewThread : public TQThread
{
public:
AudioPreviewThread(AudioFileManager *manager);
diff --git a/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp b/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp
index 182eb9b..1ae0acd 100644
--- a/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp
+++ b/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.cpp
@@ -44,8 +44,8 @@ static int apuExtantCount = 0;
AudioPreviewUpdater::AudioPreviewUpdater(AudioPreviewThread &thread,
const Composition& c, const Segment* s,
const TQRect& r,
- CompositionModelImpl* parent)
- : TQObject(parent),
+ CompositionModelImpl* tqparent)
+ : TQObject(tqparent),
m_thread(thread),
m_composition(c),
m_segment(s),
diff --git a/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h b/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h
index 347ba16..047f9b2 100644
--- a/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h
+++ b/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h
@@ -43,16 +43,17 @@ class Composition;
class AudioPreviewThread;
-class AudioPreviewUpdater : public QObject
+class AudioPreviewUpdater : public TQObject
{
Q_OBJECT
+ TQ_OBJECT
public:
AudioPreviewUpdater(AudioPreviewThread &thread,
const Composition &composition,
const Segment *segment,
const TQRect &displayExtent,
- CompositionModelImpl *parent);
+ CompositionModelImpl *tqparent);
~AudioPreviewUpdater();
void update();
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionItemHelper.cpp b/src/gui/editors/segment/segmentcanvas/CompositionItemHelper.cpp
index 9579ba2..fe4b926 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionItemHelper.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionItemHelper.cpp
@@ -60,12 +60,12 @@ timeT CompositionItemHelper::getEndTime(const CompositionItem& item, const Roseg
timeT t = 0;
if (item) {
- TQRect itemRect = item->rect();
+ TQRect tqitemRect = item->rect();
- t = std::max(grid.snapX(itemRect.x() + itemRect.width()), 0L);
+ t = std::max(grid.snapX(tqitemRect.x() + tqitemRect.width()), 0L);
// RG_DEBUG << "CompositionItemHelper::getEndTime() : rect width = "
-// << itemRect.width()
+// << tqitemRect.width()
// << " - item is repeating : " << item->isRepeating()
// << " - endTime = " << t
// << endl;
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionItemImpl.cpp b/src/gui/editors/segment/segmentcanvas/CompositionItemImpl.cpp
index 12984a0..76cbe70 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionItemImpl.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionItemImpl.cpp
@@ -48,7 +48,7 @@ CompositionItemImpl::CompositionItemImpl(Segment& s, const CompositionRect& rect
TQRect CompositionItemImpl::rect() const
{
- TQRect res = m_rect;
+ TQRect res = static_cast<const TQRect&>(m_rect);
if (m_rect.isRepeating()) {
CompositionRect::repeatmarks repeatMarks = m_rect.getRepeatMarks();
int neww = m_rect.getBaseWidth();
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionModel.h b/src/gui/editors/segment/segmentcanvas/CompositionModel.h
index 63412c0..1e4bd2f 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionModel.h
+++ b/src/gui/editors/segment/segmentcanvas/CompositionModel.h
@@ -56,6 +56,7 @@ typedef std::vector<TQImage> PixmapArray;
class CompositionModel : public TQObject, public CompositionObserver, public SegmentObserver
{
Q_OBJECT
+ TQ_OBJECT
public:
struct CompositionItemCompare {
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp
index 9627b16..388a4c1 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp
@@ -231,7 +231,7 @@ void CompositionModelImpl::makeAudioPreviewRects(AudioPreviewDrawData* apRects,
TQPoint basePoint = segRect.topLeft();
- AudioPreviewDrawDataItem previewItem(previewImage, basePoint, segRect);
+ AudioPreviewDrawDataItem previewItem(previewImage, basePoint, static_cast<const TQRect&>(segRect));
if (getChangeType() == ChangeResizeFromStart) {
CompositionRect originalRect = computeSegmentRect(*segment);
@@ -476,7 +476,7 @@ void CompositionModelImpl::slotAudioPreviewComplete(AudioPreviewUpdater* apu)
TQRect updateRect;
if (apData) {
- RG_DEBUG << "CompositionModelImpl::slotAudioPreviewComplete(" << apu << "): apData contains " << apData->getValues().size() << " values already" << endl;
+ RG_DEBUG << "CompositionModelImpl::slotAudioPreviewComplete(" << apu << "): apData tqcontains " << apData->getValues().size() << " values already" << endl;
unsigned int channels = 0;
const std::vector<float> &values = apu->getComputedValues(channels);
if (channels > 0) {
@@ -501,7 +501,7 @@ TQRect CompositionModelImpl::postProcessAudioPreview(AudioPreviewData* apData, c
m_audioSegmentPreviewMap[segment] = previewPainter.getPreviewImage();
- return previewPainter.getSegmentRect();
+ return static_cast<const TQRect&>(previewPainter.getSegmentRect());
}
void CompositionModelImpl::slotInstrumentParametersChanged(InstrumentId id)
@@ -796,7 +796,7 @@ CompositionModel::itemcontainer CompositionModelImpl::getItemsAt(const TQPoint&
Segment* s = *i;
CompositionRect sr = computeSegmentRect(*s);
- if (sr.contains(point)) {
+ if (sr.tqcontains(point)) {
// RG_DEBUG << "CompositionModelImpl::getItemsAt() adding " << sr << " for segment " << s << endl;
CompositionItem item(new CompositionItemImpl(*s, sr));
unsigned int z = computeZForSegment(s);
@@ -1124,7 +1124,7 @@ CompositionRect CompositionModelImpl::computeSegmentRect(const Segment& s, bool
if (s.getType() == Segment::Audio) {
static TQRegExp re1("( *\\([^)]*\\))*$"); // (inserted) (copied) (etc)
static TQRegExp re2("\\.[^.]+$"); // filename suffix
- label.replace(re1, "").replace(re2, "");
+ label.tqreplace(re1, "").tqreplace(re2, "");
}
cr.setLabel(label);
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.h b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.h
index 2d3fd64..f2998c3 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.h
+++ b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.h
@@ -62,6 +62,7 @@ class AudioPreviewThread;
class CompositionModelImpl : public CompositionModel
{
Q_OBJECT
+ TQ_OBJECT
public:
CompositionModelImpl(Composition& compo,
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionRect.cpp b/src/gui/editors/segment/segmentcanvas/CompositionRect.cpp
index 9f867a5..ec4bef0 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionRect.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionRect.cpp
@@ -37,6 +37,6 @@
namespace Rosegarden
{
- const TQColor CompositionRect::DefaultPenColor = Qt::black;
+ const TQColor CompositionRect::DefaultPenColor = TQt::black;
const TQColor CompositionRect::DefaultBrushColor = TQColor(COLOUR_DEF_R, COLOUR_DEF_G, COLOUR_DEF_B);
}
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionRect.h b/src/gui/editors/segment/segmentcanvas/CompositionRect.h
index 45c5f50..53dcc2e 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionRect.h
+++ b/src/gui/editors/segment/segmentcanvas/CompositionRect.h
@@ -41,7 +41,7 @@ class TQPoint;
namespace Rosegarden
{
-class CompositionRect : public QRect
+class CompositionRect : public TQRect
{
public:
typedef TQValueVector<int> repeatmarks;
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
index 1ff0263..6faf230 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
@@ -88,12 +88,12 @@ protected:
CompositionView::CompositionView(RosegardenGUIDoc* doc,
CompositionModel* model,
- TQWidget * parent, const char * name, WFlags f)
+ TQWidget * tqparent, const char * name, WFlags f)
#if KDE_VERSION >= KDE_MAKE_VERSION(3,2,0)
- : RosegardenScrollView(parent, name, f | WNoAutoErase | WStaticContents),
+ : RosegardenScrollView(tqparent, name, f | WNoAutoErase | WStaticContents),
#else
:
- RosegardenScrollView(parent, name, f | WRepaintNoErase | WResizeNoErase | WStaticContents),
+ RosegardenScrollView(tqparent, name, f | WRepaintNoErase | WResizeNoErase | WStaticContents),
#endif
m_model(model),
m_currentItem(0),
@@ -191,7 +191,7 @@ CompositionView::CompositionView(RosegardenGUIDoc* doc,
}
if (doc) {
- doc->getAudioPreviewThread().setEmptyQueueListener(this);
+ doc->getAudioPreviewThread().setEmptyQueueListener(TQT_TQOBJECT(this));
}
m_segmentsDrawBuffer.setOptimization(TQPixmap::BestOptim);
@@ -227,7 +227,7 @@ void CompositionView::slotUpdateSize()
RulerScale *ruler = grid().getRulerScale();
- int minWidth = sizeHint().width();
+ int minWidth = tqsizeHint().width();
int computedWidth = int(nearbyint(ruler->getTotalWidth()));
int width = std::max(computedWidth, minWidth);
@@ -327,7 +327,7 @@ void CompositionView::slotSetTool(const TQString& toolName)
if (m_tool)
m_tool->ready();
else {
- KMessageBox::error(0, TQString("CompositionView::slotSetTool() : unknown tool name %1").arg(toolName));
+ KMessageBox::error(0, TQString("CompositionView::slotSetTool() : unknown tool name %1").tqarg(toolName));
}
}
@@ -495,7 +495,7 @@ void CompositionView::resizeEvent(TQResizeEvent* e)
void CompositionView::viewportPaintEvent(TQPaintEvent* e)
{
- TQMemArray<TQRect> rects = e->region().rects();
+ TQMemArray<TQRect> rects = TQRegion(e->region()).tqrects();
for (unsigned int i = 0; i < rects.size(); ++i) {
viewportPaintRect(rects[i]);
@@ -550,7 +550,7 @@ void CompositionView::viewportPaintRect(TQRect r)
// DEBUG
// TQPainter pdebug(viewport());
- // static TQPen framePen(Qt::red, 1);
+ // static TQPen framePen(TQt::red, 1);
// pdebug.setPen(framePen);
// pdebug.drawRect(updateRect);
@@ -669,7 +669,7 @@ void CompositionView::refreshSegmentsDrawBuffer(const TQRect& rect)
drawArea(&p, rect);
// DEBUG - show what's updated
- // TQPen framePen(Qt::red, 1);
+ // TQPen framePen(TQt::red, 1);
// p.setPen(framePen);
// p.drawRect(rect);
@@ -682,7 +682,7 @@ void CompositionView::refreshArtifactsDrawBuffer(const TQRect& rect)
// << rect << endl;
TQPainter p;
- p.begin(&m_artifactsDrawBuffer, viewport());
+ p.tqbegin(&m_artifactsDrawBuffer, viewport());
p.translate( -contentsX(), -contentsY());
// TQRect r(contentsX(), contentsY(), m_artifactsDrawBuffer.width(), m_artifactsDrawBuffer.height());
drawAreaArtifacts(&p, rect);
@@ -929,7 +929,7 @@ void CompositionView::drawAreaArtifacts(TQPainter * p, const TQRect& clipRect)
//
// Split line
//
- if (m_splitLinePos.x() > 0 && clipRect.contains(m_splitLinePos)) {
+ if (m_splitLinePos.x() > 0 && clipRect.tqcontains(m_splitLinePos)) {
p->save();
p->setPen(m_guideColor);
p->drawLine(m_splitLinePos.x(), m_splitLinePos.y(),
@@ -975,7 +975,7 @@ void CompositionView::drawCompRect(const CompositionRect& r, TQPainter *p, const
// draw 'start' rectangle with original brush
//
- TQRect startRect = r;
+ TQRect startRect = static_cast<const TQRect&>(r);
startRect.setWidth(repeatMarks[0] - r.x());
p->setBrush(r.getBrush());
drawRect(startRect, p, clipRect, r.isSelected(), intersectLvl, fill);
@@ -984,7 +984,7 @@ void CompositionView::drawCompRect(const CompositionRect& r, TQPainter *p, const
// now draw the 'repeat' marks
//
p->setPen(CompositionColourCache::getInstance()->RepeatSegmentBorder);
- int penWidth = std::max(r.getPen().width(), 1u);
+ int penWidth = std::max((uint)r.getPen().width(), 1u);
for (unsigned int i = 0; i < repeatMarks.size(); ++i) {
int pos = repeatMarks[i];
@@ -1020,9 +1020,9 @@ void CompositionView::drawCompRectLabel(const CompositionRect& r, TQPainter *p,
TQRect textRect(r);
textRect.setX(textRect.x() + 3);
TQString label = " " + r.getLabel() + " ";
- TQRect textBoundingRect = p->boundingRect(textRect, Qt::AlignLeft | Qt::AlignVCenter, label);
+ TQRect textBoundingRect = p->boundingRect(textRect, TQt::AlignLeft | TQt::AlignVCenter, label);
p->drawRect(textBoundingRect & r);
- p->drawText(textRect, Qt::AlignLeft | Qt::AlignVCenter, label);
+ p->drawText(textRect, TQt::AlignLeft | TQt::AlignVCenter, label);
p->restore();
}
#else
@@ -1036,7 +1036,7 @@ void CompositionView::drawCompRectLabel(const CompositionRect& r, TQPainter *p,
font.setItalic(false);
p->setFont(font);
- TQRect labelRect = QRect
+ TQRect labelRect = TQRect
(r.x(),
r.y() + ((r.height() - p->fontMetrics().height()) / 2) + 1,
r.width(),
@@ -1074,7 +1074,7 @@ void CompositionView::drawCompRectLabel(const CompositionRect& r, TQPainter *p,
labelRect.setY(wy);
p->drawText(labelRect,
- Qt::AlignLeft | Qt::AlignTop,
+ TQt::AlignLeft | TQt::AlignTop,
r.getLabel());
}
@@ -1084,7 +1084,7 @@ void CompositionView::drawCompRectLabel(const CompositionRect& r, TQPainter *p,
p->setPen(GUIPalette::getColour
(GUIPalette::SegmentLabel));
p->drawText(labelRect,
- Qt::AlignLeft | Qt::AlignVCenter, r.getLabel());
+ TQt::AlignLeft | TQt::AlignVCenter, r.getLabel());
p->restore();
}
#endif
@@ -1122,13 +1122,13 @@ void CompositionView::drawRect(const TQRect& r, TQPainter *p, const TQRect& clip
// RG_DEBUG << "CompositionView::drawRect : intersected color : " << fillColor << " isSelected : " << isSelected << endl;
}
} else {
- p->setBrush(Qt::NoBrush);
+ p->setBrush(TQt::NoBrush);
}
// Paint using the small coordinates...
TQRect intersection = rect.intersect(clipRect);
- if (clipRect.contains(rect)) {
+ if (clipRect.tqcontains(rect)) {
p->drawRect(rect);
} else {
// draw only what's necessary
@@ -1199,7 +1199,7 @@ void CompositionView::drawIntersections(const CompositionModel::rectcontainer& r
break;
for (; i != rects.end(); ++i) {
- CompositionRect ri = testRect.intersect(*i);
+ CompositionRect ri = TQT_TQRECT_OBJECT(testRect.intersect(*i));
if (!ri.isEmpty()) {
CompositionModel::rectcontainer::iterator t = std::find(intersections.begin(),
intersections.end(), ri);
@@ -1246,7 +1246,7 @@ void CompositionView::drawIntersections(const CompositionModel::rectcontainer& r
break;
for (; i != intersections.end(); ++i) {
- CompositionRect ri = testRect.intersect(*i);
+ CompositionRect ri = TQT_TQRECT_OBJECT(testRect.intersect(*i));
if (!ri.isEmpty() && ri != *i) {
CompositionModel::rectcontainer::iterator t = std::find(intersections2.begin(),
intersections2.end(), ri);
@@ -1356,15 +1356,15 @@ void CompositionView::slotToolHelpChanged(const TQString &text)
void CompositionView::contentsMousePressEvent(TQMouseEvent* e)
{
- Qt::ButtonState bs = e->state();
- slotSetSelectCopy((bs & Qt::ControlButton) != 0);
- slotSetSelectAdd((bs & Qt::ShiftButton) != 0);
- slotSetFineGrain((bs & Qt::ShiftButton) != 0);
- slotSetPencilOverExisting((bs & Qt::AltButton + Qt::ControlButton) != 0);
+ TQt::ButtonState bs = e->state();
+ slotSetSelectCopy((bs & TQt::ControlButton) != 0);
+ slotSetSelectAdd((bs & TQt::ShiftButton) != 0);
+ slotSetFineGrain((bs & TQt::ShiftButton) != 0);
+ slotSetPencilOverExisting((bs & TQt::AltButton + TQt::ControlButton) != 0);
switch (e->button()) {
- case LeftButton:
- case MidButton:
+ case Qt::LeftButton:
+ case Qt::MidButton:
startAutoScroll();
if (m_tool)
@@ -1373,7 +1373,7 @@ void CompositionView::contentsMousePressEvent(TQMouseEvent* e)
RG_DEBUG << "CompositionView::contentsMousePressEvent() :"
<< this << " no tool\n";
break;
- case RightButton:
+ case Qt::RightButton:
if (m_tool)
m_tool->handleRightButtonPress(e);
else
@@ -1394,8 +1394,8 @@ void CompositionView::contentsMouseReleaseEvent(TQMouseEvent* e)
if (!m_tool)
return ;
- if (e->button() == LeftButton ||
- e->button() == MidButton )
+ if (e->button() == Qt::LeftButton ||
+ e->button() == Qt::MidButton )
m_tool->handleMouseButtonRelease(e);
}
@@ -1434,9 +1434,9 @@ void CompositionView::contentsMouseMoveEvent(TQMouseEvent* e)
if (!m_tool)
return ;
- Qt::ButtonState bs = e->state();
- slotSetFineGrain((bs & Qt::ShiftButton) != 0);
- slotSetPencilOverExisting((bs & Qt::AltButton) != 0);
+ TQt::ButtonState bs = e->state();
+ slotSetFineGrain((bs & TQt::ShiftButton) != 0);
+ slotSetPencilOverExisting((bs & TQt::AltButton) != 0);
int follow = m_tool->handleMouseMove(e);
setScrollDirectionConstraint(follow);
@@ -1584,7 +1584,7 @@ CompositionView::slotTextFloatTimeout()
{
hideTextFloat();
slotArtifactsDrawBufferNeedsRefresh();
- // rgapp->slotSetStatusMessage(TQString::null);
+ // rgapp->slotSetStatusMessage(TQString());
}
}
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.h b/src/gui/editors/segment/segmentcanvas/CompositionView.h
index c31cf96..12c5fb4 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.h
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.h
@@ -64,9 +64,10 @@ class CompositionRect;
class CompositionView : public RosegardenScrollView
{
Q_OBJECT
+ TQ_OBJECT
public:
CompositionView(RosegardenGUIDoc*, CompositionModel*,
- TQWidget * parent=0, const char* name=0, WFlags f=0);
+ TQWidget * tqparent=0, const char* name=0, WFlags f=0);
void setPointerPos(int pos);
int getPointerPos() { return m_pointerPos; }
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentEraser.cpp b/src/gui/editors/segment/segmentcanvas/SegmentEraser.cpp
index f519c8a..3c4a7ae 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentEraser.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentEraser.cpp
@@ -50,7 +50,7 @@ SegmentEraser::SegmentEraser(CompositionView *c, RosegardenGUIDoc *d)
void SegmentEraser::ready()
{
- m_canvas->viewport()->setCursor(Qt::pointingHandCursor);
+ m_canvas->viewport()->setCursor(TQt::pointingHandCursor);
setBasicContextHelp();
}
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentEraser.h b/src/gui/editors/segment/segmentcanvas/SegmentEraser.h
index 78165b9..e3bb6b5 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentEraser.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentEraser.h
@@ -43,6 +43,7 @@ class CompositionView;
class SegmentEraser : public SegmentTool
{
Q_OBJECT
+ TQ_OBJECT
friend class SegmentToolBox;
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h b/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h
index d1bb9a7..00d942e 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h
@@ -44,7 +44,7 @@ class RulerScale;
class SegmentItemPreview
{
public:
- SegmentItemPreview(Segment& parent,
+ SegmentItemPreview(Segment& tqparent,
RulerScale* scale);
virtual ~SegmentItemPreview();
@@ -59,7 +59,7 @@ public:
PreviewState getPreviewState() const { return m_previewState; }
/**
- * Sets whether the preview shape shown in the segment needs
+ * Sets whether the preview tqshape shown in the segment needs
* to be refreshed
*/
void setPreviewCurrent(bool c)
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentJoiner.h b/src/gui/editors/segment/segmentcanvas/SegmentJoiner.h
index 946edee..f2fd935 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentJoiner.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentJoiner.h
@@ -43,6 +43,7 @@ class CompositionView;
class SegmentJoiner : public SegmentTool
{
Q_OBJECT
+ TQ_OBJECT
friend class SegmentToolBox;
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp b/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
index bc621fe..e2970ab 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp
@@ -62,7 +62,7 @@ SegmentMover::SegmentMover(CompositionView *c, RosegardenGUIDoc *d)
void SegmentMover::ready()
{
- m_canvas->viewport()->setCursor(Qt::sizeAllCursor);
+ m_canvas->viewport()->setCursor(TQt::sizeAllCursor);
connect(m_canvas, TQT_SIGNAL(contentsMoving (int, int)),
this, TQT_SLOT(slotCanvasScrolled(int, int)));
setBasicContextHelp();
@@ -328,8 +328,8 @@ int SegmentMover::handleMouseMove(TQMouseEvent *e)
comp.getMusicalTimeForAbsoluteTime(currentItemStartTime, bar, beat, fraction, remainder);
TQString posString = TQString("%1.%2s (%3, %4, %5)")
- .arg(time.sec).arg(ms)
- .arg(bar + 1).arg(beat).arg(fraction);
+ .tqarg(time.sec).tqarg(ms)
+ .tqarg(bar + 1).tqarg(beat).tqarg(fraction);
m_canvas->setTextFloat(guideX + 10, guideY - 30, posString);
m_canvas->updateContents();
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentMover.h b/src/gui/editors/segment/segmentcanvas/SegmentMover.h
index 580fff0..882647e 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentMover.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentMover.h
@@ -44,6 +44,7 @@ class CompositionView;
class SegmentMover : public SegmentTool
{
Q_OBJECT
+ TQ_OBJECT
friend class SegmentToolBox;
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp b/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp
index 60a74f4..8f4399c 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp
@@ -64,7 +64,7 @@ SegmentPencil::SegmentPencil(CompositionView *c, RosegardenGUIDoc *d)
void SegmentPencil::ready()
{
- m_canvas->viewport()->setCursor(Qt::ibeamCursor);
+ m_canvas->viewport()->setCursor(TQt::ibeamCursor);
connect(m_canvas, TQT_SIGNAL(contentsMoving (int, int)),
this, TQT_SLOT(slotCanvasScrolled(int, int)));
setContextHelpFor(TQPoint(0, 0));
@@ -86,7 +86,7 @@ void SegmentPencil::slotCanvasScrolled(int newX, int newY)
void SegmentPencil::handleMouseButtonPress(TQMouseEvent *e)
{
- if (e->button() == RightButton)
+ if (e->button() == Qt::RightButton)
return;
// is user holding Ctrl+Alt? (ugly, but we are running short on available
@@ -153,7 +153,7 @@ void SegmentPencil::handleMouseButtonPress(TQMouseEvent *e)
void SegmentPencil::handleMouseButtonRelease(TQMouseEvent* e)
{
- if (e->button() == RightButton)
+ if (e->button() == Qt::RightButton)
return ;
setContextHelpFor(e->pos());
@@ -196,9 +196,9 @@ void SegmentPencil::handleMouseButtonRelease(TQMouseEvent* e)
segment->setLowestPlayable(track->getLowestPlayable());
segment->setHighestPlayable(track->getHighestPlayable());
- std::string label = qstrtostr(track->getPresetLabel());
+ std::string label = (track->getPresetLabel());
if (label != "") {
- segment->setLabel(qstrtostr(track->getPresetLabel()));
+ segment->setLabel((track->getPresetLabel()));
}
CompositionItem item = CompositionItemHelper::makeCompositionItem(segment);
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentPencil.h b/src/gui/editors/segment/segmentcanvas/SegmentPencil.h
index f283f15..894babf 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentPencil.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentPencil.h
@@ -47,6 +47,7 @@ class CompositionView;
class SegmentPencil : public SegmentTool
{
Q_OBJECT
+ TQ_OBJECT
friend class SegmentToolBox;
friend class SegmentSelector;
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp b/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp
index 99241f1..4c4c884 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp
@@ -69,7 +69,7 @@ SegmentResizer::SegmentResizer(CompositionView *c, RosegardenGUIDoc *d,
void SegmentResizer::ready()
{
- m_canvas->viewport()->setCursor(Qt::sizeHorCursor);
+ m_canvas->viewport()->setCursor(TQt::sizeHorCursor);
connect(m_canvas, TQT_SIGNAL(contentsMoving (int, int)),
this, TQT_SLOT(slotCanvasScrolled(int, int)));
setBasicContextHelp(false);
@@ -116,7 +116,7 @@ void SegmentResizer::handleMouseButtonRelease(TQMouseEvent *e)
{
RG_DEBUG << "SegmentResizer::handleMouseButtonRelease" << endl;
- bool rescale = (e->state() & Qt::ControlButton);
+ bool rescale = (e->state() & TQt::ControlButton);
if (m_currentItem) {
@@ -243,7 +243,7 @@ int SegmentResizer::handleMouseMove(TQMouseEvent *e)
{
// RG_DEBUG << "SegmentResizer::handleMouseMove" << endl;
- bool rescale = (e->state() & Qt::ControlButton);
+ bool rescale = (e->state() & TQt::ControlButton);
if (!m_currentItem) {
setBasicContextHelp(rescale);
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentResizer.h b/src/gui/editors/segment/segmentcanvas/SegmentResizer.h
index 7a0600d..809dc34 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentResizer.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentResizer.h
@@ -48,6 +48,7 @@ class CompositionView;
class SegmentResizer : public SegmentTool
{
Q_OBJECT
+ TQ_OBJECT
friend class SegmentToolBox;
friend class SegmentSelector;
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
index d601c16..964bc3b 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
@@ -75,7 +75,7 @@ SegmentSelector::~SegmentSelector()
void SegmentSelector::ready()
{
- m_canvas->viewport()->setCursor(Qt::arrowCursor);
+ m_canvas->viewport()->setCursor(TQt::arrowCursor);
connect(m_canvas, TQT_SIGNAL(contentsMoving (int, int)),
this, TQT_SLOT(slotCanvasScrolled(int, int)));
setContextHelp(i18n("Click and drag to select segments"));
@@ -174,8 +174,8 @@ SegmentSelector::handleMouseButtonPress(TQMouseEvent *e)
// Add on middle button or ctrl+left - bounding box on rest
//
- if (e->button() == MidButton ||
- (e->button() == LeftButton && (e->state() & Qt::ControlButton))) {
+ if (e->button() == Qt::MidButton ||
+ (e->button() == Qt::LeftButton && (e->state() & TQ_ControlButton))) {
m_dispatchTool = getToolBox()->getTool(SegmentPencil::ToolName);
@@ -217,7 +217,7 @@ SegmentSelector::handleMouseButtonRelease(TQMouseEvent *e)
if (m_dispatchTool) {
m_dispatchTool->handleMouseButtonRelease(e);
m_dispatchTool = 0;
- m_canvas->viewport()->setCursor(Qt::arrowCursor);
+ m_canvas->viewport()->setCursor(TQt::arrowCursor);
return ;
}
@@ -232,7 +232,7 @@ SegmentSelector::handleMouseButtonRelease(TQMouseEvent *e)
return ;
}
- m_canvas->viewport()->setCursor(Qt::arrowCursor);
+ m_canvas->viewport()->setCursor(TQt::arrowCursor);
Composition &comp = m_doc->getComposition();
@@ -313,7 +313,7 @@ int
SegmentSelector::handleMouseMove(TQMouseEvent *e)
{
if (!m_buttonPressed) {
- setContextHelpFor(e->pos(), (e->state() & Qt::ControlButton));
+ setContextHelpFor(e->pos(), (e->state() & TQt::ControlButton));
return RosegardenCanvasView::NoFollow;
}
@@ -352,7 +352,7 @@ SegmentSelector::handleMouseMove(TQMouseEvent *e)
return RosegardenCanvasView::FollowHorizontal | RosegardenCanvasView::FollowVertical;
}
- m_canvas->viewport()->setCursor(Qt::sizeAllCursor);
+ m_canvas->viewport()->setCursor(TQt::sizeAllCursor);
if (m_segmentCopyMode && !m_segmentQuickCopyDone) {
KMacroCommand *mcommand = new KMacroCommand
@@ -466,8 +466,8 @@ SegmentSelector::handleMouseMove(TQMouseEvent *e)
comp.getMusicalTimeForAbsoluteTime(currentItemStartTime, bar, beat, fraction, remainder);
TQString posString = TQString("%1.%2s (%3, %4, %5)")
- .arg(time.sec).arg(ms)
- .arg(bar + 1).arg(beat).arg(fraction);
+ .tqarg(time.sec).tqarg(ms)
+ .tqarg(bar + 1).tqarg(beat).tqarg(fraction);
m_canvas->setTextFloat(guideX + 10, guideY - 30, posString);
m_canvas->updateContents();
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSelector.h b/src/gui/editors/segment/segmentcanvas/SegmentSelector.h
index 3c602fa..db572d0 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentSelector.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentSelector.h
@@ -44,6 +44,7 @@ class CompositionView;
class SegmentSelector : public SegmentTool
{
Q_OBJECT
+ TQ_OBJECT
friend class SegmentToolBox;
friend class SegmentTool;
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSplitter.cpp b/src/gui/editors/segment/segmentcanvas/SegmentSplitter.cpp
index 1149cd9..d5fe45a 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentSplitter.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentSplitter.cpp
@@ -59,7 +59,7 @@ SegmentSplitter::~SegmentSplitter()
void SegmentSplitter::ready()
{
- m_canvas->viewport()->setCursor(Qt::splitHCursor);
+ m_canvas->viewport()->setCursor(TQt::splitHCursor);
setBasicContextHelp();
}
@@ -71,7 +71,7 @@ SegmentSplitter::handleMouseButtonPress(TQMouseEvent *e)
CompositionItem item = m_canvas->getFirstItemAt(e->pos());
if (item) {
- m_canvas->viewport()->setCursor(Qt::blankCursor);
+ m_canvas->viewport()->setCursor(TQt::blankCursor);
m_prevX = item->rect().x();
m_prevX = item->rect().y();
drawSplitLine(e);
@@ -106,7 +106,7 @@ SegmentSplitter::handleMouseButtonRelease(TQMouseEvent *e)
}
// Reinstate the cursor
- m_canvas->viewport()->setCursor(Qt::splitHCursor);
+ m_canvas->viewport()->setCursor(TQt::splitHCursor);
m_canvas->slotHideSplitLine();
}
@@ -118,12 +118,12 @@ SegmentSplitter::handleMouseMove(TQMouseEvent *e)
CompositionItem item = m_canvas->getFirstItemAt(e->pos());
if (item) {
-// m_canvas->viewport()->setCursor(Qt::blankCursor);
+// m_canvas->viewport()->setCursor(TQt::blankCursor);
drawSplitLine(e);
delete item;
return RosegardenCanvasView::FollowHorizontal;
} else {
- m_canvas->viewport()->setCursor(Qt::splitHCursor);
+ m_canvas->viewport()->setCursor(TQt::splitHCursor);
m_canvas->slotHideSplitLine();
return RosegardenCanvasView::NoFollow;
}
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSplitter.h b/src/gui/editors/segment/segmentcanvas/SegmentSplitter.h
index 3f21ece..a2fc1f6 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentSplitter.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentSplitter.h
@@ -45,6 +45,7 @@ class CompositionView;
class SegmentSplitter : public SegmentTool
{
Q_OBJECT
+ TQ_OBJECT
friend class SegmentToolBox;
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp b/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp
index 438cc51..b74cc9f 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentTool.cpp
@@ -42,7 +42,7 @@ namespace Rosegarden
{
SegmentTool::SegmentTool(CompositionView* canvas, RosegardenGUIDoc *doc)
- : BaseTool("segment_tool_menu", dynamic_cast<KMainWindow*>(doc->parent())->factory(), canvas),
+ : BaseTool("segment_tool_menu", dynamic_cast<KMainWindow*>(doc->tqparent())->factory(), TQT_TQOBJECT(canvas)),
m_canvas(canvas),
m_doc(doc),
m_changeMade(false)
@@ -54,7 +54,7 @@ SegmentTool::~SegmentTool()
void SegmentTool::ready()
{
- m_canvas->viewport()->setCursor(Qt::arrowCursor);
+ m_canvas->viewport()->setCursor(TQt::arrowCursor);
}
void
@@ -86,12 +86,12 @@ SegmentTool::createMenu()
RG_DEBUG << "SegmentTool::createMenu()\n";
RosegardenGUIApp *app =
- dynamic_cast<RosegardenGUIApp*>(m_doc->parent());
+ dynamic_cast<RosegardenGUIApp*>(m_doc->tqparent());
if (app) {
m_menu = static_cast<TQPopupMenu*>
//(app->factory()->container("segment_tool_menu", app));
- (m_parentFactory->container("segment_tool_menu", app));
+ (m_tqparentFactory->container("segment_tool_menu", app));
if (!m_menu) {
RG_DEBUG << "SegmentTool::createMenu() failed\n";
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentTool.h b/src/gui/editors/segment/segmentcanvas/SegmentTool.h
index 5b054a8..1b33ba3 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentTool.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentTool.h
@@ -64,7 +64,7 @@ public:
virtual ~SegmentTool();
/**
- * Is called by the parent View (EditView or SegmentCanvas) when
+ * Is called by the tqparent View (EditView or SegmentCanvas) when
* the tool is set as current.
* Add any setup here
*/
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
index 5ce8a58..c0b4aeb 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp
@@ -42,9 +42,9 @@
namespace Rosegarden
{
-SegmentToolBox::SegmentToolBox(CompositionView* parent, RosegardenGUIDoc* doc)
- : BaseToolBox(parent),
- m_canvas(parent),
+SegmentToolBox::SegmentToolBox(CompositionView* tqparent, RosegardenGUIDoc* doc)
+ : BaseToolBox(tqparent),
+ m_canvas(tqparent),
m_doc(doc)
{}
@@ -84,7 +84,7 @@ SegmentTool* SegmentToolBox::createTool(const TQString& toolName)
else {
KMessageBox::error(0, TQString("SegmentToolBox::createTool : unrecognised toolname %1 (%2)")
- .arg(toolName).arg(toolNamelc));
+ .tqarg(toolName).tqarg(toolNamelc));
return 0;
}
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h
index 2609708..c975e53 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h
+++ b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h
@@ -43,8 +43,9 @@ class CompositionView;
class SegmentToolBox : public BaseToolBox
{
Q_OBJECT
+ TQ_OBJECT
public:
- SegmentToolBox(CompositionView* parent, RosegardenGUIDoc*);
+ SegmentToolBox(CompositionView* tqparent, RosegardenGUIDoc*);
virtual SegmentTool* getTool(const TQString& toolName);