summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/parameters
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/editors/parameters')
-rw-r--r--src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp4
-rw-r--r--src/gui/editors/parameters/InstrumentParameterBox.cpp6
-rw-r--r--src/gui/editors/parameters/InstrumentParameterPanel.cpp2
-rw-r--r--src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp22
-rw-r--r--src/gui/editors/parameters/RosegardenParameterArea.cpp8
-rw-r--r--src/gui/editors/parameters/RosegardenParameterArea.h4
-rw-r--r--src/gui/editors/parameters/RosegardenParameterBox.h10
-rw-r--r--src/gui/editors/parameters/SegmentParameterBox.cpp14
-rw-r--r--src/gui/editors/parameters/TrackParameterBox.cpp20
9 files changed, 45 insertions, 45 deletions
diff --git a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
index 553af2b..7299a9f 100644
--- a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
@@ -24,7 +24,7 @@
#include "AudioInstrumentParameterPanel.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <kapplication.h>
#include <klocale.h>
@@ -48,7 +48,7 @@
#include <tqcolor.h>
#include <tqframe.h>
#include <tqlabel.h>
-#include <palette.h>
+#include <tqpalette.h>
#include <tqpixmap.h>
#include <tqpushbutton.h>
#include <tqstring.h>
diff --git a/src/gui/editors/parameters/InstrumentParameterBox.cpp b/src/gui/editors/parameters/InstrumentParameterBox.cpp
index 30c2f46..b618bed 100644
--- a/src/gui/editors/parameters/InstrumentParameterBox.cpp
+++ b/src/gui/editors/parameters/InstrumentParameterBox.cpp
@@ -24,7 +24,7 @@
#include "InstrumentParameterBox.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <klocale.h>
#include "misc/Debug.h"
@@ -122,8 +122,8 @@ InstrumentParameterBox::InstrumentParameterBox(RosegardenGUIDoc *doc,
// Layout the groups left to right.
- TQBoxLayout* layout = new TQVBoxLayout(this);
- layout->addWidget(m_widgetStack);
+ TQBoxLayout* tqlayout = new TQVBoxLayout(this);
+ tqlayout->addWidget(m_widgetStack);
}
diff --git a/src/gui/editors/parameters/InstrumentParameterPanel.cpp b/src/gui/editors/parameters/InstrumentParameterPanel.cpp
index ba91b17..9cca26d 100644
--- a/src/gui/editors/parameters/InstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/InstrumentParameterPanel.cpp
@@ -48,7 +48,7 @@ InstrumentParameterPanel::InstrumentParameterPanel(RosegardenGUIDoc *doc,
int width25 = metrics.width("1234567890123456789012345");
m_instrumentLabel->setFixedWidth(width25);
- m_instrumentLabel->setAlignment(TQt::AlignCenter);
+ m_instrumentLabel->tqsetAlignment(TQt::AlignCenter);
}
void
diff --git a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
index 9387798..ceb2e26 100644
--- a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
@@ -24,7 +24,7 @@
#include "MIDIInstrumentParameterPanel.h"
-#include <layout.h>
+#include <tqlayout.h>
#include "sound/Midi.h"
#include <klocale.h>
@@ -98,7 +98,7 @@ MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc
m_variationValue->setMinimumWidth(width22);
m_connectionLabel->setFixedWidth(width25);
- m_connectionLabel->setAlignment(TQt::AlignCenter);
+ m_connectionLabel->tqsetAlignment(TQt::AlignCenter);
// Configure the empty final row to accomodate any extra vertical space.
@@ -131,7 +131,7 @@ MIDIInstrumentParameterPanel::MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc
// Populate channel lists
//
for (int i = 0; i < 16; i++) {
- m_channelValue->insertItem(TQString("%1").arg(i + 1));
+ m_channelValue->insertItem(TQString("%1").tqarg(i + 1));
}
m_channelValue->setSizeLimit(16);
@@ -212,13 +212,13 @@ MIDIInstrumentParameterPanel::setupForInstrument(Instrument *instrument)
//
TQString connection(strtoqstr(md->getConnection()));
if (connection == "") {
- m_connectionLabel->setText(i18n("[ %1 ]").arg(i18n("No connection")));
+ m_connectionLabel->setText(i18n("[ %1 ]").tqarg(i18n("No connection")));
} else {
// remove trailing "(duplex)", "(read only)", "(write only)" etc
connection.replace(TQRegExp("\\s*\\([^)0-9]+\\)\\s*$"), "");
- TQString text = i18n("[ %1 ]").arg(connection);
+ TQString text = i18n("[ %1 ]").tqarg(connection);
/*TQString origText(text);
TQFontMetrics metrics(m_connectionLabel->fontMetrics());
@@ -361,7 +361,7 @@ MIDIInstrumentParameterPanel::setupControllers(MidiDevice *md)
redraw = 0;
}
if (redraw == 2) {
- rotary->repaint();
+ rotary->tqrepaint();
}
// Update the controller name that is associated with
@@ -641,8 +641,8 @@ MIDIInstrumentParameterPanel::populateProgramList()
std::string programName = programs[i].getName();
if (programName != "") {
m_programValue->insertItem(TQString("%1. %2")
- .arg(programs[i].getProgram() + 1)
- .arg(strtoqstr(programName)));
+ .tqarg(programs[i].getProgram() + 1)
+ .tqarg(strtoqstr(programName)));
if (m_selectedInstrument->getProgram() == programs[i]) {
currentProgram = m_programs.size();
}
@@ -763,8 +763,8 @@ MIDIInstrumentParameterPanel::populateVariationList()
strtoqstr(programName));
*/
m_variationValue->insertItem(TQString("%1. %2")
- .arg(variations[i] + 1)
- .arg(strtoqstr(programName)));
+ .tqarg(variations[i] + 1)
+ .tqarg(strtoqstr(programName)));
if (m_selectedInstrument->getProgram() == program) {
currentVariation = m_variations.size();
}
@@ -787,7 +787,7 @@ MIDIInstrumentParameterPanel::populateVariationList()
}
} else {
- //!!! seem to have problems here -- the grid layout doesn't
+ //!!! seem to have problems here -- the grid tqlayout doesn't
//like us adding stuff in the middle so if we go from 1
//visible row (say program) to 2 (program + variation) the
//second one overlaps the control knobs
diff --git a/src/gui/editors/parameters/RosegardenParameterArea.cpp b/src/gui/editors/parameters/RosegardenParameterArea.cpp
index 8a7fcd3..5e13652 100644
--- a/src/gui/editors/parameters/RosegardenParameterArea.cpp
+++ b/src/gui/editors/parameters/RosegardenParameterArea.cpp
@@ -35,7 +35,7 @@
#include <tqscrollview.h>
#include <tqstring.h>
#include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqvgroupbox.h>
#include <tqwidget.h>
#include <tqwidgetstack.h>
@@ -86,15 +86,15 @@ void RosegardenParameterArea::addRosegardenParameterBox(
m_parameterBoxes.push_back(b);
m_scrollView->setMinimumWidth(std::max(m_scrollView->minimumWidth(),
- b->sizeHint().width()) + 8);
+ b->tqsizeHint().width()) + 8);
// Create a titled group box for the parameter box, parented by the
- // classic layout widget, so that it can be used to provide a title
+ // classic tqlayout widget, so that it can be used to provide a title
// and outline, in classic mode. Add this container to an array that
// parallels the above array of parameter boxes.
TQVGroupBox *box = new TQVGroupBox(b->getLongLabel(), m_classic);
- box->layout()->setMargin( 4 ); // about half the default value
+ box->tqlayout()->setMargin( 4 ); // about half the default value
TQFont f;
f.setBold( true );
box->setFont( f );
diff --git a/src/gui/editors/parameters/RosegardenParameterArea.h b/src/gui/editors/parameters/RosegardenParameterArea.h
index 95eae45..7fd8989 100644
--- a/src/gui/editors/parameters/RosegardenParameterArea.h
+++ b/src/gui/editors/parameters/RosegardenParameterArea.h
@@ -72,13 +72,13 @@ public:
TAB_BOX_STYLE // A horizontal list of tabs, displaying one box at a time.
};
- // Redisplay the widgets with a different layout style.
+ // Redisplay the widgets with a different tqlayout style.
void setArrangement(Arrangement style);
protected:
private:
- Arrangement m_style; // The current layout style.
+ Arrangement m_style; // The current tqlayout style.
// The list of parameter box widgets that are being displayed by this
// widget.
diff --git a/src/gui/editors/parameters/RosegardenParameterBox.h b/src/gui/editors/parameters/RosegardenParameterBox.h
index df21d92..459aeab 100644
--- a/src/gui/editors/parameters/RosegardenParameterBox.h
+++ b/src/gui/editors/parameters/RosegardenParameterBox.h
@@ -43,7 +43,7 @@ namespace Rosegarden
/**
* A flat TQFrame, in which a group of parameters can be laid out.
- * Virtual method functions are defined for for requesting a layout
+ * Virtual method functions are defined for for requesting a tqlayout
* style, and returning the single-word to use for labelling the
* box.
*/
@@ -72,11 +72,11 @@ public:
protected:
void init();
- // List the layout styles that may be requested via a call to setStyle().
+ // List the tqlayout styles that may be requested via a call to setStyle().
enum LayoutMode {
- LANDSCAPE_MODE, // Optimize the layout for a tall and narrow parent.
- PORTRAIT_MODE // Optimize the layout for a short and wide parent.
+ LANDSCAPE_MODE, // Optimize the tqlayout for a tall and narrow parent.
+ PORTRAIT_MODE // Optimize the tqlayout for a short and wide parent.
};
void setLayoutMode(LayoutMode mode);
@@ -84,7 +84,7 @@ protected:
TQFont m_font;
TQString m_shortLabel; // The string that containers can use for labelling and identification
TQString m_longLabel; // The full title
- LayoutMode m_mode; // The current layout mode.
+ LayoutMode m_mode; // The current tqlayout mode.
};
diff --git a/src/gui/editors/parameters/SegmentParameterBox.cpp b/src/gui/editors/parameters/SegmentParameterBox.cpp
index 299369a..34f3976 100644
--- a/src/gui/editors/parameters/SegmentParameterBox.cpp
+++ b/src/gui/editors/parameters/SegmentParameterBox.cpp
@@ -24,7 +24,7 @@
#include "SegmentParameterBox.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <kapplication.h>
#include <klocale.h>
@@ -333,7 +333,7 @@ SegmentParameterBox::initBox()
// populate the transpose combo
//
for (int i = -m_transposeRange; i < m_transposeRange + 1; i++) {
- m_transposeValue->insertItem(noMap, TQString("%1").arg(i));
+ m_transposeValue->insertItem(noMap, TQString("%1").tqarg(i));
if (i == 0)
m_transposeValue->setCurrentItem(m_transposeValue->count() - 1);
}
@@ -363,7 +363,7 @@ SegmentParameterBox::initBox()
for (int i = 0; i < 10; i++) {
int rtd = (i < 5 ? ((i + 1) * 10) : ((i - 3) * 50));
m_realTimeDelays.push_back(rtd);
- m_delayValue->insertItem(i18n("%1 ms").arg(rtd));
+ m_delayValue->insertItem(i18n("%1 ms").tqarg(rtd));
}
// set delay blank initially
@@ -666,7 +666,7 @@ SegmentParameterBox::populateBoxFromSegments()
// 2nd arg of "true" means "add if necessary"
case All:
m_transposeValue->
- setCurrentItem(TQString("%1").arg(transposeLevel), true);
+ setCurrentItem(TQString("%1").tqarg(transposeLevel), true);
break;
case Some:
@@ -694,7 +694,7 @@ SegmentParameterBox::populateBoxFromSegments()
} else if (delayLevel < 0) {
- m_delayValue->setCurrentItem(i18n("%1 ms").arg( -delayLevel),
+ m_delayValue->setCurrentItem(i18n("%1 ms").tqarg( -delayLevel),
true);
}
@@ -1019,8 +1019,8 @@ SegmentParameterBox::updateHighLow()
//!!! FIXME this code is broken, and needs to be fixed after the fashion of
//the TPB, but I'm not bothering with that at this time, because they are
//going to be hidden for 1.3 anyway
-// m_highButton->setText(TQString("&High: %1%2").arg(highest.getNoteName(key)).arg(highest.getOctave(base)));
-// m_lowButton->setText(TQString("&Low: %1%2").arg(lowest.getNoteName(key)).arg(lowest.getOctave(base)));
+// m_highButton->setText(TQString("&High: %1%2").tqarg(highest.getNoteName(key)).tqarg(highest.getOctave(base)));
+// m_lowButton->setText(TQString("&Low: %1%2").tqarg(lowest.getNoteName(key)).tqarg(lowest.getOctave(base)));
}
void
diff --git a/src/gui/editors/parameters/TrackParameterBox.cpp b/src/gui/editors/parameters/TrackParameterBox.cpp
index 167017d..94b1137 100644
--- a/src/gui/editors/parameters/TrackParameterBox.cpp
+++ b/src/gui/editors/parameters/TrackParameterBox.cpp
@@ -28,7 +28,7 @@
#include "TrackParameterBox.h"
-#include <layout.h>
+#include <tqlayout.h>
#include <kapplication.h>
#include <klocale.h>
@@ -128,7 +128,7 @@ TrackParameterBox::TrackParameterBox( RosegardenGUIDoc *doc,
// track label
//
m_trackLabel = new KSqueezedTextLabel(i18n("<untitled>"), this);
- m_trackLabel->setAlignment(TQt::AlignCenter);
+ m_trackLabel->tqsetAlignment(TQt::AlignCenter);
//mainLayout->addMultiCellWidget(m_trackLabel, 0, 0, 0, 5, AlignCenter);
mainLayout->addWidget(m_trackLabel, 0, 0);
@@ -311,7 +311,7 @@ TrackParameterBox::TrackParameterBox( RosegardenGUIDoc *doc,
int transposeRange = 48;
for (int i = -transposeRange; i < transposeRange + 1; i++) {
- m_defTranspose->insertItem(TQString("%1").arg(i));
+ m_defTranspose->insertItem(TQString("%1").tqarg(i));
if (i == 0)
m_defTranspose->setCurrentItem(m_defTranspose->count() - 1);
}
@@ -468,7 +468,7 @@ TrackParameterBox::populatePlaybackDeviceList()
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;
}
@@ -601,10 +601,10 @@ TrackParameterBox::updateHighLow()
bool useSharps = true;
bool includeOctave = true;
-// m_highButton->setText(i18n("High: %1").arg(highest.getAsString(useSharps, includeOctave, base)));
-// m_lowButton->setText(i18n("Low: %1").arg(lowest.getAsString(useSharps, includeOctave, base)));
- m_highButton->setText(TQString("%1").arg(highest.getAsString(useSharps, includeOctave, base).c_str()));
- m_lowButton->setText(TQString("%1").arg(lowest.getAsString(useSharps, includeOctave, base).c_str()));
+// m_highButton->setText(i18n("High: %1").tqarg(highest.getAsString(useSharps, includeOctave, base)));
+// m_lowButton->setText(i18n("Low: %1").tqarg(lowest.getAsString(useSharps, includeOctave, base)));
+ m_highButton->setText(TQString("%1").tqarg(highest.getAsString(useSharps, includeOctave, base).c_str()));
+ m_lowButton->setText(TQString("%1").tqarg(lowest.getAsString(useSharps, includeOctave, base).c_str()));
m_presetLbl->setEnabled(false);
}
@@ -624,7 +624,7 @@ TrackParameterBox::slotUpdateControls(int /*dummy*/)
return ;
m_defClef->setCurrentItem(trk->getClef());
- m_defTranspose->setCurrentItem(TQString("%1").arg(trk->getTranspose()), true);
+ m_defTranspose->setCurrentItem(TQString("%1").tqarg(trk->getTranspose()), true);
m_defColor->setCurrentItem(trk->getColor());
m_highestPlayable = trk->getHighestPlayable();
m_lowestPlayable = trk->getLowestPlayable();
@@ -663,7 +663,7 @@ TrackParameterBox::slotSelectedTrackNameChanged()
else
m_trackName.truncate(20);
int trackNum = trk->getPosition() + 1;
- m_trackLabel->setText(i18n("[ Track %1 - %2 ]").arg(trackNum).arg(m_trackName));
+ m_trackLabel->setText(i18n("[ Track %1 - %2 ]").tqarg(trackNum).tqarg(m_trackName));
}
void