diff options
Diffstat (limited to 'src/gui/editors')
80 files changed, 742 insertions, 742 deletions
diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp index 91b2b4d..67a233a 100644 --- a/src/gui/editors/eventlist/EventView.cpp +++ b/src/gui/editors/eventlist/EventView.cpp @@ -76,7 +76,7 @@ #include <tqgroupbox.h> #include <tqiconset.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqpixmap.h> #include <tqpoint.h> @@ -161,40 +161,40 @@ EventView::EventView(RosegardenGUIDoc *doc, (1, Qt::Horizontal, i18n("Triggered Segment Properties"), getCentralWidget()); TQFrame *frame = new TQFrame(groupBox); - TQGridLayout *tqlayout = new TQGridLayout(frame, 5, 3, 5, 5); + TQGridLayout *layout = new TQGridLayout(frame, 5, 3, 5, 5); - tqlayout->addWidget(new TQLabel(i18n("Label: "), frame), 0, 0); + layout->addWidget(new TQLabel(i18n("Label: "), frame), 0, 0); TQString label = strtoqstr(segments[0]->getLabel()); if (label == "") label = i18n("<no label>"); m_triggerName = new TQLabel(label, frame); - tqlayout->addWidget(m_triggerName, 0, 1); + layout->addWidget(m_triggerName, 0, 1); TQPushButton *editButton = new TQPushButton(i18n("edit"), frame); - tqlayout->addWidget(editButton, 0, 2); + layout->addWidget(editButton, 0, 2); connect(editButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotEditTriggerName())); - tqlayout->addWidget(new TQLabel(i18n("Base pitch: "), frame), 1, 0); - m_triggerPitch = new TQLabel(TQString("%1").tqarg(rec->getBasePitch()), frame); - tqlayout->addWidget(m_triggerPitch, 1, 1); + layout->addWidget(new TQLabel(i18n("Base pitch: "), frame), 1, 0); + m_triggerPitch = new TQLabel(TQString("%1").arg(rec->getBasePitch()), frame); + layout->addWidget(m_triggerPitch, 1, 1); editButton = new TQPushButton(i18n("edit"), frame); - tqlayout->addWidget(editButton, 1, 2); + layout->addWidget(editButton, 1, 2); connect(editButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotEditTriggerPitch())); - tqlayout->addWidget(new TQLabel(i18n("Base velocity: "), frame), 2, 0); - m_triggerVelocity = new TQLabel(TQString("%1").tqarg(rec->getBaseVelocity()), frame); - tqlayout->addWidget(m_triggerVelocity, 2, 1); + layout->addWidget(new TQLabel(i18n("Base velocity: "), frame), 2, 0); + m_triggerVelocity = new TQLabel(TQString("%1").arg(rec->getBaseVelocity()), frame); + layout->addWidget(m_triggerVelocity, 2, 1); editButton = new TQPushButton(i18n("edit"), frame); - tqlayout->addWidget(editButton, 2, 2); + layout->addWidget(editButton, 2, 2); connect(editButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotEditTriggerVelocity())); /*!!! Comment out these two options, which are not yet used anywhere else -- intended for use with library ornaments, not yet implemented - tqlayout->addWidget(new TQLabel(i18n("Default timing: "), frame), 3, 0); + layout->addWidget(new TQLabel(i18n("Default timing: "), frame), 3, 0); KComboBox *adjust = new KComboBox(frame); - tqlayout->addMultiCellWidget(adjust, 3, 3, 1, 2); + layout->addMultiCellWidget(adjust, 3, 3, 1, 2); adjust->insertItem(i18n("As stored")); adjust->insertItem(i18n("Truncate if longer than note")); adjust->insertItem(i18n("End at same time as note")); @@ -216,7 +216,7 @@ EventView::EventView(RosegardenGUIDoc *doc, TQCheckBox *retune = new TQCheckBox(i18n("Adjust pitch to trigger note by default"), frame); retune->setChecked(rec->getDefaultRetune()); connect(retune, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotTriggerRetuneChanged())); - tqlayout->addMultiCellWidget(retune, 4, 4, 1, 2); + layout->addMultiCellWidget(retune, 4, 4, 1, 2); */ @@ -387,7 +387,7 @@ EventView::applyLayout(int /*staffNo*/) int p = (*it)->get <Int>(BaseProperties::PITCH); pitchStr = TQString("%1 %2 ") - .tqarg(p).tqarg(MidiPitchLabel(p).getTQString()); + .arg(p).arg(MidiPitchLabel(p).getTQString()); } else if ((*it)->isa(Note::EventType)) { pitchStr = "<not set>"; } @@ -613,27 +613,27 @@ EventView::makeTimeString(timeT time, int timeMode) (time, bar, beat, fraction, remainder); ++bar; return TQString("%1%2%3-%4%5-%6%7-%8%9 ") - .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); + .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); } case 1: // real time { RealTime rt = getDocument()->getComposition().getElapsedRealTime(time); - // return TQString("%1 ").tqarg(rt.toString().c_str()); - return TQString("%1 ").tqarg(rt.toText().c_str()); + // return TQString("%1 ").arg(rt.toString().c_str()); + return TQString("%1 ").arg(rt.toText().c_str()); } default: - return TQString("%1 ").tqarg(time); + return TQString("%1 ").arg(time); } } @@ -649,15 +649,15 @@ EventView::makeDurationString(timeT time, getDocument()->getComposition().getMusicalTimeForDuration (time, duration, bar, beat, fraction, remainder); return TQString("%1%2%3-%4%5-%6%7-%8%9 ") - .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); + .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); } case 1: // real time @@ -665,12 +665,12 @@ EventView::makeDurationString(timeT time, RealTime rt = getDocument()->getComposition().getRealTimeDifference (time, time + duration); - // return TQString("%1 ").tqarg(rt.toString().c_str()); - return TQString("%1 ").tqarg(rt.toText().c_str()); + // return TQString("%1 ").arg(rt.toString().c_str()); + return TQString("%1 ").arg(rt.toText().c_str()); } default: - return TQString("%1 ").tqarg(duration); + return TQString("%1 ").arg(duration); } } @@ -719,7 +719,7 @@ EventView::slotEditTriggerPitch() if (dlg->exec() == TQDialog::Accepted) { addCommandToHistory(new SetTriggerSegmentBasePitchCommand (&getDocument()->getComposition(), id, dlg->getPitch())); - m_triggerPitch->setText(TQString("%1").tqarg(dlg->getPitch())); + m_triggerPitch->setText(TQString("%1").arg(dlg->getPitch())); } } @@ -737,7 +737,7 @@ EventView::slotEditTriggerVelocity() if (dlg->exec() == TQDialog::Accepted) { addCommandToHistory(new SetTriggerSegmentBaseVelocityCommand (&getDocument()->getComposition(), id, dlg->getVelocity())); - m_triggerVelocity->setText(TQString("%1").tqarg(dlg->getVelocity())); + m_triggerVelocity->setText(TQString("%1").arg(dlg->getVelocity())); } } @@ -1575,8 +1575,8 @@ EventView::updateViewCaption() if (m_isTriggerSegment) { setCaption(i18n("%1 - Triggered Segment: %2") - .tqarg(getDocument()->getTitle()) - .tqarg(strtoqstr(m_segments[0]->getLabel()))); + .arg(getDocument()->getTitle()) + .arg(strtoqstr(m_segments[0]->getLabel()))); } else if (m_segments.size() == 1) { @@ -1590,14 +1590,14 @@ EventView::updateViewCaption() trackPosition = track->getPosition(); setCaption(i18n("%1 - Segment Track #%2 - Event List") - .tqarg(getDocument()->getTitle()) - .tqarg(trackPosition + 1)); + .arg(getDocument()->getTitle()) + .arg(trackPosition + 1)); } else { setCaption(i18n("%1 - %2 Segments - Event List") - .tqarg(getDocument()->getTitle()) - .tqarg(m_segments.size())); + .arg(getDocument()->getTitle()) + .arg(m_segments.size())); } } diff --git a/src/gui/editors/guitar/ChordMap.cpp b/src/gui/editors/guitar/ChordMap.cpp index 64ea463..fad1871 100644 --- a/src/gui/editors/guitar/ChordMap.cpp +++ b/src/gui/editors/guitar/ChordMap.cpp @@ -26,7 +26,7 @@ #include "ChordMap.h" #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> namespace Rosegarden { @@ -201,7 +201,7 @@ bool ChordMap::saveDocument(const TQString& filename, bool userChordsOnly, TQStr outStream << "</chords>\n"; outStream << "</rosegarden-chord-data>\n"; - return outStream.tqdevice()->status() == IO_Ok; + return outStream.device()->status() == IO_Ok; } int ChordMap::FILE_FORMAT_VERSION_MAJOR = 1; diff --git a/src/gui/editors/guitar/ChordXmlHandler.cpp b/src/gui/editors/guitar/ChordXmlHandler.cpp index d2f71b4..6802485 100644 --- a/src/gui/editors/guitar/ChordXmlHandler.cpp +++ b/src/gui/editors/guitar/ChordXmlHandler.cpp @@ -134,9 +134,9 @@ bool ChordXmlHandler::error(const TQXmlParseException& exception) { m_errorString = TQString("%1 at line %2, column %3") - .tqarg(exception.message()) - .tqarg(exception.lineNumber()) - .tqarg(exception.columnNumber()); + .arg(exception.message()) + .arg(exception.lineNumber()) + .arg(exception.columnNumber()); return TQXmlDefaultHandler::error( exception ); } @@ -144,9 +144,9 @@ bool ChordXmlHandler::fatalError(const TQXmlParseException& exception) { m_errorString = TQString("%1 at line %2, column %3") - .tqarg(exception.message()) - .tqarg(exception.lineNumber()) - .tqarg(exception.columnNumber()); + .arg(exception.message()) + .arg(exception.lineNumber()) + .arg(exception.columnNumber()); return TQXmlDefaultHandler::fatalError( exception ); } diff --git a/src/gui/editors/guitar/Fingering.cpp b/src/gui/editors/guitar/Fingering.cpp index 7e5ecc4..59459e9 100644 --- a/src/gui/editors/guitar/Fingering.cpp +++ b/src/gui/editors/guitar/Fingering.cpp @@ -69,24 +69,24 @@ Fingering::getStartFret() const bool Fingering::hasBarre() const { - int lastStringtqStatus = m_strings[getNbStrings() - 1]; + int lastStringStatus = m_strings[getNbStrings() - 1]; - return ((m_strings[0] > OPEN && m_strings[0] == lastStringtqStatus) || - (m_strings[1] > OPEN && m_strings[1] == lastStringtqStatus) || - (m_strings[2] > OPEN && m_strings[2] == lastStringtqStatus)); + return ((m_strings[0] > OPEN && m_strings[0] == lastStringStatus) || + (m_strings[1] > OPEN && m_strings[1] == lastStringStatus) || + (m_strings[2] > OPEN && m_strings[2] == lastStringStatus)); } Fingering::Barre Fingering::getBarre() const { - int lastStringtqStatus = m_strings[getNbStrings() - 1]; + int lastStringStatus = m_strings[getNbStrings() - 1]; Barre res; - res.fret = lastStringtqStatus; + res.fret = lastStringStatus; for(unsigned int i = 0; i < 3; ++i) { - if (m_strings[i] > OPEN && m_strings[i] == lastStringtqStatus) + if (m_strings[i] > OPEN && m_strings[i] == lastStringStatus) res.start = i; break; } @@ -115,7 +115,7 @@ Fingering::parseFingering(const TQString& ch, TQString& errorString) // NOTATION_DEBUG << "Fingering::parseFingering : '" << t << "' = MUTED\n"; fingering[idx] = MUTED; } else { - errorString = i18n("couldn't parse fingering '%1' in '%2'").tqarg(t).tqarg(ch); + errorString = i18n("couldn't parse fingering '%1' in '%2'").arg(t).arg(ch); } } @@ -140,8 +140,8 @@ std::string Fingering::toString() const bool operator<(const Fingering& a, const Fingering& b) { for(unsigned int i = 0; i < Fingering::DEFAULT_NB_STRINGS; ++i) { - if (a.getStringtqStatus(i) != b.getStringtqStatus(i)) { - return a.getStringtqStatus(i) < b.getStringtqStatus(i); + if (a.getStringStatus(i) != b.getStringStatus(i)) { + return a.getStringStatus(i) < b.getStringStatus(i); } } return false; diff --git a/src/gui/editors/guitar/Fingering.h b/src/gui/editors/guitar/Fingering.h index b413d3b..32693dd 100644 --- a/src/gui/editors/guitar/Fingering.h +++ b/src/gui/editors/guitar/Fingering.h @@ -60,8 +60,8 @@ public: * returns the fret number on which the string is pressed, or one of MUTED and OPEN * */ - int getStringtqStatus(int stringNb) const { return m_strings[stringNb]; } - void setStringtqStatus(int stringNb, int status) { m_strings[stringNb] = status; } + int getStringStatus(int stringNb) const { return m_strings[stringNb]; } + void setStringStatus(int stringNb, int status) { m_strings[stringNb] = status; } unsigned int getStartFret() const; unsigned int getNbStrings() const { return m_strings.size(); } diff --git a/src/gui/editors/guitar/FingeringBox.cpp b/src/gui/editors/guitar/FingeringBox.cpp index 6ca2c39..49058b2 100644 --- a/src/gui/editors/guitar/FingeringBox.cpp +++ b/src/gui/editors/guitar/FingeringBox.cpp @@ -219,16 +219,16 @@ FingeringBox::processMouseRelease(unsigned int release_string_num, if(m_press_fret_num == 0) { - int stringtqStatus = m_fingering.getStringtqStatus(m_press_string_num); + int stringStatus = m_fingering.getStringStatus(m_press_string_num); - if (stringtqStatus == Guitar::Fingering::OPEN) + if (stringStatus == Guitar::Fingering::OPEN) aVal = Guitar::Fingering::MUTED; - else if (stringtqStatus > Guitar::Fingering::OPEN) + else if (stringStatus > Guitar::Fingering::OPEN) aVal = Guitar::Fingering::OPEN; } - m_fingering.setStringtqStatus(m_press_string_num, aVal); + m_fingering.setStringStatus(m_press_string_num, aVal); update(); } diff --git a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp index 8a4fb3e..9658e5d 100644 --- a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp +++ b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp @@ -33,7 +33,7 @@ #include <klocale.h> #include <kmessagebox.h> #include <kstddirs.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> namespace Rosegarden diff --git a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp index f401cd1..47cdf4c 100644 --- a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp +++ b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp @@ -30,7 +30,7 @@ #include "misc/Debug.h" #include <tqlistbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcombobox.h> #include <tqpushbutton.h> #include <tqlabel.h> @@ -416,7 +416,7 @@ GuitarChordSelectorDialog::parseChordFile(const TQString& chordFileName) TQFile chordFile(chordFileName); bool ok = chordFile.open(IO_ReadOnly); if (!ok) - KMessageBox::error(0, i18n("couldn't open file '%1'").tqarg(handler.errorString())); + KMessageBox::error(0, i18n("couldn't open file '%1'").arg(handler.errorString())); TQXmlInputSource source(chordFile); TQXmlSimpleReader reader; @@ -425,7 +425,7 @@ GuitarChordSelectorDialog::parseChordFile(const TQString& chordFileName) NOTATION_DEBUG << "GuitarChordSelectorDialog::parseChordFile() parsing " << chordFileName << endl; reader.parse(source); if (!ok) - KMessageBox::error(0, i18n("couldn't parse chord dictionnary : %1").tqarg(handler.errorString())); + KMessageBox::error(0, i18n("couldn't parse chord dictionnary : %1").arg(handler.errorString())); } diff --git a/src/gui/editors/guitar/NoteSymbols.h b/src/gui/editors/guitar/NoteSymbols.h index fa52a45..383e9c8 100644 --- a/src/gui/editors/guitar/NoteSymbols.h +++ b/src/gui/editors/guitar/NoteSymbols.h @@ -29,7 +29,7 @@ #include <utility> -#include <tqbrush.h> +#include <brush.h> #include <tqpainter.h> namespace Rosegarden diff --git a/src/gui/editors/matrix/MatrixElement.cpp b/src/gui/editors/matrix/MatrixElement.cpp index b60b63f..ca6e88d 100644 --- a/src/gui/editors/matrix/MatrixElement.cpp +++ b/src/gui/editors/matrix/MatrixElement.cpp @@ -32,7 +32,7 @@ #include "gui/general/GUIPalette.h" #include "QCanvasMatrixDiamond.h" #include "QCanvasMatrixRectangle.h" -#include <tqbrush.h> +#include <brush.h> #include <tqcanvas.h> #include <tqcolor.h> diff --git a/src/gui/editors/matrix/MatrixElement.h b/src/gui/editors/matrix/MatrixElement.h index 921297c..f05723b 100644 --- a/src/gui/editors/matrix/MatrixElement.h +++ b/src/gui/editors/matrix/MatrixElement.h @@ -27,7 +27,7 @@ #define _RG_MATRIXELEMENT_H_ #include "base/ViewElement.h" -#include <tqbrush.h> +#include <brush.h> #include <tqcanvas.h> #include "QCanvasMatrixRectangle.h" diff --git a/src/gui/editors/matrix/MatrixHLayout.cpp b/src/gui/editors/matrix/MatrixHLayout.cpp index f4615fa..99b89c2 100644 --- a/src/gui/editors/matrix/MatrixHLayout.cpp +++ b/src/gui/editors/matrix/MatrixHLayout.cpp @@ -61,7 +61,7 @@ void MatrixHLayout::scanStaff(Staff &staffBase, { Profiler profiler("MatrixHLayout::scanStaff", true); - // The Matrix tqlayout is not currently designed to be able to lay + // The Matrix layout is not currently designed to be able to lay // out more than one staff, because we have no requirement to show // more than one at once in the Matrix view. To make it work for // multiple staffs should be straightforward; we just need to bear @@ -88,7 +88,7 @@ void MatrixHLayout::scanStaff(Staff &staffBase, } // Do this in two parts: bar lines separately from elements. - // (We don't need to do all that stuff notationhtqlayout has to do, + // (We don't need to do all that stuff notationhlayout has to do, // scanning the notes bar-by-bar; we can just place the bar lines // in the theoretically-correct places and do the same with the // notes quite independently.) diff --git a/src/gui/editors/matrix/MatrixHLayout.h b/src/gui/editors/matrix/MatrixHLayout.h index 291d618..76f1b31 100644 --- a/src/gui/editors/matrix/MatrixHLayout.h +++ b/src/gui/editors/matrix/MatrixHLayout.h @@ -62,7 +62,7 @@ public: timeT = 0); /** - * Returns the total length of all elements once tqlayout is done. + * Returns the total length of all elements once layout is done. * This is the x-coord of the end of the last element on the * longest staff */ @@ -84,9 +84,9 @@ public: virtual double getBarPosition(int barNo) const; /** - * Precomputes tqlayout data for a single staff, updating any + * Precomputes layout data for a single staff, updating any * internal data stores associated with that staff and updating - * any tqlayout-related properties in the events on the staff's + * any layout-related properties in the events on the staff's * segment. */ virtual void scanStaff(Staff&, @@ -94,10 +94,10 @@ public: timeT = 0); /** - * Computes any tqlayout data that may depend on the results of + * Computes any layout data that may depend on the results of * scanning more than one staff. This may mean doing most of - * the tqlayout (likely for horizontal tqlayout) or nothing at all - * (likely for vertical tqlayout). + * the layout (likely for horizontal layout) or nothing at all + * (likely for vertical layout). */ virtual void finishLayout(timeT = 0, timeT = 0); @@ -118,7 +118,7 @@ protected: // pair of has-time-sig and time-sig typedef std::pair<bool, TimeSignature> TimeSigData; - // pair of tqlayout-x and time-signature if there is one + // pair of layout-x and time-signature if there is one typedef std::pair<double, TimeSigData> BarData; typedef FastVector<BarData> BarDataList; BarDataList m_barData; @@ -133,7 +133,7 @@ protected: */ class ZoomableMatrixHLayoutRulerScale : public RulerScale, public HZoomable { public: - ZoomableMatrixHLayoutRulerScale(MatrixHLayout& tqlayout) : RulerScale(tqlayout.getComposition()), m_referenceHLayout(tqlayout) {}; + ZoomableMatrixHLayoutRulerScale(MatrixHLayout& layout) : RulerScale(layout.getComposition()), m_referenceHLayout(layout) {}; virtual double getBarPosition(int n) const { return m_referenceHLayout.getBarPosition(n) * getHScaleFactor(); } virtual double getXForTime(timeT time) const { return m_referenceHLayout.getXForTime(time) * getHScaleFactor(); } diff --git a/src/gui/editors/matrix/MatrixParameterBox.cpp b/src/gui/editors/matrix/MatrixParameterBox.cpp index 75228c3..ef1deb7 100644 --- a/src/gui/editors/matrix/MatrixParameterBox.cpp +++ b/src/gui/editors/matrix/MatrixParameterBox.cpp @@ -34,7 +34,7 @@ #include <tqfont.h> #include <tqfontmetrics.h> #include <tqframe.h> -#include <tqlayout.h> +#include <layout.h> #include <tqwidget.h> diff --git a/src/gui/editors/matrix/MatrixToolBox.cpp b/src/gui/editors/matrix/MatrixToolBox.cpp index 3254b35..dab9632 100644 --- a/src/gui/editors/matrix/MatrixToolBox.cpp +++ b/src/gui/editors/matrix/MatrixToolBox.cpp @@ -73,7 +73,7 @@ EditTool* MatrixToolBox::createTool(const TQString& toolName) else { KMessageBox::error(0, TQString("MatrixToolBox::createTool : unrecognised toolname %1 (%2)") - .tqarg(toolName).tqarg(toolNamelc)); + .arg(toolName).arg(toolNamelc)); return 0; } diff --git a/src/gui/editors/matrix/MatrixVLayout.h b/src/gui/editors/matrix/MatrixVLayout.h index 538e598..a33e0d1 100644 --- a/src/gui/editors/matrix/MatrixVLayout.h +++ b/src/gui/editors/matrix/MatrixVLayout.h @@ -58,9 +58,9 @@ public: timeT = 0); /** - * Precomputes tqlayout data for a single staff, updating any + * Precomputes layout data for a single staff, updating any * internal data stores associated with that staff and updating - * any tqlayout-related properties in the events on the staff's + * any layout-related properties in the events on the staff's * segment. */ virtual void scanStaff(Staff &staff, @@ -68,10 +68,10 @@ public: timeT = 0); /** - * Computes any tqlayout data that may depend on the results of + * Computes any layout data that may depend on the results of * scanning more than one staff. This may mean doing most of - * the tqlayout (likely for horizontal tqlayout) or nothing at all - * (likely for vertical tqlayout). + * the layout (likely for horizontal layout) or nothing at all + * (likely for vertical layout). */ virtual void finishLayout(timeT = 0, timeT = 0); diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp index 195da46..78a24c4 100644 --- a/src/gui/editors/matrix/MatrixView.cpp +++ b/src/gui/editors/matrix/MatrixView.cpp @@ -116,7 +116,7 @@ #include <tqcanvas.h> #include <tqcursor.h> #include <tqdialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqiconset.h> #include <tqlabel.h> #include <tqpixmap.h> @@ -140,10 +140,10 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc, TQWidget *parent, bool drumMode) : EditView(doc, segments, 3, parent, "matrixview"), - m_htqlayout(&doc->getComposition()), - m_referenceRuler(new ZoomableMatrixHLayoutRulerScale(m_htqlayout)), - m_vtqlayout(), - m_snapGrid(new SnapGrid(&m_htqlayout)), + m_hlayout(&doc->getComposition()), + m_referenceRuler(new ZoomableMatrixHLayoutRulerScale(m_hlayout)), + m_vlayout(), + m_snapGrid(new SnapGrid(&m_hlayout)), m_lastEndMarkerTime(0), m_hoveredOverAbsoluteTime(0), m_hoveredOverNoteName(0), @@ -205,7 +205,7 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc, TQString backgroundPixmap = isDrumMode() ? "bg-paper-white.xpm" : "bg-matrix-lines.xpm"; if (background.load(TQString("%1/misc/%2"). arg(pixmapDir, backgroundPixmap))) { - tCanvas->tqsetBackgroundPixmap(background); + tCanvas->setBackgroundPixmap(background); } } @@ -430,29 +430,29 @@ MatrixView::MatrixView(RosegardenGUIDoc *doc, (doc, TQT_SIGNAL(pointerPositionChanged(timeT)), TQT_TQOBJECT(this), TQT_SLOT(slotSetPointerPosition(timeT))); - MATRIX_DEBUG << "MatrixView : applying tqlayout\n"; + MATRIX_DEBUG << "MatrixView : applying layout\n"; bool layoutApplied = applyLayout(); if (!layoutApplied) - KMessageBox::sorry(0, i18n("Couldn't apply piano roll tqlayout")); + KMessageBox::sorry(0, i18n("Couldn't apply piano roll layout")); else { MATRIX_DEBUG << "MatrixView : rendering elements\n"; for (unsigned int i = 0; i < m_staffs.size(); ++i) { m_staffs[i]->positionAllElements(); - m_staffs[i]->getSegment().getRefreshtqStatus + m_staffs[i]->getSegment().getRefreshStatus (m_segmentsRefreshStatusIds[i]).setNeedsRefresh(false); } } StandardRuler *topStandardRuler = new StandardRuler(getDocument(), - &m_htqlayout, int(xorigin), 25, + &m_hlayout, int(xorigin), 25, false, getCentralWidget()); topStandardRuler->setSnapGrid(m_snapGrid); setTopStandardRuler(topStandardRuler); StandardRuler *bottomStandardRuler = new StandardRuler(getDocument(), - &m_htqlayout, 0, 25, + &m_hlayout, 0, 25, true, getBottomWidget()); bottomStandardRuler->setSnapGrid(m_snapGrid); setBottomStandardRuler(bottomStandardRuler); @@ -667,7 +667,7 @@ void MatrixView::setupActions() icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory::makeToolbarPixmap("chord"))); (new KToggleAction(i18n("C&hord Insert Mode"), icon, Key_H, - TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()), + TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()), actionCollection(), "chord_mode"))-> setChecked(false); @@ -903,9 +903,9 @@ void MatrixView::setupActions() else if (d == crotchetDuration) cut = Key_4; else if (d == crotchetDuration * 2) cut = Key_2; - TQString actionName = TQString("snap_%1").tqarg(int((crotchetDuration * 4) / d)); + TQString actionName = TQString("snap_%1").arg(int((crotchetDuration * 4) / d)); if (d == (crotchetDuration * 3) / 2) actionName = "snap_3"; - new KAction(i18n("Snap to %1").tqarg(label), pixmap, cut, TQT_TQOBJECT(this), + new KAction(i18n("Snap to %1").arg(label), pixmap, cut, TQT_TQOBJECT(this), TQT_SLOT(slotSetSnapFromAction()), actionCollection(), actionName.ascii()); } @@ -1032,20 +1032,20 @@ bool MatrixView::applyLayout(int staffNo, { Profiler profiler("MatrixView::applyLayout", true); - m_htqlayout.reset(); - m_vtqlayout.reset(); + m_hlayout.reset(); + m_vlayout.reset(); for (unsigned int i = 0; i < m_staffs.size(); ++i) { if (staffNo >= 0 && (int)i != staffNo) continue; - m_htqlayout.scanStaff(*m_staffs[i], startTime, endTime); - m_vtqlayout.scanStaff(*m_staffs[i], startTime, endTime); + m_hlayout.scanStaff(*m_staffs[i], startTime, endTime); + m_vlayout.scanStaff(*m_staffs[i], startTime, endTime); } - m_htqlayout.finishLayout(); - m_vtqlayout.finishLayout(); + m_hlayout.finishLayout(); + m_vlayout.finishLayout(); if (m_staffs[0]->getSegment().getEndMarkerTime() != m_lastEndMarkerTime || m_lastEndMarkerTime == 0 || @@ -1099,7 +1099,7 @@ void MatrixView::setViewSize(TQSize s) void MatrixView::repaintRulers() { for (unsigned int i = 0; i != m_propertyViewRulers.size(); i++) - m_propertyViewRulers[i].first->tqrepaint(); + m_propertyViewRulers[i].first->repaint(); } void MatrixView::updateView() @@ -1196,8 +1196,8 @@ void MatrixView::setCurrentSelection(EventSelection* s, bool preview, getStaff(segment)->positionElements(std::min(startA, startB), std::max(endA, endB)); } else { - // mark refresh status and then request a tqrepaint - segment.getRefreshtqStatus + // mark refresh status and then request a repaint + segment.getRefreshStatus (m_segmentsRefreshStatusIds [getStaff(segment)->getId()]). push(std::min(startA, startB), std::max(endA, endB)); @@ -1213,14 +1213,14 @@ void MatrixView::setCurrentSelection(EventSelection* s, bool preview, getStaff(s->getSegment())->positionElements(startB, endB); } else { - // mark refresh status and then request a tqrepaint + // mark refresh status and then request a repaint - oldSelection->getSegment().getRefreshtqStatus + oldSelection->getSegment().getRefreshStatus (m_segmentsRefreshStatusIds [getStaff(oldSelection->getSegment())->getId()]). push(startA, endA); - s->getSegment().getRefreshtqStatus + s->getSegment().getRefreshStatus (m_segmentsRefreshStatusIds [getStaff(s->getSegment())->getId()]). push(startB, endB); @@ -1474,13 +1474,13 @@ MatrixView::slotHoveredOverNoteChanged(int evPitch, long ms = rt.msec(); TQString msg = i18n("Note: %1 (%2.%3s)") - .tqarg(TQString("%1-%2-%3-%4") - .tqarg(TQString("%1").tqarg(bar + 1).rightJustify(3, '0')) - .tqarg(TQString("%1").tqarg(beat).rightJustify(2, '0')) - .tqarg(TQString("%1").tqarg(fraction).rightJustify(2, '0')) - .tqarg(TQString("%1").tqarg(remainder).rightJustify(2, '0'))) - .tqarg(rt.sec) - .tqarg(TQString("%1").tqarg(ms).rightJustify(3, '0')); + .arg(TQString("%1-%2-%3-%4") + .arg(TQString("%1").arg(bar + 1).rightJustify(3, '0')) + .arg(TQString("%1").arg(beat).rightJustify(2, '0')) + .arg(TQString("%1").arg(fraction).rightJustify(2, '0')) + .arg(TQString("%1").arg(remainder).rightJustify(2, '0'))) + .arg(rt.sec) + .arg(TQString("%1").arg(ms).rightJustify(3, '0')); m_hoveredOverAbsoluteTime->setText(msg); } @@ -1488,8 +1488,8 @@ MatrixView::slotHoveredOverNoteChanged(int evPitch, m_haveHoveredOverNote = false; m_hoveredOverNoteName->setText(i18n("%1 (%2)") - .tqarg(label.getTQString()) - .tqarg(evPitch)); + .arg(label.getTQString()) + .arg(evPitch)); m_pitchRuler->drawHoverNote(evPitch); } @@ -1504,7 +1504,7 @@ MatrixView::slotHoveredOverKeyChanged(unsigned int y) if (evPitch != m_previousEvPitch) { MidiPitchLabel label(evPitch); m_hoveredOverNoteName->setText(TQString("%1 (%2)"). - tqarg(label.getTQString()).tqarg(evPitch)); + arg(label.getTQString()).arg(evPitch)); m_previousEvPitch = evPitch; } } @@ -1529,13 +1529,13 @@ MatrixView::slotHoveredOverAbsoluteTimeChanged(unsigned int time) // to support Unicode TQString message = i18n("Time: %1 (%2.%3s)") - .tqarg(TQString("%1-%2-%3-%4") - .tqarg(TQString("%1").tqarg(bar + 1).rightJustify(3, '0')) - .tqarg(TQString("%1").tqarg(beat).rightJustify(2, '0')) - .tqarg(TQString("%1").tqarg(fraction).rightJustify(2, '0')) - .tqarg(TQString("%1").tqarg(remainder).rightJustify(2, '0'))) - .tqarg(rt.sec) - .tqarg(TQString("%1").tqarg(ms).rightJustify(3, '0')); + .arg(TQString("%1-%2-%3-%4") + .arg(TQString("%1").arg(bar + 1).rightJustify(3, '0')) + .arg(TQString("%1").arg(beat).rightJustify(2, '0')) + .arg(TQString("%1").arg(fraction).rightJustify(2, '0')) + .arg(TQString("%1").arg(remainder).rightJustify(2, '0'))) + .arg(rt.sec) + .arg(TQString("%1").arg(ms).rightJustify(3, '0')); m_hoveredOverAbsoluteTime->setText(message); } @@ -1552,7 +1552,7 @@ MatrixView::slotSetPointerPosition(timeT time, bool scroll) Composition &comp = getDocument()->getComposition(); int barNo = comp.getBarNumber(time); - if (barNo >= m_htqlayout.getLastVisibleBarOnStaff(*m_staffs[0])) { + if (barNo >= m_hlayout.getLastVisibleBarOnStaff(*m_staffs[0])) { Segment &seg = m_staffs[0]->getSegment(); @@ -1561,20 +1561,20 @@ MatrixView::slotSetPointerPosition(timeT time, bool scroll) seg.getStartTime() + ((time - seg.getStartTime()) % (seg.getEndMarkerTime() - seg.getStartTime())); - m_staffs[0]->setPointerPosition(m_htqlayout, time); + m_staffs[0]->setPointerPosition(m_hlayout, time); } else { m_staffs[0]->hidePointer(); scroll = false; } - } else if (barNo < m_htqlayout.getFirstVisibleBarOnStaff(*m_staffs[0])) { + } else if (barNo < m_hlayout.getFirstVisibleBarOnStaff(*m_staffs[0])) { m_staffs[0]->hidePointer(); scroll = false; } else { - m_staffs[0]->setPointerPosition(m_htqlayout, time); + m_staffs[0]->setPointerPosition(m_hlayout, time); } if (scroll && !getCanvasView()->isAutoScrolling()) - getCanvasView()->slotScrollHoriz(static_cast<int>(getXbyWorldMatrix(m_htqlayout.getXForTime(time)))); + getCanvasView()->slotScrollHoriz(static_cast<int>(getXbyWorldMatrix(m_hlayout.getXForTime(time)))); updateView(); } @@ -1585,11 +1585,11 @@ MatrixView::slotSetInsertCursorPosition(timeT time, bool scroll) //!!! For now. Probably unlike slotSetPointerPosition this one // should snap to the nearest event or grid line. - m_staffs[0]->setInsertCursorPosition(m_htqlayout, time); + m_staffs[0]->setInsertCursorPosition(m_hlayout, time); if (scroll && !getCanvasView()->isAutoScrolling()) { getCanvasView()->slotScrollHoriz - (static_cast<int>(getXbyWorldMatrix(m_htqlayout.getXForTime(time)))); + (static_cast<int>(getXbyWorldMatrix(m_hlayout.getXForTime(time)))); } updateView(); @@ -1830,7 +1830,7 @@ void MatrixView::slotInsertNoteFromAction() } catch (...) { KMessageBox::sorry - (this, i18n("Unknown note insert action %1").tqarg(name)); + (this, i18n("Unknown note insert action %1").arg(name)); return ; } @@ -2052,7 +2052,7 @@ MatrixView::slotSetSnap(timeT t) } for (unsigned int i = 0; i < m_staffs.size(); ++i) - m_staffs[i]->sizeStaff(m_htqlayout); + m_staffs[i]->sizeStaff(m_hlayout); m_segments[0]->setSnapGridSize(t); @@ -2161,7 +2161,7 @@ MatrixView::initActionsToolbar() m_velocityCombo = new KComboBox(actionsToolbar); for (int i = 0; i <= 127; ++i) { - m_velocityCombo->insertItem(TQString("%1").tqarg(i)); + m_velocityCombo->insertItem(TQString("%1").arg(i)); } m_velocityCombo->setCurrentItem(100); //!!! associate with segment @@ -2236,8 +2236,8 @@ MatrixView::slotChangeHorizontalZoom(int) { double zoomValue = m_hZoomSlider->getCurrentSize(); - // m_zoomLabel->setText(i18n("%1%").tqarg(zoomValue*100.0 * 2)); // GROSS HACK - see in matrixstaff.h - BREAKS MATRIX VIEW, see bug 1000595 - m_zoomLabel->setText(i18n("%1%").tqarg(zoomValue*100.0)); + // m_zoomLabel->setText(i18n("%1%").arg(zoomValue*100.0 * 2)); // GROSS HACK - see in matrixstaff.h - BREAKS MATRIX VIEW, see bug 1000595 + m_zoomLabel->setText(i18n("%1%").arg(zoomValue*100.0)); MATRIX_DEBUG << "MatrixView::slotChangeHorizontalZoom() : zoom factor = " << zoomValue << endl; @@ -2245,9 +2245,9 @@ MatrixView::slotChangeHorizontalZoom(int) m_referenceRuler->setHScaleFactor(zoomValue); if (m_tempoRuler) - m_tempoRuler->tqrepaint(); + m_tempoRuler->repaint(); if (m_chordNameRuler) - m_chordNameRuler->tqrepaint(); + m_chordNameRuler->repaint(); // Set zoom matrix // @@ -2266,7 +2266,7 @@ MatrixView::slotChangeHorizontalZoom(int) for (unsigned int i = 0; i < m_propertyViewRulers.size(); ++i) { m_propertyViewRulers[i].first->setHScaleFactor(zoomValue); - m_propertyViewRulers[i].first->tqrepaint(); + m_propertyViewRulers[i].first->repaint(); } if (m_topStandardRuler) @@ -2314,7 +2314,7 @@ MatrixView::slotZoomOut() void MatrixView::scrollToTime(timeT t) { - double layoutCoord = m_htqlayout.getXForTime(t); + double layoutCoord = m_hlayout.getXForTime(t); getCanvasView()->slotScrollHoriz(int(layoutCoord)); } @@ -2366,7 +2366,7 @@ MatrixView::addPropertyViewRuler(const PropertyName &property) int height = 20; - PropertyViewRuler *newRuler = new PropertyViewRuler(&m_htqlayout, + PropertyViewRuler *newRuler = new PropertyViewRuler(&m_hlayout, m_segments[0], property, xorigin, @@ -2409,7 +2409,7 @@ MatrixView::removePropertyViewRuler(unsigned int number) RulerScale* MatrixView::getHLayout() { - return &m_htqlayout; + return &m_hlayout; } Staff* @@ -2429,14 +2429,14 @@ timeT MatrixView::getInsertionTime() { MatrixStaff *staff = m_staffs[0]; - return staff->getInsertCursorTime(m_htqlayout); + return staff->getInsertCursorTime(m_hlayout); } void MatrixView::slotStepBackward() { timeT time(getInsertionTime()); - slotSetInsertCursorPosition(SnapGrid(&m_htqlayout).snapTime + slotSetInsertCursorPosition(SnapGrid(&m_hlayout).snapTime (time - 1, SnapGrid::SnapLeft)); } @@ -2445,7 +2445,7 @@ void MatrixView::slotStepForward() { timeT time(getInsertionTime()); - slotSetInsertCursorPosition(SnapGrid(&m_htqlayout).snapTime + slotSetInsertCursorPosition(SnapGrid(&m_hlayout).snapTime (time + 1, SnapGrid::SnapRight)); } @@ -2553,7 +2553,7 @@ MatrixView::readjustCanvasSize() MatrixStaff &staff = *m_staffs[i]; - staff.sizeStaff(m_htqlayout); + staff.sizeStaff(m_hlayout); // if (staff.getTotalWidth() + staff.getX() > maxWidth) { // maxWidth = staff.getTotalWidth() + staff.getX() + 1; @@ -2721,23 +2721,23 @@ MatrixView::updateViewCaption() trackPosition = track->getPosition(); setCaption(i18n("%1 - Segment Track #%2 - %3") - .tqarg(getDocument()->getTitle()) - .tqarg(trackPosition + 1) - .tqarg(view)); + .arg(getDocument()->getTitle()) + .arg(trackPosition + 1) + .arg(view)); } else if (m_segments.size() == getDocument()->getComposition().getNbSegments()) { setCaption(i18n("%1 - All Segments - %2") - .tqarg(getDocument()->getTitle()) - .tqarg(view)); + .arg(getDocument()->getTitle()) + .arg(view)); } else { setCaption(i18n("%1 - 1 Segment - %2", "%1 - %n Segments - %2", m_segments.size()) - .tqarg(getDocument()->getTitle()) - .tqarg(view)); + .arg(getDocument()->getTitle()) + .arg(view)); } } @@ -2745,10 +2745,10 @@ int MatrixView::computePostLayoutWidth() { Segment *segment = m_segments[0]; Composition *composition = segment->getComposition(); - int endX = int(m_htqlayout.getXForTime + int endX = int(m_hlayout.getXForTime (composition->getBarEndForTime (segment->getEndMarkerTime()))); - int startX = int(m_htqlayout.getXForTime + int startX = int(m_hlayout.getXForTime (composition->getBarStartForTime (segment->getStartTime()))); @@ -2928,7 +2928,7 @@ MatrixView::slotToggleStepByStep() } void -MatrixView::slotUpdateInsertModetqStatus() +MatrixView::slotUpdateInsertModeStatus() { TQString message; if (isInChordMode()) { @@ -3044,17 +3044,17 @@ MatrixView::slotPercussionSetChanged(Instrument * newInstr) m_pitchRuler = pitchRuler; m_pianoView->addChild(m_pitchRuler); m_pitchRuler->show(); - m_pianoView->setFixedWidth(pitchRuler->tqsizeHint().width()); + m_pianoView->setFixedWidth(pitchRuler->sizeHint().width()); // Update matrix canvas readjustCanvasSize(); bool layoutApplied = applyLayout(); if (!layoutApplied) - KMessageBox::sorry(0, i18n("Couldn't apply piano roll tqlayout")); + KMessageBox::sorry(0, i18n("Couldn't apply piano roll layout")); else { MATRIX_DEBUG << "MatrixView : rendering elements\n"; m_staffs[0]->positionAllElements(); - m_staffs[0]->getSegment().getRefreshtqStatus + m_staffs[0]->getSegment().getRefreshStatus (m_segmentsRefreshStatusIds[0]).setNeedsRefresh(false); update(); } diff --git a/src/gui/editors/matrix/MatrixView.h b/src/gui/editors/matrix/MatrixView.h index 6dc6519..45c43fb 100644 --- a/src/gui/editors/matrix/MatrixView.h +++ b/src/gui/editors/matrix/MatrixView.h @@ -190,7 +190,7 @@ public: * Adjust an X coord by world matrix */ double getXbyWorldMatrix(double value) - { return m_canvasView->tqworldMatrix().m11() * value; } + { return m_canvasView->worldMatrix().m11() * value; } double getXbyInverseWorldMatrix(double value) { return m_canvasView->inverseWorldMatrix().m11() * value; } @@ -292,7 +292,7 @@ public slots: void slotToggleStepByStep(); /// status stuff - void slotUpdateInsertModetqStatus(); + void slotUpdateInsertModeStatus(); /// transforms void slotTransformsQuantize(); @@ -520,7 +520,7 @@ protected: /** * save general Options like all bar positions and status as well - * as the tqgeometry and the recent file list to the configuration + * as the geometry and the recent file list to the configuration * file */ virtual void slotSaveOptions(); @@ -594,13 +594,13 @@ protected: std::vector<MatrixStaff*> m_staffs; - MatrixHLayout m_htqlayout; - MatrixVLayout m_vtqlayout; + MatrixHLayout m_hlayout; + MatrixVLayout m_vlayout; SnapGrid *m_snapGrid; timeT m_lastEndMarkerTime; - // tqStatus bar elements + // Status bar elements TQLabel* m_hoveredOverAbsoluteTime; TQLabel* m_hoveredOverNoteName; TQLabel *m_selectionCounter; diff --git a/src/gui/editors/matrix/PianoKeyboard.cpp b/src/gui/editors/matrix/PianoKeyboard.cpp index 7ae4a5a..0b8563e 100644 --- a/src/gui/editors/matrix/PianoKeyboard.cpp +++ b/src/gui/editors/matrix/PianoKeyboard.cpp @@ -65,13 +65,13 @@ PianoKeyboard::PianoKeyboard(TQWidget *parent, int keys) setMouseTracking(true); } -TQSize PianoKeyboard::tqsizeHint() const +TQSize PianoKeyboard::sizeHint() const { return TQSize(m_keySize.width(), m_keySize.height() * m_nbKeys); } -TQSize PianoKeyboard::tqminimumSizeHint() const +TQSize PianoKeyboard::minimumSizeHint() const { return m_keySize; } @@ -154,7 +154,7 @@ void PianoKeyboard::paintEvent(TQPaintEvent*) label.getTQString()); } - paint.setBrush(tqcolorGroup().foreground()); + paint.setBrush(colorGroup().foreground()); for (unsigned int i = 0; i < m_blackKeyPos.size(); ++i) paint.drawRect(0, m_blackKeyPos[i], @@ -249,7 +249,7 @@ void PianoKeyboard::mouseMoveEvent(TQMouseEvent* e) // // RWB (20040220) // - MatrixView *matrixView = dynamic_cast<MatrixView*>(tqtopLevelWidget()); + MatrixView *matrixView = dynamic_cast<MatrixView*>(topLevelWidget()); if (matrixView) { MatrixStaff *staff = matrixView->getStaff(0); diff --git a/src/gui/editors/matrix/PianoKeyboard.h b/src/gui/editors/matrix/PianoKeyboard.h index 7c29c89..3d8b583 100644 --- a/src/gui/editors/matrix/PianoKeyboard.h +++ b/src/gui/editors/matrix/PianoKeyboard.h @@ -49,8 +49,8 @@ class PianoKeyboard : public PitchRuler public: PianoKeyboard(TQWidget *parent, int keys = 88); - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; /* * We want to be able to call this from the matrix view diff --git a/src/gui/editors/matrix/QCanvasMatrixDiamond.cpp b/src/gui/editors/matrix/QCanvasMatrixDiamond.cpp index d8d7b06..e44e7d5 100644 --- a/src/gui/editors/matrix/QCanvasMatrixDiamond.cpp +++ b/src/gui/editors/matrix/QCanvasMatrixDiamond.cpp @@ -68,7 +68,7 @@ void QCanvasMatrixDiamond::drawShape(TQPainter & p) TQPointArray pa(4); int q = height() / 2 + 2; - TQPoint mapPos = p.tqworldMatrix().map(TQPoint(int(x()), int(y()))); + TQPoint mapPos = p.worldMatrix().map(TQPoint(int(x()), int(y()))); pa[0] = TQPoint(mapPos.x(), mapPos.y() - 3); pa[1] = TQPoint(mapPos.x() + q, mapPos.y() - 3 + q); diff --git a/src/gui/editors/matrix/QCanvasMatrixDiamond.h b/src/gui/editors/matrix/QCanvasMatrixDiamond.h index 8b736e7..2546961 100644 --- a/src/gui/editors/matrix/QCanvasMatrixDiamond.h +++ b/src/gui/editors/matrix/QCanvasMatrixDiamond.h @@ -41,7 +41,7 @@ class MatrixElement; /** - * A TQCanvas diamond tqshape referencing a MatrixElement + * A TQCanvas diamond shape referencing a MatrixElement */ class QCanvasMatrixDiamond : public QCanvasMatrixRectangle { diff --git a/src/gui/editors/notation/FontViewFrame.cpp b/src/gui/editors/notation/FontViewFrame.cpp index d07ba40..6e24a18 100644 --- a/src/gui/editors/notation/FontViewFrame.cpp +++ b/src/gui/editors/notation/FontViewFrame.cpp @@ -97,7 +97,7 @@ FontViewFrame::loadFont() FcPatternDestroy(pattern); if (!match || result != FcResultMatch) { - KMessageBox::error(this, i18n("Error: Unable to match font name %1").tqarg(m_fontName)); + KMessageBox::error(this, i18n("Error: Unable to match font name %1").arg(m_fontName)); return ; } @@ -106,7 +106,7 @@ FontViewFrame::loadFont() if (TQString((const char *)matchFamily).lower() != m_fontName.lower()) { KMessageBox::sorry(this, i18n("Warning: No good match for font name %1 (best is %2)"). - tqarg(m_fontName).tqarg(TQString((const char *)matchFamily))); + arg(m_fontName).arg(TQString((const char *)matchFamily))); m_fontName = (const char *)matchFamily; } @@ -125,7 +125,7 @@ void FontViewFrame::setGlyphs(bool glyphs) update(); } -TQSize FontViewFrame::tqsizeHint() const +TQSize FontViewFrame::sizeHint() const { return TQSize(16 * m_fontSize * 3 / 2 + margin() + 2 * frameWidth(), 16 * m_fontSize * 3 / 2 + margin() + 2 * frameWidth()); @@ -186,7 +186,7 @@ void FontViewFrame::paintEvent( TQPaintEvent* e ) continue; p.setFont(kapp->font()); TQFontMetrics afm(kapp->font()); - TQString s = TQString("%1").tqarg(m_row * 256 + (j - 1) * 16); + TQString s = TQString("%1").arg(m_row * 256 + (j - 1) * 16); p.drawText(x - afm.width(s), y, s); p.setPen(TQColor(190, 190, 255)); p.drawLine(0, y, width(), y); @@ -194,7 +194,7 @@ void FontViewFrame::paintEvent( TQPaintEvent* e ) continue; } else if (j == 0) { p.setFont(kapp->font()); - TQString s = TQString("%1").tqarg(i - 1); + TQString s = TQString("%1").arg(i - 1); p.drawText(x, y, s); p.setPen(TQColor(190, 190, 255)); p.drawLine(x, 0, x, height()); diff --git a/src/gui/editors/notation/FontViewFrame.h b/src/gui/editors/notation/FontViewFrame.h index fbfc95a..1d649c4 100644 --- a/src/gui/editors/notation/FontViewFrame.h +++ b/src/gui/editors/notation/FontViewFrame.h @@ -49,7 +49,7 @@ public: FontViewFrame(int pixelSize, TQWidget *parent = 0, const char *name = 0); virtual ~FontViewFrame(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; bool hasRow(int row) const; public slots: diff --git a/src/gui/editors/notation/NotationElement.h b/src/gui/editors/notation/NotationElement.h index 6dfad3d..2bb036f 100644 --- a/src/gui/editors/notation/NotationElement.h +++ b/src/gui/editors/notation/NotationElement.h @@ -43,7 +43,7 @@ class Event; /** - * The Notation H and V tqlayout is performed on a + * The Notation H and V layout is performed on a * NotationElementList. Once this is done, each NotationElement is * affected a TQCanvasItem which is set at these coords. * @@ -82,7 +82,7 @@ public: * Sets the X coordinate and width of the space "underneath" * this element, i.e. the extents within which a mouse click * or some such might be considered to be interested in this - * element as opposed to any other. These are tqlayout coords + * element as opposed to any other. These are layout coords */ void setLayoutAirspace(double x, double width) { m_airX = x; m_airWidth = width; diff --git a/src/gui/editors/notation/NotationGroup.h b/src/gui/editors/notation/NotationGroup.h index 9906747..c7b1134 100644 --- a/src/gui/editors/notation/NotationGroup.h +++ b/src/gui/editors/notation/NotationGroup.h @@ -73,13 +73,13 @@ public: /** * Writes the BEAMED, BEAM_ABOVE, and STEM_UP properties into the - * notes in the group, as appropriate. Does not require tqlayout x + * notes in the group, as appropriate. Does not require layout x * coordinates to have been set. */ void applyStemProperties(); /** - * Writes beam data into each note in the group. Notes' tqlayout x + * Writes beam data into each note in the group. Notes' layout x * coordinates must already have been set. Does not require * applyStemProperties to have already been called. */ @@ -87,7 +87,7 @@ public: /** * Writes tupling line data into each note in the group. Notes' - * tqlayout x coordinates must already have been set. Does nothing + * layout x coordinates must already have been set. Does nothing * if this is not a tupled group. */ void applyTuplingLine(NotationStaff &); diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp index e971521..4d891a6 100644 --- a/src/gui/editors/notation/NotationHLayout.cpp +++ b/src/gui/editors/notation/NotationHLayout.cpp @@ -1230,15 +1230,15 @@ NotationHLayout::finishLayout(timeT startTime, timeT endTime) m_timePerProgressIncrement = timeCovered / (100 / m_barData.size()); - tqlayout(i, startTime, endTime); + layout(i, startTime, endTime); ++staffNo; } } void -NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime) +NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime) { - Profiler profiler("NotationHLayout::tqlayout"); + Profiler profiler("NotationHLayout::layout"); Staff &staff = *(i->first); NotationElementList *notes = staff.getViewElementList(); @@ -1251,7 +1251,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime // bool haveSimpleOffset = false; // double simpleOffset = 0; - NOTATION_DEBUG << "NotationHLayout::tqlayout: full tqlayout " << isFullLayout << ", times " << startTime << "->" << endTime << endl; + NOTATION_DEBUG << "NotationHLayout::layout: full layout " << isFullLayout << ", times " << startTime << "->" << endTime << endl; double x = 0, barX = 0; TieMap tieMap; @@ -1287,7 +1287,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime NotationElementList::iterator from = bdi->second.basicData.start; NotationElementList::iterator to; - NOTATION_DEBUG << "NotationHLayout::tqlayout(): starting bar " << barNo << ", x = " << barX << ", width = " << bdi->second.sizeData.idealWidth << ", time = " << (from == notes->end() ? -1 : (*from)->getViewAbsoluteTime()) << endl; + NOTATION_DEBUG << "NotationHLayout::layout(): starting bar " << barNo << ", x = " << barX << ", width = " << bdi->second.sizeData.idealWidth << ", time = " << (from == notes->end() ? -1 : (*from)->getViewAbsoluteTime()) << endl; BarDataList::iterator nbdi(bdi); if (++nbdi == barList.end()) { @@ -1307,10 +1307,10 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime double offset = barX - bdi->second.layoutData.x; - NOTATION_DEBUG << "NotationHLayout::tqlayout(): bar " << barNo << " has needsLayout false and offset of " << offset << endl; + NOTATION_DEBUG << "NotationHLayout::layout(): bar " << barNo << " has needsLayout false and offset of " << offset << endl; if (offset > -0.1 && offset < 0.1) { - NOTATION_DEBUG << "NotationHLayout::tqlayout(): no offset, ignoring" << endl; + NOTATION_DEBUG << "NotationHLayout::layout(): no offset, ignoring" << endl; continue; } @@ -1323,7 +1323,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime it != to && it != notes->end(); ++it) { NotationElement* nel = static_cast<NotationElement*>(*it); - NOTATION_DEBUG << "NotationHLayout::tqlayout(): shifting element's x to " << ((*it)->getLayoutX() + offset) << " (was " << (*it)->getLayoutX() << ")" << endl; + NOTATION_DEBUG << "NotationHLayout::layout(): shifting element's x to " << ((*it)->getLayoutX() + offset) << " (was " << (*it)->getLayoutX() << ")" << endl; nel->setLayoutX((*it)->getLayoutX() + offset); double airX, airWidth; nel->getLayoutAirspace(airX, airWidth); @@ -1342,7 +1342,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime timeSigToPlace = !bdi->second.basicData.timeSignature.isHidden(); } if (timeSigToPlace) { - NOTATION_DEBUG << "NotationHLayout::tqlayout(): there's a time sig in this bar" << endl; + NOTATION_DEBUG << "NotationHLayout::layout(): there's a time sig in this bar" << endl; } bool repeatClefAndKey = false; @@ -1350,7 +1350,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime repeatClefAndKey = true; } if (repeatClefAndKey) { - NOTATION_DEBUG << "NotationHLayout::tqlayout(): need to repeat clef & key in this bar" << endl; + NOTATION_DEBUG << "NotationHLayout::layout(): need to repeat clef & key in this bar" << endl; } double barInset = notationStaff.getBarInset(barNo, repeatClefAndKey); @@ -1467,7 +1467,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime } } - NOTATION_DEBUG << "NotationHLayout::tqlayout(): setting element's x to " << x << " (was " << el->getLayoutX() << ")" << endl; + NOTATION_DEBUG << "NotationHLayout::layout(): setting element's x to " << x << " (was " << el->getLayoutX() << ")" << endl; double displacedX = 0.0; long dxRaw = 0; @@ -1692,7 +1692,7 @@ NotationHLayout::positionChord(Staff &staff, barEndsInChord = true; // #704958 (multiple tuplet spanners created when entering - // triplet chord) -- tqlayout() updates the beamed group data + // triplet chord) -- layout() updates the beamed group data // for non-notes, but we have to do it for notes so as to // ensure every note in the chord is accounted for sampleGroupElement(staff, clef, key, citr); diff --git a/src/gui/editors/notation/NotationHLayout.h b/src/gui/editors/notation/NotationHLayout.h index 07cf25e..878dc17 100644 --- a/src/gui/editors/notation/NotationHLayout.h +++ b/src/gui/editors/notation/NotationHLayout.h @@ -56,7 +56,7 @@ class AccidentalTable; /** - * Horizontal notation tqlayout + * Horizontal notation layout * * computes the X coordinates of notation elements */ @@ -77,9 +77,9 @@ public: } /** - * Precomputes tqlayout data for a single staff. The resulting data + * Precomputes layout data for a single staff. The resulting data * is stored in the BarDataMap, keyed from the staff reference; - * the entire map is then used by reconcileBars() and tqlayout(). + * the entire map is then used by reconcileBars() and layout(). * The map should be cleared (by calling reset()) before a full * set of staffs is preparsed. */ @@ -167,7 +167,7 @@ public: static std::vector<int> getAvailableProportions(); /** - * Returns the total length of all elements once tqlayout is done + * Returns the total length of all elements once layout is done * This is the x-coord of the end of the last element on the longest * staff, plus the space allocated to that element */ @@ -211,7 +211,7 @@ public: * Returns the X coord corresponding to the given time value. * This RulerScale method works by interpolating between bar lines * (the inverse of the way getTimeForX works), and should be used - * for any rulers associated with the tqlayout. + * for any rulers associated with the layout. */ virtual double getXForTime(timeT time) const; @@ -286,7 +286,7 @@ protected: } sizeData; struct LayoutData - { // slots either assumed, or only known at tqlayout time + { // slots either assumed, or only known at layout time bool needsLayout; double x; // coordinate for display of barline int timeSigX; @@ -360,7 +360,7 @@ protected: /// Tries to harmonize the bar positions for all the staves (page mode) void reconcileBarsPage(); - void tqlayout(BarDataMap::iterator, + void layout(BarDataMap::iterator, timeT startTime, timeT endTime); diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp index 83575c6..1baa33c 100644 --- a/src/gui/editors/notation/NotationStaff.cpp +++ b/src/gui/editors/notation/NotationStaff.cpp @@ -379,7 +379,7 @@ NotationStaff::getClosestElementToLayoutX(double x, return notes->end(); } - NOTATION_DEBUG << "NotationStaff::getClosestElementToLayoutX: found element at tqlayout " << (*result)->getLayoutX() << " - we're at tqlayout " << x << endl; + NOTATION_DEBUG << "NotationStaff::getClosestElementToLayoutX: found element at layout " << (*result)->getLayoutX() << " - we're at layout " << x << endl; PRINT_ELAPSED("NotationStaff::getClosestElementToLayoutX"); @@ -449,7 +449,7 @@ NotationStaff::renderElements(NotationElementList::iterator from, // NOTATION_DEBUG << "NotationStaff " << this << "::renderElements()" << endl; Profiler profiler("NotationStaff::renderElements"); - emit setOperationName(i18n("Rendering staff %1...").tqarg(getId() + 1)); + emit setOperationName(i18n("Rendering staff %1...").arg(getId() + 1)); emit setProgress(0); throwIfCancelled(); @@ -512,7 +512,7 @@ NotationStaff::renderPrintable(timeT from, timeT to) Profiler profiler("NotationStaff::renderElements"); - emit setOperationName(i18n("Rendering notes on staff %1...").tqarg(getId() + 1)); + emit setOperationName(i18n("Rendering notes on staff %1...").arg(getId() + 1)); emit setProgress(0); throwIfCancelled(); @@ -580,7 +580,7 @@ NotationStaff::positionElements(timeT from, timeT to) if (to < startTime) to = startTime; if (to == from) return; - emit setOperationName(i18n("Positioning staff %1...").tqarg(getId() + 1)); + emit setOperationName(i18n("Positioning staff %1...").arg(getId() + 1)); emit setProgress(0); throwIfCancelled(); diff --git a/src/gui/editors/notation/NotationStaff.h b/src/gui/editors/notation/NotationStaff.h index bb056c0..f58e77d 100644 --- a/src/gui/editors/notation/NotationStaff.h +++ b/src/gui/editors/notation/NotationStaff.h @@ -136,14 +136,14 @@ public: /** * Assign suitable coordinates to the elements on the staff, - * based entirely on the tqlayout X and Y coordinates they were - * given by the horizontal and vertical tqlayout processes. + * based entirely on the layout X and Y coordinates they were + * given by the horizontal and vertical layout processes. * * This is necessary because the sprites that are being positioned - * may have been created either after the tqlayout process completed + * may have been created either after the layout process completed * (by renderElements) or before (by the previous renderElements * call, if the sprites are unchanged but have moved) -- so - * neither the tqlayout nor renderElements can authoritatively set + * neither the layout nor renderElements can authoritatively set * their final positions. * * This method also updates the selected-ness of any elements it @@ -197,7 +197,7 @@ public: * elements). Pass movedOnly as true to indicate that elements * have not changed but only been repositioned, for example as a * consequence of a modification on another staff that caused a - * retqlayout. + * relayout. */ virtual void markChanged(timeT from = 0, timeT to = 0, @@ -270,7 +270,7 @@ public: Accidentals::NoAccidental) const; /** - * Find the NotationElement whose tqlayout x-coord is closest to x, + * Find the NotationElement whose layout x-coord is closest to x, * without regard to its y-coord. * * If notesAndRestsOnly is true, will return the closest note @@ -289,7 +289,7 @@ public: int proximityThreshold = 10); /** - * Find the NotationElement "under" the given tqlayout x-coord, + * Find the NotationElement "under" the given layout x-coord, * without regard to its y-coord. * * Also returns the clef and key in force at the given coordinates. @@ -396,7 +396,7 @@ protected: * Returns true if the item at the given iterator appears to have * moved horizontally without the spacing around it changing. * - * In practice, calculates the offset between the intended tqlayout + * In practice, calculates the offset between the intended layout * and current canvas coordinates of the item at the given * iterator, and returns true if this offset is equal to those of * all other following iterators at the same time as well as the @@ -412,7 +412,7 @@ protected: /** * Prepare a painter to draw an object of logical width w at - * tqlayout-x coord x, starting at offset dx into the object, by + * layout-x coord x, starting at offset dx into the object, by * setting the painter's clipping so as to crop the object at the * right edge of the row if it would otherwise overrun. The * return value is the amount of the object visible on this row @@ -473,8 +473,8 @@ protected: TQPainter *m_printPainter; - enum BartqStatus { UnRendered = 0, Rendered, Positioned }; - typedef std::map<int, BartqStatus> BarStatusMap; + enum BarStatus { UnRendered = 0, Rendered, Positioned }; + typedef std::map<int, BarStatus> BarStatusMap; BarStatusMap m_status; std::pair<int, int> m_lastRenderCheck; bool m_ready; diff --git a/src/gui/editors/notation/NotationStrings.cpp b/src/gui/editors/notation/NotationStrings.cpp index e4cae98..9bbc6e6 100644 --- a/src/gui/editors/notation/NotationStrings.cpp +++ b/src/gui/editors/notation/NotationStrings.cpp @@ -49,26 +49,26 @@ NotationStrings::addDots(TQString s, int dots, if (internationalize) { if (dots > 1) { if (hyphenate) - return i18n("%1-dotted-%2").tqarg(dots).tqarg(s); + return i18n("%1-dotted-%2").arg(dots).arg(s); else - return i18n("%1-dotted %2").tqarg(dots).tqarg(s); + return i18n("%1-dotted %2").arg(dots).arg(s); } else { if (hyphenate) - return i18n("dotted-%1").tqarg(s); + return i18n("dotted-%1").arg(s); else - return i18n("dotted %1").tqarg(s); + return i18n("dotted %1").arg(s); } } else { if (dots > 1) { if (hyphenate) - return TQString("%1-dotted-%2").tqarg(dots).tqarg(s); + return TQString("%1-dotted-%2").arg(dots).arg(s); else - return TQString("%1-dotted %2").tqarg(dots).tqarg(s); + return TQString("%1-dotted %2").arg(dots).arg(s); } else { if (hyphenate) - return TQString("dotted-%1").tqarg(s); + return TQString("dotted-%1").arg(s); else - return TQString("dotted %1").tqarg(s); + return TQString("dotted %1").arg(s); } } } @@ -93,11 +93,11 @@ NotationStrings::getNoteName(Note note, bool plural, bool triplet) }; if (plural && triplet) { - return addDots(i18n("%1 triplets").tqarg(names[type]), dots, false, true); // TODO PLURAL - this is broken because it assumes there's only 1 plural form + return addDots(i18n("%1 triplets").arg(names[type]), dots, false, true); // TODO PLURAL - this is broken because it assumes there's only 1 plural form } else if (plural) { return addDots(pluralnames[type], dots, false, true); } else if (triplet) { - return addDots(i18n("%1 triplet").tqarg(names[type]), dots, false, true); + return addDots(i18n("%1 triplet").arg(names[type]), dots, false, true); } else { return addDots(names[type], dots, false, true); } @@ -123,11 +123,11 @@ NotationStrings::getAmericanName(Note note, bool plural, bool triplet) }; if (plural && triplet) { - return addDots(TQString("%1 triplets").tqarg(names[type]), dots, false, false); + return addDots(TQString("%1 triplets").arg(names[type]), dots, false, false); } else if (plural) { return addDots(pluralnames[type], dots, false, false); } else if (triplet) { - return addDots(TQString("%1 triplet").tqarg(names[type]), dots, false, false); + return addDots(TQString("%1 triplet").arg(names[type]), dots, false, false); } else { return addDots(names[type], dots, false, false); } @@ -151,11 +151,11 @@ NotationStrings::getShortNoteName(Note note, bool plural, bool triplet) }; if (plural && triplet) { - return addDots(i18n("%1 triplets").tqarg(names[type]), dots, false, true); // TODO - this is broken because it assumes there's only 1 plural form + return addDots(i18n("%1 triplets").arg(names[type]), dots, false, true); // TODO - this is broken because it assumes there's only 1 plural form } else if (plural) { return addDots(pluralnames[type], dots, false, true); } else if (triplet) { - return addDots(i18n("%1 triplet").tqarg(names[type]), dots, false, true); + return addDots(i18n("%1 triplet").arg(names[type]), dots, false, true); } else { return addDots(names[type], dots, false, true); } @@ -271,11 +271,11 @@ NotationStrings::makeNoteMenuLabel(timeT duration, timeT wholeNote = Note(Note::Semibreve).getDuration(); if ((wholeNote / duration) * duration == wholeNote) { - return TQString("1/%1").tqarg(wholeNote / duration); + return TQString("1/%1").arg(wholeNote / duration); } else if ((duration / wholeNote) * wholeNote == duration) { - return TQString("%1/1").tqarg(duration / wholeNote); + return TQString("%1/1").arg(duration / wholeNote); } else { - return i18n("%1 ticks").tqarg(duration); + return i18n("%1 ticks").arg(duration); plural = false; } diff --git a/src/gui/editors/notation/NotationToolBox.cpp b/src/gui/editors/notation/NotationToolBox.cpp index f2fa642..7632413 100644 --- a/src/gui/editors/notation/NotationToolBox.cpp +++ b/src/gui/editors/notation/NotationToolBox.cpp @@ -89,7 +89,7 @@ EditTool* NotationToolBox::createTool(const TQString& toolName) else { KMessageBox::error(0, TQString("NotationToolBox::createTool : unrecognised toolname %1 (%2)") - .tqarg(toolName).tqarg(toolNamelc)); + .arg(toolName).arg(toolNamelc)); return 0; } diff --git a/src/gui/editors/notation/NotationVLayout.cpp b/src/gui/editors/notation/NotationVLayout.cpp index af6a2fe..5afaa4a 100644 --- a/src/gui/editors/notation/NotationVLayout.cpp +++ b/src/gui/editors/notation/NotationVLayout.cpp @@ -236,7 +236,7 @@ NotationVLayout::scanStaff(Staff &staffBase, timeT, timeT) if (!(*chord[j])->event()->get <Int> (m_properties.HEIGHT_ON_STAFF, height)) { - std::cerr << TQString("ERROR: Event in chord at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").tqarg((*chord[j])->getViewAbsoluteTime()).ascii() << std::endl; + std::cerr << TQString("ERROR: Event in chord at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").arg((*chord[j])->getViewAbsoluteTime()).ascii() << std::endl; (*chord[j])->event()->dump(std::cerr); } h.push_back(height); @@ -249,7 +249,7 @@ NotationVLayout::scanStaff(Staff &staffBase, timeT, timeT) bool hasShifted = chord.hasNoteHeadShifted(); - double y0 = -1E50; // A very unlikely Y tqlayout value + double y0 = -1E50; // A very unlikely Y layout value for (unsigned int j = 0; j < chord.size(); ++j) { @@ -269,7 +269,7 @@ NotationVLayout::scanStaff(Staff &staffBase, timeT, timeT) // These calculations and assignments are pretty much final // if the chord is not in a beamed group, but if it is then // they will be reworked by NotationGroup::applyBeam, which - // is called from NotationHLayout::tqlayout, which is called + // is called from NotationHLayout::layout, which is called // after this. Any inaccuracies here for beamed groups // should be stamped out there. @@ -342,7 +342,7 @@ NotationVLayout::scanStaff(Staff &staffBase, timeT, timeT) // Not optimal, as we can end up scanning the chord // multiple times (we'll return to it after scanning the // contained note). [We can't just iterate over all - // elements within the chord (as we can in htqlayout) + // elements within the chord (as we can in hlayout) // because we need them in height order.] i = chord.getFirstElementNotInChord(); @@ -490,7 +490,7 @@ NotationVLayout::positionSlur(NotationStaff &staff, if (!event->get <Int>(m_properties.HEIGHT_ON_STAFF, h)) { KMessageBox::sorry - ((TQWidget *)parent(), i18n("Spanned note at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").tqarg((*scooter)->getViewAbsoluteTime())); + ((TQWidget *)parent(), i18n("Spanned note at %1 has no HEIGHT_ON_STAFF property!\nThis is a bug (the program would previously have crashed by now)").arg((*scooter)->getViewAbsoluteTime())); event->dump(std::cerr); } diff --git a/src/gui/editors/notation/NotationVLayout.h b/src/gui/editors/notation/NotationVLayout.h index b69c06c..2e718c7 100644 --- a/src/gui/editors/notation/NotationVLayout.h +++ b/src/gui/editors/notation/NotationVLayout.h @@ -52,7 +52,7 @@ class Composition; /** - * Vertical notation tqlayout + * Vertical notation layout * * computes the Y coordinate of notation elements */ @@ -91,9 +91,9 @@ public: timeT = 0); /** - * Do any tqlayout dependent on more than one staff. As it - * happens, we have none, but we do have some tqlayout that - * depends on the final results from the horizontal tqlayout + * Do any layout dependent on more than one staff. As it + * happens, we have none, but we do have some layout that + * depends on the final results from the horizontal layout * (for slurs), so we should do that here */ virtual void finishLayout(timeT = 0, diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp index bd553ee..be96fdf 100644 --- a/src/gui/editors/notation/NotationView.cpp +++ b/src/gui/editors/notation/NotationView.cpp @@ -25,7 +25,7 @@ #include "NotationView.h" #include <list> -#include <tqlayout.h> +#include <layout.h> #include "misc/Debug.h" #include <kapplication.h> @@ -194,7 +194,7 @@ #include <ktempfile.h> #include <ktoolbar.h> #include <kxmlguiclient.h> -#include <tqbrush.h> +#include <brush.h> #include <tqcanvas.h> #include <tqcursor.h> #include <tqdialog.h> @@ -372,9 +372,9 @@ NotationView::NotationView(RosegardenGUIDoc *doc, m_pageMode(LinedStaff::LinearMode), m_leftGutter(20), m_notePixmapFactory(new NotePixmapFactory(m_fontName, m_fontSize)), - m_htqlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory, + m_hlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory, m_properties, TQT_TQOBJECT(this))), - m_vtqlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory, + m_vlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory, m_properties, TQT_TQOBJECT(this))), m_chordNameRuler(0), m_tempoRuler(0), @@ -409,7 +409,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, // Initialise the display-related defaults that will be needed - // by both the actions and the tqlayout toolbar + // by both the actions and the layout toolbar m_config->setGroup(NotationViewConfigGroup); @@ -435,15 +435,15 @@ NotationView::NotationView(RosegardenGUIDoc *doc, NoteFontFactory::getDefaultSize(m_fontName)); int defaultSpacing = m_config->readNumEntry("spacing", 100); - m_htqlayout->setSpacing(defaultSpacing); + m_hlayout->setSpacing(defaultSpacing); int defaultProportion = m_config->readNumEntry("proportion", 60); - m_htqlayout->setProportion(defaultProportion); + m_hlayout->setProportion(defaultProportion); delete m_notePixmapFactory; m_notePixmapFactory = new NotePixmapFactory(m_fontName, m_fontSize); - m_htqlayout->setNotePixmapFactory(m_notePixmapFactory); - m_vtqlayout->setNotePixmapFactory(m_notePixmapFactory); + m_hlayout->setNotePixmapFactory(m_notePixmapFactory); + m_vlayout->setNotePixmapFactory(m_notePixmapFactory); setupActions(); // setupAddControlRulerMenu(); - too early for notation, moved to end of ctor. @@ -460,19 +460,19 @@ NotationView::NotationView(RosegardenGUIDoc *doc, updateViewCaption(); m_chordNameRuler = new ChordNameRuler - (m_htqlayout, doc, segments, m_leftGutter, 20, getCentralWidget()); + (m_hlayout, doc, segments, m_leftGutter, 20, getCentralWidget()); addRuler(m_chordNameRuler); if (showProgressive) m_chordNameRuler->show(); m_tempoRuler = new TempoRuler - (m_htqlayout, doc, this, m_leftGutter, 24, false, getCentralWidget()); + (m_hlayout, doc, this, m_leftGutter, 24, false, getCentralWidget()); addRuler(m_tempoRuler); m_tempoRuler->hide(); static_cast<TempoRuler *>(m_tempoRuler)->connectSignals(); m_rawNoteRuler = new RawNoteRuler - (m_htqlayout, segments[0], m_leftGutter, 20, getCentralWidget()); + (m_hlayout, segments[0], m_leftGutter, 20, getCentralWidget()); addRuler(m_rawNoteRuler); m_rawNoteRuler->show(); @@ -484,7 +484,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, readOptions(); - setBottomStandardRuler(new StandardRuler(getDocument(), m_htqlayout, m_leftGutter, 25, + setBottomStandardRuler(new StandardRuler(getDocument(), m_hlayout, m_leftGutter, 25, true, getBottomWidget())); for (unsigned int i = 0; i < segments.size(); ++i) @@ -506,7 +506,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, m_canvasView->setLeftFixedWidget(m_headersGroupView); // Add a close button just above the track headers. - // The grid tqlayout is only here to maintain the button in a + // The grid layout is only here to maintain the button in a // right place m_headersTopFrame = new TQFrame(getCentralWidget()); TQGridLayout * headersTopGrid @@ -522,7 +522,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, TQToolTip::add(hideHeadersButton, i18n("Close track headers")); headersTopGrid->setMargin(4); setTopStandardRuler(new StandardRuler(getDocument(), - m_htqlayout, m_leftGutter, 25, + m_hlayout, m_leftGutter, 25, false, getCentralWidget()), m_headersTopFrame); m_topStandardRuler->getLoopRuler()->setBackgroundColor @@ -544,7 +544,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, // - // tqlayout + // layout // ProgressDialog* progressDlg = 0; @@ -585,7 +585,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, setPageMode(mode); for (unsigned int i = 0; i < m_staffs.size(); ++i) { - m_staffs[i]->getSegment().getRefreshtqStatus + m_staffs[i]->getSegment().getRefreshStatus (m_segmentsRefreshStatusIds[i]).setNeedsRefresh(false); } @@ -594,7 +594,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, } catch (ProgressReporter::Cancelled c) { // when cancelled, m_ok is false -- checked by calling method - NOTATION_DEBUG << "NotationView ctor : tqlayout Cancelled" << endl; + NOTATION_DEBUG << "NotationView ctor : layout Cancelled" << endl; } NOTATION_DEBUG << "NotationView ctor : m_ok = " << m_ok << endl; @@ -754,10 +754,10 @@ NotationView::NotationView(RosegardenGUIDoc *doc, slotSetInsertCursorPosition(0); slotSetPointerPosition(doc->getComposition().getPosition()); setCurrentSelection(0, false, true); - slotUpdateInsertModetqStatus(); - m_chordNameRuler->tqrepaint(); - m_tempoRuler->tqrepaint(); - m_rawNoteRuler->tqrepaint(); + slotUpdateInsertModeStatus(); + m_chordNameRuler->repaint(); + m_tempoRuler->repaint(); + m_rawNoteRuler->repaint(); m_inhibitRefresh = false; // slotCheckRendered(0, getCanvasView()->visibleWidth()); @@ -817,9 +817,9 @@ NotationView::NotationView(RosegardenGUIDoc *doc, m_pageMode(LinedStaff::LinearMode), m_leftGutter(0), m_notePixmapFactory(new NotePixmapFactory(m_fontName, m_fontSize)), - m_htqlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory, + m_hlayout(new NotationHLayout(&doc->getComposition(), m_notePixmapFactory, m_properties, TQT_TQOBJECT(this))), - m_vtqlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory, + m_vlayout(new NotationVLayout(&doc->getComposition(), m_notePixmapFactory, m_properties, TQT_TQOBJECT(this))), m_chordNameRuler(0), m_tempoRuler(0), @@ -850,7 +850,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, // Initialise the display-related defaults that will be needed - // by both the actions and the tqlayout toolbar + // by both the actions and the layout toolbar m_config->setGroup(NotationViewConfigGroup); @@ -871,20 +871,20 @@ NotationView::NotationView(RosegardenGUIDoc *doc, if (referenceView) { - m_htqlayout->setSpacing(referenceView->m_htqlayout->getSpacing()); - m_htqlayout->setProportion(referenceView->m_htqlayout->getProportion()); + m_hlayout->setSpacing(referenceView->m_hlayout->getSpacing()); + m_hlayout->setProportion(referenceView->m_hlayout->getProportion()); } else { int defaultSpacing = m_config->readNumEntry("spacing", 100); - m_htqlayout->setSpacing(defaultSpacing); + m_hlayout->setSpacing(defaultSpacing); int defaultProportion = m_config->readNumEntry("proportion", 60); - m_htqlayout->setProportion(defaultProportion); + m_hlayout->setProportion(defaultProportion); } delete m_notePixmapFactory; m_notePixmapFactory = new NotePixmapFactory(m_fontName, m_fontSize); - m_htqlayout->setNotePixmapFactory(m_notePixmapFactory); - m_vtqlayout->setNotePixmapFactory(m_notePixmapFactory); + m_hlayout->setNotePixmapFactory(m_notePixmapFactory); + m_vlayout->setNotePixmapFactory(m_notePixmapFactory); setBackgroundMode(PaletteBase); m_config->setGroup(NotationViewConfigGroup); @@ -930,7 +930,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, setPageMode(LinedStaff::MultiPageMode); // also positions and renders the staffs! for (unsigned int i = 0; i < m_staffs.size(); ++i) { - m_staffs[i]->getSegment().getRefreshtqStatus + m_staffs[i]->getSegment().getRefreshStatus (m_segmentsRefreshStatusIds[i]).setNeedsRefresh(false); } @@ -939,7 +939,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, } catch (ProgressReporter::Cancelled c) { // when cancelled, m_ok is false -- checked by calling method - NOTATION_DEBUG << "NotationView ctor : tqlayout Cancelled" << endl; + NOTATION_DEBUG << "NotationView ctor : layout Cancelled" << endl; } NOTATION_DEBUG << "NotationView ctor : m_ok = " << m_ok << endl; @@ -1223,7 +1223,7 @@ void NotationView::positionStaffs() } } - m_htqlayout->setPageWidth(pageWidth - leftMargin * 2); + m_hlayout->setPageWidth(pageWidth - leftMargin * 2); int topGutter = 0; @@ -1341,7 +1341,7 @@ void NotationView::positionPages() haveBackground = true; } // we're happy to ignore errors from this one: - deskBackground.load(TQString("%1/misc/bg-desktop.xpm").tqarg(pixmapDir)); + deskBackground.load(TQString("%1/misc/bg-desktop.xpm").arg(pixmapDir)); } int pageWidth = getPageWidth(); @@ -1365,14 +1365,14 @@ void NotationView::positionPages() if (m_pageMode != LinedStaff::MultiPageMode) { if (haveBackground) { - canvas()->tqsetBackgroundPixmap(background); + canvas()->setBackgroundPixmap(background); getCanvasView()->setBackgroundMode(TQt::FixedPixmap); getCanvasView()->setPaletteBackgroundPixmap(background); getCanvasView()->setErasePixmap(background); } } else { if (haveBackground) { - canvas()->tqsetBackgroundPixmap(deskBackground); + canvas()->setBackgroundPixmap(deskBackground); getCanvasView()->setBackgroundMode(TQt::FixedPixmap); getCanvasView()->setPaletteBackgroundPixmap(background); getCanvasView()->setErasePixmap(background); @@ -1389,7 +1389,7 @@ void NotationView::positionPages() int w = pageWidth - leftMargin / 2; int h = pageHeight; - TQString str = TQString("%1").tqarg(page + 1); + TQString str = TQString("%1").arg(page + 1); TQCanvasText *text = new TQCanvasText(str, pageNumberFont, canvas()); text->setX(m_leftGutter + pageWidth * page + pageWidth - pageNumberMetrics.width(str) - leftMargin); text->setY(y + h - pageNumberMetrics.descent() - topMargin); @@ -1482,13 +1482,13 @@ void NotationView::readOptions() opt = m_config->readBoolEntry("Show Annotations", true); m_annotationsVisible = opt; getToggleAction("show_annotations")->setChecked(opt); - slotUpdateAnnotationstqStatus(); + slotUpdateAnnotationsStatus(); // slotToggleAnnotations(); opt = m_config->readBoolEntry("Show LilyPond Directives", true); m_lilyPondDirectivesVisible = opt; getToggleAction("show_lilypond_directives")->setChecked(opt); - slotUpdateLilyPondDirectivestqStatus(); + slotUpdateLilyPondDirectivesStatus(); } void NotationView::setupActions() @@ -1549,7 +1549,7 @@ void NotationView::setupActions() KActionMenu *spacingActionMenu = new KActionMenu(i18n("S&pacing"), TQT_TQOBJECT(this), "stretch_actionmenu"); - int defaultSpacing = m_htqlayout->getSpacing(); + int defaultSpacing = m_hlayout->getSpacing(); std::vector<int> spacings = NotationHLayout::getAvailableSpacings(); for (std::vector<int>::iterator i = spacings.begin(); @@ -1557,9 +1557,9 @@ void NotationView::setupActions() KToggleAction *spacingAction = new KToggleAction - (TQString("%1%").tqarg(*i), 0, TQT_TQOBJECT(this), + (TQString("%1%").arg(*i), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeSpacingFromAction()), - actionCollection(), TQString("spacing_%1").tqarg(*i).ascii()); + actionCollection(), TQString("spacing_%1").arg(*i).ascii()); spacingAction->setExclusiveGroup("spacing"); spacingAction->setChecked(*i == defaultSpacing); @@ -1571,13 +1571,13 @@ void NotationView::setupActions() KActionMenu *proportionActionMenu = new KActionMenu(i18n("Du&ration Factor"), TQT_TQOBJECT(this), "proportion_actionmenu"); - int defaultProportion = m_htqlayout->getProportion(); + int defaultProportion = m_hlayout->getProportion(); std::vector<int> proportions = NotationHLayout::getAvailableProportions(); for (std::vector<int>::iterator i = proportions.begin(); i != proportions.end(); ++i) { - TQString name = TQString("%1%").tqarg(*i); + TQString name = TQString("%1%").arg(*i); if (*i == 0) name = i18n("None"); @@ -1585,7 +1585,7 @@ void NotationView::setupActions() new KToggleAction (name, 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeProportionFromAction()), - actionCollection(), TQString("proportion_%1").tqarg(*i).ascii()); + actionCollection(), TQString("proportion_%1").arg(*i).ascii()); proportionAction->setExclusiveGroup("proportion"); proportionAction->setChecked(*i == defaultProportion); @@ -1820,7 +1820,7 @@ void NotationView::setupActions() TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); - TQCanvasPixmap pixmap(pixmapDir + "/toolbar/linear-tqlayout.xpm"); + TQCanvasPixmap pixmap(pixmapDir + "/toolbar/linear-layout.xpm"); icon = TQIconSet(pixmap); KRadioAction *linearModeAction = new KRadioAction (i18n("&Linear Layout"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotLinearMode()), @@ -1910,21 +1910,21 @@ void NotationView::setupActions() icon = TQIconSet(NotePixmapFactory::toTQPixmap (NotePixmapFactory::makeToolbarPixmap("triplet"))); (new KToggleAction(i18n("Trip&let Insert Mode"), icon, Key_G, - TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()), + TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()), actionCollection(), "triplet_mode"))-> setChecked(false); icon = TQIconSet(NotePixmapFactory::toTQPixmap (NotePixmapFactory::makeToolbarPixmap("chord"))); (new KToggleAction(i18n("C&hord Insert Mode"), icon, Key_H, - TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()), + TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()), actionCollection(), "chord_mode"))-> setChecked(false); icon = TQIconSet(NotePixmapFactory::toTQPixmap (NotePixmapFactory::makeToolbarPixmap("group-grace"))); (new KToggleAction(i18n("Grace Insert Mode"), icon, 0, - TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModetqStatus()), + TQT_TQOBJECT(this), TQT_SLOT(slotUpdateInsertModeStatus()), actionCollection(), "grace_mode"))-> setChecked(false); /*!!! @@ -2263,7 +2263,7 @@ void NotationView::setupActions() for (int i = 0; i <= 5; ++i) { new KAction(slashTitles[i], 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddSlashes()), actionCollection(), - TQString("slashes_%1").tqarg(i).ascii()); + TQString("slashes_%1").arg(i).ascii()); } new KAction(ClefInsertionCommand::getGlobalName(), 0, TQT_TQOBJECT(this), @@ -2546,7 +2546,7 @@ NotationView::setupFontSizeMenu(std::string oldFontName) for (unsigned int i = 0; i < sizes.size(); ++i) { KAction *action = actionCollection()->action - (TQString("note_font_size_%1").tqarg(sizes[i]).ascii()); + (TQString("note_font_size_%1").arg(sizes[i]).ascii()); m_fontSizeActionMenu->remove (action); @@ -2560,7 +2560,7 @@ NotationView::setupFontSizeMenu(std::string oldFontName) for (unsigned int i = 0; i < sizes.size(); ++i) { - TQString actionName = TQString("note_font_size_%1").tqarg(sizes[i]); + TQString actionName = TQString("note_font_size_%1").arg(sizes[i]); KToggleAction *sizeAction = dynamic_cast<KToggleAction *> (actionCollection()->action(actionName.ascii())); @@ -2611,7 +2611,7 @@ void NotationView::initLayoutToolbar() if (!layoutToolbar) { std::cerr - << "NotationView::initLayoutToolbar() : tqlayout toolbar not found" + << "NotationView::initLayoutToolbar() : layout toolbar not found" << std::endl; return ; } @@ -2679,7 +2679,7 @@ void NotationView::initLayoutToolbar() // // spacing combo // - int defaultSpacing = m_htqlayout->getSpacing(); + int defaultSpacing = m_hlayout->getSpacing(); std::vector<int> spacings = NotationHLayout::getAvailableSpacings(); m_spacingCombo = new KComboBox(layoutToolbar, "spacing combo"); @@ -2786,17 +2786,17 @@ NotationView::setPageMode(LinedStaff::PageMode pageMode) int topMargin = 0, leftMargin = 0; getPageMargins(leftMargin, topMargin); - m_htqlayout->setPageMode(pageMode != LinedStaff::LinearMode); - m_htqlayout->setPageWidth(pageWidth - leftMargin * 2); + m_hlayout->setPageMode(pageMode != LinedStaff::LinearMode); + m_hlayout->setPageWidth(pageWidth - leftMargin * 2); - NOTATION_DEBUG << "NotationView::setPageMode: set tqlayout's page width to " + NOTATION_DEBUG << "NotationView::setPageMode: set layout's page width to " << (pageWidth - leftMargin * 2) << endl; positionStaffs(); bool layoutApplied = applyLayout(); if (!layoutApplied) - KMessageBox::sorry(0, "Couldn't apply tqlayout"); + KMessageBox::sorry(0, "Couldn't apply layout"); else { for (unsigned int i = 0; i < m_staffs.size(); ++i) { m_staffs[i]->markChanged(); @@ -2894,7 +2894,7 @@ void NotationView::scrollToTime(timeT t) { - double notationViewLayoutCoord = m_htqlayout->getXForTime(t); + double notationViewLayoutCoord = m_hlayout->getXForTime(t); // Doesn't appear to matter which staff we use //!!! actually it probably does matter, if they don't have the same extents @@ -2912,7 +2912,7 @@ NotationView::scrollToTime(timeT t) RulerScale* NotationView::getHLayout() { - return m_htqlayout; + return m_hlayout; } void @@ -2948,8 +2948,8 @@ NotationView::paintEvent(TQPaintEvent *e) getPageMargins(leftMargin, topMargin); if (m_pageMode == LinedStaff::ContinuousPageMode) { - // retqlayout if the window width changes significantly in continuous page mode - int diff = int(getPageWidth() - leftMargin * 2 - m_htqlayout->getPageWidth()); + // relayout if the window width changes significantly in continuous page mode + int diff = int(getPageWidth() - leftMargin * 2 - m_hlayout->getPageWidth()); if (diff < -10 || diff > 10) { setPageMode(m_pageMode); refreshSegment(0, 0, 0); @@ -2990,15 +2990,15 @@ NotationView::paintEvent(TQPaintEvent *e) } } - slotSetOperationNameAndtqStatus(i18n(" Ready.")); + slotSetOperationNameAndStatus(i18n(" Ready.")); } bool NotationView::applyLayout(int staffNo, timeT startTime, timeT endTime) { - slotSetOperationNameAndtqStatus(i18n("Laying out score...")); + slotSetOperationNameAndStatus(i18n("Laying out score...")); ProgressDialog::processEvents(); - m_htqlayout->setStaffCount(m_staffs.size()); + m_hlayout->setStaffCount(m_staffs.size()); Profiler profiler("NotationView::applyLayout"); unsigned int i; @@ -3008,20 +3008,20 @@ bool NotationView::applyLayout(int staffNo, timeT startTime, timeT endTime) if (staffNo >= 0 && (int)i != staffNo) continue; - slotSetOperationNameAndtqStatus(i18n("Laying out staff %1...").tqarg(i + 1)); + slotSetOperationNameAndStatus(i18n("Laying out staff %1...").arg(i + 1)); ProgressDialog::processEvents(); - m_htqlayout->resetStaff(*m_staffs[i], startTime, endTime); - m_vtqlayout->resetStaff(*m_staffs[i], startTime, endTime); - m_htqlayout->scanStaff(*m_staffs[i], startTime, endTime); - m_vtqlayout->scanStaff(*m_staffs[i], startTime, endTime); + m_hlayout->resetStaff(*m_staffs[i], startTime, endTime); + m_vlayout->resetStaff(*m_staffs[i], startTime, endTime); + m_hlayout->scanStaff(*m_staffs[i], startTime, endTime); + m_vlayout->scanStaff(*m_staffs[i], startTime, endTime); } - slotSetOperationNameAndtqStatus(i18n("Reconciling staffs...")); + slotSetOperationNameAndStatus(i18n("Reconciling staffs...")); ProgressDialog::processEvents(); - m_htqlayout->finishLayout(startTime, endTime); - m_vtqlayout->finishLayout(startTime, endTime); + m_hlayout->finishLayout(startTime, endTime); + m_vlayout->finishLayout(startTime, endTime); // find the last finishing staff for future use @@ -3194,8 +3194,8 @@ void NotationView::setCurrentSelection(EventSelection* s, bool preview, getLinedStaff(segment)->positionElements(std::min(startA, startB), std::max(endA, endB)); } else { - // mark refresh status and then request a tqrepaint - segment.getRefreshtqStatus + // mark refresh status and then request a repaint + segment.getRefreshStatus (m_segmentsRefreshStatusIds [getLinedStaff(segment)->getId()]). push(std::min(startA, startB), std::max(endA, endB)); @@ -3211,14 +3211,14 @@ void NotationView::setCurrentSelection(EventSelection* s, bool preview, getLinedStaff(s->getSegment())->positionElements(startB, endB); } else { - // mark refresh status and then request a tqrepaint + // mark refresh status and then request a repaint - oldSelection->getSegment().getRefreshtqStatus + oldSelection->getSegment().getRefreshStatus (m_segmentsRefreshStatusIds [getLinedStaff(oldSelection->getSegment())->getId()]). push(startA, endA); - s->getSegment().getRefreshtqStatus + s->getSegment().getRefreshStatus (m_segmentsRefreshStatusIds [getLinedStaff(s->getSegment())->getId()]). push(startB, endB); @@ -3349,10 +3349,10 @@ void NotationView::setNotePixmapFactory(NotePixmapFactory* f) { delete m_notePixmapFactory; m_notePixmapFactory = f; - if (m_htqlayout) - m_htqlayout->setNotePixmapFactory(m_notePixmapFactory); - if (m_vtqlayout) - m_vtqlayout->setNotePixmapFactory(m_notePixmapFactory); + if (m_hlayout) + m_hlayout->setNotePixmapFactory(m_notePixmapFactory); + if (m_vlayout) + m_vlayout->setNotePixmapFactory(m_notePixmapFactory); } Segment * @@ -3469,7 +3469,7 @@ NotationView::getStaffForCanvasCoords(int x, int y) const LinedStaff::LinedStaffCoords coords = s->getLayoutCoordsForCanvasCoords(x, y); - timeT t = m_htqlayout->getTimeForX(coords.first); + timeT t = m_hlayout->getTimeForX(coords.first); // In order to find the correct starting and ending bar of the segment, // make infinitesimal shifts (+1 and -1) towards its center. timeT t0 = getDocument()->getComposition().getBarStartForTime(m_staffs[m_currentStaff]->getSegment().getStartTime()+1); @@ -3488,7 +3488,7 @@ NotationView::getStaffForCanvasCoords(int x, int y) const LinedStaff::LinedStaffCoords coords = s->getLayoutCoordsForCanvasCoords(x, y); - timeT t = m_htqlayout->getTimeForX(coords.first); + timeT t = m_hlayout->getTimeForX(coords.first); // In order to find the correct starting and ending bar of the segment, // make infinitesimal shifts (+1 and -1) towards its center. timeT t0 = getDocument()->getComposition().getBarStartForTime(m_staffs[i]->getSegment().getStartTime()+1); @@ -3589,8 +3589,8 @@ void NotationView::print(bool previewOnly) LinedStaff::LinedStaffCoords cc1 = staff->getLayoutCoordsForCanvasCoords (pageRect.x() + pageRect.width(), pageRect.y() + pageRect.height()); - timeT t0 = m_htqlayout->getTimeForX(cc0.first); - timeT t1 = m_htqlayout->getTimeForX(cc1.first); + timeT t0 = m_hlayout->getTimeForX(cc0.first); + timeT t1 = m_hlayout->getTimeForX(cc1.first); m_staffs[i]->setPrintPainter(&printpainter); m_staffs[i]->checkRendered(t0, t1); @@ -3629,8 +3629,8 @@ void NotationView::print(bool previewOnly) LinedStaff::LinedStaffCoords cc1 = staff->getLayoutCoordsForCanvasCoords (pageRect.x() + pageRect.width(), pageRect.y() + pageRect.height()); - timeT t0 = m_htqlayout->getTimeForX(cc0.first); - timeT t1 = m_htqlayout->getTimeForX(cc1.first); + timeT t0 = m_hlayout->getTimeForX(cc0.first); + timeT t1 = m_hlayout->getTimeForX(cc1.first); m_staffs[i]->renderPrintable(t0, t1); } @@ -3745,7 +3745,7 @@ NotationView::updateThumbnails(bool complete) int w = pageWidth - leftMargin / 2; int h = pageHeight; - TQString str = TQString("%1").tqarg(page + 1); + TQString str = TQString("%1").arg(page + 1); thumbPainter.drawRect(x / thumbScale, y / thumbScale, w / thumbScale, h / thumbScale); @@ -3809,7 +3809,7 @@ void NotationView::refreshSegment(Segment *segment, } setMenuStates(); - slotSetOperationNameAndtqStatus(i18n(" Ready.")); + slotSetOperationNameAndStatus(i18n(" Ready.")); NOTATION_DEBUG << "*** " << endl; } @@ -3876,7 +3876,7 @@ void NotationView::readjustCanvasSize() double maxWidth = 0.0; int maxHeight = 0; - slotSetOperationNameAndtqStatus(i18n("Sizing and allocating canvas...")); + slotSetOperationNameAndStatus(i18n("Sizing and allocating canvas...")); ProgressDialog::processEvents(); int progressTotal = m_staffs.size() + 2; @@ -3886,7 +3886,7 @@ void NotationView::readjustCanvasSize() LinedStaff &staff = *m_staffs[i]; - staff.sizeStaff(*m_htqlayout); + staff.sizeStaff(*m_hlayout); UPDATE_PROGRESS(1); if (staff.getTotalWidth() + staff.getX() > maxWidth) { @@ -3944,7 +3944,7 @@ void NotationView::readjustCanvasSize() } } - // Give a correct vertical tqalignment to track headers + // Give a correct vertical alignment to track headers if ((m_pageMode == LinedStaff::LinearMode) && m_showHeadersGroup) { m_headersGroupView->setContentsPos(0, getCanvasView()->contentsY()); } @@ -4067,7 +4067,7 @@ void NotationView::initActionDataMaps() (NotationStrings::getReferenceName(Note(type, 0), false)); TQString shortName(TQString("change_%1%2") - .tqarg(notationOnly ? "notation_" : "").tqarg(refName)); + .arg(notationOnly ? "notation_" : "").arg(refName)); shortName.replace(TQRegExp("-"), "_"); TQString titleName @@ -4095,7 +4095,7 @@ void NotationView::initActionDataMaps() Mark mark = marks[i]; TQString markName(strtoqstr(mark)); - TQString actionName = TQString("add_%1").tqarg(markName); + TQString actionName = TQString("add_%1").arg(markName); m_markActionDataMap->insert (actionName, new MarkActionData @@ -4110,10 +4110,10 @@ void NotationView::setupProgress(KProgress* bar) if (bar) { NOTATION_DEBUG << "NotationView::setupProgress(bar)\n"; - connect(m_htqlayout, TQT_SIGNAL(setProgress(int)), + connect(m_hlayout, TQT_SIGNAL(setProgress(int)), bar, TQT_SLOT(setValue(int))); - connect(m_htqlayout, TQT_SIGNAL(incrementProgress(int)), + connect(m_hlayout, TQT_SIGNAL(incrementProgress(int)), bar, TQT_SLOT(advance(int))); connect(this, TQT_SIGNAL(setProgress(int)), @@ -4142,11 +4142,11 @@ void NotationView::setupProgress(ProgressDialog* dialog) setupProgress(dialog->progressBar()); connect(dialog, TQT_SIGNAL(cancelClicked()), - m_htqlayout, TQT_SLOT(slotCancel())); + m_hlayout, TQT_SLOT(slotCancel())); for (unsigned int i = 0; i < m_staffs.size(); ++i) { connect(m_staffs[i], TQT_SIGNAL(setOperationName(TQString)), - this, TQT_SLOT(slotSetOperationNameAndtqStatus(TQString))); + this, TQT_SLOT(slotSetOperationNameAndStatus(TQString))); connect(dialog, TQT_SIGNAL(cancelClicked()), m_staffs[i], TQT_SLOT(slotCancel())); @@ -4159,10 +4159,10 @@ void NotationView::setupProgress(ProgressDialog* dialog) } -void NotationView::slotSetOperationNameAndtqStatus(TQString name) +void NotationView::slotSetOperationNameAndStatus(TQString name) { emit setOperationName(name); - statusBar()->changeItem(TQString(" %1").tqarg(name), + statusBar()->changeItem(TQString(" %1").arg(name), KTmpStatusMsg::getDefaultId()); } @@ -4170,7 +4170,7 @@ void NotationView::disconnectProgress() { NOTATION_DEBUG << "NotationView::disconnectProgress()" << endl; - m_htqlayout->disconnect(); + m_hlayout->disconnect(); disconnect(TQT_SIGNAL(setProgress(int))); disconnect(TQT_SIGNAL(incrementProgress(int))); disconnect(TQT_SIGNAL(setOperationName(TQString))); @@ -4203,18 +4203,18 @@ void NotationView::updateViewCaption() trackPosition = track->getPosition(); // std::cout << std::endl << std::endl << std::endl << "DEBUG TITLE BAR: " << getDocument()->getTitle() << std::endl << std::endl << std::endl; setCaption(i18n("%1 - Segment Track #%2 - Notation") - .tqarg(getDocument()->getTitle()) - .tqarg(trackPosition + 1)); + .arg(getDocument()->getTitle()) + .arg(trackPosition + 1)); } else if (m_segments.size() == getDocument()->getComposition().getNbSegments()) { setCaption(i18n("%1 - All Segments - Notation") - .tqarg(getDocument()->getTitle())); + .arg(getDocument()->getTitle())); } else { setCaption(i18n("%1 - Segment - Notation", "%1 - %n Segments - Notation", m_segments.size()) - .tqarg(getDocument()->getTitle())); + .arg(getDocument()->getTitle())); } } @@ -4230,7 +4230,7 @@ NotationView::MarkActionDataMap* NotationView::m_markActionDataMap = 0; void -NotationView::slotUpdateInsertModetqStatus() +NotationView::slotUpdateInsertModeStatus() { TQString tripletMessage = i18n("Triplet"); TQString chordMessage = i18n("Chord"); @@ -4238,22 +4238,22 @@ NotationView::slotUpdateInsertModetqStatus() TQString message; if (isInTripletMode()) { - message = i18n("%1 %2").tqarg(message).tqarg(tripletMessage); + message = i18n("%1 %2").arg(message).arg(tripletMessage); } if (isInChordMode()) { - message = i18n("%1 %2").tqarg(message).tqarg(chordMessage); + message = i18n("%1 %2").arg(message).arg(chordMessage); } if (isInGraceMode()) { - message = i18n("%1 %2").tqarg(message).tqarg(graceMessage); + message = i18n("%1 %2").arg(message).arg(graceMessage); } m_insertModeLabel->setText(message); } void -NotationView::slotUpdateAnnotationstqStatus() +NotationView::slotUpdateAnnotationsStatus() { if (!areAnnotationsVisible()) { for (int i = 0; i < getStaffCount(); ++i) { @@ -4273,7 +4273,7 @@ NotationView::slotUpdateAnnotationstqStatus() } void -NotationView::slotUpdateLilyPondDirectivestqStatus() +NotationView::slotUpdateLilyPondDirectivesStatus() { if (!areLilyPondDirectivesVisible()) { for (int i = 0; i < getStaffCount(); ++i) { @@ -4317,22 +4317,22 @@ NotationView::slotChangeSpacingFromAction() } else { KMessageBox::sorry - (this, i18n("Unknown spacing action %1").tqarg(name)); + (this, i18n("Unknown spacing action %1").arg(name)); } } void NotationView::slotChangeSpacing(int spacing) { - if (m_htqlayout->getSpacing() == spacing) + if (m_hlayout->getSpacing() == spacing) return ; - m_htqlayout->setSpacing(spacing); + m_hlayout->setSpacing(spacing); // m_spacingSlider->setSize(spacing); KToggleAction *action = dynamic_cast<KToggleAction *> - (actionCollection()->action(TQString("spacing_%1").tqarg(spacing).ascii())); + (actionCollection()->action(TQString("spacing_%1").arg(spacing).ascii())); if (action) action->setChecked(true); else { @@ -4357,7 +4357,7 @@ NotationView::slotChangeSpacing(int spacing) void NotationView::slotChangeProportionFromIndex(int n) { - std::vector<int> proportions = m_htqlayout->getAvailableProportions(); + std::vector<int> proportions = m_hlayout->getAvailableProportions(); if (n >= (int)proportions.size()) n = proportions.size() - 1; slotChangeProportion(proportions[n]); @@ -4375,22 +4375,22 @@ NotationView::slotChangeProportionFromAction() } else { KMessageBox::sorry - (this, i18n("Unknown proportion action %1").tqarg(name)); + (this, i18n("Unknown proportion action %1").arg(name)); } } void NotationView::slotChangeProportion(int proportion) { - if (m_htqlayout->getProportion() == proportion) + if (m_hlayout->getProportion() == proportion) return ; - m_htqlayout->setProportion(proportion); + m_hlayout->setProportion(proportion); // m_proportionSlider->setSize(proportion); KToggleAction *action = dynamic_cast<KToggleAction *> - (actionCollection()->action(TQString("proportion_%1").tqarg(proportion).ascii())); + (actionCollection()->action(TQString("proportion_%1").arg(proportion).ascii())); if (action) action->setChecked(true); else { @@ -4422,7 +4422,7 @@ NotationView::slotChangeFontFromAction() slotChangeFont(name); } else { KMessageBox::sorry - (this, i18n("Unknown font action %1").tqarg(name)); + (this, i18n("Unknown font action %1").arg(name)); } } @@ -4440,11 +4440,11 @@ NotationView::slotChangeFontSizeFromAction() slotChangeFont(m_fontName, size); else { KMessageBox::sorry - (this, i18n("Unknown font size %1").tqarg(name)); + (this, i18n("Unknown font size %1").arg(name)); } } else { KMessageBox::sorry - (this, i18n("Unknown font size action %1").tqarg(name)); + (this, i18n("Unknown font size action %1").arg(name)); } } @@ -4581,7 +4581,7 @@ NotationView::slotChangeFont(std::string newName, int newSize) int topMargin = 0, leftMargin = 0; getPageMargins(leftMargin, topMargin); - m_htqlayout->setPageWidth(pageWidth - leftMargin * 2); + m_hlayout->setPageWidth(pageWidth - leftMargin * 2); } for (unsigned int i = 0; i < m_staffs.size(); ++i) { @@ -4594,7 +4594,7 @@ NotationView::slotChangeFont(std::string newName, int newSize) bool layoutApplied = applyLayout(); if (!layoutApplied) - KMessageBox::sorry(0, "Couldn't apply tqlayout"); + KMessageBox::sorry(0, "Couldn't apply layout"); else { for (unsigned int i = 0; i < m_staffs.size(); ++i) { m_staffs[i]->markChanged(); @@ -5357,7 +5357,7 @@ void NotationView::slotAddIndication(std::string type, TQString desc) setSingleSelectedEvent(m_currentEventSelection->getSegment(), command->getLastInsertedEvent()); } else { - KMessageBox::sorry(this, i18n("Can't add overlapping %1 indications").tqarg(desc)); // TODO PLURAL - how many 'indications' ? + KMessageBox::sorry(this, i18n("Can't add overlapping %1 indications").arg(desc)); // TODO PLURAL - how many 'indications' ? delete command; } } @@ -5568,7 +5568,7 @@ void NotationView::slotSetStyleFromAction() if (name.left(6) == "style_") { name = name.right(name.length() - 6); - KTmpStatusMsg msg(i18n("Changing to %1 style...").tqarg(name), + KTmpStatusMsg msg(i18n("Changing to %1 style...").arg(name), this); addCommandToHistory(new ChangeStyleCommand @@ -5576,7 +5576,7 @@ void NotationView::slotSetStyleFromAction() *m_currentEventSelection)); } else { KMessageBox::sorry - (this, i18n("Unknown style action %1").tqarg(name)); + (this, i18n("Unknown style action %1").arg(name)); } } @@ -5608,7 +5608,7 @@ void NotationView::slotInsertNoteFromAction() } catch (...) { KMessageBox::sorry - (this, i18n("Unknown note insert action %1").tqarg(name)); + (this, i18n("Unknown note insert action %1").arg(name)); return ; } @@ -6027,9 +6027,9 @@ NotationView::slotMakeOrnament() TQString name; int barNo = segment.getComposition()->getBarNumber(absTime); if (track) { - name = TQString(i18n("Ornament track %1 bar %2").tqarg(track->getPosition() + 1).tqarg(barNo + 1)); + name = TQString(i18n("Ornament track %1 bar %2").arg(track->getPosition() + 1).arg(barNo + 1)); } else { - name = TQString(i18n("Ornament bar %1").tqarg(barNo + 1)); + name = TQString(i18n("Ornament bar %1").arg(barNo + 1)); } MakeOrnamentDialog dialog(this, name, basePitch); @@ -6438,22 +6438,22 @@ NotationView::slotSetPointerPosition(timeT time, bool scroll) for (unsigned int i = 0; i < m_staffs.size(); ++i) { - double layoutX = m_htqlayout->getXForTimeByEvent(time); + double layoutX = m_hlayout->getXForTimeByEvent(time); Segment &seg = m_staffs[i]->getSegment(); bool good = true; - if (barNo >= m_htqlayout->getLastVisibleBarOnStaff(*m_staffs[i])) { + if (barNo >= m_hlayout->getLastVisibleBarOnStaff(*m_staffs[i])) { if (seg.isRepeating() && time < seg.getRepeatEndTime()) { timeT mappedTime = seg.getStartTime() + ((time - seg.getStartTime()) % (seg.getEndMarkerTime() - seg.getStartTime())); - layoutX = m_htqlayout->getXForTimeByEvent(mappedTime); + layoutX = m_hlayout->getXForTimeByEvent(mappedTime); } else { good = false; } - } else if (barNo < m_htqlayout->getFirstVisibleBarOnStaff(*m_staffs[i])) { + } else if (barNo < m_hlayout->getFirstVisibleBarOnStaff(*m_staffs[i])) { good = false; } @@ -6536,7 +6536,7 @@ NotationView::slotSetCurrentStaff(int staffNo) m_chordNameRuler->setCurrentSegment(segment); m_rawNoteRuler->setCurrentSegment(segment); - m_rawNoteRuler->tqrepaint(); + m_rawNoteRuler->repaint(); setControlRulersCurrentSegment(); updateView(); @@ -6750,7 +6750,7 @@ NotationView::doDeferredCursorMove() t == segment.getEndTime() || t == segment.getBarStartForTime(t)) { - staff->setInsertCursorPosition(*m_htqlayout, t); + staff->setInsertCursorPosition(*m_hlayout, t); if (type == CursorMoveAndMakeVisible) { double cx; @@ -6976,21 +6976,21 @@ void NotationView::slotMultiPageMode() void NotationView::slotToggleChordsRuler() { - if (m_htqlayout->isPageMode()) + if (m_hlayout->isPageMode()) return ; toggleWidget(m_chordNameRuler, "show_chords_ruler"); } void NotationView::slotToggleRawNoteRuler() { - if (m_htqlayout->isPageMode()) + if (m_hlayout->isPageMode()) return ; toggleWidget(m_rawNoteRuler, "show_raw_note_ruler"); } void NotationView::slotToggleTempoRuler() { - if (m_htqlayout->isPageMode()) + if (m_hlayout->isPageMode()) return ; toggleWidget(m_tempoRuler, "show_tempo_ruler"); } @@ -6998,7 +6998,7 @@ void NotationView::slotToggleTempoRuler() void NotationView::slotToggleAnnotations() { m_annotationsVisible = !m_annotationsVisible; - slotUpdateAnnotationstqStatus(); + slotUpdateAnnotationsStatus(); //!!! use refresh mechanism refreshSegment(0, 0, 0); } @@ -7006,7 +7006,7 @@ void NotationView::slotToggleAnnotations() void NotationView::slotToggleLilyPondDirectives() { m_lilyPondDirectivesVisible = !m_lilyPondDirectivesVisible; - slotUpdateLilyPondDirectivestqStatus(); + slotUpdateLilyPondDirectivesStatus(); //!!! use refresh mechanism refreshSegment(0, 0, 0); } @@ -7116,7 +7116,7 @@ void NotationView::slotNonNotationItemPressed(TQMouseEvent *e, TQCanvasItem *it) } else if (dynamic_cast<TQCanvasTimeSigSprite *>(it)) { double layoutX = (dynamic_cast<TQCanvasTimeSigSprite *>(it))->getLayoutX(); - emit editTimeSignature(m_htqlayout->getTimeForX(layoutX)); + emit editTimeSignature(m_hlayout->getTimeForX(layoutX)); } } @@ -7194,17 +7194,17 @@ NotationView::slotHoveredOverAbsoluteTimeChanged(unsigned int time) // TQString message; // TQString format("%ld (%ld.%03lds)"); - // format = i18n("Time: %1").tqarg(format); + // format = i18n("Time: %1").arg(format); // message.sprintf(format, t, rt.sec, ms); TQString message = i18n("Time: %1 (%2.%3s)") - .tqarg(TQString("%1-%2-%3-%4") - .tqarg(TQString("%1").tqarg(bar + 1).rightJustify(3, '0')) - .tqarg(TQString("%1").tqarg(beat).rightJustify(2, '0')) - .tqarg(TQString("%1").tqarg(fraction).rightJustify(2, '0')) - .tqarg(TQString("%1").tqarg(remainder).rightJustify(2, '0'))) - .tqarg(rt.sec) - .tqarg(TQString("%1").tqarg(ms).rightJustify(3, '0')); + .arg(TQString("%1-%2-%3-%4") + .arg(TQString("%1").arg(bar + 1).rightJustify(3, '0')) + .arg(TQString("%1").arg(beat).rightJustify(2, '0')) + .arg(TQString("%1").arg(fraction).rightJustify(2, '0')) + .arg(TQString("%1").arg(remainder).rightJustify(2, '0'))) + .arg(rt.sec) + .arg(TQString("%1").arg(ms).rightJustify(3, '0')); m_hoveredOverAbsoluteTime->setText(message); } @@ -7396,8 +7396,8 @@ NotationView::slotCheckRendered(double cx0, double cx1) LinedStaff::LinedStaffCoords cc1 = staff->getLayoutCoordsForCanvasCoords (cx1, staff->getTotalHeight() + staff->getY()); - timeT t0 = m_htqlayout->getTimeForX(cc0.first); - timeT t1 = m_htqlayout->getTimeForX(cc1.first); + timeT t0 = m_hlayout->getTimeForX(cc0.first); + timeT t1 = m_hlayout->getTimeForX(cc1.first); if (dynamic_cast<NotationStaff *>(staff)->checkRendered(t0, t1)) { something = true; //!!! diff --git a/src/gui/editors/notation/NotationView.h b/src/gui/editors/notation/NotationView.h index 461d299..ac8f58c 100644 --- a/src/gui/editors/notation/NotationView.h +++ b/src/gui/editors/notation/NotationView.h @@ -274,13 +274,13 @@ public: /// Sound the given note void playNote(Segment &segment, int pitch, int velocity = -1); - /// Switches between page- and linear- tqlayout modes + /// Switches between page- and linear- layout modes void setPageMode(LinedStaff::PageMode mode); - /// Returns the page width according to the tqlayout mode (page/linear) + /// Returns the page width according to the layout mode (page/linear) int getPageWidth(); - /// Returns the page height according to the tqlayout mode (page/linear) + /// Returns the page height according to the layout mode (page/linear) int getPageHeight(); /// Returns the margins within the page (zero if not in MultiPageMode) @@ -310,7 +310,7 @@ public: /** * Render segments on printing painter. This uses the current - * font size and tqlayout, rather than the optimal ones for the + * font size and layout, rather than the optimal ones for the * printer configuration (notation editing is not quite WYSIWYG, * and we may be in a non-page mode). * @@ -446,7 +446,7 @@ public slots: void slotToggleGroupToolBar(); /** - * toggles the tqlayout toolbar + * toggles the layout toolbar */ void slotToggleLayoutToolBar(); @@ -494,9 +494,9 @@ public slots: void slotToggleStepByStep(); /// status stuff - void slotUpdateInsertModetqStatus(); - void slotUpdateAnnotationstqStatus(); - void slotUpdateLilyPondDirectivestqStatus(); + void slotUpdateInsertModeStatus(); + void slotUpdateAnnotationsStatus(); + void slotUpdateLilyPondDirectivesStatus(); /// edit menu void slotPreviewSelection(); @@ -773,22 +773,22 @@ public slots: /// Changes to the next font size down void slotZoomOut(); - /// Changes the htqlayout spacing of the staffs on the view + /// Changes the hlayout spacing of the staffs on the view void slotChangeSpacing(int newSpacing); - /// Changes the htqlayout spacing of the staffs on the view + /// Changes the hlayout spacing of the staffs on the view void slotChangeSpacingFromStringValue(const TQString&); - /// Changes the htqlayout spacing of the staffs on the view + /// Changes the hlayout spacing of the staffs on the view void slotChangeSpacingFromAction(); - /// Changes the htqlayout proportion of the staffs on the view + /// Changes the hlayout proportion of the staffs on the view void slotChangeProportion(int newProportion); - /// Changes the htqlayout proportion of the staffs on the view + /// Changes the hlayout proportion of the staffs on the view void slotChangeProportionFromIndex(int newProportionIndex); - /// Changes the htqlayout proportion of the staffs on the view + /// Changes the hlayout proportion of the staffs on the view void slotChangeProportionFromAction(); /// Note-on received asynchronously -- consider step-by-step editing @@ -812,7 +812,7 @@ public slots: /// Do some background rendering work. void slotRenderSomething(); - void slotSetOperationNameAndtqStatus(TQString); + void slotSetOperationNameAndStatus(TQString); // Update notation view based on track/staff name change void slotUpdateStaffName(); @@ -876,7 +876,7 @@ protected: protected slots: /** * save general Options like all bar positions and status as well - * as the tqgeometry and the recent file list to the configuration + * as the geometry and the recent file list to the configuration * file */ virtual void slotSaveOptions(); @@ -912,13 +912,13 @@ protected: virtual void initStatusBar(); /** - * Place the staffs at the correct x & y coordinates (before tqlayout) + * Place the staffs at the correct x & y coordinates (before layout) */ void positionStaffs(); /** * Place the page pixmaps (if any) at the correct x & y - * coordinates (after tqlayout) + * coordinates (after layout) */ void positionPages(); @@ -929,7 +929,7 @@ protected: void updateThumbnails(bool complete); /** - * setup the tqlayout/font toolbar + * setup the layout/font toolbar */ void initLayoutToolbar(); @@ -940,15 +940,15 @@ protected: */ void toggleNamedToolBar(const TQString& toolBarName, bool* force = 0); - /// Calls all the relevant preparse and tqlayout methods + /// Calls all the relevant preparse and layout methods virtual bool applyLayout(int staffNo = -1, timeT startTime = 0, timeT endTime = 0); /** - * Readjust the size of the canvas after a tqlayout + * Readjust the size of the canvas after a layout * - * Checks the total width computed by the horizontal tqlayout + * Checks the total width computed by the horizontal layout * * @see NotationHLayout#getTotalWidth() */ @@ -1074,8 +1074,8 @@ protected: NotePixmapFactory *m_notePixmapFactory; - NotationHLayout* m_htqlayout; - NotationVLayout* m_vtqlayout; + NotationHLayout* m_hlayout; + NotationVLayout* m_vlayout; ChordNameRuler *m_chordNameRuler; TQWidget *m_tempoRuler; diff --git a/src/gui/editors/notation/NoteFont.cpp b/src/gui/editors/notation/NoteFont.cpp index 18f82f7..5f84e7a 100644 --- a/src/gui/editors/notation/NoteFont.cpp +++ b/src/gui/editors/notation/NoteFont.cpp @@ -66,7 +66,7 @@ NoteFont::NoteFont(std::string fontName, int size) : if (size > 0) { if (sizes.find(size) == sizes.end()) { - throw BadNoteFont(qstrtostr(TQString("Font \"%1\" not available in size %2").tqarg(strtoqstr(fontName)).tqarg(size))); + throw BadNoteFont(qstrtostr(TQString("Font \"%1\" not available in size %2").arg(strtoqstr(fontName)).arg(size))); } else { m_size = size; } @@ -86,8 +86,8 @@ NoteFont::NoteFont(std::string fontName, int size) : // Locate our font's pixmap map in the font map, create if necessary std::string fontKey = qstrtostr(TQString("__%1__%2__") - .tqarg(strtoqstr(m_fontMap.getName())) - .tqarg(m_size)); + .arg(strtoqstr(m_fontMap.getName())) + .arg(m_size)); FontPixmapMap::iterator i = m_fontPixmapMap->find(fontKey); if (i == m_fontPixmapMap->end()) { @@ -444,13 +444,13 @@ NoteFont::getShadedPixmap(CharName baseCharName, TQPixmap &pixmap, CharName NoteFont::getNameWithColour(CharName base, int hue) const { - return qstrtostr(TQString("%1__%2").tqarg(hue).tqarg(strtoqstr(base))); + return qstrtostr(TQString("%1__%2").arg(hue).arg(strtoqstr(base))); } CharName NoteFont::getNameShaded(CharName base) const { - return qstrtostr(TQString("shaded__%1").tqarg(strtoqstr(base))); + return qstrtostr(TQString("shaded__%1").arg(strtoqstr(base))); } bool diff --git a/src/gui/editors/notation/NoteFontMap.cpp b/src/gui/editors/notation/NoteFontMap.cpp index 47fc9f5..f82a263 100644 --- a/src/gui/editors/notation/NoteFontMap.cpp +++ b/src/gui/editors/notation/NoteFontMap.cpp @@ -57,8 +57,8 @@ NoteFontMap::NoteFontMap(std::string name) : TQString mapFileName; TQString mapFileMixedName = TQString("%1/mappings/%2.xml") - .tqarg(m_fontDirectory) - .tqarg(strtoqstr(name)); + .arg(m_fontDirectory) + .arg(strtoqstr(name)); TQFileInfo mapFileMixedInfo(mapFileMixedName); @@ -67,8 +67,8 @@ NoteFontMap::NoteFontMap(std::string name) : TQString lowerName = strtoqstr(name).lower(); lowerName.replace(TQRegExp(" "), "_"); TQString mapFileLowerName = TQString("%1/mappings/%2.xml") - .tqarg(m_fontDirectory) - .tqarg(lowerName); + .arg(m_fontDirectory) + .arg(lowerName); TQFileInfo mapFileLowerInfo(mapFileLowerName); @@ -76,11 +76,11 @@ NoteFontMap::NoteFontMap(std::string name) : if (mapFileLowerName != mapFileMixedName) { throw MappingFileReadFailed (qstrtostr(i18n("Can't open font mapping file %1 or %2"). - tqarg(mapFileMixedName).tqarg(mapFileLowerName))); + arg(mapFileMixedName).arg(mapFileLowerName))); } else { throw MappingFileReadFailed (qstrtostr(i18n("Can't open font mapping file %1"). - tqarg(mapFileMixedName))); + arg(mapFileMixedName))); } } else { mapFileName = mapFileLowerName; @@ -595,7 +595,7 @@ NoteFontMap::startElement(const TQString &, const TQString &, m_systemFontNames[n] = name; delete font; } else { - std::cerr << TQString("Warning: Unable to load font \"%1\"").tqarg(name).ascii() << std::endl; + std::cerr << TQString("Warning: Unable to load font \"%1\"").arg(name).ascii() << std::endl; m_ok = false; } @@ -615,7 +615,7 @@ NoteFontMap::startElement(const TQString &, const TQString &, } if (!have) { std::cerr << TQString("Warning: Unable to load any of the fonts in \"%1\""). - tqarg(names).ascii() << std::endl; + arg(names).ascii() << std::endl; m_ok = false; } @@ -657,10 +657,10 @@ bool NoteFontMap::error(const TQXmlParseException& exception) { m_errorString = TQString("%1 at line %2, column %3: %4") - .tqarg(exception.message()) - .tqarg(exception.lineNumber()) - .tqarg(exception.columnNumber()) - .tqarg(m_errorString); + .arg(exception.message()) + .arg(exception.lineNumber()) + .arg(exception.columnNumber()) + .arg(m_errorString); return TQXmlDefaultHandler::error(exception); } @@ -668,10 +668,10 @@ bool NoteFontMap::fatalError(const TQXmlParseException& exception) { m_errorString = TQString("%1 at line %2, column %3: %4") - .tqarg(exception.message()) - .tqarg(exception.lineNumber()) - .tqarg(exception.columnNumber()) - .tqarg(m_errorString); + .arg(exception.message()) + .arg(exception.lineNumber()) + .arg(exception.columnNumber()) + .arg(m_errorString); return TQXmlDefaultHandler::fatalError(exception); } @@ -705,20 +705,20 @@ bool NoteFontMap::checkFile(int size, std::string &src) const { TQString pixmapFileMixedName = TQString("%1/%2/%3/%4.xpm") - .tqarg(m_fontDirectory) - .tqarg(strtoqstr(m_srcDirectory)) - .tqarg(size) - .tqarg(strtoqstr(src)); + .arg(m_fontDirectory) + .arg(strtoqstr(m_srcDirectory)) + .arg(size) + .arg(strtoqstr(src)); TQFileInfo pixmapFileMixedInfo(pixmapFileMixedName); if (!pixmapFileMixedInfo.isReadable()) { TQString pixmapFileLowerName = TQString("%1/%2/%3/%4.xpm") - .tqarg(m_fontDirectory) - .tqarg(strtoqstr(m_srcDirectory).lower()) - .tqarg(size) - .tqarg(strtoqstr(src)); + .arg(m_fontDirectory) + .arg(strtoqstr(m_srcDirectory).lower()) + .arg(size) + .arg(strtoqstr(src)); TQFileInfo pixmapFileLowerInfo(pixmapFileLowerName); diff --git a/src/gui/editors/notation/NoteFontViewer.cpp b/src/gui/editors/notation/NoteFontViewer.cpp index d485244..d3dc2a3 100644 --- a/src/gui/editors/notation/NoteFontViewer.cpp +++ b/src/gui/editors/notation/NoteFontViewer.cpp @@ -50,7 +50,7 @@ NoteFontViewer::slotViewChanged(int i) for (int r = 0; r < 256; ++r) { if (m_frame->hasRow(r)) { - m_rows->insertItem(TQString("%1").tqarg(r)); + m_rows->insertItem(TQString("%1").arg(r)); if (firstRow < 0) firstRow = r; } @@ -84,7 +84,7 @@ NoteFontViewer::slotFontChanged(const TQString &s) NoteFontViewer::NoteFontViewer(TQWidget *parent, TQString noteFontName, TQStringList fontNames, int pixelSize) : KDialogBase(parent, 0, true, - i18n("Note Font Viewer: %1").tqarg(noteFontName), Close) + i18n("Note Font Viewer: %1").arg(noteFontName), Close) { TQVBox *box = makeVBoxMainWidget(); KToolBar* controls = new KToolBar(box); diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp index 2ff4969..9103d4e 100644 --- a/src/gui/editors/notation/NotePixmapFactory.cpp +++ b/src/gui/editors/notation/NotePixmapFactory.cpp @@ -1880,7 +1880,7 @@ NotePixmapFactory::makeClefPixmap(const Clef &clef) else if (adjustedOctave < 8) adjustedOctave++; - TQString text = TQString("%1").tqarg(adjustedOctave); + TQString text = TQString("%1").arg(adjustedOctave); TQRect rect = m_clefOttavaFontMetrics.boundingRect(text); createPixmapAndMask(plain.getWidth(), @@ -2228,7 +2228,7 @@ NotePixmapFactory::makeTrackHeaderPixmap( else if (adjustedOctave < 8) adjustedOctave++; - TQString text = TQString("%1").tqarg(adjustedOctave); + TQString text = TQString("%1").arg(adjustedOctave); TQRect rect = m_clefOttavaFontMetrics.boundingRect(text); m_p->painter().setPen(colour); diff --git a/src/gui/editors/notation/NotePixmapFactory.h b/src/gui/editors/notation/NotePixmapFactory.h index 9bf32b1..2b502f1 100644 --- a/src/gui/editors/notation/NotePixmapFactory.h +++ b/src/gui/editors/notation/NotePixmapFactory.h @@ -140,7 +140,7 @@ public: TQCanvasPixmap* makeTrackHeaderPixmap(int width, int height, TrackHeader *header); - // Bounding box and other tqgeometry methods: + // Bounding box and other geometry methods: int getNoteBodyWidth (Note::Type = Note::Crotchet) const; diff --git a/src/gui/editors/notation/NotePixmapPainter.h b/src/gui/editors/notation/NotePixmapPainter.h index 9b56052..ff8edae 100644 --- a/src/gui/editors/notation/NotePixmapPainter.h +++ b/src/gui/editors/notation/NotePixmapPainter.h @@ -61,13 +61,13 @@ public: if (mask) { m_useMask = true; - m_maskPainter.tqbegin(mask, unclipped); + m_maskPainter.begin(mask, unclipped); } else { m_useMask = false; } m_painter = &m_myPainter; - return m_painter->tqbegin(device, unclipped); + return m_painter->begin(device, unclipped); } bool end() { @@ -105,19 +105,19 @@ public: void drawPolygon(const TQPointArray &a, bool winding = false, int index = 0, int n = -1) { - m_painter->tqdrawPolygon(a, winding, index, n); - if (m_useMask) m_maskPainter.tqdrawPolygon(a, winding, index, n); + m_painter->drawPolygon(a, winding, index, n); + if (m_useMask) m_maskPainter.drawPolygon(a, winding, index, n); } void drawPolyline(const TQPointArray &a, int index = 0, int n = -1) { - m_painter->tqdrawPolyline(a, index, n); - if (m_useMask) m_maskPainter.tqdrawPolyline(a, index, n); + m_painter->drawPolyline(a, index, n); + if (m_useMask) m_maskPainter.drawPolyline(a, index, n); } void drawPixmap(int x, int y, const TQPixmap &pm, int sx = 0, int sy = 0, int sw = -1, int sh = -1) { - m_painter->tqdrawPixmap(x, y, pm, sx, sy, sw, sh); - if (m_useMask) m_maskPainter.tqdrawPixmap(x, y, *(pm.mask()), sx, sy, sw, sh); + m_painter->drawPixmap(x, y, pm, sx, sy, sw, sh); + if (m_useMask) m_maskPainter.drawPixmap(x, y, *(pm.mask()), sx, sy, sw, sh); } void drawText(int x, int y, const TQString &string) { diff --git a/src/gui/editors/notation/NoteStyle.cpp b/src/gui/editors/notation/NoteStyle.cpp index 00ce956..1e316fd 100644 --- a/src/gui/editors/notation/NoteStyle.cpp +++ b/src/gui/editors/notation/NoteStyle.cpp @@ -70,12 +70,12 @@ NoteStyle::getShape(Note::Type type) if (m_baseStyle) return m_baseStyle->getShape(type); std::cerr - << "WARNING: NoteStyle::getShape: No tqshape defined for note type " + << "WARNING: NoteStyle::getShape: No shape defined for note type " << type << ", defaulting to AngledOval" << std::endl; return AngledOval; } - return i->second.tqshape; + return i->second.shape; } bool @@ -183,57 +183,57 @@ NoteStyle::getNoteHeadCharName(Note::Type type) CharName name = NoteCharacterNames::UNKNOWN; bool inverted = false; - if (desc.tqshape == AngledOval) { + if (desc.shape == AngledOval) { name = desc.filled ? NoteCharacterNames::NOTEHEAD_BLACK : NoteCharacterNames::VOID_NOTEHEAD; - } else if (desc.tqshape == LevelOval) { + } else if (desc.shape == LevelOval) { if (desc.filled) { std::cerr << "WARNING: NoteStyle::getNoteHeadCharName: No filled level oval head" << std::endl; } name = NoteCharacterNames::WHOLE_NOTE; - } else if (desc.tqshape == Breve) { + } else if (desc.shape == Breve) { if (desc.filled) { std::cerr << "WARNING: NoteStyle::getNoteHeadCharName: No filled breve head" << std::endl; } name = NoteCharacterNames::BREVE; - } else if (desc.tqshape == Cross) { + } else if (desc.shape == Cross) { name = desc.filled ? NoteCharacterNames::X_NOTEHEAD : NoteCharacterNames::CIRCLE_X_NOTEHEAD; - } else if (desc.tqshape == TriangleUp) { + } else if (desc.shape == TriangleUp) { name = desc.filled ? NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_BLACK : NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_WHITE; - } else if (desc.tqshape == TriangleDown) { + } else if (desc.shape == TriangleDown) { name = desc.filled ? NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_BLACK : NoteCharacterNames::TRIANGLE_NOTEHEAD_UP_WHITE; inverted = true; - } else if (desc.tqshape == Diamond) { + } else if (desc.shape == Diamond) { name = desc.filled ? NoteCharacterNames::SEMIBREVIS_BLACK : NoteCharacterNames::SEMIBREVIS_WHITE; - } else if (desc.tqshape == Rectangle) { + } else if (desc.shape == Rectangle) { name = desc.filled ? NoteCharacterNames::STQUARE_NOTEHEAD_BLACK : NoteCharacterNames::STQUARE_NOTEHEAD_WHITE; - } else if (desc.tqshape == Number) { + } else if (desc.shape == Number) { std::cerr << "WARNING: NoteStyle::getNoteHeadCharName: Number not yet implemented" << std::endl; name = NoteCharacterNames::UNKNOWN; //!!! - } else if (desc.tqshape == CustomCharName) { + } else if (desc.shape == CustomCharName) { name = desc.charName; @@ -433,10 +433,10 @@ NoteStyle::checkDescription(Note::Type note) } void -NoteStyle::setShape(Note::Type note, NoteHeadShape tqshape) +NoteStyle::setShape(Note::Type note, NoteHeadShape shape) { checkDescription(note); - m_notes[note].tqshape = tqshape; + m_notes[note].shape = shape; } void diff --git a/src/gui/editors/notation/NoteStyle.h b/src/gui/editors/notation/NoteStyle.h index 4431c16..3959e01 100644 --- a/src/gui/editors/notation/NoteStyle.h +++ b/src/gui/editors/notation/NoteStyle.h @@ -99,8 +99,8 @@ public: protected: struct NoteDescription { - NoteHeadShape tqshape; // if CustomCharName, use charName - CharName charName; // only used if tqshape == CustomCharName + NoteHeadShape shape; // if CustomCharName, use charName + CharName charName; // only used if shape == CustomCharName bool filled; bool stem; int flags; @@ -109,14 +109,14 @@ protected: VFixPoint vfix; NoteDescription() : - tqshape(AngledOval), charName(NoteCharacterNames::UNKNOWN), + shape(AngledOval), charName(NoteCharacterNames::UNKNOWN), filled(true), stem(true), flags(0), slashes(0), hfix(Normal), vfix(Middle) { } - NoteDescription(NoteHeadShape _tqshape, CharName _charName, + NoteDescription(NoteHeadShape _shape, CharName _charName, bool _filled, bool _stem, int _flags, int _slashes, HFixPoint _hfix, VFixPoint _vfix) : - tqshape(_tqshape), charName(_charName), + shape(_shape), charName(_charName), filled(_filled), stem(_stem), flags(_flags), slashes(_slashes), hfix(_hfix), vfix(_vfix) { } }; diff --git a/src/gui/editors/notation/NoteStyleFactory.cpp b/src/gui/editors/notation/NoteStyleFactory.cpp index d5e0815..4303cc6 100644 --- a/src/gui/editors/notation/NoteStyleFactory.cpp +++ b/src/gui/editors/notation/NoteStyleFactory.cpp @@ -63,7 +63,7 @@ NoteStyleFactory::getAvailableStyleNames() for (TQStringList::Iterator i = files.begin(); i != files.end(); ++i) { if ((*i).length() > 4 && (*i).right(4) == ".xml") { - TQFileInfo fileInfo(TQString("%1/%2").tqarg(styleDir).tqarg(*i)); + TQFileInfo fileInfo(TQString("%1/%2").arg(styleDir).arg(*i)); if (fileInfo.exists() && fileInfo.isReadable()) { std::string styleName = qstrtostr((*i).left((*i).length() - 4)); if (styleName == DefaultStyle) diff --git a/src/gui/editors/notation/NoteStyleFileReader.cpp b/src/gui/editors/notation/NoteStyleFileReader.cpp index b8619c9..10e5f13 100644 --- a/src/gui/editors/notation/NoteStyleFileReader.cpp +++ b/src/gui/editors/notation/NoteStyleFileReader.cpp @@ -48,13 +48,13 @@ NoteStyleFileReader::NoteStyleFileReader(std::string name) : KGlobal::dirs()->findResource("appdata", "styles/"); TQString styleFileName = - TQString("%1/%2.xml").tqarg(styleDirectory).tqarg(strtoqstr(name)); + TQString("%1/%2.xml").arg(styleDirectory).arg(strtoqstr(name)); TQFileInfo fileInfo(styleFileName); if (!fileInfo.isReadable()) { throw StyleFileReadFailed - (qstrtostr(i18n("Can't open style file %1").tqarg(styleFileName))); + (qstrtostr(i18n("Can't open style file %1").arg(styleFileName))); } TQFile styleFile(styleFileName); @@ -98,7 +98,7 @@ NoteStyleFileReader::startElement(const TQString &, const TQString &, if (!setFromAttributes(type, attributes)) return false; } catch (NotationStrings::MalformedNoteName n) { - m_errorString = i18n("Unrecognised note name %1").tqarg(s); + m_errorString = i18n("Unrecognised note name %1").arg(s); return false; } @@ -125,7 +125,7 @@ NoteStyleFileReader::setFromAttributes(Note::Type type, TQString s; bool haveShape = false; - s = attributes.value("tqshape"); + s = attributes.value("shape"); if (!s.isNull()) { m_style->setShape(type, qstrtostr(s.lower())); haveShape = true; @@ -134,7 +134,7 @@ NoteStyleFileReader::setFromAttributes(Note::Type type, s = attributes.value("charname"); if (!s.isNull()) { if (haveShape) { - m_errorString = i18n("global and note elements may have tqshape " + m_errorString = i18n("global and note elements may have shape " "or charname attribute, but not both"); return false; } diff --git a/src/gui/editors/notation/TrackHeader.cpp b/src/gui/editors/notation/TrackHeader.cpp index fa19ca5..83dca88 100644 --- a/src/gui/editors/notation/TrackHeader.cpp +++ b/src/gui/editors/notation/TrackHeader.cpp @@ -65,7 +65,7 @@ namespace Rosegarden { -// tqStatus bits +// Status bits const int TrackHeader::SEGMENT_HERE = 1 << 0; const int TrackHeader::SUPERIMPOSED_SEGMENTS = 1 << 1; const int TrackHeader::INCONSISTENT_CLEFS = 1 << 2; @@ -111,12 +111,12 @@ TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos int trackPos = comp->getTrackPositionById(m_track); TQString toolTipText = TQString(i18n("Track %1 : \"%2\"") - .tqarg(trackPos + 1) - .tqarg(strtoqstr(track->getLabel()))); + .arg(trackPos + 1) + .arg(strtoqstr(track->getLabel()))); TQString preset = track->getPresetLabel().c_str(); if (preset != TQString("")) - toolTipText += TQString(i18n("\nNotate for: %1").tqarg(preset)); + toolTipText += TQString(i18n("\nNotate for: %1").arg(preset)); TQString notationSize = i18n("normal"); switch (track->getStaffSize()) { @@ -154,8 +154,8 @@ TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos } toolTipText += TQString(i18n("\nSize: %1, Bracket: %2 ")) - .tqarg(notationSize) - .tqarg(bracketText); + .arg(notationSize) + .arg(bracketText); // Sort segments by position on the track SortedSegments segments; @@ -181,17 +181,17 @@ TrackHeader::TrackHeader(TQWidget *parent, TrackId trackId, int height, int ypos TQString transposeName; transposeValueToName(transpose, transposeName); toolTipText += TQString(i18n("\nbars [%1-%2] in %3 (tr=%4) : \"%5\"")) - .tqarg(barStart) - .tqarg(barEnd) - .tqarg(transposeName) - .tqarg(transpose) - .tqarg(strtoqstr((*i)->getLabel())); + .arg(barStart) + .arg(barEnd) + .arg(transposeName) + .arg(transpose) + .arg(strtoqstr((*i)->getLabel())); } else { toolTipText += TQString(i18n("\nbars [%1-%2] (tr=%3) : \"%4\"")) - .tqarg(barStart) - .tqarg(barEnd) - .tqarg(transpose) - .tqarg(strtoqstr((*i)->getLabel())); + .arg(barStart) + .arg(barEnd) + .arg(transpose) + .arg(strtoqstr((*i)->getLabel())); } } @@ -350,9 +350,9 @@ TrackHeader::lookAtStaff(double x, int maxWidth) transposeValueToName(m_transpose, noteName); m_upperText = TQString(i18n("%1: %2") - .tqarg(trackPos + 1) - .tqarg(strtoqstr(track->getLabel()))); - if (m_transpose) m_transposeText = i18n(" in %1").tqarg(noteName); + .arg(trackPos + 1) + .arg(strtoqstr(track->getLabel()))); + if (m_transpose) m_transposeText = i18n(" in %1").arg(noteName); else m_transposeText = TQString(""); NotePixmapFactory * npf = m_notationView->getNotePixmapFactory(); diff --git a/src/gui/editors/notation/TrackHeader.h b/src/gui/editors/notation/TrackHeader.h index 3f7029e..85ee067 100644 --- a/src/gui/editors/notation/TrackHeader.h +++ b/src/gui/editors/notation/TrackHeader.h @@ -169,7 +169,7 @@ private : void transposeValueToName(int transpose, TQString &transposeName); - // tqStatus bits + // Status bits static const int SEGMENT_HERE; static const int SUPERIMPOSED_SEGMENTS; static const int INCONSISTENT_CLEFS; diff --git a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp index 7299a9f..553af2b 100644 --- a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp +++ b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp @@ -24,7 +24,7 @@ #include "AudioInstrumentParameterPanel.h" -#include <tqlayout.h> +#include <layout.h> #include <kapplication.h> #include <klocale.h> @@ -48,7 +48,7 @@ #include <tqcolor.h> #include <tqframe.h> #include <tqlabel.h> -#include <tqpalette.h> +#include <palette.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 b618bed..30c2f46 100644 --- a/src/gui/editors/parameters/InstrumentParameterBox.cpp +++ b/src/gui/editors/parameters/InstrumentParameterBox.cpp @@ -24,7 +24,7 @@ #include "InstrumentParameterBox.h" -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include "misc/Debug.h" @@ -122,8 +122,8 @@ InstrumentParameterBox::InstrumentParameterBox(RosegardenGUIDoc *doc, // Layout the groups left to right. - TQBoxLayout* tqlayout = new TQVBoxLayout(this); - tqlayout->addWidget(m_widgetStack); + TQBoxLayout* layout = new TQVBoxLayout(this); + layout->addWidget(m_widgetStack); } diff --git a/src/gui/editors/parameters/InstrumentParameterPanel.cpp b/src/gui/editors/parameters/InstrumentParameterPanel.cpp index 9cca26d..ba91b17 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->tqsetAlignment(TQt::AlignCenter); + m_instrumentLabel->setAlignment(TQt::AlignCenter); } void diff --git a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp index ceb2e26..9387798 100644 --- a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp +++ b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp @@ -24,7 +24,7 @@ #include "MIDIInstrumentParameterPanel.h" -#include <tqlayout.h> +#include <layout.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->tqsetAlignment(TQt::AlignCenter); + m_connectionLabel->setAlignment(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").tqarg(i + 1)); + m_channelValue->insertItem(TQString("%1").arg(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 ]").tqarg(i18n("No connection"))); + m_connectionLabel->setText(i18n("[ %1 ]").arg(i18n("No connection"))); } else { // remove trailing "(duplex)", "(read only)", "(write only)" etc connection.replace(TQRegExp("\\s*\\([^)0-9]+\\)\\s*$"), ""); - TQString text = i18n("[ %1 ]").tqarg(connection); + TQString text = i18n("[ %1 ]").arg(connection); /*TQString origText(text); TQFontMetrics metrics(m_connectionLabel->fontMetrics()); @@ -361,7 +361,7 @@ MIDIInstrumentParameterPanel::setupControllers(MidiDevice *md) redraw = 0; } if (redraw == 2) { - rotary->tqrepaint(); + rotary->repaint(); } // 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") - .tqarg(programs[i].getProgram() + 1) - .tqarg(strtoqstr(programName))); + .arg(programs[i].getProgram() + 1) + .arg(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") - .tqarg(variations[i] + 1) - .tqarg(strtoqstr(programName))); + .arg(variations[i] + 1) + .arg(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 tqlayout doesn't + //!!! seem to have problems here -- the grid layout 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 5e13652..8a7fcd3 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 <tqlayout.h> +#include <layout.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->tqsizeHint().width()) + 8); + b->sizeHint().width()) + 8); // Create a titled group box for the parameter box, parented by the - // classic tqlayout widget, so that it can be used to provide a title + // classic layout 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->tqlayout()->setMargin( 4 ); // about half the default value + box->layout()->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 7fd8989..95eae45 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 tqlayout style. + // Redisplay the widgets with a different layout style. void setArrangement(Arrangement style); protected: private: - Arrangement m_style; // The current tqlayout style. + Arrangement m_style; // The current layout 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 459aeab..df21d92 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 tqlayout + * Virtual method functions are defined for for requesting a layout * style, and returning the single-word to use for labelling the * box. */ @@ -72,11 +72,11 @@ public: protected: void init(); - // List the tqlayout styles that may be requested via a call to setStyle(). + // List the layout styles that may be requested via a call to setStyle(). enum LayoutMode { - LANDSCAPE_MODE, // Optimize the tqlayout for a tall and narrow parent. - PORTRAIT_MODE // Optimize the tqlayout for a short and wide parent. + LANDSCAPE_MODE, // Optimize the layout for a tall and narrow parent. + PORTRAIT_MODE // Optimize the layout 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 tqlayout mode. + LayoutMode m_mode; // The current layout mode. }; diff --git a/src/gui/editors/parameters/SegmentParameterBox.cpp b/src/gui/editors/parameters/SegmentParameterBox.cpp index 34f3976..299369a 100644 --- a/src/gui/editors/parameters/SegmentParameterBox.cpp +++ b/src/gui/editors/parameters/SegmentParameterBox.cpp @@ -24,7 +24,7 @@ #include "SegmentParameterBox.h" -#include <tqlayout.h> +#include <layout.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").tqarg(i)); + m_transposeValue->insertItem(noMap, TQString("%1").arg(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").tqarg(rtd)); + m_delayValue->insertItem(i18n("%1 ms").arg(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").tqarg(transposeLevel), true); + setCurrentItem(TQString("%1").arg(transposeLevel), true); break; case Some: @@ -694,7 +694,7 @@ SegmentParameterBox::populateBoxFromSegments() } else if (delayLevel < 0) { - m_delayValue->setCurrentItem(i18n("%1 ms").tqarg( -delayLevel), + m_delayValue->setCurrentItem(i18n("%1 ms").arg( -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").tqarg(highest.getNoteName(key)).tqarg(highest.getOctave(base))); -// m_lowButton->setText(TQString("&Low: %1%2").tqarg(lowest.getNoteName(key)).tqarg(lowest.getOctave(base))); +// 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))); } void diff --git a/src/gui/editors/parameters/TrackParameterBox.cpp b/src/gui/editors/parameters/TrackParameterBox.cpp index 94b1137..167017d 100644 --- a/src/gui/editors/parameters/TrackParameterBox.cpp +++ b/src/gui/editors/parameters/TrackParameterBox.cpp @@ -28,7 +28,7 @@ #include "TrackParameterBox.h" -#include <tqlayout.h> +#include <layout.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->tqsetAlignment(TQt::AlignCenter); + m_trackLabel->setAlignment(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").tqarg(i)); + m_defTranspose->insertItem(TQString("%1").arg(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").tqarg(label).tqarg(pname); + pname = TQString("%1: %2").arg(label).arg(pname); } else { pname = label; } @@ -601,10 +601,10 @@ TrackParameterBox::updateHighLow() bool useSharps = true; bool includeOctave = true; -// 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_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_presetLbl->setEnabled(false); } @@ -624,7 +624,7 @@ TrackParameterBox::slotUpdateControls(int /*dummy*/) return ; m_defClef->setCurrentItem(trk->getClef()); - m_defTranspose->setCurrentItem(TQString("%1").tqarg(trk->getTranspose()), true); + m_defTranspose->setCurrentItem(TQString("%1").arg(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 ]").tqarg(trackNum).tqarg(m_trackName)); + m_trackLabel->setText(i18n("[ Track %1 - %2 ]").arg(trackNum).arg(m_trackName)); } void diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp index 581e065..160a09f 100644 --- a/src/gui/editors/segment/ControlEditorDialog.cpp +++ b/src/gui/editors/segment/ControlEditorDialog.cpp @@ -24,7 +24,7 @@ #include "ControlEditorDialog.h" -#include <tqlayout.h> +#include <layout.h> #include <kapplication.h> #include <klocale.h> @@ -96,7 +96,7 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent, // spacing hack! new TQLabel("", mainFrame); - new TQLabel(i18n(" Control Events for %1 (device %2)").tqarg(deviceName). + new TQLabel(i18n(" Control Events for %1 (device %2)").arg(deviceName). arg(device), mainFrame); new TQLabel("", mainFrame); @@ -121,10 +121,10 @@ ControlEditorDialog::ControlEditorDialog(TQWidget *parent, TQFrame* btnBox = new TQFrame(mainFrame); - btnBox->tqsetSizePolicy( + btnBox->setSizePolicy( TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); - TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10); + TQHBoxLayout* layout = 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")); - tqlayout->addStretch(10); - tqlayout->addWidget(m_addButton); - tqlayout->addWidget(m_deleteButton); - tqlayout->addSpacing(30); + layout->addStretch(10); + layout->addWidget(m_addButton); + layout->addWidget(m_deleteButton); + layout->addSpacing(30); - tqlayout->addWidget(m_closeButton); - tqlayout->addSpacing(5); + layout->addWidget(m_closeButton); + layout->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").tqarg(it->getIPBPosition()); + TQString position = TQString("%1").arg(it->getIPBPosition()); if (position.toInt() == -1) position = notShowing; @@ -235,9 +235,9 @@ ControlEditorDialog::slotUpdate() strtoqstr(it->getType()), TQString("-"), strtoqstr(it->getDescription()), - TQString("%1").tqarg(it->getMin()), - TQString("%1").tqarg(it->getMax()), - TQString("%1").tqarg(it->getDefault()), + TQString("%1").arg(it->getMin()), + TQString("%1").arg(it->getMax()), + TQString("%1").arg(it->getDefault()), colour, position); } else { @@ -247,9 +247,9 @@ ControlEditorDialog::slotUpdate() strtoqstr(it->getType()), value, strtoqstr(it->getDescription()), - TQString("%1").tqarg(it->getMin()), - TQString("%1").tqarg(it->getMax()), - TQString("%1").tqarg(it->getDefault()), + TQString("%1").arg(it->getMin()), + TQString("%1").arg(it->getMax()), + TQString("%1").arg(it->getDefault()), colour, position); } diff --git a/src/gui/editors/segment/ControlParameterEditDialog.cpp b/src/gui/editors/segment/ControlParameterEditDialog.cpp index b00ac83..6c0921e 100644 --- a/src/gui/editors/segment/ControlParameterEditDialog.cpp +++ b/src/gui/editors/segment/ControlParameterEditDialog.cpp @@ -24,7 +24,7 @@ #include "ControlParameterEditDialog.h" -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include "misc/Debug.h" @@ -72,47 +72,47 @@ ControlParameterEditDialog::ControlParameterEditDialog( TQFrame *frame = new TQFrame(groupBox); - TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 10, 5); + TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 10, 5); - tqlayout->addWidget(new TQLabel(i18n("Name:"), frame), 0, 0); + layout->addWidget(new TQLabel(i18n("Name:"), frame), 0, 0); m_nameEdit = new TQLineEdit(frame); - tqlayout->addWidget(m_nameEdit, 0, 1); + layout->addWidget(m_nameEdit, 0, 1); - tqlayout->addWidget(new TQLabel(i18n("Type:"), frame), 1, 0); + layout->addWidget(new TQLabel(i18n("Type:"), frame), 1, 0); m_typeCombo = new KComboBox(frame); - tqlayout->addMultiCellWidget(m_typeCombo, 1, 1, 1, 2); + layout->addMultiCellWidget(m_typeCombo, 1, 1, 1, 2); - tqlayout->addWidget(new TQLabel(i18n("Description:"), frame), 2, 0); + layout->addWidget(new TQLabel(i18n("Description:"), frame), 2, 0); m_description = new TQLineEdit(frame); - tqlayout->addMultiCellWidget(m_description, 2, 2, 1, 2); + layout->addMultiCellWidget(m_description, 2, 2, 1, 2); // hex value alongside decimal value m_hexValue = new TQLabel(frame); - tqlayout->addWidget(m_hexValue, 3, 1); + layout->addWidget(m_hexValue, 3, 1); - tqlayout->addWidget(new TQLabel(i18n("Control Event value:"), frame), 3, 0); + layout->addWidget(new TQLabel(i18n("Control Event value:"), frame), 3, 0); m_controllerBox = new TQSpinBox(frame); - tqlayout->addWidget(m_controllerBox, 3, 2); + layout->addWidget(m_controllerBox, 3, 2); - tqlayout->addWidget(new TQLabel(i18n("Minimum value:"), frame), 4, 0); + layout->addWidget(new TQLabel(i18n("Minimum value:"), frame), 4, 0); m_minBox = new TQSpinBox(frame); - tqlayout->addMultiCellWidget(m_minBox, 4, 4, 1, 2); + layout->addMultiCellWidget(m_minBox, 4, 4, 1, 2); - tqlayout->addWidget(new TQLabel(i18n("Maximum value:"), frame), 5, 0); + layout->addWidget(new TQLabel(i18n("Maximum value:"), frame), 5, 0); m_maxBox = new TQSpinBox(frame); - tqlayout->addMultiCellWidget(m_maxBox, 5, 5, 1, 2); + layout->addMultiCellWidget(m_maxBox, 5, 5, 1, 2); - tqlayout->addWidget(new TQLabel(i18n("Default value:"), frame), 6, 0); + layout->addWidget(new TQLabel(i18n("Default value:"), frame), 6, 0); m_defaultBox = new TQSpinBox(frame); - tqlayout->addMultiCellWidget(m_defaultBox, 6, 6, 1, 2); + layout->addMultiCellWidget(m_defaultBox, 6, 6, 1, 2); - tqlayout->addWidget(new TQLabel(i18n("Color:"), frame), 7, 0); + layout->addWidget(new TQLabel(i18n("Color:"), frame), 7, 0); m_colourCombo = new KComboBox(frame); - tqlayout->addMultiCellWidget(m_colourCombo, 7, 7, 1, 2); + layout->addMultiCellWidget(m_colourCombo, 7, 7, 1, 2); - tqlayout->addWidget(new TQLabel(i18n("Instrument Parameter Box position:"), frame), 8, 0); + layout->addWidget(new TQLabel(i18n("Instrument Parameter Box position:"), frame), 8, 0); m_ipbPosition = new KComboBox(frame); - tqlayout->addMultiCellWidget(m_ipbPosition, 8, 8, 1, 2); + layout->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").tqarg(i)); + m_ipbPosition->insertItem(TQString("%1").arg(i)); if (m_control->getType() == Controller::EventType) m_typeCombo->setCurrentItem(0); diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp index 029ff9c..2eb8b3f 100644 --- a/src/gui/editors/segment/MarkerEditor.cpp +++ b/src/gui/editors/segment/MarkerEditor.cpp @@ -25,7 +25,7 @@ #include "MarkerEditor.h" #include "MarkerEditorViewItem.h" -#include <tqlayout.h> +#include <layout.h> #include <kapplication.h> #include <klocale.h> @@ -105,10 +105,10 @@ MarkerEditor::MarkerEditor(TQWidget *parent, TQFrame* btnBox = new TQFrame(mainFrame); - btnBox->tqsetSizePolicy( + btnBox->setSizePolicy( TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); - TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10); + TQHBoxLayout* layout = 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")); - tqlayout->addStretch(10); - tqlayout->addWidget(m_addButton); - tqlayout->addWidget(m_deleteButton); - tqlayout->addWidget(m_deleteAllButton); - tqlayout->addSpacing(30); + layout->addStretch(10); + layout->addWidget(m_addButton); + layout->addWidget(m_deleteButton); + layout->addWidget(m_deleteAllButton); + layout->addSpacing(30); - tqlayout->addWidget(m_closeButton); - tqlayout->addSpacing(5); + layout->addWidget(m_closeButton); + layout->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").tqarg(pos)); + m_absoluteTime->setText(TQString("%1").arg(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 ").tqarg(hours); + realTime += TQString("%1h ").arg(hours); if (mins) - realTime += TQString("%1m ").tqarg(mins); + realTime += TQString("%1m ").arg(mins); secsStr.sprintf("%ld.%03lds", secs, msecs); realTime += secsStr; @@ -203,7 +203,7 @@ MarkerEditor::updatePosition() m_realTime->setText(realTime); TQString barTime = - TQString("%1").tqarg(m_doc->getComposition().getBarNumber(pos) + 1); + TQString("%1").arg(m_doc->getComposition().getBarNumber(pos) + 1); // again only update if needed if (m_barTime->text() != barTime) @@ -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 ") - .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); + .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); } case 1: // real time { RealTime rt = m_doc->getComposition().getElapsedRealTime(time); - // return TQString("%1 ").tqarg(rt.toString().c_str()); - return TQString("%1 ").tqarg(rt.toText().c_str()); + // return TQString("%1 ").arg(rt.toString().c_str()); + return TQString("%1 ").arg(rt.toText().c_str()); } default: - return TQString("%1 ").tqarg(time); + return TQString("%1 ").arg(time); } } diff --git a/src/gui/editors/segment/PlayList.cpp b/src/gui/editors/segment/PlayList.cpp index 95d9cfc..7fa094d 100644 --- a/src/gui/editors/segment/PlayList.cpp +++ b/src/gui/editors/segment/PlayList.cpp @@ -27,7 +27,7 @@ #include "PlayListView.h" #include "PlayListViewItem.h" #include "document/ConfigGroups.h" -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kconfig.h> diff --git a/src/gui/editors/segment/TrackButtons.cpp b/src/gui/editors/segment/TrackButtons.cpp index 2e779fd..6ebe281 100644 --- a/src/gui/editors/segment/TrackButtons.cpp +++ b/src/gui/editors/segment/TrackButtons.cpp @@ -24,7 +24,7 @@ #include "TrackButtons.h" -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kstddirs.h> @@ -77,7 +77,7 @@ TrackButtons::TrackButtons(RosegardenGUIDoc* doc, WFlags f) : TQFrame(parent, name, f), m_doc(doc), - m_tqlayout(new TQVBoxLayout(this)), + m_layout(new TQVBoxLayout(this)), m_recordSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))), m_muteSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))), m_clickedSigMapper(new TQSignalMapper(TQT_TQOBJECT(this))), @@ -100,13 +100,13 @@ TrackButtons::TrackButtons(RosegardenGUIDoc* doc, // Set the spacing between vertical elements // - m_tqlayout->setSpacing(m_borderGap); + m_layout->setSpacing(m_borderGap); // Now draw the buttons and labels and meters // makeButtons(); - m_tqlayout->addStretch(20); + m_layout->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_tqlayout->addWidget(trackHBox); + m_layout->addWidget(trackHBox); m_trackHBoxes.push_back(trackHBox); } } @@ -297,7 +297,7 @@ TrackButtons::slotUpdateTracks() if (trackHBox) { trackHBox->show(); - m_tqlayout->insertWidget(i, trackHBox); + m_layout->insertWidget(i, trackHBox); m_trackHBoxes.push_back(trackHBox); } } else @@ -647,17 +647,17 @@ TrackButtons::populateInstrumentPopup(Instrument *thisTrackInstr, TQPopupMenu* i KGlobal::dirs()->findResource("appdata", "pixmaps/"); connectedPixmap.load - (TQString("%1/misc/connected.xpm").tqarg(pixmapDir)); + (TQString("%1/misc/connected.xpm").arg(pixmapDir)); connectedUsedPixmap.load - (TQString("%1/misc/connected-used.xpm").tqarg(pixmapDir)); + (TQString("%1/misc/connected-used.xpm").arg(pixmapDir)); connectedSelectedPixmap.load - (TQString("%1/misc/connected-selected.xpm").tqarg(pixmapDir)); + (TQString("%1/misc/connected-selected.xpm").arg(pixmapDir)); unconnectedPixmap.load - (TQString("%1/misc/unconnected.xpm").tqarg(pixmapDir)); + (TQString("%1/misc/unconnected.xpm").arg(pixmapDir)); unconnectedUsedPixmap.load - (TQString("%1/misc/unconnected-used.xpm").tqarg(pixmapDir)); + (TQString("%1/misc/unconnected-used.xpm").arg(pixmapDir)); unconnectedSelectedPixmap.load - (TQString("%1/misc/unconnected-selected.xpm").tqarg(pixmapDir)); + (TQString("%1/misc/unconnected-selected.xpm").arg(pixmapDir)); havePixmaps = true; } @@ -706,7 +706,7 @@ TrackButtons::populateInstrumentPopup(Instrument *thisTrackInstr, TQPopupMenu* i pname = strtoqstr(plugin->getDistinctiveConfigurationText()); } if (pname != "") { - pname = TQString("%1: %2").tqarg(label).tqarg(pname); + pname = TQString("%1: %2").arg(label).arg(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 *hbtqlayout = new TQHBoxLayout(trackHBox); + TQHBoxLayout *hblayout = 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 - hbtqlayout->addSpacing(vuSpacing); + hblayout->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); - hbtqlayout->addWidget(vuMeter); + hblayout->addWidget(vuMeter); // Create another little gap - hbtqlayout->addSpacing(vuSpacing); + hblayout->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")); - hbtqlayout->addWidget(mute); + hblayout->addWidget(mute); record = new KLedButton(Rosegarden::GUIPalette::getColour (Rosegarden::GUIPalette::RecordMIDITrackLED), trackHBox); TQToolTip::add(record, i18n("Record on this track")); - hbtqlayout->addWidget(record); + hblayout->addWidget(record); record->setLook(KLed::Sunken); mute->setLook(KLed::Sunken); @@ -1084,8 +1084,8 @@ TQFrame* TrackButtons::makeButton(Rosegarden::TrackId trackId) // Track label // trackLabel = new TrackLabel(trackId, track->getPosition(), trackHBox); - hbtqlayout->addWidget(trackLabel); - hbtqlayout->addSpacing(vuSpacing); + hblayout->addWidget(trackLabel); + hblayout->addSpacing(vuSpacing); if (track->getLabel() == std::string("")) { Rosegarden::Instrument *ins = diff --git a/src/gui/editors/segment/TrackButtons.h b/src/gui/editors/segment/TrackButtons.h index 0622642..184ed19 100644 --- a/src/gui/editors/segment/TrackButtons.h +++ b/src/gui/editors/segment/TrackButtons.h @@ -186,7 +186,7 @@ protected: RosegardenGUIDoc *m_doc; - TQVBoxLayout *m_tqlayout; + TQVBoxLayout *m_layout; 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 3fa85ba..c6812dc 100644 --- a/src/gui/editors/segment/TrackEditor.cpp +++ b/src/gui/editors/segment/TrackEditor.cpp @@ -24,7 +24,7 @@ #include "TrackEditor.h" -#include <tqlayout.h> +#include <layout.h> #include <kapplication.h> #include <klocale.h> @@ -76,7 +76,7 @@ #include <tqwidget.h> #include <tqvalidator.h> #include <tqdragobject.h> -#include <tqtextstream.h> +#include <textstream.h> namespace Rosegarden @@ -331,7 +331,7 @@ void TrackEditor::slotReadjustCanvasSize() void TrackEditor::slotTrackButtonsWidthChanged() { - // We need to make sure the trackButtons tqgeometry is fully updated + // We need to make sure the trackButtons geometry is fully updated // ProgressDialog::processEvents(); @@ -360,13 +360,13 @@ int TrackEditor::getTrackCellHeight() const bool TrackEditor::isCompositionModified() { - return m_doc->getComposition().getRefreshtqStatus + return m_doc->getComposition().getRefreshStatus (m_compositionRefreshStatusId).needsRefresh(); } void TrackEditor::setCompositionModified(bool c) { - m_doc->getComposition().getRefreshtqStatus + m_doc->getComposition().getRefreshStatus (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)") - .tqarg(section).tqarg(fromIdx).tqarg(toIdx) << endl; + .arg(section).arg(fromIdx).arg(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()->getTransporttqStatus() != STOPPED)) { + (m_doc->getSequenceManager()->getTransportStatus() != 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()->getTransporttqStatus() != STOPPED)) { + (m_doc->getSequenceManager()->getTransportStatus() != STOPPED)) { if (m_playTracking) { getSegmentCanvas()->slotScrollHoriz(int(double(newTimePosition) / ruler->getUnitsPerPixel())); diff --git a/src/gui/editors/segment/TrackHeader.cpp b/src/gui/editors/segment/TrackHeader.cpp index 84b850b..3806c6d 100644 --- a/src/gui/editors/segment/TrackHeader.cpp +++ b/src/gui/editors/segment/TrackHeader.cpp @@ -41,7 +41,7 @@ void TrackHeader::paintEvent(TQPaintEvent *e) { TQPainter p( this ); - p.setPen( tqcolorGroup().buttonText() ); + p.setPen( colorGroup().buttonText() ); int pos = (orientation() == Qt::Horizontal) ? e->rect().left() : e->rect().top(); diff --git a/src/gui/editors/segment/TrackLabel.cpp b/src/gui/editors/segment/TrackLabel.cpp index 144fcd6..49b3afc 100644 --- a/src/gui/editors/segment/TrackLabel.cpp +++ b/src/gui/editors/segment/TrackLabel.cpp @@ -124,18 +124,18 @@ TrackLabel::setSelected(bool on) if (on) { m_selected = true; - m_instrumentLabel->setPaletteBackgroundColor(tqcolorGroup().highlight()); - m_instrumentLabel->setPaletteForegroundColor(tqcolorGroup().highlightedText()); - m_trackLabel->setPaletteBackgroundColor(tqcolorGroup().highlight()); - m_trackLabel->setPaletteForegroundColor(tqcolorGroup().highlightedText()); + m_instrumentLabel->setPaletteBackgroundColor(colorGroup().highlight()); + m_instrumentLabel->setPaletteForegroundColor(colorGroup().highlightedText()); + m_trackLabel->setPaletteBackgroundColor(colorGroup().highlight()); + m_trackLabel->setPaletteForegroundColor(colorGroup().highlightedText()); } else { m_selected = false; - m_instrumentLabel->setPaletteBackgroundColor(tqcolorGroup().background()); - m_trackLabel->setPaletteBackgroundColor(tqcolorGroup().background()); - m_instrumentLabel->setPaletteForegroundColor(tqcolorGroup().text()); - m_trackLabel->setPaletteForegroundColor(tqcolorGroup().text()); + m_instrumentLabel->setPaletteBackgroundColor(colorGroup().background()); + m_trackLabel->setPaletteBackgroundColor(colorGroup().background()); + m_instrumentLabel->setPaletteForegroundColor(colorGroup().text()); + m_trackLabel->setPaletteForegroundColor(colorGroup().text()); } if (visibleWidget()) visibleWidget()->update(); diff --git a/src/gui/editors/segment/TrackVUMeter.cpp b/src/gui/editors/segment/TrackVUMeter.cpp index ad91278..f8acbe8 100644 --- a/src/gui/editors/segment/TrackVUMeter.cpp +++ b/src/gui/editors/segment/TrackVUMeter.cpp @@ -43,7 +43,7 @@ TrackVUMeter::TrackVUMeter(TQWidget *parent, VUMeter(parent, type, false, false, width, height, VUMeter::Horizontal, name), m_position(position), m_textHeight(12) { - tqsetAlignment(AlignCenter); + setAlignment(AlignCenter); TQFont font; font.setPointSize(font.pointSize() * 95 / 100); @@ -67,7 +67,7 @@ TrackVUMeter::meterStop() { setMinimumHeight(m_textHeight); setMaximumHeight(m_textHeight); - setText(TQString("%1").tqarg(m_position + 1)); + setText(TQString("%1").arg(m_position + 1)); if (m_active) { m_active = false; update(); diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp index 29b7bf0..e1e7513 100644 --- a/src/gui/editors/segment/TriggerSegmentManager.cpp +++ b/src/gui/editors/segment/TriggerSegmentManager.cpp @@ -25,7 +25,7 @@ #include "TriggerSegmentManager.h" #include "TriggerManagerItem.h" -#include <tqlayout.h> +#include <layout.h> #include <kapplication.h> #include "base/BaseProperties.h" @@ -99,10 +99,10 @@ TriggerSegmentManager::TriggerSegmentManager(TQWidget *parent, TQFrame* btnBox = new TQFrame(mainFrame); - btnBox->tqsetSizePolicy( + btnBox->setSizePolicy( TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); - TQHBoxLayout* tqlayout = new TQHBoxLayout(btnBox, 4, 10); + TQHBoxLayout* layout = 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")); - tqlayout->addStretch(10); - tqlayout->addWidget(m_addButton); - tqlayout->addWidget(m_deleteButton); - tqlayout->addWidget(m_deleteAllButton); - tqlayout->addSpacing(30); + layout->addStretch(10); + layout->addWidget(m_addButton); + layout->addWidget(m_deleteButton); + layout->addWidget(m_deleteAllButton); + layout->addSpacing(30); - tqlayout->addWidget(m_closeButton); - tqlayout->addSpacing(5); + layout->addWidget(m_closeButton); + layout->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()).tqarg(uses); + tracks.size()).arg(uses); TQString pitch = TQString("%1 (%2)") - .tqarg(MidiPitchLabel((*it)->getBasePitch()).getTQString()) - .tqarg((*it)->getBasePitch()); + .arg(MidiPitchLabel((*it)->getBasePitch()).getTQString()) + .arg((*it)->getBasePitch()); - TQString velocity = TQString("%1").tqarg((*it)->getBaseVelocity()); + TQString velocity = TQString("%1").arg((*it)->getBaseVelocity()); item = new TriggerManagerItem - (m_listView, TQString("%1").tqarg(i + 1), TQString("%1").tqarg((*it)->getId()), + (m_listView, TQString("%1").arg(i + 1), TQString("%1").arg((*it)->getId()), label, timeString, pitch, velocity, used); item->setRawDuration(duration); @@ -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 ") - .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); + .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); } case 1: // real time @@ -539,12 +539,12 @@ TriggerSegmentManager::makeDurationString(timeT time, RealTime rt = m_doc->getComposition().getRealTimeDifference (time, time + duration); - // return TQString("%1 ").tqarg(rt.toString().c_str()); - return TQString("%1 ").tqarg(rt.toText().c_str()); + // return TQString("%1 ").arg(rt.toString().c_str()); + return TQString("%1 ").arg(rt.toText().c_str()); } default: - return TQString("%1 ").tqarg(duration); + return TQString("%1 ").arg(duration); } } diff --git a/src/gui/editors/segment/segmentcanvas/CompositionItemHelper.cpp b/src/gui/editors/segment/segmentcanvas/CompositionItemHelper.cpp index fe4b926..9579ba2 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 tqitemRect = item->rect(); + TQRect itemRect = item->rect(); - t = std::max(grid.snapX(tqitemRect.x() + tqitemRect.width()), 0L); + t = std::max(grid.snapX(itemRect.x() + itemRect.width()), 0L); // RG_DEBUG << "CompositionItemHelper::getEndTime() : rect width = " -// << tqitemRect.width() +// << itemRect.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 76cbe70..4b2926e 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionItemImpl.cpp +++ b/src/gui/editors/segment/segmentcanvas/CompositionItemImpl.cpp @@ -28,7 +28,7 @@ #include "misc/Debug.h" #include "base/Segment.h" #include "CompositionRect.h" -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqpen.h> #include <tqpoint.h> diff --git a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp index eb79e45..e9cc333 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp +++ b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp @@ -50,7 +50,7 @@ #include "AudioPreviewPainter.h" #include "gui/general/GUIPalette.h" #include "SegmentOrderer.h" -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqpen.h> #include <tqpoint.h> diff --git a/src/gui/editors/segment/segmentcanvas/CompositionRect.cpp b/src/gui/editors/segment/segmentcanvas/CompositionRect.cpp index ec4bef0..679ffce 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionRect.cpp +++ b/src/gui/editors/segment/segmentcanvas/CompositionRect.cpp @@ -26,7 +26,7 @@ #include "CompositionRect.h" #include "base/ColourMap.h" -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqpen.h> #include <tqpoint.h> diff --git a/src/gui/editors/segment/segmentcanvas/CompositionRect.h b/src/gui/editors/segment/segmentcanvas/CompositionRect.h index 53dcc2e..e969d17 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionRect.h +++ b/src/gui/editors/segment/segmentcanvas/CompositionRect.h @@ -26,7 +26,7 @@ #ifndef _RG_COMPOSITIONRECT_H_ #define _RG_COMPOSITIONRECT_H_ -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqpen.h> #include <tqrect.h> diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp index 75216b8..516573e 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp +++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp @@ -47,7 +47,7 @@ #include "SegmentToolBox.h" #include "SegmentTool.h" #include <kmessagebox.h> -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqevent.h> #include <tqfont.h> @@ -227,7 +227,7 @@ void CompositionView::slotUpdateSize() RulerScale *ruler = grid().getRulerScale(); - int minWidth = tqsizeHint().width(); + int minWidth = sizeHint().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").tqarg(toolName)); + KMessageBox::error(0, TQString("CompositionView::slotSetTool() : unknown tool name %1").arg(toolName)); } } @@ -495,7 +495,7 @@ void CompositionView::resizeEvent(TQResizeEvent* e) void CompositionView::viewportPaintEvent(TQPaintEvent* e) { - TQMemArray<TQRect> rects = TQRegion(e->region()).tqrects(); + TQMemArray<TQRect> rects = TQRegion(e->region()).rects(); for (unsigned int i = 0; i < rects.size(); ++i) { viewportPaintRect(rects[i]); @@ -682,7 +682,7 @@ void CompositionView::refreshArtifactsDrawBuffer(const TQRect& rect) // << rect << endl; TQPainter p; - p.tqbegin(&m_artifactsDrawBuffer, viewport()); + p.begin(&m_artifactsDrawBuffer, viewport()); p.translate( -contentsX(), -contentsY()); // TQRect r(contentsX(), contentsY(), m_artifactsDrawBuffer.width(), m_artifactsDrawBuffer.height()); drawAreaArtifacts(&p, rect); diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.h b/src/gui/editors/segment/segmentcanvas/CompositionView.h index a1f6f07..95a1926 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionView.h +++ b/src/gui/editors/segment/segmentcanvas/CompositionView.h @@ -30,7 +30,7 @@ #include "CompositionModel.h" #include "CompositionItem.h" #include "gui/general/RosegardenScrollView.h" -#include <tqbrush.h> +#include <brush.h> #include <tqcolor.h> #include <tqpen.h> #include <tqpixmap.h> diff --git a/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h b/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h index cdf373e..d1bb9a7 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h +++ b/src/gui/editors/segment/segmentcanvas/SegmentItemPreview.h @@ -59,7 +59,7 @@ public: PreviewState getPreviewState() const { return m_previewState; } /** - * Sets whether the preview tqshape shown in the segment needs + * Sets whether the preview shape shown in the segment needs * to be refreshed */ void setPreviewCurrent(bool c) diff --git a/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp b/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp index e2970ab..04da855 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp +++ b/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp @@ -328,8 +328,8 @@ int SegmentMover::handleMouseMove(TQMouseEvent *e) comp.getMusicalTimeForAbsoluteTime(currentItemStartTime, bar, beat, fraction, remainder); TQString posString = TQString("%1.%2s (%3, %4, %5)") - .tqarg(time.sec).tqarg(ms) - .tqarg(bar + 1).tqarg(beat).tqarg(fraction); + .arg(time.sec).arg(ms) + .arg(bar + 1).arg(beat).arg(fraction); m_canvas->setTextFloat(guideX + 10, guideY - 30, posString); m_canvas->updateContents(); diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp index 964bc3b..c1b1f4b 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp +++ b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp @@ -466,8 +466,8 @@ SegmentSelector::handleMouseMove(TQMouseEvent *e) comp.getMusicalTimeForAbsoluteTime(currentItemStartTime, bar, beat, fraction, remainder); TQString posString = TQString("%1.%2s (%3, %4, %5)") - .tqarg(time.sec).tqarg(ms) - .tqarg(bar + 1).tqarg(beat).tqarg(fraction); + .arg(time.sec).arg(ms) + .arg(bar + 1).arg(beat).arg(fraction); m_canvas->setTextFloat(guideX + 10, guideY - 30, posString); m_canvas->updateContents(); diff --git a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp index 68bee60..5ce8a58 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp +++ b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.cpp @@ -84,7 +84,7 @@ SegmentTool* SegmentToolBox::createTool(const TQString& toolName) else { KMessageBox::error(0, TQString("SegmentToolBox::createTool : unrecognised toolname %1 (%2)") - .tqarg(toolName).tqarg(toolNamelc)); + .arg(toolName).arg(toolNamelc)); return 0; } diff --git a/src/gui/editors/tempo/TempoView.cpp b/src/gui/editors/tempo/TempoView.cpp index 7629632..ff3b1ec 100644 --- a/src/gui/editors/tempo/TempoView.cpp +++ b/src/gui/editors/tempo/TempoView.cpp @@ -58,7 +58,7 @@ #include <tqptrlist.h> #include <tqsize.h> #include <tqstring.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcanvas.h> #include <kstatusbar.h> @@ -218,7 +218,7 @@ TempoView::applyLayout(int /*staffNo*/) new TempoListItem(comp, TempoListItem::TimeSignature, sig.first, i, m_list, timeString, i18n("Time Signature "), - TQString("%1/%2 ").tqarg(sig.second.getNumerator()). + TQString("%1/%2 ").arg(sig.second.getNumerator()). arg(sig.second.getDenominator()), properties); } @@ -243,7 +243,7 @@ TempoView::applyLayout(int /*staffNo*/) if (sig.getBeatDuration() == Note(Note::Crotchet).getDuration()) { desc = i18n("%1.%2%3"). - tqarg(qpmUnits).tqarg(qpmTenths).tqarg(qpmHundredths); + arg(qpmUnits).arg(qpmTenths).arg(qpmHundredths); } else { float bpm = (qpm * Note(Note::Crotchet).getDuration()) / @@ -253,8 +253,8 @@ TempoView::applyLayout(int /*staffNo*/) int bpmHundredths = int((bpm - bpmUnits - bpmTenths / 10.0) * 100 + 0.001); desc = i18n("%1.%2%3 qpm (%4.%5%6 bpm) "). - tqarg(qpmUnits).tqarg(qpmTenths).tqarg(qpmHundredths). - tqarg(bpmUnits).tqarg(bpmTenths).tqarg(bpmHundredths); + arg(qpmUnits).arg(qpmTenths).arg(qpmHundredths). + arg(bpmUnits).arg(bpmTenths).arg(bpmHundredths); } TQString timeString = makeTimeString(tempo.first, timeMode); @@ -354,27 +354,27 @@ TempoView::makeTimeString(timeT time, int timeMode) (time, bar, beat, fraction, remainder); ++bar; return TQString("%1%2%3-%4%5-%6%7-%8%9 ") - .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); + .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); } case 1: // real time { RealTime rt = getDocument()->getComposition().getElapsedRealTime(time); - // return TQString("%1 ").tqarg(rt.toString().c_str()); - return TQString("%1 ").tqarg(rt.toText().c_str()); + // return TQString("%1 ").arg(rt.toString().c_str()); + return TQString("%1 ").arg(rt.toText().c_str()); } default: - return TQString("%1 ").tqarg(time); + return TQString("%1 ").arg(time); } } @@ -832,7 +832,7 @@ void TempoView::updateViewCaption() { setCaption(i18n("%1 - Tempo and Time Signature Editor") - .tqarg(getDocument()->getTitle())); + .arg(getDocument()->getTitle())); } } |