summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:35 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:57:35 -0600
commit6ca08e7a881c0c97f338e0085f75af04ec08ad04 (patch)
tree5462bef0f060df1c19e3fcb98250e5cfa24edc11 /src/gui/dialogs
parent4faf11eccc5f08d2aa0540157d6eff80b7cdb02a (diff)
downloadrosegarden-6ca08e7a881c0c97f338e0085f75af04ec08ad04.tar.gz
rosegarden-6ca08e7a881c0c97f338e0085f75af04ec08ad04.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.
Diffstat (limited to 'src/gui/dialogs')
-rw-r--r--src/gui/dialogs/AudioManagerDialog.cpp22
-rw-r--r--src/gui/dialogs/AudioManagerDialog.h2
-rw-r--r--src/gui/dialogs/AudioPlayingDialog.cpp2
-rw-r--r--src/gui/dialogs/AudioPluginDialog.cpp16
-rw-r--r--src/gui/dialogs/AudioSplitDialog.cpp30
-rw-r--r--src/gui/dialogs/BeatsBarsDialog.cpp8
-rw-r--r--src/gui/dialogs/ClefDialog.cpp24
-rw-r--r--src/gui/dialogs/ConfigureDialog.cpp4
-rw-r--r--src/gui/dialogs/CountdownBar.cpp4
-rw-r--r--src/gui/dialogs/CountdownDialog.cpp14
-rw-r--r--src/gui/dialogs/DocumentConfigureDialog.cpp6
-rw-r--r--src/gui/dialogs/EventFilterDialog.cpp4
-rw-r--r--src/gui/dialogs/EventFilterDialog.h2
-rw-r--r--src/gui/dialogs/EventParameterDialog.cpp14
-rw-r--r--src/gui/dialogs/ExportDeviceDialog.cpp2
-rw-r--r--src/gui/dialogs/FileLocateDialog.cpp8
-rw-r--r--src/gui/dialogs/FloatEdit.cpp2
-rw-r--r--src/gui/dialogs/IdentifyTextCodecDialog.cpp4
-rw-r--r--src/gui/dialogs/ImportDeviceDialog.cpp12
-rw-r--r--src/gui/dialogs/IntervalDialog.cpp42
-rw-r--r--src/gui/dialogs/KeySignatureDialog.cpp2
-rw-r--r--src/gui/dialogs/LilyPondOptionsDialog.cpp20
-rw-r--r--src/gui/dialogs/LyricEditDialog.cpp10
-rw-r--r--src/gui/dialogs/ManageMetronomeDialog.cpp32
-rw-r--r--src/gui/dialogs/MarkerModifyDialog.cpp16
-rw-r--r--src/gui/dialogs/PitchPickerDialog.cpp6
-rw-r--r--src/gui/dialogs/ShowSequencerStatusDialog.cpp2
-rw-r--r--src/gui/dialogs/SimpleEventEditDialog.cpp62
-rw-r--r--src/gui/dialogs/SplitByPitchDialog.cpp14
-rw-r--r--src/gui/dialogs/SplitByRecordingSrcDialog.cpp14
-rw-r--r--src/gui/dialogs/TempoDialog.cpp40
-rw-r--r--src/gui/dialogs/TimeSignatureDialog.cpp26
-rw-r--r--src/gui/dialogs/TransportDialog.cpp20
-rw-r--r--src/gui/dialogs/TriggerSegmentDialog.cpp16
-rw-r--r--src/gui/dialogs/TupletDialog.cpp38
-rw-r--r--src/gui/dialogs/UnusedAudioSelectionDialog.cpp4
-rw-r--r--src/gui/dialogs/UseOrnamentDialog.cpp26
37 files changed, 285 insertions, 285 deletions
diff --git a/src/gui/dialogs/AudioManagerDialog.cpp b/src/gui/dialogs/AudioManagerDialog.cpp
index e9a0f7c..0c38cc2 100644
--- a/src/gui/dialogs/AudioManagerDialog.cpp
+++ b/src/gui/dialogs/AudioManagerDialog.cpp
@@ -343,7 +343,7 @@ AudioManagerDialog::slotPopulateFileList()
//
length = (*it)->getLength();
msecs.sprintf("%03d", length.nsec / 1000000);
- item->setText(1, TQString("%1.%2s").arg(length.sec).arg(msecs));
+ item->setText(1, TQString("%1.%2s").tqarg(length.sec).tqarg(msecs));
// set start time and duration
item->setStartTime(RealTime::zeroTime);
@@ -361,11 +361,11 @@ AudioManagerDialog::slotPopulateFileList()
// Resolution
//
- item->setText(5, TQString("%1 bits").arg((*it)->getBitsPerSample()));
+ item->setText(5, TQString("%1 bits").tqarg((*it)->getBitsPerSample()));
// Channels
//
- item->setText(4, TQString("%1").arg((*it)->getChannels()));
+ item->setText(4, TQString("%1").tqarg((*it)->getChannels()));
// Sample rate
//
@@ -384,7 +384,7 @@ AudioManagerDialog::slotPopulateFileList()
findSelection = false;
}
- // Add children
+ // Add tqchildren
//
for (iit = segments.begin(); iit != segments.end(); iit++) {
if ((*iit)->getAudioFileId() == (*it)->getId()) {
@@ -404,8 +404,8 @@ AudioManagerDialog::slotPopulateFileList()
//
msecs.sprintf("%03d", segmentDuration.nsec / 1000000);
childItem->setText(1, TQString("%1.%2s")
- .arg(segmentDuration.sec)
- .arg(msecs));
+ .tqarg(segmentDuration.sec)
+ .tqarg(msecs));
try {
m_doc->getAudioFileManager().
@@ -433,7 +433,7 @@ AudioManagerDialog::slotPopulateFileList()
foundSelection = true;
}
- // Add children
+ // Add tqchildren
}
}
}
@@ -607,7 +607,7 @@ AudioManagerDialog::slotRemove()
if (haveSegments) {
TQString question = i18n("This will unload audio file \"%1\" and remove all associated segments. Are you sure?")
- .arg(TQString(audioFile->getFilename().c_str()));
+ .tqarg(TQString(audioFile->getFilename().c_str()));
// Ask the question
int reply = KMessageBox::warningContinueCancel(this, question);
@@ -885,7 +885,7 @@ AudioManagerDialog::slotDeleteUnused()
std::cerr << i << ": " << names[i].ascii() << std::endl;
TQFile file(names[i]);
if (!file.remove()) {
- KMessageBox::error(this, i18n("File %1 could not be deleted.").arg(names[i]));
+ KMessageBox::error(this, i18n("File %1 could not be deleted.").tqarg(names[i]));
} else {
if (nameMap.find(names[i]) != nameMap.end()) {
m_doc->getAudioFileManager().removeFile(nameMap[names[i]]);
@@ -894,7 +894,7 @@ AudioManagerDialog::slotDeleteUnused()
std::cerr << "WARNING: Audio file name " << names[i].ascii() << " not in name map" << std::endl;
}
- TQFile peakFile(TQString("%1.pk").arg(names[i]));
+ TQFile peakFile(TQString("%1.pk").tqarg(names[i]));
peakFile.remove();
}
}
@@ -1179,7 +1179,7 @@ AudioManagerDialog::slotClose()
}
void
-AudioManagerDialog::setAudioSubsystemStatus(bool ok)
+AudioManagerDialog::setAudioSubsystemtqStatus(bool ok)
{
// We can do something more fancy in the future but for the moment
// this will suffice.
diff --git a/src/gui/dialogs/AudioManagerDialog.h b/src/gui/dialogs/AudioManagerDialog.h
index 132b23c..e6b9cdc 100644
--- a/src/gui/dialogs/AudioManagerDialog.h
+++ b/src/gui/dialogs/AudioManagerDialog.h
@@ -88,7 +88,7 @@ public:
// Can we playback audio currently?
//
- void setAudioSubsystemStatus(bool ok);
+ void setAudioSubsystemtqStatus(bool ok);
// Return the accelerator object
//
diff --git a/src/gui/dialogs/AudioPlayingDialog.cpp b/src/gui/dialogs/AudioPlayingDialog.cpp
index 524278e..af711ac 100644
--- a/src/gui/dialogs/AudioPlayingDialog.cpp
+++ b/src/gui/dialogs/AudioPlayingDialog.cpp
@@ -44,7 +44,7 @@ AudioPlayingDialog::AudioPlayingDialog(TQWidget *parent,
{
TQHBox *w = makeHBoxMainWidget();
TQLabel *label = new
- TQLabel(i18n("Playing audio file \"%1\"").arg(name), w);
+ TQLabel(i18n("Playing audio file \"%1\"").tqarg(name), w);
label->setMinimumHeight(80);
diff --git a/src/gui/dialogs/AudioPluginDialog.cpp b/src/gui/dialogs/AudioPluginDialog.cpp
index 9df7c22..97b4e7f 100644
--- a/src/gui/dialogs/AudioPluginDialog.cpp
+++ b/src/gui/dialogs/AudioPluginDialog.cpp
@@ -24,7 +24,7 @@
#include "AudioPluginDialog.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <klocale.h>
#include "misc/Debug.h"
@@ -86,7 +86,7 @@ AudioPluginDialog::AudioPluginDialog(TQWidget *parent,
{
setHelp("studio-plugins");
- setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
+ tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
TQSizePolicy::Fixed));
#ifdef HAVE_LIBLO
@@ -125,12 +125,12 @@ AudioPluginDialog::AudioPluginDialog(TQWidget *parent,
m_insOuts = new TQLabel(i18n("<ports>"), h);
- m_insOuts->setAlignment(AlignRight);
+ m_insOuts->tqsetAlignment(AlignRight);
TQToolTip::add
(m_insOuts, i18n("Input and output port counts."));
m_pluginId = new TQLabel(i18n("<id>"), h);
- m_pluginId->setAlignment(AlignRight);
+ m_pluginId->tqsetAlignment(AlignRight);
TQToolTip::add
(m_pluginId, i18n("Unique ID of plugin."));
@@ -383,7 +383,7 @@ AudioPluginDialog::slotPluginSelected(int i)
TQString caption =
strtoqstr(m_pluginContainer->getName()) +
- TQString(" [ %1 ] - ").arg(m_index + 1);
+ TQString(" [ %1 ] - ").tqarg(m_index + 1);
if (number == 0) {
setCaption(caption + i18n("<no plugin>"));
@@ -435,7 +435,7 @@ AudioPluginDialog::slotPluginSelected(int i)
if (plugin) {
setCaption(caption + plugin->getName());
- m_pluginId->setText(i18n("Id: %1").arg(plugin->getUniqueId()));
+ m_pluginId->setText(i18n("Id: %1").tqarg(plugin->getUniqueId()));
TQString pluginInfo = plugin->getAuthor() + TQString("\n") +
plugin->getCopyright();
@@ -491,7 +491,7 @@ AudioPluginDialog::slotPluginSelected(int i)
else if (ins == 2 && outs == 2)
m_insOuts->setText(i18n("stereo"));
else
- m_insOuts->setText(i18n("%1 in, %2 out").arg(ins).arg(outs));
+ m_insOuts->setText(i18n("%1 in, %2 out").tqarg(ins).tqarg(outs));
TQString shortName(plugin->getName());
int parenIdx = shortName.find(" (");
@@ -503,7 +503,7 @@ AudioPluginDialog::slotPluginSelected(int i)
}
adjustSize();
- setFixedSize(minimumSizeHint());
+ setFixedSize(tqminimumSizeHint());
// tell the sequencer
emit pluginSelected(m_containerId, m_index, number - 1);
diff --git a/src/gui/dialogs/AudioSplitDialog.cpp b/src/gui/dialogs/AudioSplitDialog.cpp
index 4988e55..839e506 100644
--- a/src/gui/dialogs/AudioSplitDialog.cpp
+++ b/src/gui/dialogs/AudioSplitDialog.cpp
@@ -39,7 +39,7 @@
#include <tqcanvas.h>
#include <tqhbox.h>
#include <tqlabel.h>
-#include <palette.h>
+#include <tqpalette.h>
#include <tqscrollview.h>
#include <tqspinbox.h>
#include <tqstring.h>
@@ -120,7 +120,7 @@ AudioSplitDialog::drawPreview()
rect->setZ(1);
rect->setPen(kapp->palette().color(TQPalette::Active, TQColorGroup::Dark));
rect->setBrush(kapp->palette().color(TQPalette::Active, TQColorGroup::Base));
- rect->setVisible(true);
+ rect->tqsetVisible(true);
// Get preview in vector form
//
@@ -143,7 +143,7 @@ AudioSplitDialog::drawPreview()
text->setX(30);
text->setY(30);
text->setZ(4);
- text->setVisible(true);
+ text->tqsetVisible(true);
m_canvas->update();
return ;
}
@@ -192,7 +192,7 @@ AudioSplitDialog::drawPreview()
palette().color(TQPalette::Active, TQColorGroup::Shadow));
line->setBrush(kapp->
palette().color(TQPalette::Active, TQColorGroup::Shadow));
- line->setVisible(true);
+ line->tqsetVisible(true);
}
@@ -205,15 +205,15 @@ AudioSplitDialog::drawPreview()
rect->setPen(kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow));
rect->setBrush(kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow));
rect->setZ(4);
- rect->setVisible(true);
+ rect->tqsetVisible(true);
// Start time
//
char msecs[100];
sprintf(msecs, "%03d", m_segment->getAudioStartTime().msec());
TQString startText = TQString("%1.%2s")
- .arg(m_segment->getAudioStartTime().sec)
- .arg(msecs);
+ .tqarg(m_segment->getAudioStartTime().sec)
+ .tqarg(msecs);
TQCanvasText *text = new TQCanvasText(m_canvas);
text->setColor(
kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow));
@@ -221,7 +221,7 @@ AudioSplitDialog::drawPreview()
text->setX(startX - 20);
text->setY(m_canvasHeight / 2 - m_previewHeight / 2 - 35);
text->setZ(3);
- text->setVisible(true);
+ text->tqsetVisible(true);
rect = new TQCanvasRectangle(m_canvas);
rect->setX(startX - 1);
@@ -229,14 +229,14 @@ AudioSplitDialog::drawPreview()
rect->setSize(1, m_previewHeight + 28);
rect->setPen(kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow));
rect->setZ(3);
- rect->setVisible(true);
+ rect->tqsetVisible(true);
// End time
//
sprintf(msecs, "%03d", m_segment->getAudioEndTime().msec());
TQString endText = TQString("%1.%2s")
- .arg(m_segment->getAudioEndTime().sec)
- .arg(msecs);
+ .tqarg(m_segment->getAudioEndTime().sec)
+ .tqarg(msecs);
text = new TQCanvasText(m_canvas);
text->setColor(
kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow));
@@ -244,7 +244,7 @@ AudioSplitDialog::drawPreview()
text->setX(startX + m_previewWidth - 20);
text->setY(m_canvasHeight / 2 - m_previewHeight / 2 - 35);
text->setZ(3);
- text->setVisible(true);
+ text->tqsetVisible(true);
rect = new TQCanvasRectangle(m_canvas);
rect->setX(startX + m_previewWidth - 1);
@@ -252,7 +252,7 @@ AudioSplitDialog::drawPreview()
rect->setSize(1, m_previewHeight + 28);
rect->setPen(kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow));
rect->setZ(3);
- rect->setVisible(true);
+ rect->tqsetVisible(true);
m_canvas->update();
}
@@ -303,7 +303,7 @@ AudioSplitDialog::drawSplits(int threshold)
palette().color(TQPalette::Active, TQColorGroup::Mid));
rect->setBrush(kapp->
palette().color(TQPalette::Active, TQColorGroup::Mid));
- rect->setVisible(true);
+ rect->tqsetVisible(true);
tempRects.push_back(rect);
}
@@ -315,7 +315,7 @@ AudioSplitDialog::drawSplits(int threshold)
// clear any previous preview boxes
//
for (pIt = m_previewBoxes.begin(); pIt != m_previewBoxes.end(); pIt++) {
- //(*pIt)->setVisible(false);
+ //(*pIt)->tqsetVisible(false);
delete (*pIt);
}
m_previewBoxes.erase(m_previewBoxes.begin(), m_previewBoxes.end());
diff --git a/src/gui/dialogs/BeatsBarsDialog.cpp b/src/gui/dialogs/BeatsBarsDialog.cpp
index c9d9773..1624e03 100644
--- a/src/gui/dialogs/BeatsBarsDialog.cpp
+++ b/src/gui/dialogs/BeatsBarsDialog.cpp
@@ -24,7 +24,7 @@
#include "BeatsBarsDialog.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <klocale.h>
#include "base/Segment.h"
@@ -50,16 +50,16 @@ BeatsBarsDialog::BeatsBarsDialog(TQWidget* parent) :
i18n("The selected audio segment contains:"), hbox);
TQFrame *frame = new TQFrame(gbox);
- TQGridLayout *layout = new TQGridLayout(frame, 1, 2, 5, 5);
+ TQGridLayout *tqlayout = new TQGridLayout(frame, 1, 2, 5, 5);
m_spinBox = new TQSpinBox(1, INT_MAX, 1, frame, "glee");
- layout->addWidget(m_spinBox, 0, 0);
+ tqlayout->addWidget(m_spinBox, 0, 0);
m_comboBox = new KComboBox(false, frame);
m_comboBox->insertItem(i18n("beat(s)"));
m_comboBox->insertItem(i18n("bar(s)"));
m_comboBox->setCurrentItem(0);
- layout->addWidget(m_comboBox, 0, 1);
+ tqlayout->addWidget(m_comboBox, 0, 1);
}
}
diff --git a/src/gui/dialogs/ClefDialog.cpp b/src/gui/dialogs/ClefDialog.cpp
index c566948..30f49fb 100644
--- a/src/gui/dialogs/ClefDialog.cpp
+++ b/src/gui/dialogs/ClefDialog.cpp
@@ -77,7 +77,7 @@ ClefDialog::ClefDialog(TQWidget *parent,
(m_octaveUp, i18n("Up an Octave"));
m_clefLabel = new TQLabel(i18n("Clef"), clefLabelBox);
- m_clefLabel->setAlignment(AlignVCenter | AlignHCenter);
+ m_clefLabel->tqsetAlignment(AlignVCenter | AlignHCenter);
m_octaveDown = new BigArrowButton(clefLabelBox, Qt::DownArrow);
TQToolTip::add
@@ -88,7 +88,7 @@ ClefDialog::ClefDialog(TQWidget *parent,
(clefUp, i18n("Higher clef"));
m_clefNameLabel = new TQLabel(i18n("Clef"), clefLabelBox);
- m_clefNameLabel->setAlignment(AlignVCenter | AlignHCenter);
+ m_clefNameLabel->tqsetAlignment(AlignVCenter | AlignHCenter);
if (showConversionOptions) {
m_noConversionButton =
@@ -246,25 +246,25 @@ ClefDialog::redrawClefPixmap()
std::string type = m_clef.getClefType();
if (type == Clef::Treble)
- name = name.arg(i18n("Treble"));
+ name = name.tqarg(i18n("Treble"));
else if (type == Clef::French)
- name = name.arg(i18n("French violin"));
+ name = name.tqarg(i18n("French violin"));
else if (type == Clef::Soprano)
- name = name.arg(i18n("Soprano"));
+ name = name.tqarg(i18n("Soprano"));
else if (type == Clef::Mezzosoprano)
- name = name.arg(i18n("Mezzo-soprano"));
+ name = name.tqarg(i18n("Mezzo-soprano"));
else if (type == Clef::Alto)
- name = name.arg(i18n("Alto"));
+ name = name.tqarg(i18n("Alto"));
else if (type == Clef::Tenor)
- name = name.arg(i18n("Tenor"));
+ name = name.tqarg(i18n("Tenor"));
else if (type == Clef::Baritone)
- name = name.arg(i18n("C-baritone"));
+ name = name.tqarg(i18n("C-baritone"));
else if (type == Clef::Varbaritone)
- name = name.arg(i18n("F-baritone"));
+ name = name.tqarg(i18n("F-baritone"));
else if (type == Clef::Bass)
- name = name.arg(i18n("Bass"));
+ name = name.tqarg(i18n("Bass"));
else if (type == Clef::Subbass)
- name = name.arg(i18n("Sub-bass"));
+ name = name.tqarg(i18n("Sub-bass"));
m_clefNameLabel->setText(name);
}
diff --git a/src/gui/dialogs/ConfigureDialog.cpp b/src/gui/dialogs/ConfigureDialog.cpp
index ba41797..c8e7341 100644
--- a/src/gui/dialogs/ConfigureDialog.cpp
+++ b/src/gui/dialogs/ConfigureDialog.cpp
@@ -24,7 +24,7 @@
#include "ConfigureDialog.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <klocale.h>
#include "ConfigureDialogBase.h"
@@ -54,7 +54,7 @@ static TQPixmap loadIcon(const char *name)
return TQPixmap(fileBase + ".xpm");
}
TQPixmap pmap = KGlobal::instance()->iconLoader()
- ->loadIcon(TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium);
+ ->loadIcon(TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium);
return pmap;
}
diff --git a/src/gui/dialogs/CountdownBar.cpp b/src/gui/dialogs/CountdownBar.cpp
index 8d4d0b8..5e77345 100644
--- a/src/gui/dialogs/CountdownBar.cpp
+++ b/src/gui/dialogs/CountdownBar.cpp
@@ -38,7 +38,7 @@ CountdownBar::CountdownBar(TQWidget *parent, int width, int height):
TQFrame(parent), m_width(width), m_height(height), m_position(0)
{
resize(m_width, m_height);
- repaint();
+ tqrepaint();
}
void
@@ -61,7 +61,7 @@ void
CountdownBar::setPosition(int position)
{
m_position = position;
- repaint();
+ tqrepaint();
}
}
diff --git a/src/gui/dialogs/CountdownDialog.cpp b/src/gui/dialogs/CountdownDialog.cpp
index c4a56ee..8b69eb8 100644
--- a/src/gui/dialogs/CountdownDialog.cpp
+++ b/src/gui/dialogs/CountdownDialog.cpp
@@ -24,7 +24,7 @@
#include "CountdownDialog.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <klocale.h>
#include "CountdownBar.h"
@@ -48,14 +48,14 @@ CountdownDialog::CountdownDialog(TQWidget *parent, int seconds):
m_progressBarWidth(150),
m_progressBarHeight(15)
{
- TQBoxLayout *layout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 10, 14);
+ TQBoxLayout *tqlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 10, 14);
setCaption(i18n("Recording..."));
TQHBox *hBox = new TQHBox(this);
m_label = new TQLabel(hBox);
m_time = new TQLabel(hBox);
- layout->addWidget(hBox, 0, AlignCenter);
+ tqlayout->addWidget(hBox, 0, AlignCenter);
m_label->setText(i18n("Recording time remaining: "));
m_progressBar =
@@ -68,8 +68,8 @@ CountdownDialog::CountdownDialog(TQWidget *parent, int seconds):
m_stopButton = new TQPushButton(i18n("Stop"), this);
m_stopButton->setFixedWidth(60);
- layout->addWidget(m_progressBar, 0, AlignCenter);
- layout->addWidget(m_stopButton, 0, AlignRight);
+ tqlayout->addWidget(m_progressBar, 0, AlignCenter);
+ tqlayout->addWidget(m_stopButton, 0, AlignRight);
connect (m_stopButton, TQT_SIGNAL(released()), this, TQT_SIGNAL(stopped()));
@@ -112,10 +112,10 @@ CountdownDialog::setElapsedTime(int elapsedSeconds)
if (seconds < 3600) // less than an hour
{
- m_time->setText(TQString("%1:%2").arg(m).arg(s));
+ m_time->setText(TQString("%1:%2").tqarg(m).tqarg(s));
} else if (seconds < 86400) // less than a day
{
- m_time->setText(TQString("%1:%2:%3").arg(h).arg(m).arg(s));
+ m_time->setText(TQString("%1:%2:%3").tqarg(h).tqarg(m).tqarg(s));
} else {
m_time->setText(i18n("Just how big is your hard disk?"));
}
diff --git a/src/gui/dialogs/DocumentConfigureDialog.cpp b/src/gui/dialogs/DocumentConfigureDialog.cpp
index 890637d..06165e1 100644
--- a/src/gui/dialogs/DocumentConfigureDialog.cpp
+++ b/src/gui/dialogs/DocumentConfigureDialog.cpp
@@ -24,7 +24,7 @@
#include "DocumentConfigureDialog.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <klocale.h>
#include "ConfigureDialogBase.h"
@@ -53,7 +53,7 @@ static TQPixmap loadIcon(const char *name)
}
TQPixmap pmap = KGlobal::instance()->iconLoader()
- ->loadIcon(TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium);
+ ->loadIcon(TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium);
return pmap;
}
@@ -100,7 +100,7 @@ DocumentConfigureDialog::DocumentConfigureDialog(RosegardenGUIDoc *doc,
page->setPageIndex(pageIndex(pageWidget));
m_configurationPages.push_back(page);
- resize(minimumSize());
+ resize(tqminimumSize());
}
void
diff --git a/src/gui/dialogs/EventFilterDialog.cpp b/src/gui/dialogs/EventFilterDialog.cpp
index 7aefd87..fbfcdb4 100644
--- a/src/gui/dialogs/EventFilterDialog.cpp
+++ b/src/gui/dialogs/EventFilterDialog.cpp
@@ -47,7 +47,7 @@
#include <tqframe.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqpixmap.h>
#include <tqpushbutton.h>
#include <tqsizepolicy.h>
@@ -134,7 +134,7 @@ EventFilterDialog::initDialog()
TQT_SLOT(slotPitchFromChanged(int)));
m_pitchFromChooserButton = new TQPushButton(i18n("edit"), noteFrame);
- m_pitchFromChooserButton->setSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)0,
+ m_pitchFromChooserButton->tqsetSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)0,
(TQSizePolicy::SizeType)0, 0, 0, m_pitchFromChooserButton->
sizePolicy().hasHeightForWidth()));
TQToolTip::add
diff --git a/src/gui/dialogs/EventFilterDialog.h b/src/gui/dialogs/EventFilterDialog.h
index 471c67d..4e3f5f8 100644
--- a/src/gui/dialogs/EventFilterDialog.h
+++ b/src/gui/dialogs/EventFilterDialog.h
@@ -143,7 +143,7 @@ protected slots:
private:
//---------[ data members ]-----------------------------
- TQGridLayout* layout;
+ TQGridLayout* tqlayout;
TQComboBox* m_noteDurationFromComboBox;
TQComboBox* m_noteDurationIncludeComboBox;
diff --git a/src/gui/dialogs/EventParameterDialog.cpp b/src/gui/dialogs/EventParameterDialog.cpp
index 98abb44..28beb95 100644
--- a/src/gui/dialogs/EventParameterDialog.cpp
+++ b/src/gui/dialogs/EventParameterDialog.cpp
@@ -63,23 +63,23 @@ EventParameterDialog::EventParameterDialog(
// create options
// 0 flat
- text = i18n("Flat - set %1 to value").arg(strtoqstr(property));
+ text = i18n("Flat - set %1 to value").tqarg(strtoqstr(property));
m_patternCombo->insertItem(text);
// 1 alternating
- text = i18n("Alternating - set %1 to max and min on alternate events").arg(strtoqstr(property));
+ text = i18n("Alternating - set %1 to max and min on alternate events").tqarg(strtoqstr(property));
m_patternCombo->insertItem(text);
// 2 crescendo
- text = i18n("Crescendo - set %1 rising from min to max").arg(strtoqstr(property));
+ text = i18n("Crescendo - set %1 rising from min to max").tqarg(strtoqstr(property));
m_patternCombo->insertItem(text);
// 3 diminuendo
- text = i18n("Diminuendo - set %1 falling from max to min").arg(strtoqstr(property));
+ text = i18n("Diminuendo - set %1 falling from max to min").tqarg(strtoqstr(property));
m_patternCombo->insertItem(text);
// 4 ringing
- text = i18n("Ringing - set %1 alternating from max to min with both dying to zero").arg(strtoqstr(property));
+ text = i18n("Ringing - set %1 alternating from max to min with both dying to zero").tqarg(strtoqstr(property));
m_patternCombo->insertItem(text);
connect(m_patternCombo, TQT_SIGNAL(activated(int)),
@@ -94,8 +94,8 @@ EventParameterDialog::EventParameterDialog(
m_value2Combo = new KComboBox(value2Box);
for (unsigned int i = 0; i < 128; i++) {
- m_value1Combo->insertItem(TQString("%1").arg(i));
- m_value2Combo->insertItem(TQString("%1").arg(i));
+ m_value1Combo->insertItem(TQString("%1").tqarg(i));
+ m_value2Combo->insertItem(TQString("%1").tqarg(i));
}
m_value1Combo->setCurrentItem(127);
diff --git a/src/gui/dialogs/ExportDeviceDialog.cpp b/src/gui/dialogs/ExportDeviceDialog.cpp
index 348a5b8..b02ff47 100644
--- a/src/gui/dialogs/ExportDeviceDialog.cpp
+++ b/src/gui/dialogs/ExportDeviceDialog.cpp
@@ -48,7 +48,7 @@ ExportDeviceDialog::ExportDeviceDialog(TQWidget *parent, TQString deviceName) :
vbox);
m_exportAll = new TQRadioButton(i18n("Export all devices"), bg);
m_exportOne = new TQRadioButton(i18n("Export selected device only"), bg);
- new TQLabel(i18n(" (\"%1\")").arg(deviceName), bg);
+ new TQLabel(i18n(" (\"%1\")").tqarg(deviceName), bg);
m_exportOne->setChecked(true);
}
diff --git a/src/gui/dialogs/FileLocateDialog.cpp b/src/gui/dialogs/FileLocateDialog.cpp
index cd85b8d..2668ef4 100644
--- a/src/gui/dialogs/FileLocateDialog.cpp
+++ b/src/gui/dialogs/FileLocateDialog.cpp
@@ -55,10 +55,10 @@ FileLocateDialog::FileLocateDialog(TQWidget *parent,
TQHBox *w = makeHBoxMainWidget();
TQString label =
i18n("Can't find file \"%1\".\n"
- "Would you like to try and locate this file or skip it?").arg(m_file);
+ "Would you like to try and locate this file or skip it?").tqarg(m_file);
TQLabel *labelW = new TQLabel(label, w);
- labelW->setAlignment(TQt::AlignCenter);
+ labelW->tqsetAlignment(TQt::AlignCenter);
labelW->setMinimumHeight(60);
}
@@ -69,8 +69,8 @@ FileLocateDialog::slotUser3()
m_file = KFileDialog::getOpenFileName
(":WAVS",
i18n("%1|Requested file (%2)\n*.wav|WAV files (*.wav)")
- .arg(TQFileInfo(m_file).fileName())
- .arg(TQFileInfo(m_file).fileName()),
+ .tqarg(TQFileInfo(m_file).fileName())
+ .tqarg(TQFileInfo(m_file).fileName()),
this, i18n("Select an Audio File"));
RG_DEBUG << "FileLocateDialog::slotUser3() : m_file = " << m_file << endl;
diff --git a/src/gui/dialogs/FloatEdit.cpp b/src/gui/dialogs/FloatEdit.cpp
index a73668f..fc25fea 100644
--- a/src/gui/dialogs/FloatEdit.cpp
+++ b/src/gui/dialogs/FloatEdit.cpp
@@ -59,7 +59,7 @@ FloatEdit::FloatEdit(TQWidget *parent,
//std::cout << "CAL DP = " << calDP << ", dps = " << dps << std::endl;
m_spin = new HSpinBox(inVbox, value, 1, min, max, dps);
- new TQLabel(TQString("(min: %1, max: %2)").arg(min).arg(max), inVbox);
+ new TQLabel(TQString("(min: %1, max: %2)").tqarg(min).tqarg(max), inVbox);
}
float
diff --git a/src/gui/dialogs/IdentifyTextCodecDialog.cpp b/src/gui/dialogs/IdentifyTextCodecDialog.cpp
index 1b77f92..a3d905d 100644
--- a/src/gui/dialogs/IdentifyTextCodecDialog.cpp
+++ b/src/gui/dialogs/IdentifyTextCodecDialog.cpp
@@ -33,7 +33,7 @@
#include <tqfont.h>
#include <tqlabel.h>
#include <tqstring.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <tqvbox.h>
#include <tqwidget.h>
@@ -120,7 +120,7 @@ IdentifyTextCodecDialog::IdentifyTextCodecDialog(TQWidget *parent,
}
if (description != "") {
- description = i18n("%1 (%2)").arg(strtoqstr(name)).arg(description);
+ description = i18n("%1 (%2)").tqarg(strtoqstr(name)).tqarg(description);
} else {
description = strtoqstr(name);
}
diff --git a/src/gui/dialogs/ImportDeviceDialog.cpp b/src/gui/dialogs/ImportDeviceDialog.cpp
index 4b24964..6e8b494 100644
--- a/src/gui/dialogs/ImportDeviceDialog.cpp
+++ b/src/gui/dialogs/ImportDeviceDialog.cpp
@@ -24,7 +24,7 @@
#include "ImportDeviceDialog.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <kapplication.h>
#include <klocale.h>
@@ -84,7 +84,7 @@ ImportDeviceDialog::doImport()
TQString target;
if (KIO::NetAccess::download(m_url, target) == false) {
- KMessageBox::error(this, i18n("Cannot download file %1").arg(m_url.prettyURL()));
+ KMessageBox::error(this, i18n("Cannot download file %1").tqarg(m_url.prettyURL()));
return false;
}
@@ -96,14 +96,14 @@ ImportDeviceDialog::doImport()
}
if (!fileRead) {
KMessageBox::error
- (this, i18n("Cannot open file %1").arg(m_url.prettyURL()));
+ (this, i18n("Cannot open file %1").tqarg(m_url.prettyURL()));
reject();
close();
return false;
}
if (m_devices.size() == 0) {
KMessageBox::sorry
- (this, i18n("No devices found in file %1").arg(m_url.prettyURL()));
+ (this, i18n("No devices found in file %1").tqarg(m_url.prettyURL()));
reject();
close();
return false;
@@ -137,7 +137,7 @@ ImportDeviceDialog::doImport()
if ((*i)->getName() != "") {
showRenameOption = true;
} else {
- (*i)->setName(qstrtostr(i18n("Device %1").arg(count)));
+ (*i)->setName(qstrtostr(i18n("Device %1").tqarg(count)));
}
if (m_devices.size() > 1) {
m_deviceCombo->insertItem(strtoqstr((*i)->getName()));
@@ -364,7 +364,7 @@ ImportDeviceDialog::importFromSF2(TQString filename)
MidiBank bank
(msb == 1, msb, lsb,
- qstrtostr(i18n("Bank %1:%2").arg(msb).arg(lsb)));
+ qstrtostr(i18n("Bank %1:%2").tqarg(msb).tqarg(lsb)));
banks.push_back(bank);
diff --git a/src/gui/dialogs/IntervalDialog.cpp b/src/gui/dialogs/IntervalDialog.cpp
index b942f8e..0535e8e 100644
--- a/src/gui/dialogs/IntervalDialog.cpp
+++ b/src/gui/dialogs/IntervalDialog.cpp
@@ -24,7 +24,7 @@
#include "IntervalDialog.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <iostream>
#include <klocale.h>
@@ -61,12 +61,12 @@ IntervalDialog::IntervalDialog(TQWidget *parent, bool askChangeKey, bool askTran
intervalChromatic = 0;
intervalDiatonic = 0;
- //m_intervalPitchLabel = new TQLabel( i18n("Pitch: %1").arg(intervalChromatic), hBox);
- //m_intervalOctavesLabel = new TQLabel( i18n("Octaves: %1").arg(intervalDiatonic / 7), hBox);
- //m_intervalStepsLabel = new TQLabel( i18n("Steps: %1").arg(intervalDiatonic % 7), hBox);
+ //m_intervalPitchLabel = new TQLabel( i18n("Pitch: %1").tqarg(intervalChromatic), hBox);
+ //m_intervalOctavesLabel = new TQLabel( i18n("Octaves: %1").tqarg(intervalDiatonic / 7), hBox);
+ //m_intervalStepsLabel = new TQLabel( i18n("Steps: %1").tqarg(intervalDiatonic % 7), hBox);
m_intervalLabel = new TQLabel( i18n("a perfect unison"), vBox);
- m_intervalLabel->setAlignment(TQt::AlignCenter);
+ m_intervalLabel->tqsetAlignment(TQt::AlignCenter);
TQFont font(m_intervalLabel->font());
font.setItalic(true);
m_intervalLabel->setFont(font);
@@ -205,7 +205,7 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic)
else if (deviation == 0)
textIntervalDeviated += i18n("a perfect");
else
- textIntervalDeviated += i18n("an (unknown, %1)").arg(deviation);
+ textIntervalDeviated += i18n("an (unknown, %1)").tqarg(deviation);
break;
// Then the major/minor:
case 1: // second
@@ -233,7 +233,7 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic)
else if (deviation == 0)
textIntervalDeviated += i18n("a perfect");
else
- textIntervalDeviated += i18n("an (unknown, %1)").arg(deviation);
+ textIntervalDeviated += i18n("an (unknown, %1)").tqarg(deviation);
break;
default:
textIntervalDeviated += i18n("an (unknown)");
@@ -245,35 +245,35 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic)
// "1 octave and a diminished octave" is better than
// "2 octaves and a diminished unison"
if (octaves > 0) {
- textInterval += i18n("%1 octave").arg(textIntervalDeviated);
+ textInterval += i18n("%1 octave").tqarg(textIntervalDeviated);
octaves--;
} else if (octaves < 0) {
- textInterval += i18n("%1 octave").arg(textIntervalDeviated);
+ textInterval += i18n("%1 octave").tqarg(textIntervalDeviated);
octaves++;
} else {
- textInterval += i18n("%1 unison").arg(textIntervalDeviated);
+ textInterval += i18n("%1 unison").tqarg(textIntervalDeviated);
}
break;
case 1:
- textInterval += i18n("%1 second").arg(textIntervalDeviated);
+ textInterval += i18n("%1 second").tqarg(textIntervalDeviated);
break;
case 2:
- textInterval += i18n("%1 third").arg(textIntervalDeviated);
+ textInterval += i18n("%1 third").tqarg(textIntervalDeviated);
break;
case 3:
- textInterval += i18n("%1 fourth").arg(textIntervalDeviated);
+ textInterval += i18n("%1 fourth").tqarg(textIntervalDeviated);
break;
case 4:
- textInterval += i18n("%1 fifth").arg(textIntervalDeviated);
+ textInterval += i18n("%1 fifth").tqarg(textIntervalDeviated);
break;
case 5:
- textInterval += i18n("%1 sixth").arg(textIntervalDeviated);
+ textInterval += i18n("%1 sixth").tqarg(textIntervalDeviated);
break;
case 6:
- textInterval += i18n("%1 seventh").arg(textIntervalDeviated);
+ textInterval += i18n("%1 seventh").tqarg(textIntervalDeviated);
break;
default:
- textInterval += i18n("%1").arg(textIntervalDeviated);
+ textInterval += i18n("%1").tqarg(textIntervalDeviated);
}
}
@@ -285,14 +285,14 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic)
if (showStep) {
return i18n("up 1 octave and %1",
"up %n octaves and %1",
- octaves).arg(textInterval);
+ octaves).tqarg(textInterval);
} else {
return i18n("up 1 octave",
"up %n octaves",
octaves);
}
} else {
- return i18n("up %1").arg(textInterval);
+ return i18n("up %1").tqarg(textInterval);
}
}
else
@@ -301,14 +301,14 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic)
if (showStep) {
return i18n("down 1 octave and %1",
"down %n octaves and %1",
- octaves).arg(textInterval);
+ octaves).tqarg(textInterval);
} else {
return i18n("down 1 octave",
"down %n octaves",
octaves);
}
} else {
- return i18n("down %1").arg(textInterval);
+ return i18n("down %1").tqarg(textInterval);
}
}
} else {
diff --git a/src/gui/dialogs/KeySignatureDialog.cpp b/src/gui/dialogs/KeySignatureDialog.cpp
index c79ff35..a5e829d 100644
--- a/src/gui/dialogs/KeySignatureDialog.cpp
+++ b/src/gui/dialogs/KeySignatureDialog.cpp
@@ -98,7 +98,7 @@ KeySignatureDialog::KeySignatureDialog(TQWidget *parent,
(keyDown, i18n("Flatten"));
m_keyLabel = new TQLabel(i18n("Key"), keyBox);
- m_keyLabel->setAlignment(AlignVCenter | AlignHCenter);
+ m_keyLabel->tqsetAlignment(AlignVCenter | AlignHCenter);
BigArrowButton *keyUp = new BigArrowButton(keyBox, Qt::RightArrow);
TQToolTip::add
diff --git a/src/gui/dialogs/LilyPondOptionsDialog.cpp b/src/gui/dialogs/LilyPondOptionsDialog.cpp
index aba8507..b1adfec 100644
--- a/src/gui/dialogs/LilyPondOptionsDialog.cpp
+++ b/src/gui/dialogs/LilyPondOptionsDialog.cpp
@@ -27,7 +27,7 @@
#include "document/io/LilyPondExporter.h"
#include "gui/configuration/HeadersConfigurationPage.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <kapplication.h>
#include "document/ConfigGroups.h"
@@ -114,10 +114,10 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent,
m_lilyLanguage = new KComboBox(frameBasic);
// See also setDefaultLilyPondVersion below
- m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.6"));
- m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.8"));
- m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.10"));
- m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.12"));
+ m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.6"));
+ m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.8"));
+ m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.10"));
+ m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.12"));
m_lilyLanguage->setCurrentItem(config->readUnsignedNumEntry("lilylanguage", 0));
layoutBasic->addWidget(m_lilyLanguage, 0, 1);
@@ -154,7 +154,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent,
m_lilyFontSize = new KComboBox(frameBasic);
int sizes[] = { 11, 13, 16, 19, 20, 23, 26 };
for (int i = 0; i < sizeof(sizes)/sizeof(sizes[0]); ++i) {
- m_lilyFontSize->insertItem(i18n("%1 pt").arg(sizes[i]));
+ m_lilyFontSize->insertItem(i18n("%1 pt").tqarg(sizes[i]));
}
m_lilyFontSize->setCurrentItem(config->readUnsignedNumEntry
("lilyfontsize", 4));
@@ -251,10 +251,10 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent,
m_lilyLyricsHAlignment->insertItem(i18n("Left"));
m_lilyLyricsHAlignment->insertItem(i18n("Center"));
m_lilyLyricsHAlignment->insertItem(i18n("Right"));
- m_lilyLyricsHAlignment->setCurrentItem(config->readUnsignedNumEntry("lilylyricshalignment", 0));
+ m_lilyLyricsHAlignment->setCurrentItem(config->readUnsignedNumEntry("lilylyricshtqalignment", 0));
layoutAdvancedLayout->addWidget(new TQLabel(
- i18n("Lyrics alignment"), frameAdvancedLayout), 0, 0);
+ i18n("Lyrics tqalignment"), frameAdvancedLayout), 0, 0);
layoutAdvancedLayout->addWidget(m_lilyLyricsHAlignment, 0, 1);
m_lilyRaggedBottom = new TQCheckBox(
@@ -292,7 +292,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent,
advancedGrid->setRowStretch(2, 10);
- resize(minimumSize());
+ resize(tqminimumSize());
}
void
@@ -314,7 +314,7 @@ LilyPondOptionsDialog::slotApply()
config->writeEntry("lilyexportbeamings", m_lilyExportBeams->isChecked());
config->writeEntry("lilyexportstaffmerge", m_lilyExportStaffMerge->isChecked());
config->writeEntry("lilyexportstaffbrackets", m_lilyExportStaffGroup->isChecked());
- config->writeEntry("lilylyricshalignment", m_lilyLyricsHAlignment->currentItem());
+ config->writeEntry("lilylyricshtqalignment", m_lilyLyricsHAlignment->currentItem());
config->writeEntry("lilyexportmarkermode", m_lilyMarkerMode->currentItem());
m_headersPage->apply();
}
diff --git a/src/gui/dialogs/LyricEditDialog.cpp b/src/gui/dialogs/LyricEditDialog.cpp
index 66f3b24..a10cb72 100644
--- a/src/gui/dialogs/LyricEditDialog.cpp
+++ b/src/gui/dialogs/LyricEditDialog.cpp
@@ -37,7 +37,7 @@
#include <tqgroupbox.h>
#include <tqregexp.h>
#include <tqstring.h>
-#include <textedit.h>
+#include <tqtextedit.h>
#include <tqvbox.h>
#include <tqwidget.h>
#include <kcombobox.h>
@@ -81,7 +81,7 @@ LyricEditDialog::LyricEditDialog(TQWidget *parent,
unparse();
for (int i = 0; i < m_verseCount; ++i) {
- m_verseNumber->insertItem(i18n("Verse %1").arg(i + 1));
+ m_verseNumber->insertItem(i18n("Verse %1").tqarg(i + 1));
}
m_currentVerse = 0;
if (m_verseCount == 12) m_verseAddButton->setEnabled(false);
@@ -103,7 +103,7 @@ LyricEditDialog::slotAddVerse()
NOTATION_DEBUG << "LyricEditDialog::slotAddVerse" << endl;
m_verseCount++;
m_texts.push_back(m_skeleton);
- m_verseNumber->insertItem(i18n("Verse %1").arg(m_verseCount));
+ m_verseNumber->insertItem(i18n("Verse %1").tqarg(m_verseCount));
m_verseNumber->setCurrentItem(m_verseCount - 1);
slotVerseNumberChanged(m_verseCount - 1);
if (m_verseCount == 12) m_verseAddButton->setEnabled(false);
@@ -148,7 +148,7 @@ LyricEditDialog::unparse()
int lastBarNo = comp->getBarNumber(lastTime);
std::map<int, bool> haveLyric;
- TQString fragment = TQString("[%1] ").arg(lastBarNo + 1);
+ TQString fragment = TQString("[%1] ").tqarg(lastBarNo + 1);
m_skeleton = fragment;
m_texts.clear();
@@ -192,7 +192,7 @@ LyricEditDialog::unparse()
++lastBarNo;
}
- fragment += TQString("\n[%1] ").arg(myBarNo + 1);
+ fragment += TQString("\n[%1] ").tqarg(myBarNo + 1);
m_skeleton += fragment;
for (size_t v = 0; v < m_verseCount; ++v) m_texts[v] += fragment;
diff --git a/src/gui/dialogs/ManageMetronomeDialog.cpp b/src/gui/dialogs/ManageMetronomeDialog.cpp
index 7c3105b..158cd07 100644
--- a/src/gui/dialogs/ManageMetronomeDialog.cpp
+++ b/src/gui/dialogs/ManageMetronomeDialog.cpp
@@ -24,7 +24,7 @@
#include "ManageMetronomeDialog.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <klocale.h>
#include "misc/Debug.h"
@@ -77,11 +77,11 @@ ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent,
(1, Qt::Horizontal, i18n("Metronome Instrument"), vbox);
TQFrame *frame = new TQFrame(deviceBox);
- TQGridLayout *layout = new TQGridLayout(frame, 2, 2, 10, 5);
+ TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2, 10, 5);
- layout->addWidget(new TQLabel(i18n("Device"), frame), 0, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Device"), frame), 0, 0);
m_metronomeDevice = new KComboBox(frame);
- layout->addWidget(m_metronomeDevice, 0, 1);
+ tqlayout->addWidget(m_metronomeDevice, 0, 1);
DeviceList *devices = doc->getStudio().getDevices();
DeviceListConstIterator it;
@@ -108,47 +108,47 @@ ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent,
}
}
- layout->addWidget(new TQLabel(i18n("Instrument"), frame), 1, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Instrument"), frame), 1, 0);
m_metronomeInstrument = new KComboBox(frame);
connect(m_metronomeInstrument, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetModified()));
connect(m_metronomeInstrument, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInstrumentChanged(int)));
- layout->addWidget(m_metronomeInstrument, 1, 1);
+ tqlayout->addWidget(m_metronomeInstrument, 1, 1);
TQGroupBox *beatBox = new TQGroupBox
(1, Qt::Horizontal, i18n("Beats"), vbox);
frame = new TQFrame(beatBox);
- layout = new TQGridLayout(frame, 4, 2, 10, 5);
+ tqlayout = new TQGridLayout(frame, 4, 2, 10, 5);
- layout->addWidget(new TQLabel(i18n("Resolution"), frame), 0, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Resolution"), frame), 0, 0);
m_metronomeResolution = new KComboBox(frame);
m_metronomeResolution->insertItem(i18n("None"));
m_metronomeResolution->insertItem(i18n("Bars only"));
m_metronomeResolution->insertItem(i18n("Bars and beats"));
m_metronomeResolution->insertItem(i18n("Bars, beats, and divisions"));
connect(m_metronomeResolution, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotResolutionChanged(int)));
- layout->addWidget(m_metronomeResolution, 0, 1);
+ tqlayout->addWidget(m_metronomeResolution, 0, 1);
- layout->addWidget(new TQLabel(i18n("Bar velocity"), frame), 1, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Bar velocity"), frame), 1, 0);
m_metronomeBarVely = new TQSpinBox(frame);
m_metronomeBarVely->setMinValue(0);
m_metronomeBarVely->setMaxValue(127);
connect(m_metronomeBarVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified()));
- layout->addWidget(m_metronomeBarVely, 1, 1);
+ tqlayout->addWidget(m_metronomeBarVely, 1, 1);
- layout->addWidget(new TQLabel(i18n("Beat velocity"), frame), 2, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Beat velocity"), frame), 2, 0);
m_metronomeBeatVely = new TQSpinBox(frame);
m_metronomeBeatVely->setMinValue(0);
m_metronomeBeatVely->setMaxValue(127);
connect(m_metronomeBeatVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified()));
- layout->addWidget(m_metronomeBeatVely, 2, 1);
+ tqlayout->addWidget(m_metronomeBeatVely, 2, 1);
- layout->addWidget(new TQLabel(i18n("Sub-beat velocity"), frame), 3, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Sub-beat velocity"), frame), 3, 0);
m_metronomeSubBeatVely = new TQSpinBox(frame);
m_metronomeSubBeatVely->setMinValue(0);
m_metronomeSubBeatVely->setMaxValue(127);
connect(m_metronomeSubBeatVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified()));
- layout->addWidget(m_metronomeSubBeatVely, 3, 1);
+ tqlayout->addWidget(m_metronomeSubBeatVely, 3, 1);
vbox = new TQVBox(hbox);
@@ -261,7 +261,7 @@ ManageMetronomeDialog::populate(int deviceIndex)
}
}
- // if (used) iname = i18n("%1 [used]").arg(iname);
+ // if (used) iname = i18n("%1 [used]").tqarg(iname);
m_metronomeInstrument->insertItem(iname);
diff --git a/src/gui/dialogs/MarkerModifyDialog.cpp b/src/gui/dialogs/MarkerModifyDialog.cpp
index b3629bd..b5c8c2c 100644
--- a/src/gui/dialogs/MarkerModifyDialog.cpp
+++ b/src/gui/dialogs/MarkerModifyDialog.cpp
@@ -24,7 +24,7 @@
#include "MarkerModifyDialog.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <klocale.h>
#include "base/Composition.h"
@@ -80,9 +80,9 @@ MarkerModifyDialog::initialise(Composition *composition,
/*!!!
- layout->addWidget(new TQLabel(i18n("Absolute Time:"), frame), 0, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Absolute Time:"), frame), 0, 0);
m_timeEdit = new TQSpinBox(frame);
- layout->addWidget(m_timeEdit, 0, 1);
+ tqlayout->addWidget(m_timeEdit, 0, 1);
m_timeEdit->setMinValue(INT_MIN);
m_timeEdit->setMaxValue(INT_MAX);
@@ -95,15 +95,15 @@ MarkerModifyDialog::initialise(Composition *composition,
TQFrame *frame = new TQFrame(groupBox);
- TQGridLayout *layout = new TQGridLayout(frame, 2, 2, 5, 5);
+ TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2, 5, 5);
- layout->addWidget(new TQLabel(i18n("Text:"), frame), 0, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Text:"), frame), 0, 0);
m_nameEdit = new TQLineEdit(name, frame);
- layout->addWidget(m_nameEdit, 0, 1);
+ tqlayout->addWidget(m_nameEdit, 0, 1);
- layout->addWidget(new TQLabel(i18n("Description:"), frame), 1, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Description:"), frame), 1, 0);
m_desEdit = new TQLineEdit(des, frame);
- layout->addWidget(m_desEdit, 1, 1);
+ tqlayout->addWidget(m_desEdit, 1, 1);
m_nameEdit->selectAll();
m_nameEdit->setFocus();
diff --git a/src/gui/dialogs/PitchPickerDialog.cpp b/src/gui/dialogs/PitchPickerDialog.cpp
index 12e6034..ed09662 100644
--- a/src/gui/dialogs/PitchPickerDialog.cpp
+++ b/src/gui/dialogs/PitchPickerDialog.cpp
@@ -26,7 +26,7 @@
#include "PitchPickerDialog.h"
#include <klocale.h>
#include <kdialogbase.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqframe.h>
#include <tqstring.h>
#include <tqvbox.h>
@@ -43,10 +43,10 @@ PitchPickerDialog::PitchPickerDialog(TQWidget *parent, int initialPitch, TQStrin
TQFrame *frame = new TQFrame(vBox);
- TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 10, 5);
+ TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 10, 5);
m_pitch = new PitchChooser(text, frame, initialPitch);
- layout->addMultiCellWidget(m_pitch, 0, 0, 0, 2, TQt::AlignHCenter);
+ tqlayout->addMultiCellWidget(m_pitch, 0, 0, 0, 2, TQt::AlignHCenter);
}
PitchPickerDialog::~PitchPickerDialog()
diff --git a/src/gui/dialogs/ShowSequencerStatusDialog.cpp b/src/gui/dialogs/ShowSequencerStatusDialog.cpp
index 13b419a..373712a 100644
--- a/src/gui/dialogs/ShowSequencerStatusDialog.cpp
+++ b/src/gui/dialogs/ShowSequencerStatusDialog.cpp
@@ -31,7 +31,7 @@
#include <tqdatastream.h>
#include <tqlabel.h>
#include <tqstring.h>
-#include <textedit.h>
+#include <tqtextedit.h>
#include <tqvbox.h>
#include <tqwidget.h>
#include "gui/application/RosegardenApplication.h"
diff --git a/src/gui/dialogs/SimpleEventEditDialog.cpp b/src/gui/dialogs/SimpleEventEditDialog.cpp
index 41830be..b3009f6 100644
--- a/src/gui/dialogs/SimpleEventEditDialog.cpp
+++ b/src/gui/dialogs/SimpleEventEditDialog.cpp
@@ -24,7 +24,7 @@
#include "SimpleEventEditDialog.h"
-#include <layout.h>
+#include <tqlayout.h>
#include "base/BaseProperties.h"
#include "base/Event.h"
@@ -76,16 +76,16 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
TQFrame *frame = new TQFrame(groupBox);
- TQGridLayout *layout = new TQGridLayout(frame, 7, 3, 5, 5);
+ TQGridLayout *tqlayout = new TQGridLayout(frame, 7, 3, 5, 5);
- layout->addWidget(new TQLabel(i18n("Event type:"), frame), 0, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Event type:"), frame), 0, 0);
if (inserting) {
m_typeLabel = 0;
m_typeCombo = new KComboBox(frame);
- layout->addWidget(m_typeCombo, 0, 1);
+ tqlayout->addWidget(m_typeCombo, 0, 1);
m_typeCombo->insertItem(strtoqstr(Note::EventType));
m_typeCombo->insertItem(strtoqstr(Controller::EventType));
@@ -111,15 +111,15 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
m_typeCombo = 0;
m_typeLabel = new TQLabel(frame);
- layout->addWidget(m_typeLabel, 0, 1);
+ tqlayout->addWidget(m_typeLabel, 0, 1);
}
m_timeLabel = new TQLabel(i18n("Absolute time:"), frame);
- layout->addWidget(m_timeLabel, 1, 0);
+ tqlayout->addWidget(m_timeLabel, 1, 0);
m_timeSpinBox = new TQSpinBox(INT_MIN, INT_MAX, Note(Note::Shortest).getDuration(), frame);
m_timeEditButton = new TQPushButton("edit", frame);
- layout->addWidget(m_timeSpinBox, 1, 1);
- layout->addWidget(m_timeEditButton, 1, 2);
+ tqlayout->addWidget(m_timeSpinBox, 1, 1);
+ tqlayout->addWidget(m_timeEditButton, 1, 2);
connect(m_timeSpinBox, TQT_SIGNAL(valueChanged(int)),
TQT_SLOT(slotAbsoluteTimeChanged(int)));
@@ -127,11 +127,11 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
TQT_SLOT(slotEditAbsoluteTime()));
m_durationLabel = new TQLabel(i18n("Duration:"), frame);
- layout->addWidget(m_durationLabel, 2, 0);
+ tqlayout->addWidget(m_durationLabel, 2, 0);
m_durationSpinBox = new TQSpinBox(0, INT_MAX, Note(Note::Shortest).getDuration(), frame);
m_durationEditButton = new TQPushButton("edit", frame);
- layout->addWidget(m_durationSpinBox, 2, 1);
- layout->addWidget(m_durationEditButton, 2, 2);
+ tqlayout->addWidget(m_durationSpinBox, 2, 1);
+ tqlayout->addWidget(m_durationEditButton, 2, 2);
connect(m_durationSpinBox, TQT_SIGNAL(valueChanged(int)),
TQT_SLOT(slotDurationChanged(int)));
@@ -139,11 +139,11 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
TQT_SLOT(slotEditDuration()));
m_pitchLabel = new TQLabel(i18n("Pitch:"), frame);
- layout->addWidget(m_pitchLabel, 3, 0);
+ tqlayout->addWidget(m_pitchLabel, 3, 0);
m_pitchSpinBox = new TQSpinBox(frame);
m_pitchEditButton = new TQPushButton("edit", frame);
- layout->addWidget(m_pitchSpinBox, 3, 1);
- layout->addWidget(m_pitchEditButton, 3, 2);
+ tqlayout->addWidget(m_pitchSpinBox, 3, 1);
+ tqlayout->addWidget(m_pitchEditButton, 3, 2);
connect(m_pitchSpinBox, TQT_SIGNAL(valueChanged(int)),
TQT_SLOT(slotPitchChanged(int)));
@@ -155,15 +155,15 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
m_controllerLabel = new TQLabel(i18n("Controller name:"), frame);
m_controllerLabelValue = new TQLabel(i18n("<none>"), frame);
- m_controllerLabelValue->setAlignment(TQLabel::AlignRight);
+ m_controllerLabelValue->tqsetAlignment(TQLabel::AlignRight);
- layout->addWidget(m_controllerLabel, 4, 0);
- layout->addWidget(m_controllerLabelValue, 4, 1);
+ tqlayout->addWidget(m_controllerLabel, 4, 0);
+ tqlayout->addWidget(m_controllerLabelValue, 4, 1);
m_velocityLabel = new TQLabel(i18n("Velocity:"), frame);
- layout->addWidget(m_velocityLabel, 5, 0);
+ tqlayout->addWidget(m_velocityLabel, 5, 0);
m_velocitySpinBox = new TQSpinBox(frame);
- layout->addWidget(m_velocitySpinBox, 5, 1);
+ tqlayout->addWidget(m_velocitySpinBox, 5, 1);
connect(m_velocitySpinBox, TQT_SIGNAL(valueChanged(int)),
TQT_SLOT(slotVelocityChanged(int)));
@@ -172,14 +172,14 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
m_velocitySpinBox->setMaxValue(MidiMaxValue);
m_metaLabel = new TQLabel(i18n("Meta string:"), frame);
- layout->addWidget(m_metaLabel, 6, 0);
+ tqlayout->addWidget(m_metaLabel, 6, 0);
m_metaEdit = new TQLineEdit(frame);
- layout->addWidget(m_metaEdit, 6, 1);
+ tqlayout->addWidget(m_metaEdit, 6, 1);
m_sysexLoadButton = new TQPushButton(i18n("Load data"), frame);
- layout->addWidget(m_sysexLoadButton, 6, 2);
+ tqlayout->addWidget(m_sysexLoadButton, 6, 2);
m_sysexSaveButton = new TQPushButton(i18n("Save data"), frame);
- layout->addWidget(m_sysexSaveButton, 4, 2);
+ tqlayout->addWidget(m_sysexSaveButton, 4, 2);
connect(m_metaEdit, TQT_SIGNAL(textChanged(const TQString &)),
TQT_SLOT(slotMetaChanged(const TQString &)));
@@ -193,21 +193,21 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
frame = new TQFrame(m_notationGroupBox);
- layout = new TQGridLayout(frame, 3, 3, 5, 5);
+ tqlayout = new TQGridLayout(frame, 3, 3, 5, 5);
m_lockNotationValues = new TQCheckBox(i18n("Lock to changes in performed values"), frame);
- layout->addMultiCellWidget(m_lockNotationValues, 0, 0, 0, 2);
+ tqlayout->addMultiCellWidget(m_lockNotationValues, 0, 0, 0, 2);
m_lockNotationValues->setChecked(true);
connect(m_lockNotationValues, TQT_SIGNAL(released()),
TQT_SLOT(slotLockNotationChanged()));
m_notationTimeLabel = new TQLabel(i18n("Notation time:"), frame);
- layout->addWidget(m_notationTimeLabel, 1, 0);
+ tqlayout->addWidget(m_notationTimeLabel, 1, 0);
m_notationTimeSpinBox = new TQSpinBox(INT_MIN, INT_MAX, Note(Note::Shortest).getDuration(), frame);
m_notationTimeEditButton = new TQPushButton("edit", frame);
- layout->addWidget(m_notationTimeSpinBox, 1, 1);
- layout->addWidget(m_notationTimeEditButton, 1, 2);
+ tqlayout->addWidget(m_notationTimeSpinBox, 1, 1);
+ tqlayout->addWidget(m_notationTimeEditButton, 1, 2);
connect(m_notationTimeSpinBox, TQT_SIGNAL(valueChanged(int)),
TQT_SLOT(slotNotationAbsoluteTimeChanged(int)));
@@ -215,11 +215,11 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent,
TQT_SLOT(slotEditNotationAbsoluteTime()));
m_notationDurationLabel = new TQLabel(i18n("Notation duration:"), frame);
- layout->addWidget(m_notationDurationLabel, 2, 0);
+ tqlayout->addWidget(m_notationDurationLabel, 2, 0);
m_notationDurationSpinBox = new TQSpinBox(0, INT_MAX, Note(Note::Shortest).getDuration(), frame);
m_notationDurationEditButton = new TQPushButton("edit", frame);
- layout->addWidget(m_notationDurationSpinBox, 2, 1);
- layout->addWidget(m_notationDurationEditButton, 2, 2);
+ tqlayout->addWidget(m_notationDurationSpinBox, 2, 1);
+ tqlayout->addWidget(m_notationDurationEditButton, 2, 2);
connect(m_notationDurationSpinBox, TQT_SIGNAL(valueChanged(int)),
TQT_SLOT(slotNotationDurationChanged(int)));
diff --git a/src/gui/dialogs/SplitByPitchDialog.cpp b/src/gui/dialogs/SplitByPitchDialog.cpp
index 7788af1..2c93253 100644
--- a/src/gui/dialogs/SplitByPitchDialog.cpp
+++ b/src/gui/dialogs/SplitByPitchDialog.cpp
@@ -36,7 +36,7 @@
#include <tqlabel.h>
#include <tqvbox.h>
#include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
namespace Rosegarden
@@ -49,27 +49,27 @@ SplitByPitchDialog::SplitByPitchDialog(TQWidget *parent) :
TQFrame *frame = new TQFrame(vBox);
- TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 10, 5);
+ TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 10, 5);
m_pitch = new PitchChooser(i18n("Starting split pitch"), frame, 60);
- layout->addMultiCellWidget(m_pitch, 0, 0, 0, 2, TQt::AlignHCenter);
+ tqlayout->addMultiCellWidget(m_pitch, 0, 0, 0, 2, TQt::AlignHCenter);
m_range = new TQCheckBox(i18n("Range up and down to follow music"), frame);
- layout->addMultiCellWidget(m_range,
+ tqlayout->addMultiCellWidget(m_range,
1, 1, // fromRow, toRow
0, 2 // fromCol, toCol
);
m_duplicate = new TQCheckBox(i18n("Duplicate non-note events"), frame);
- layout->addMultiCellWidget(m_duplicate, 2, 2, 0, 2);
+ tqlayout->addMultiCellWidget(m_duplicate, 2, 2, 0, 2);
- layout->addWidget(new TQLabel(i18n("Clef handling:"), frame), 3, 0);
+ tqlayout->addWidget(new TQLabel(i18n("Clef handling:"), frame), 3, 0);
m_clefs = new KComboBox(frame);
m_clefs->insertItem(i18n("Leave clefs alone"));
m_clefs->insertItem(i18n("Guess new clefs"));
m_clefs->insertItem(i18n("Use treble and bass clefs"));
- layout->addMultiCellWidget(m_clefs, 3, 3, 1, 2);
+ tqlayout->addMultiCellWidget(m_clefs, 3, 3, 1, 2);
m_range->setChecked(true);
m_duplicate->setChecked(true);
diff --git a/src/gui/dialogs/SplitByRecordingSrcDialog.cpp b/src/gui/dialogs/SplitByRecordingSrcDialog.cpp
index 89a4586..1609865 100644
--- a/src/gui/dialogs/SplitByRecordingSrcDialog.cpp
+++ b/src/gui/dialogs/SplitByRecordingSrcDialog.cpp
@@ -24,7 +24,7 @@
#include "SplitByRecordingSrcDialog.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <klocale.h>
#include "misc/Strings.h"
@@ -52,23 +52,23 @@ SplitByRecordingSrcDialog::SplitByRecordingSrcDialog(TQWidget *parent, Rosegarde
TQGroupBox *groupBox = new TQGroupBox
(1, Qt::Horizontal, i18n("Recording Source"), vBox);
TQFrame *frame = new TQFrame(groupBox);
- TQGridLayout *layout = new TQGridLayout(frame, 2, 2, 10, 5);
+ TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2, 10, 5);
- layout->addWidget(new TQLabel( i18n("Channel:"), frame ), 0, 0);
+ tqlayout->addWidget(new TQLabel( i18n("Channel:"), frame ), 0, 0);
m_channel = new KComboBox( frame );
m_channel->setSizeLimit( 17 );
- layout->addWidget(m_channel, 0, 1);
+ tqlayout->addWidget(m_channel, 0, 1);
TQSpacerItem *spacer = new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
- layout->addItem( spacer, 0, 2 );
+ tqlayout->addItem( spacer, 0, 2 );
m_channel->insertItem(i18n("any"));
for (int i = 1; i < 17; ++i) {
m_channel->insertItem(TQString::number(i));
}
- layout->addWidget(new TQLabel( i18n("Device:"), frame ), 1, 0);
+ tqlayout->addWidget(new TQLabel( i18n("Device:"), frame ), 1, 0);
m_device = new KComboBox( frame );
- layout->addMultiCellWidget( m_device, 1, 1, 1, 2 );
+ tqlayout->addMultiCellWidget( m_device, 1, 1, 1, 2 );
m_deviceIds.clear();
m_deviceIds.push_back( -1);
diff --git a/src/gui/dialogs/TempoDialog.cpp b/src/gui/dialogs/TempoDialog.cpp
index c2c54a3..92d7165 100644
--- a/src/gui/dialogs/TempoDialog.cpp
+++ b/src/gui/dialogs/TempoDialog.cpp
@@ -24,7 +24,7 @@
#include "TempoDialog.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <klocale.h>
#include "misc/Debug.h"
@@ -63,18 +63,18 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc,
TQGroupBox *groupBox = new TQGroupBox(1, Qt::Horizontal, i18n("Tempo"), vbox);
TQFrame *frame = new TQFrame(groupBox);
- TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 5, 5);
+ TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 5, 5);
// Set tempo
- layout->addWidget(new TQLabel(i18n("New tempo:"), frame), 0, 1);
+ tqlayout->addWidget(new TQLabel(i18n("New tempo:"), frame), 0, 1);
m_tempoValueSpinBox = new HSpinBox(frame, 0, 100000, 0.0, 1000.0, 5);
- layout->addWidget(m_tempoValueSpinBox, 0, 2);
+ tqlayout->addWidget(m_tempoValueSpinBox, 0, 2);
connect(m_tempoValueSpinBox, TQT_SIGNAL(valueChanged(const TQString &)),
TQT_SLOT(slotTempoChanged(const TQString &)));
m_tempoTap= new TQPushButton(i18n("Tap"), frame);
- layout->addWidget(m_tempoTap, 0, 3);
+ tqlayout->addWidget(m_tempoTap, 0, 3);
connect(m_tempoTap, TQT_SIGNAL(clicked()), TQT_SLOT(slotTapClicked()));
@@ -85,13 +85,13 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc,
// m_tempoTargetCheckBox = new TQCheckBox(i18n("Ramping to:"), frame);
m_tempoTargetSpinBox = new HSpinBox(frame, 0, 100000, 0.0, 1000.0, 5);
- // layout->addMultiCellWidget(m_tempoTargetCheckBox, 1, 1, 0, 1, AlignRight);
- // layout->addWidget(m_tempoTargetSpinBox, 1, 2);
+ // tqlayout->addMultiCellWidget(m_tempoTargetCheckBox, 1, 1, 0, 1, AlignRight);
+ // tqlayout->addWidget(m_tempoTargetSpinBox, 1, 2);
- layout->addMultiCellWidget(m_tempoConstant, 1, 1, 1, 2);
- layout->addMultiCellWidget(m_tempoRampToNext, 2, 2, 1, 2);
- layout->addWidget(m_tempoRampToTarget, 3, 1);
- layout->addWidget(m_tempoTargetSpinBox, 3, 2);
+ tqlayout->addMultiCellWidget(m_tempoConstant, 1, 1, 1, 2);
+ tqlayout->addMultiCellWidget(m_tempoRampToNext, 2, 2, 1, 2);
+ tqlayout->addWidget(m_tempoRampToTarget, 3, 1);
+ tqlayout->addWidget(m_tempoTargetSpinBox, 3, 2);
// connect(m_tempoTargetCheckBox, TQT_SIGNAL(clicked()),
// TQT_SLOT(slotTargetCheckBoxClicked()));
@@ -105,13 +105,13 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc,
TQT_SLOT(slotTargetChanged(const TQString &)));
m_tempoBeatLabel = new TQLabel(frame);
- layout->addWidget(m_tempoBeatLabel, 0, 4);
+ tqlayout->addWidget(m_tempoBeatLabel, 0, 4);
m_tempoBeat = new TQLabel(frame);
- layout->addWidget(m_tempoBeat, 0, 5);
+ tqlayout->addWidget(m_tempoBeat, 0, 5);
m_tempoBeatsPerMinute = new TQLabel(frame);
- layout->addWidget(m_tempoBeatsPerMinute, 0, 6);
+ tqlayout->addWidget(m_tempoBeatsPerMinute, 0, 6);
m_timeEditor = 0;
@@ -253,17 +253,17 @@ TempoDialog::populateTempo()
RealTime tempoTime = comp.getElapsedRealTime(m_tempoTime);
TQString milliSeconds;
milliSeconds.sprintf("%03d", tempoTime.msec());
- m_tempoTimeLabel->setText(i18n("%1.%2 s,").arg(tempoTime.sec)
- .arg(milliSeconds));
+ m_tempoTimeLabel->setText(i18n("%1.%2 s,").tqarg(tempoTime.sec)
+ .tqarg(milliSeconds));
int barNo = comp.getBarNumber(m_tempoTime);
if (comp.getBarStart(barNo) == m_tempoTime) {
m_tempoBarLabel->setText
- (i18n("at the start of measure %1.").arg(barNo + 1));
+ (i18n("at the start of measure %1.").tqarg(barNo + 1));
m_tempoChangeStartOfBar->setEnabled(false);
} else {
m_tempoBarLabel->setText(
- i18n("in the middle of measure %1.").arg(barNo + 1));
+ i18n("in the middle of measure %1.").tqarg(barNo + 1));
m_tempoChangeStartOfBar->setEnabled(true);
}
@@ -282,8 +282,8 @@ TempoDialog::populateTempo()
lastms.sprintf("%03d", lastRT.msec());
int lastBar = comp.getBarNumber(lastTempoTime);
m_tempoChangeBeforeAt->setText
- (i18n(" (at %1.%2 s, in measure %3)").arg(lastRT.sec)
- .arg(lastms).arg(lastBar + 1));
+ (i18n(" (at %1.%2 s, in measure %3)").tqarg(lastRT.sec)
+ .tqarg(lastms).tqarg(lastBar + 1));
m_tempoChangeBeforeAt->show();
m_tempoChangeBefore->setEnabled(true);
diff --git a/src/gui/dialogs/TimeSignatureDialog.cpp b/src/gui/dialogs/TimeSignatureDialog.cpp
index f9de575..7aae2aa 100644
--- a/src/gui/dialogs/TimeSignatureDialog.cpp
+++ b/src/gui/dialogs/TimeSignatureDialog.cpp
@@ -92,12 +92,12 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent,
BigArrowButton *denomDown = new BigArrowButton(denomBox, Qt::LeftArrow);
m_numLabel = new TQLabel
- (TQString("%1").arg(m_timeSignature.getNumerator()), numBox);
+ (TQString("%1").tqarg(m_timeSignature.getNumerator()), numBox);
m_denomLabel = new TQLabel
- (TQString("%1").arg(m_timeSignature.getDenominator()), denomBox);
+ (TQString("%1").tqarg(m_timeSignature.getDenominator()), denomBox);
- m_numLabel->setAlignment(AlignHCenter | AlignVCenter);
- m_denomLabel->setAlignment(AlignHCenter | AlignVCenter);
+ m_numLabel->tqsetAlignment(AlignHCenter | AlignVCenter);
+ m_denomLabel->tqsetAlignment(AlignHCenter | AlignVCenter);
m_numLabel->setFont(*timeSigFont);
m_denomLabel->setFont(*timeSigFont);
@@ -139,11 +139,11 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent,
if (atStartOfBar) {
scopeText = TQString
(i18n("Insertion point is at start of measure %1."))
- .arg(barNo + 1);
+ .tqarg(barNo + 1);
} else {
scopeText = TQString
(i18n("Insertion point is in the middle of measure %1."))
- .arg(barNo + 1);
+ .tqarg(barNo + 1);
}
} else {
scopeText = TQString
@@ -152,19 +152,19 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent,
new TQLabel(scopeText, groupBox);
m_asGivenButton = new TQRadioButton
- (i18n("Start measure %1 here").arg(barNo + 2), groupBox);
+ (i18n("Start measure %1 here").tqarg(barNo + 2), groupBox);
if (!atStartOfBar) {
m_startOfBarButton = new TQRadioButton
(i18n("Change time from start of measure %1")
- .arg(barNo + 1), groupBox);
+ .tqarg(barNo + 1), groupBox);
m_startOfBarButton->setChecked(true);
} else {
m_asGivenButton->setChecked(true);
}
} else {
new TQLabel(i18n("Time change will take effect at the start of measure %1.")
- .arg(barNo + 1), groupBox);
+ .tqarg(barNo + 1), groupBox);
}
}
@@ -231,7 +231,7 @@ TimeSignatureDialog::slotNumDown()
int n = m_timeSignature.getNumerator();
if (--n >= 1) {
m_timeSignature = TimeSignature(n, m_timeSignature.getDenominator());
- m_numLabel->setText(TQString("%1").arg(n));
+ m_numLabel->setText(TQString("%1").tqarg(n));
}
slotUpdateCommonTimeButton();
}
@@ -242,7 +242,7 @@ TimeSignatureDialog::slotNumUp()
int n = m_timeSignature.getNumerator();
if (++n <= 99) {
m_timeSignature = TimeSignature(n, m_timeSignature.getDenominator());
- m_numLabel->setText(TQString("%1").arg(n));
+ m_numLabel->setText(TQString("%1").tqarg(n));
}
slotUpdateCommonTimeButton();
}
@@ -253,7 +253,7 @@ TimeSignatureDialog::slotDenomDown()
int n = m_timeSignature.getDenominator();
if ((n /= 2) >= 1) {
m_timeSignature = TimeSignature(m_timeSignature.getNumerator(), n);
- m_denomLabel->setText(TQString("%1").arg(n));
+ m_denomLabel->setText(TQString("%1").tqarg(n));
}
slotUpdateCommonTimeButton();
}
@@ -264,7 +264,7 @@ TimeSignatureDialog::slotDenomUp()
int n = m_timeSignature.getDenominator();
if ((n *= 2) <= 64) {
m_timeSignature = TimeSignature(m_timeSignature.getNumerator(), n);
- m_denomLabel->setText(TQString("%1").arg(n));
+ m_denomLabel->setText(TQString("%1").tqarg(n));
}
slotUpdateCommonTimeButton();
}
diff --git a/src/gui/dialogs/TransportDialog.cpp b/src/gui/dialogs/TransportDialog.cpp
index a63beac..68c42a7 100644
--- a/src/gui/dialogs/TransportDialog.cpp
+++ b/src/gui/dialogs/TransportDialog.cpp
@@ -46,7 +46,7 @@
#include <tqfont.h>
#include <tqhbox.h>
#include <tqlabel.h>
-#include <palette.h>
+#include <tqpalette.h>
#include <tqpixmap.h>
#include <tqpushbutton.h>
#include <tqstring.h>
@@ -206,10 +206,10 @@ TransportDialog::TransportDialog(TQWidget *parent,
pal.setColor(TQColorGroup::Foreground, TQColor(192, 216, 255));
m_transport->TempoDisplay->setPalette(pal);
- m_transport->TempoDisplay->setAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight));
+ m_transport->TempoDisplay->tqsetAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight));
m_transport->TimeSigDisplay->setPalette(pal);
- m_transport->TimeSigDisplay->setAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight));
+ m_transport->TimeSigDisplay->tqsetAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight));
TQFont localFont(m_transport->OutDisplay->font() );
localFont.setFamily( "lucida" );
@@ -344,7 +344,7 @@ TransportDialog::loadPixmaps()
TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
for (int i = 0; i < 10; i++) {
- fileName = TQString("%1/transport/led-%2.xpm").arg(pixmapDir).arg(i);
+ fileName = TQString("%1/transport/led-%2.xpm").tqarg(pixmapDir).tqarg(i);
if (!m_lcdList[i].load(fileName)) {
std::cerr << "TransportDialog - failed to load pixmap \""
<< fileName.ascii() << "\"" << std::endl;
@@ -353,7 +353,7 @@ TransportDialog::loadPixmaps()
// Load the "negative" sign pixmap
//
- fileName = TQString("%1/transport/led--.xpm").arg(pixmapDir);
+ fileName = TQString("%1/transport/led--.xpm").tqarg(pixmapDir);
m_lcdNegative.load(fileName);
}
@@ -479,7 +479,7 @@ TransportDialog::displayTime()
case FrameMode:
m_clearMetronomeTimer->stop();
- m_transport->TimeDisplayLabel->setText(TQString("%1").arg(m_sampleRate));
+ m_transport->TimeDisplayLabel->setText(TQString("%1").tqarg(m_sampleRate));
m_transport->TimeDisplayLabel->show();
break;
}
@@ -917,7 +917,7 @@ TransportDialog::setMidiInLabel(const MappedEvent *mE)
MidiPitchLabel mPL(mE->getPitch());
m_transport->InDisplay->setText
(mPL.getTQString() +
- TQString(" %1").arg(mE->getVelocity()));
+ TQString(" %1").tqarg(mE->getVelocity()));
}
break;
@@ -977,7 +977,7 @@ TransportDialog::setMidiOutLabel(const MappedEvent *mE)
MidiPitchLabel mPL(mE->getPitch());
m_transport->OutDisplay->setText
(mPL.getTQString() +
- TQString(" %1").arg(mE->getVelocity()));
+ TQString(" %1").tqarg(mE->getVelocity()));
}
break;
@@ -1133,8 +1133,8 @@ TransportDialog::slotSetBackground(TQColor c)
/* this is a bit more thorough, but too slow and flickery:
- const TQObjectList *children = m_transport->LCDBoxFrame->children();
- TQObjectListIt it(*children);
+ const TQObjectList *tqchildren = m_transport->LCDBoxFrame->tqchildren();
+ TQObjectListIt it(*tqchildren);
TQObject *obj;
while ((obj = it.current()) != 0) {
diff --git a/src/gui/dialogs/TriggerSegmentDialog.cpp b/src/gui/dialogs/TriggerSegmentDialog.cpp
index 4e4c75b..744d628 100644
--- a/src/gui/dialogs/TriggerSegmentDialog.cpp
+++ b/src/gui/dialogs/TriggerSegmentDialog.cpp
@@ -41,7 +41,7 @@
#include <tqstring.h>
#include <tqvbox.h>
#include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
namespace Rosegarden
@@ -56,27 +56,27 @@ TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *parent,
TQVBox *vbox = makeVBoxMainWidget();
TQFrame *frame = new TQFrame(vbox);
- TQGridLayout *layout = new TQGridLayout(frame, 3, 2, 5, 5);
+ TQGridLayout *tqlayout = new TQGridLayout(frame, 3, 2, 5, 5);
TQLabel *label = new TQLabel(i18n("Trigger segment: "), frame);
- layout->addWidget(label, 0, 0);
+ tqlayout->addWidget(label, 0, 0);
m_segment = new KComboBox(frame);
- layout->addWidget(m_segment, 0, 1);
+ tqlayout->addWidget(m_segment, 0, 1);
int n = 1;
for (Composition::triggersegmentcontaineriterator i =
m_composition->getTriggerSegments().begin();
i != m_composition->getTriggerSegments().end(); ++i) {
m_segment->insertItem
- (TQString("%1. %2").arg(n++).arg(strtoqstr((*i)->getSegment()->getLabel())));
+ (TQString("%1. %2").tqarg(n++).tqarg(strtoqstr((*i)->getSegment()->getLabel())));
}
label = new TQLabel(i18n("Perform with timing: "), frame);
- layout->addWidget(label, 1, 0);
+ tqlayout->addWidget(label, 1, 0);
m_adjustTime = new KComboBox(frame);
- layout->addWidget(m_adjustTime, 1, 1);
+ tqlayout->addWidget(m_adjustTime, 1, 1);
m_adjustTime->insertItem(i18n("As stored"));
m_adjustTime->insertItem(i18n("Truncate if longer than note"));
@@ -86,7 +86,7 @@ TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *parent,
m_retune = new TQCheckBox(i18n("Adjust pitch to note"), frame);
m_retune->setChecked(true);
- layout->addWidget(m_retune, 2, 1);
+ tqlayout->addWidget(m_retune, 2, 1);
setupFromConfig();
}
diff --git a/src/gui/dialogs/TupletDialog.cpp b/src/gui/dialogs/TupletDialog.cpp
index e4a1e00..d9d528b 100644
--- a/src/gui/dialogs/TupletDialog.cpp
+++ b/src/gui/dialogs/TupletDialog.cpp
@@ -24,7 +24,7 @@
#include "TupletDialog.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <klocale.h>
#include "base/NotationTypes.h"
@@ -120,7 +120,7 @@ TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType,
new TQLabel(i18n("Selected region:"), timingDisplayGrid);
new TQLabel("", timingDisplayGrid);
m_selectionDurationDisplay = new TQLabel("x", timingDisplayGrid);
- m_selectionDurationDisplay->setAlignment(int(TQLabel::AlignVCenter |
+ m_selectionDurationDisplay->tqsetAlignment(int(TQLabel::AlignVCenter |
TQLabel::AlignRight));
} else {
m_selectionDurationDisplay = 0;
@@ -129,19 +129,19 @@ TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType,
new TQLabel(i18n("Group with current timing:"), timingDisplayGrid);
m_untupledDurationCalculationDisplay = new TQLabel("x", timingDisplayGrid);
m_untupledDurationDisplay = new TQLabel("x", timingDisplayGrid);
- m_untupledDurationDisplay->setAlignment(int(TQLabel::AlignVCenter |
+ m_untupledDurationDisplay->tqsetAlignment(int(TQLabel::AlignVCenter |
TQLabel::AlignRight));
new TQLabel(i18n("Group with new timing:"), timingDisplayGrid);
m_tupledDurationCalculationDisplay = new TQLabel("x", timingDisplayGrid);
m_tupledDurationDisplay = new TQLabel("x", timingDisplayGrid);
- m_tupledDurationDisplay->setAlignment(int(TQLabel::AlignVCenter |
+ m_tupledDurationDisplay->tqsetAlignment(int(TQLabel::AlignVCenter |
TQLabel::AlignRight));
new TQLabel(i18n("Gap created by timing change:"), timingDisplayGrid);
m_newGapDurationCalculationDisplay = new TQLabel("x", timingDisplayGrid);
m_newGapDurationDisplay = new TQLabel("x", timingDisplayGrid);
- m_newGapDurationDisplay->setAlignment(int(TQLabel::AlignVCenter |
+ m_newGapDurationDisplay->tqsetAlignment(int(TQLabel::AlignVCenter |
TQLabel::AlignRight));
if (maxDuration > 0) {
@@ -150,7 +150,7 @@ TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType,
m_unchangedDurationCalculationDisplay = new TQLabel
("x", timingDisplayGrid);
m_unchangedDurationDisplay = new TQLabel("x", timingDisplayGrid);
- m_unchangedDurationDisplay->setAlignment(int(TQLabel::AlignVCenter |
+ m_unchangedDurationDisplay->tqsetAlignment(int(TQLabel::AlignVCenter |
TQLabel::AlignRight));
} else {
@@ -238,7 +238,7 @@ TupletDialog::updateUntupledCombo()
TQString previousText = m_untupledCombo->currentText();
if (previousText.toInt() == 0) {
if (maxValue < 3)
- previousText = TQString("%1").arg(maxValue);
+ previousText = TQString("%1").tqarg(maxValue);
else
previousText = "3";
}
@@ -247,7 +247,7 @@ TupletDialog::updateUntupledCombo()
bool setText = false;
for (int i = 1; i <= maxValue; ++i) {
- TQString text = TQString("%1").arg(i);
+ TQString text = TQString("%1").tqarg(i);
m_untupledCombo->insertItem(text);
if (m_hasTimingAlready->isChecked()) {
if (i == (m_maxDuration * 3) / (Note(getUnitType()).getDuration()*2)) {
@@ -278,7 +278,7 @@ TupletDialog::updateTupledCombo()
if (previousText.toInt() == 0 ||
previousText.toInt() > untupled) {
if (untupled < 2)
- previousText = TQString("%1").arg(untupled);
+ previousText = TQString("%1").tqarg(untupled);
else
previousText = "2";
}
@@ -286,7 +286,7 @@ TupletDialog::updateTupledCombo()
m_tupledCombo->clear();
for (int i = 1; i < untupled; ++i) {
- TQString text = TQString("%1").arg(i);
+ TQString text = TQString("%1").tqarg(i);
m_tupledCombo->insertItem(text);
if (m_hasTimingAlready->isChecked()) {
if (i == m_maxDuration / Note(getUnitType()).getDuration()) {
@@ -310,33 +310,33 @@ TupletDialog::updateTimingDisplays()
timeT tupledDuration = unitDuration * tupledCount;
if (m_selectionDurationDisplay) {
- m_selectionDurationDisplay->setText(TQString("%1").arg(m_maxDuration));
+ m_selectionDurationDisplay->setText(TQString("%1").tqarg(m_maxDuration));
}
m_untupledDurationCalculationDisplay->setText
- (TQString(" %1 x %2 = ").arg(untupledCount).arg(unitDuration));
+ (TQString(" %1 x %2 = ").tqarg(untupledCount).tqarg(unitDuration));
m_untupledDurationDisplay->setText
- (TQString("%1").arg(untupledDuration));
+ (TQString("%1").tqarg(untupledDuration));
m_tupledDurationCalculationDisplay->setText
- (TQString(" %1 x %2 = ").arg(tupledCount).arg(unitDuration));
+ (TQString(" %1 x %2 = ").tqarg(tupledCount).tqarg(unitDuration));
m_tupledDurationDisplay->setText
- (TQString("%1").arg(tupledDuration));
+ (TQString("%1").tqarg(tupledDuration));
m_newGapDurationCalculationDisplay->setText
- (TQString(" %1 - %2 = ").arg(untupledDuration).arg(tupledDuration));
+ (TQString(" %1 - %2 = ").tqarg(untupledDuration).tqarg(tupledDuration));
m_newGapDurationDisplay->setText
- (TQString("%1").arg(untupledDuration - tupledDuration));
+ (TQString("%1").tqarg(untupledDuration - tupledDuration));
if (m_selectionDurationDisplay && m_unchangedDurationDisplay) {
if (m_maxDuration != untupledDuration) {
m_unchangedDurationCalculationDisplay->setText
- (TQString(" %1 - %2 = ").arg(m_maxDuration).arg(untupledDuration));
+ (TQString(" %1 - %2 = ").tqarg(m_maxDuration).tqarg(untupledDuration));
} else {
m_unchangedDurationCalculationDisplay->setText("");
}
m_unchangedDurationDisplay->setText
- (TQString("%1").arg(m_maxDuration - untupledDuration));
+ (TQString("%1").tqarg(m_maxDuration - untupledDuration));
}
}
diff --git a/src/gui/dialogs/UnusedAudioSelectionDialog.cpp b/src/gui/dialogs/UnusedAudioSelectionDialog.cpp
index b15fe07..9a86252 100644
--- a/src/gui/dialogs/UnusedAudioSelectionDialog.cpp
+++ b/src/gui/dialogs/UnusedAudioSelectionDialog.cpp
@@ -60,8 +60,8 @@ UnusedAudioSelectionDialog::UnusedAudioSelectionDialog(TQWidget *parent,
TQString fileSize = i18n(" (not found) ");
TQString fileDate;
if (info.exists()) {
- fileSize = TQString(" %1 ").arg(info.size());
- fileDate = TQString(" %1 ").arg(info.lastModified().toString());
+ fileSize = TQString(" %1 ").tqarg(info.size());
+ fileDate = TQString(" %1 ").tqarg(info.lastModified().toString());
}
TQListViewItem *item = new KListViewItem
(m_listView, fileName, fileSize, fileDate);
diff --git a/src/gui/dialogs/UseOrnamentDialog.cpp b/src/gui/dialogs/UseOrnamentDialog.cpp
index 9076803..2c8fb97 100644
--- a/src/gui/dialogs/UseOrnamentDialog.cpp
+++ b/src/gui/dialogs/UseOrnamentDialog.cpp
@@ -24,7 +24,7 @@
#include "UseOrnamentDialog.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <kapplication.h>
#include "base/BaseProperties.h"
@@ -63,13 +63,13 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
TQGroupBox *notationBox = new TQGroupBox(1, Qt::Horizontal, i18n("Notation"), vbox);
TQFrame *frame = new TQFrame(notationBox);
- TQGridLayout *layout = new TQGridLayout(frame, 4, 1, 5, 5);
+ TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 1, 5, 5);
label = new TQLabel(i18n("Display as: "), frame);
- layout->addWidget(label, 0, 0);
+ tqlayout->addWidget(label, 0, 0);
m_mark = new KComboBox(frame);
- layout->addWidget(m_mark, 0, 1);
+ tqlayout->addWidget(m_mark, 0, 1);
m_marks.push_back(Marks::Trill);
m_marks.push_back(Marks::LongTrill);
@@ -96,35 +96,35 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
connect(m_mark, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMarkChanged(int)));
m_textLabel = new TQLabel(i18n(" Text: "), frame);
- layout->addWidget(m_textLabel, 0, 2);
+ tqlayout->addWidget(m_textLabel, 0, 2);
m_text = new TQLineEdit(frame);
- layout->addWidget(m_text, 0, 3);
+ tqlayout->addWidget(m_text, 0, 3);
TQGroupBox *performBox = new TQGroupBox(1, Qt::Horizontal, i18n("Performance"), vbox);
frame = new TQFrame(performBox);
- layout = new TQGridLayout(frame, 3, 2, 5, 5);
+ tqlayout = new TQGridLayout(frame, 3, 2, 5, 5);
label = new TQLabel(i18n("Perform using triggered segment: "), frame);
- layout->addWidget(label, 0, 0);
+ tqlayout->addWidget(label, 0, 0);
m_ornament = new KComboBox(frame);
- layout->addWidget(m_ornament, 0, 1);
+ tqlayout->addWidget(m_ornament, 0, 1);
int n = 1;
for (Composition::triggersegmentcontaineriterator i =
m_composition->getTriggerSegments().begin();
i != m_composition->getTriggerSegments().end(); ++i) {
m_ornament->insertItem
- (TQString("%1. %2").arg(n++).arg(strtoqstr((*i)->getSegment()->getLabel())));
+ (TQString("%1. %2").tqarg(n++).tqarg(strtoqstr((*i)->getSegment()->getLabel())));
}
label = new TQLabel(i18n("Perform with timing: "), frame);
- layout->addWidget(label, 1, 0);
+ tqlayout->addWidget(label, 1, 0);
m_adjustTime = new KComboBox(frame);
- layout->addWidget(m_adjustTime, 1, 1);
+ tqlayout->addWidget(m_adjustTime, 1, 1);
m_adjustTime->insertItem(i18n("As stored"));
m_adjustTime->insertItem(i18n("Truncate if longer than note"));
@@ -134,7 +134,7 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent,
m_retune = new TQCheckBox(i18n("Adjust pitch to note"), frame);
m_retune->setChecked(true);
- layout->addWidget(m_retune, 2, 1);
+ tqlayout->addWidget(m_retune, 2, 1);
setupFromConfig();
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-05 02:20:52 +0000