diff options
Diffstat (limited to 'src/commands/notation')
80 files changed, 126 insertions, 126 deletions
diff --git a/src/commands/notation/AddFingeringMarkCommand.cpp b/src/commands/notation/AddFingeringMarkCommand.cpp index 0c2e895..e8031ff 100644 --- a/src/commands/notation/AddFingeringMarkCommand.cpp +++ b/src/commands/notation/AddFingeringMarkCommand.cpp @@ -32,14 +32,14 @@ #include "base/Selection.h" #include "base/Sets.h" #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden { QString -AddFingeringMarkCommand::getGlobalName(QString fingering) +AddFingeringMarkCommand::getGlobalName(TQString fingering) { if (fingering == "") return i18n("Add Other &Fingering..."); diff --git a/src/commands/notation/AddFingeringMarkCommand.h b/src/commands/notation/AddFingeringMarkCommand.h index 1d95002..e044ef7 100644 --- a/src/commands/notation/AddFingeringMarkCommand.h +++ b/src/commands/notation/AddFingeringMarkCommand.h @@ -28,7 +28,7 @@ #include "document/BasicSelectionCommand.h" #include <string> -#include <qstring.h> +#include <tqstring.h> @@ -47,7 +47,7 @@ public: BasicSelectionCommand(getGlobalName(), selection, true), m_selection(&selection), m_text(text) { } - static QString getGlobalName(QString fingering = ""); + static TQString getGlobalName(TQString fingering = ""); protected: virtual void modifySegment(); diff --git a/src/commands/notation/AddIndicationCommand.cpp b/src/commands/notation/AddIndicationCommand.cpp index 717463d..73aceb6 100644 --- a/src/commands/notation/AddIndicationCommand.cpp +++ b/src/commands/notation/AddIndicationCommand.cpp @@ -34,7 +34,7 @@ #include "base/Selection.h" #include "document/BasicCommand.h" #include "gui/editors/notation/NotationProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden @@ -164,7 +164,7 @@ AddIndicationCommand::getGlobalName(std::string indicationType) return i18n("Add &Glissando"); } - QString n = i18n("Add &%1%2").arg((char)toupper(indicationType[0])).arg(strtoqstr(indicationType.substr(1))); + TQString n = i18n("Add &%1%2").arg((char)toupper(indicationType[0])).arg(strtoqstr(indicationType.substr(1))); return n; } diff --git a/src/commands/notation/AddIndicationCommand.h b/src/commands/notation/AddIndicationCommand.h index c43dc3a..396a488 100644 --- a/src/commands/notation/AddIndicationCommand.h +++ b/src/commands/notation/AddIndicationCommand.h @@ -28,7 +28,7 @@ #include "document/BasicCommand.h" #include <string> -#include <qstring.h> +#include <tqstring.h> #include "base/Event.h" @@ -59,7 +59,7 @@ public: return getStartTime() + m_indicationDuration; } - static QString getGlobalName(std::string indicationType); + static TQString getGlobalName(std::string indicationType); protected: virtual void modifySegment(); diff --git a/src/commands/notation/AddMarkCommand.cpp b/src/commands/notation/AddMarkCommand.cpp index 5b30431..0fa8268 100644 --- a/src/commands/notation/AddMarkCommand.cpp +++ b/src/commands/notation/AddMarkCommand.cpp @@ -30,7 +30,7 @@ #include "base/Selection.h" #include "document/BasicSelectionCommand.h" #include "base/BaseProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden @@ -41,7 +41,7 @@ using namespace BaseProperties; QString AddMarkCommand::getGlobalName(Mark markType) { - QString m = strtoqstr(markType); + TQString m = strtoqstr(markType); // Gosh, lots of collisions if (markType == Marks::Sforzando) diff --git a/src/commands/notation/AddMarkCommand.h b/src/commands/notation/AddMarkCommand.h index 5bc36b4..5382417 100644 --- a/src/commands/notation/AddMarkCommand.h +++ b/src/commands/notation/AddMarkCommand.h @@ -27,7 +27,7 @@ #define _RG_NOTESMENUADDMARKCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> @@ -46,7 +46,7 @@ public: BasicSelectionCommand(getGlobalName(mark), selection, true), m_selection(&selection), m_mark(mark) { } - static QString getGlobalName(Mark mark); + static TQString getGlobalName(Mark mark); protected: virtual void modifySegment(); diff --git a/src/commands/notation/AddTextMarkCommand.cpp b/src/commands/notation/AddTextMarkCommand.cpp index d3de487..3983152 100644 --- a/src/commands/notation/AddTextMarkCommand.cpp +++ b/src/commands/notation/AddTextMarkCommand.cpp @@ -28,7 +28,7 @@ #include "base/Selection.h" #include "document/BasicSelectionCommand.h" #include "base/BaseProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/AddTextMarkCommand.h b/src/commands/notation/AddTextMarkCommand.h index b4037cc..00cf66b 100644 --- a/src/commands/notation/AddTextMarkCommand.h +++ b/src/commands/notation/AddTextMarkCommand.h @@ -28,7 +28,7 @@ #include "document/BasicSelectionCommand.h" #include <string> -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -48,7 +48,7 @@ public: BasicSelectionCommand(getGlobalName(), selection, true), m_selection(&selection), m_text(text) { } - static QString getGlobalName() { return i18n("Add Te&xt Mark..."); } + static TQString getGlobalName() { return i18n("Add Te&xt Mark..."); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/AutoBeamCommand.cpp b/src/commands/notation/AutoBeamCommand.cpp index 04c243d..860e9cf 100644 --- a/src/commands/notation/AutoBeamCommand.cpp +++ b/src/commands/notation/AutoBeamCommand.cpp @@ -30,7 +30,7 @@ #include "base/Selection.h" #include "document/BasicSelectionCommand.h" #include "base/BaseProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/AutoBeamCommand.h b/src/commands/notation/AutoBeamCommand.h index b26caf1..e437af7 100644 --- a/src/commands/notation/AutoBeamCommand.h +++ b/src/commands/notation/AutoBeamCommand.h @@ -27,7 +27,7 @@ #define _RG_NOTESMENUAUTOBEAMCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -49,7 +49,7 @@ public: AutoBeamCommand(Segment &segment) : BasicSelectionCommand(getGlobalName(), segment) { } - static QString getGlobalName() { return i18n("&Auto-Beam"); } + static TQString getGlobalName() { return i18n("&Auto-Beam"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/BeamCommand.cpp b/src/commands/notation/BeamCommand.cpp index fb75dcb..8e572e7 100644 --- a/src/commands/notation/BeamCommand.cpp +++ b/src/commands/notation/BeamCommand.cpp @@ -29,7 +29,7 @@ #include "base/Selection.h" #include "document/BasicSelectionCommand.h" #include "base/BaseProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/BeamCommand.h b/src/commands/notation/BeamCommand.h index 9fd112b..8456af2 100644 --- a/src/commands/notation/BeamCommand.h +++ b/src/commands/notation/BeamCommand.h @@ -27,7 +27,7 @@ #define _RG_NOTESMENUBEAMCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -46,7 +46,7 @@ public: BasicSelectionCommand(getGlobalName(), selection, true), m_selection(&selection) { } - static QString getGlobalName() { return i18n("&Beam Group"); } + static TQString getGlobalName() { return i18n("&Beam Group"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/BreakCommand.cpp b/src/commands/notation/BreakCommand.cpp index ae74e37..ccb64d1 100644 --- a/src/commands/notation/BreakCommand.cpp +++ b/src/commands/notation/BreakCommand.cpp @@ -29,7 +29,7 @@ #include "document/BasicSelectionCommand.h" #include "gui/editors/notation/NotationProperties.h" #include "base/BaseProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/BreakCommand.h b/src/commands/notation/BreakCommand.h index 5c95a33..c4b234e 100644 --- a/src/commands/notation/BreakCommand.h +++ b/src/commands/notation/BreakCommand.h @@ -27,7 +27,7 @@ #define _RG_NOTESMENUBREAKCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -46,7 +46,7 @@ public: BasicSelectionCommand(getGlobalName(), selection, true), m_selection(&selection) { } - static QString getGlobalName() { return i18n("&Unbeam"); } + static TQString getGlobalName() { return i18n("&Unbeam"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/ChangeSlurPositionCommand.cpp b/src/commands/notation/ChangeSlurPositionCommand.cpp index dc2ff0b..cc8613b 100644 --- a/src/commands/notation/ChangeSlurPositionCommand.cpp +++ b/src/commands/notation/ChangeSlurPositionCommand.cpp @@ -29,7 +29,7 @@ #include "base/Selection.h" #include "document/BasicSelectionCommand.h" #include "gui/editors/notation/NotationProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/ChangeSlurPositionCommand.h b/src/commands/notation/ChangeSlurPositionCommand.h index 11c4bce..e8a4911 100644 --- a/src/commands/notation/ChangeSlurPositionCommand.h +++ b/src/commands/notation/ChangeSlurPositionCommand.h @@ -27,7 +27,7 @@ #define _RG_ADJUSTMENUCHANGESLURPOSITIONCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -47,7 +47,7 @@ public: BasicSelectionCommand(getGlobalName(above), selection, true), m_selection(&selection), m_above(above) { } - static QString getGlobalName(bool above) { + static TQString getGlobalName(bool above) { return above ? i18n("Slur &Above") : i18n("Slur &Below"); } diff --git a/src/commands/notation/ChangeStemsCommand.cpp b/src/commands/notation/ChangeStemsCommand.cpp index 413f9d2..d133d46 100644 --- a/src/commands/notation/ChangeStemsCommand.cpp +++ b/src/commands/notation/ChangeStemsCommand.cpp @@ -29,7 +29,7 @@ #include "base/Selection.h" #include "document/BasicSelectionCommand.h" #include "gui/editors/notation/NotationProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/ChangeStemsCommand.h b/src/commands/notation/ChangeStemsCommand.h index 40b48bf..5874275 100644 --- a/src/commands/notation/ChangeStemsCommand.h +++ b/src/commands/notation/ChangeStemsCommand.h @@ -27,7 +27,7 @@ #define _RG_ADJUSTMENUCHANGESTEMSCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -47,7 +47,7 @@ public: BasicSelectionCommand(getGlobalName(up), selection, true), m_selection(&selection), m_up(up) { } - static QString getGlobalName(bool up) { + static TQString getGlobalName(bool up) { return up ? i18n("Stems &Up") : i18n("Stems &Down"); } diff --git a/src/commands/notation/ChangeStyleCommand.cpp b/src/commands/notation/ChangeStyleCommand.cpp index f8d5c04..f4b3456 100644 --- a/src/commands/notation/ChangeStyleCommand.cpp +++ b/src/commands/notation/ChangeStyleCommand.cpp @@ -31,7 +31,7 @@ #include "document/BasicSelectionCommand.h" #include "gui/editors/notation/NotationProperties.h" #include "gui/editors/notation/NoteStyleFactory.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/ChangeStyleCommand.h b/src/commands/notation/ChangeStyleCommand.h index d5edbab..cdc5af9 100644 --- a/src/commands/notation/ChangeStyleCommand.h +++ b/src/commands/notation/ChangeStyleCommand.h @@ -28,7 +28,7 @@ #include "document/BasicSelectionCommand.h" #include "gui/editors/notation/NoteStyle.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -49,11 +49,11 @@ public: BasicSelectionCommand(getGlobalName(style), selection, true), m_selection(&selection), m_style(style) { } - static QString getGlobalName() { + static TQString getGlobalName() { return i18n("Change &Note Style"); } - static QString getGlobalName(NoteStyleName style); + static TQString getGlobalName(NoteStyleName style); protected: virtual void modifySegment(); diff --git a/src/commands/notation/ChangeTiePositionCommand.cpp b/src/commands/notation/ChangeTiePositionCommand.cpp index 42f67e6..b374ef0 100644 --- a/src/commands/notation/ChangeTiePositionCommand.cpp +++ b/src/commands/notation/ChangeTiePositionCommand.cpp @@ -30,7 +30,7 @@ #include "base/BaseProperties.h" #include "document/BasicSelectionCommand.h" #include "gui/editors/notation/NotationProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/ChangeTiePositionCommand.h b/src/commands/notation/ChangeTiePositionCommand.h index c4c58a7..3b01618 100644 --- a/src/commands/notation/ChangeTiePositionCommand.h +++ b/src/commands/notation/ChangeTiePositionCommand.h @@ -27,7 +27,7 @@ #define _RG_ADJUSTMENUCHANGETIEPOSITIONCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -43,7 +43,7 @@ public: BasicSelectionCommand(getGlobalName(above), selection, true), m_selection(&selection), m_above(above) { } - static QString getGlobalName(bool above) { + static TQString getGlobalName(bool above) { return above ? i18n("Tie &Above") : i18n("Tie &Below"); } diff --git a/src/commands/notation/ClefInsertionCommand.cpp b/src/commands/notation/ClefInsertionCommand.cpp index f21c1b0..c2c5738 100644 --- a/src/commands/notation/ClefInsertionCommand.cpp +++ b/src/commands/notation/ClefInsertionCommand.cpp @@ -33,7 +33,7 @@ #include "base/SegmentNotationHelper.h" #include "base/BaseProperties.h" #include "document/BasicCommand.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden @@ -66,7 +66,7 @@ ClefInsertionCommand::getGlobalName(Clef *) { /* doesn't handle octave offset -- leave it for now if (clef) { - QString name(strtoqstr(clef->getClefType())); + TQString name(strtoqstr(clef->getClefType())); name = name.left(1).upper() + name.right(name.length()-1); return i18n("Change to %1 Cle&f...").arg(name); } else { diff --git a/src/commands/notation/ClefInsertionCommand.h b/src/commands/notation/ClefInsertionCommand.h index 3e9b940..9cacdfb 100644 --- a/src/commands/notation/ClefInsertionCommand.h +++ b/src/commands/notation/ClefInsertionCommand.h @@ -28,7 +28,7 @@ #include "base/NotationTypes.h" #include "document/BasicCommand.h" -#include <qstring.h> +#include <tqstring.h> #include "base/Event.h" @@ -51,7 +51,7 @@ public: bool shouldTranspose = false); virtual ~ClefInsertionCommand(); - static QString getGlobalName(Clef *clef = 0); + static TQString getGlobalName(Clef *clef = 0); virtual timeT getRelayoutEndTime(); Event *getLastInsertedEvent() { return m_lastInsertedEvent; } diff --git a/src/commands/notation/CollapseRestsCommand.cpp b/src/commands/notation/CollapseRestsCommand.cpp index 655b3b6..9578a8a 100644 --- a/src/commands/notation/CollapseRestsCommand.cpp +++ b/src/commands/notation/CollapseRestsCommand.cpp @@ -29,7 +29,7 @@ #include "base/SegmentNotationHelper.h" #include "base/Selection.h" #include "document/BasicCommand.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/CollapseRestsCommand.h b/src/commands/notation/CollapseRestsCommand.h index 337fe04..1f4f663 100644 --- a/src/commands/notation/CollapseRestsCommand.h +++ b/src/commands/notation/CollapseRestsCommand.h @@ -27,7 +27,7 @@ #define _RG_ADJUSTMENUCOLLAPSERESTSCOMMAND_H_ #include "document/BasicCommand.h" -#include <qstring.h> +#include <tqstring.h> #include "base/Event.h" #include <klocale.h> @@ -51,7 +51,7 @@ public: CollapseRestsCommand(EventSelection &selection); - static QString getGlobalName() { return i18n("&Collapse Rests"); } + static TQString getGlobalName() { return i18n("&Collapse Rests"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/DeCounterpointCommand.cpp b/src/commands/notation/DeCounterpointCommand.cpp index 1f97476..9a2699a 100644 --- a/src/commands/notation/DeCounterpointCommand.cpp +++ b/src/commands/notation/DeCounterpointCommand.cpp @@ -29,7 +29,7 @@ #include "base/SegmentNotationHelper.h" #include "base/Selection.h" #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/DeCounterpointCommand.h b/src/commands/notation/DeCounterpointCommand.h index e0cda37..7e16d4b 100644 --- a/src/commands/notation/DeCounterpointCommand.h +++ b/src/commands/notation/DeCounterpointCommand.h @@ -27,7 +27,7 @@ #define _RG_ADJUSTMENUDECOUNTERPOINTCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -52,7 +52,7 @@ public: BasicSelectionCommand(getGlobalName(), segment, true), m_selection(0) { } - static QString getGlobalName() { return i18n("Split-and-Tie Overlapping &Chords"); } + static TQString getGlobalName() { return i18n("Split-and-Tie Overlapping &Chords"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/FixNotationQuantizeCommand.cpp b/src/commands/notation/FixNotationQuantizeCommand.cpp index 014d610..14f01c8 100644 --- a/src/commands/notation/FixNotationQuantizeCommand.cpp +++ b/src/commands/notation/FixNotationQuantizeCommand.cpp @@ -30,7 +30,7 @@ #include "base/Segment.h" #include "base/Selection.h" #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/FixNotationQuantizeCommand.h b/src/commands/notation/FixNotationQuantizeCommand.h index dfce3e9..3a5d334 100644 --- a/src/commands/notation/FixNotationQuantizeCommand.h +++ b/src/commands/notation/FixNotationQuantizeCommand.h @@ -27,7 +27,7 @@ #define _RG_ADJUSTMENUFIXNOTATIONQUANTIZECOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -46,7 +46,7 @@ public: BasicSelectionCommand(getGlobalName(), selection, true), m_selection(&selection) { } - static QString getGlobalName() { return i18n("Fi&x Notation Quantization"); } + static TQString getGlobalName() { return i18n("Fi&x Notation Quantization"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/GraceCommand.cpp b/src/commands/notation/GraceCommand.cpp index 99b8e5a..1d1065d 100644 --- a/src/commands/notation/GraceCommand.cpp +++ b/src/commands/notation/GraceCommand.cpp @@ -30,7 +30,7 @@ #include "base/Selection.h" #include "document/BasicCommand.h" #include "base/BaseProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/GraceCommand.h b/src/commands/notation/GraceCommand.h index 08dcd87..e432a11 100644 --- a/src/commands/notation/GraceCommand.h +++ b/src/commands/notation/GraceCommand.h @@ -27,7 +27,7 @@ #define _RG_ADJUSTMENUGRACECOMMAND_H_ #include "document/BasicCommand.h" -#include <qstring.h> +#include <tqstring.h> #include "base/Event.h" #include <klocale.h> @@ -46,7 +46,7 @@ class GraceCommand : public BasicCommand public: GraceCommand(EventSelection &selection); - static QString getGlobalName() { return i18n("Make &Grace Notes"); } + static TQString getGlobalName() { return i18n("Make &Grace Notes"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/IncrementDisplacementsCommand.cpp b/src/commands/notation/IncrementDisplacementsCommand.cpp index 2ac44df..299d58f 100644 --- a/src/commands/notation/IncrementDisplacementsCommand.cpp +++ b/src/commands/notation/IncrementDisplacementsCommand.cpp @@ -28,7 +28,7 @@ #include "base/Selection.h" #include "document/BasicSelectionCommand.h" #include "base/BaseProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/IncrementDisplacementsCommand.h b/src/commands/notation/IncrementDisplacementsCommand.h index 4272b6a..bbedc7b 100644 --- a/src/commands/notation/IncrementDisplacementsCommand.h +++ b/src/commands/notation/IncrementDisplacementsCommand.h @@ -27,7 +27,7 @@ #define _RG_INCREMENTDISPLACEMENTSCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -49,7 +49,7 @@ public: m_dx(dx), m_dy(dy) { } - static QString getGlobalName() { return i18n("Fine Reposition"); } + static TQString getGlobalName() { return i18n("Fine Reposition"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/InterpretCommand.cpp b/src/commands/notation/InterpretCommand.cpp index d8a82cd..6d1b18b 100644 --- a/src/commands/notation/InterpretCommand.cpp +++ b/src/commands/notation/InterpretCommand.cpp @@ -35,7 +35,7 @@ #include "base/BaseProperties.h" #include "base/Selection.h" #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/InterpretCommand.h b/src/commands/notation/InterpretCommand.h index e1ace8f..a50a0f7 100644 --- a/src/commands/notation/InterpretCommand.h +++ b/src/commands/notation/InterpretCommand.h @@ -29,7 +29,7 @@ #include "document/BasicSelectionCommand.h" #include <map> #include <string> -#include <qstring.h> +#include <tqstring.h> #include "base/Event.h" #include <klocale.h> @@ -67,7 +67,7 @@ public: virtual ~InterpretCommand(); - static QString getGlobalName() { return i18n("&Interpret..."); } + static TQString getGlobalName() { return i18n("&Interpret..."); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/KeyInsertionCommand.cpp b/src/commands/notation/KeyInsertionCommand.cpp index 39b87e2..fc2bb84 100644 --- a/src/commands/notation/KeyInsertionCommand.cpp +++ b/src/commands/notation/KeyInsertionCommand.cpp @@ -33,7 +33,7 @@ #include "base/Studio.h" #include "document/BasicCommand.h" #include "base/BaseProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/KeyInsertionCommand.h b/src/commands/notation/KeyInsertionCommand.h index a9caa6a..1a03383 100644 --- a/src/commands/notation/KeyInsertionCommand.h +++ b/src/commands/notation/KeyInsertionCommand.h @@ -28,7 +28,7 @@ #include "base/NotationTypes.h" #include "document/BasicCommand.h" -#include <qstring.h> +#include <tqstring.h> #include "base/Event.h" #include <klocale.h> #include "misc/Strings.h" @@ -60,7 +60,7 @@ public: bool shouldIgnorePercussion); virtual ~KeyInsertionCommand(); - static QString getGlobalName(Key *key = 0) { + static TQString getGlobalName(Key *key = 0) { if (key) { return i18n("Change to &Key %1...").arg(strtoqstr(key->getName())); } else { diff --git a/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp b/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp index 5716a8b..73ebffb 100644 --- a/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp +++ b/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp @@ -30,7 +30,7 @@ #include "base/Selection.h" #include "document/BasicSelectionCommand.h" #include "gui/editors/notation/NotationProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/MakeAccidentalsCautionaryCommand.h b/src/commands/notation/MakeAccidentalsCautionaryCommand.h index 2745dc7..13c1674 100644 --- a/src/commands/notation/MakeAccidentalsCautionaryCommand.h +++ b/src/commands/notation/MakeAccidentalsCautionaryCommand.h @@ -27,7 +27,7 @@ #define _RG_MAKEACCIDENTALSCAUTIONARYCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> @@ -47,7 +47,7 @@ public: m_selection(&selection), m_cautionary(cautionary) { } - static QString getGlobalName(bool cautionary); + static TQString getGlobalName(bool cautionary); protected: virtual void modifySegment(); diff --git a/src/commands/notation/MakeChordCommand.cpp b/src/commands/notation/MakeChordCommand.cpp index 668e627..307ac6d 100644 --- a/src/commands/notation/MakeChordCommand.cpp +++ b/src/commands/notation/MakeChordCommand.cpp @@ -30,7 +30,7 @@ #include "base/Segment.h" #include "base/Selection.h" #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/MakeChordCommand.h b/src/commands/notation/MakeChordCommand.h index 9c85ea2..e5028ba 100644 --- a/src/commands/notation/MakeChordCommand.h +++ b/src/commands/notation/MakeChordCommand.h @@ -27,7 +27,7 @@ #define _RG_ADJUSTMENUMAKECHORDCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -47,7 +47,7 @@ public: BasicSelectionCommand(getGlobalName(), selection, true), m_selection(&selection) { } - static QString getGlobalName() { return i18n("Make &Chord"); } + static TQString getGlobalName() { return i18n("Make &Chord"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/MakeNotesViableCommand.cpp b/src/commands/notation/MakeNotesViableCommand.cpp index 26cff3c..6da7e82 100644 --- a/src/commands/notation/MakeNotesViableCommand.cpp +++ b/src/commands/notation/MakeNotesViableCommand.cpp @@ -29,7 +29,7 @@ #include "base/SegmentNotationHelper.h" #include "base/Selection.h" #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/MakeNotesViableCommand.h b/src/commands/notation/MakeNotesViableCommand.h index f84f76d..4916750 100644 --- a/src/commands/notation/MakeNotesViableCommand.h +++ b/src/commands/notation/MakeNotesViableCommand.h @@ -27,7 +27,7 @@ #define _RG_ADJUSTMENUMAKENOTESVIABLECOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -52,7 +52,7 @@ public: BasicSelectionCommand(getGlobalName(), segment, true), m_selection(0) { } - static QString getGlobalName() { return i18n("Tie Notes at &Barlines"); } + static TQString getGlobalName() { return i18n("Tie Notes at &Barlines"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/MakeRegionViableCommand.cpp b/src/commands/notation/MakeRegionViableCommand.cpp index 597b232..62c576b 100644 --- a/src/commands/notation/MakeRegionViableCommand.cpp +++ b/src/commands/notation/MakeRegionViableCommand.cpp @@ -28,7 +28,7 @@ #include "base/Segment.h" #include "base/SegmentNotationHelper.h" #include "document/BasicCommand.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/MakeRegionViableCommand.h b/src/commands/notation/MakeRegionViableCommand.h index 64762cb..9d9b0f0 100644 --- a/src/commands/notation/MakeRegionViableCommand.h +++ b/src/commands/notation/MakeRegionViableCommand.h @@ -27,7 +27,7 @@ #define _RG_ADJUSTMENUMAKEREGIONVIABLECOMMAND_H_ #include "document/BasicCommand.h" -#include <qstring.h> +#include <tqstring.h> #include "base/Event.h" #include <klocale.h> @@ -49,7 +49,7 @@ public: timeT endTime) : BasicCommand(getGlobalName(), segment, startTime, endTime) { } - static QString getGlobalName() { return i18n("Tie Notes at &Barlines"); } + static TQString getGlobalName() { return i18n("Tie Notes at &Barlines"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/MultiKeyInsertionCommand.cpp b/src/commands/notation/MultiKeyInsertionCommand.cpp index 77bf625..f242b9c 100644 --- a/src/commands/notation/MultiKeyInsertionCommand.cpp +++ b/src/commands/notation/MultiKeyInsertionCommand.cpp @@ -29,7 +29,7 @@ #include "base/NotationTypes.h" #include "base/Segment.h" #include "KeyInsertionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include "document/RosegardenGUIDoc.h" #include "base/Studio.h" #include "misc/Debug.h" diff --git a/src/commands/notation/MultiKeyInsertionCommand.h b/src/commands/notation/MultiKeyInsertionCommand.h index b8ae152..644e877 100644 --- a/src/commands/notation/MultiKeyInsertionCommand.h +++ b/src/commands/notation/MultiKeyInsertionCommand.h @@ -27,7 +27,7 @@ #define _RG_MULTIKEYINSERTIONCOMMAND_H_ #include "base/NotationTypes.h" -#include <qstring.h> +#include <tqstring.h> #include "base/Event.h" #include <klocale.h> #include "misc/Strings.h" @@ -58,7 +58,7 @@ public: bool shouldIgnorePercussion); virtual ~MultiKeyInsertionCommand(); - static QString getGlobalName(Key *key = 0) { + static TQString getGlobalName(Key *key = 0) { if (key) { return i18n("Change all to &Key %1...").arg(strtoqstr(key->getName())); } else { diff --git a/src/commands/notation/NormalizeRestsCommand.cpp b/src/commands/notation/NormalizeRestsCommand.cpp index 9d96586..20a17b5 100644 --- a/src/commands/notation/NormalizeRestsCommand.cpp +++ b/src/commands/notation/NormalizeRestsCommand.cpp @@ -28,7 +28,7 @@ #include "base/Segment.h" #include "base/Selection.h" #include "document/BasicCommand.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/NormalizeRestsCommand.h b/src/commands/notation/NormalizeRestsCommand.h index db57920..6d26c7b 100644 --- a/src/commands/notation/NormalizeRestsCommand.h +++ b/src/commands/notation/NormalizeRestsCommand.h @@ -27,7 +27,7 @@ #define _RG_ADJUSTMENUNORMALIZERESTSCOMMAND_H_ #include "document/BasicCommand.h" -#include <qstring.h> +#include <tqstring.h> #include "base/Event.h" #include <klocale.h> @@ -51,7 +51,7 @@ public: NormalizeRestsCommand(EventSelection &selection); - static QString getGlobalName() { return i18n("&Normalize Rests"); } + static TQString getGlobalName() { return i18n("&Normalize Rests"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/RemoveFingeringMarksCommand.cpp b/src/commands/notation/RemoveFingeringMarksCommand.cpp index 2b66cba..5b69a0b 100644 --- a/src/commands/notation/RemoveFingeringMarksCommand.cpp +++ b/src/commands/notation/RemoveFingeringMarksCommand.cpp @@ -27,7 +27,7 @@ #include "base/Selection.h" #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/RemoveFingeringMarksCommand.h b/src/commands/notation/RemoveFingeringMarksCommand.h index 6e02bfc..71fcca0 100644 --- a/src/commands/notation/RemoveFingeringMarksCommand.h +++ b/src/commands/notation/RemoveFingeringMarksCommand.h @@ -27,7 +27,7 @@ #define _RG_NOTESMENUREMOVEFINGERINGMARKSCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -46,7 +46,7 @@ public: BasicSelectionCommand(getGlobalName(), selection, true), m_selection(&selection) { } - static QString getGlobalName() { return i18n("&Remove Fingerings"); } + static TQString getGlobalName() { return i18n("&Remove Fingerings"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/RemoveMarksCommand.cpp b/src/commands/notation/RemoveMarksCommand.cpp index 29513c2..631ba1a 100644 --- a/src/commands/notation/RemoveMarksCommand.cpp +++ b/src/commands/notation/RemoveMarksCommand.cpp @@ -27,7 +27,7 @@ #include "base/Selection.h" #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include "base/BaseProperties.h" diff --git a/src/commands/notation/RemoveMarksCommand.h b/src/commands/notation/RemoveMarksCommand.h index d04a1c9..1603c50 100644 --- a/src/commands/notation/RemoveMarksCommand.h +++ b/src/commands/notation/RemoveMarksCommand.h @@ -27,7 +27,7 @@ #define _RG_NOTESMENUREMOVEMARKSCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -46,7 +46,7 @@ public: BasicSelectionCommand(getGlobalName(), selection, true), m_selection(&selection) { } - static QString getGlobalName() { return i18n("&Remove All Marks"); } + static TQString getGlobalName() { return i18n("&Remove All Marks"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/RemoveNotationQuantizeCommand.cpp b/src/commands/notation/RemoveNotationQuantizeCommand.cpp index 9b500fc..2d824a0 100644 --- a/src/commands/notation/RemoveNotationQuantizeCommand.cpp +++ b/src/commands/notation/RemoveNotationQuantizeCommand.cpp @@ -28,7 +28,7 @@ #include "base/Event.h" #include "base/Selection.h" #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/RemoveNotationQuantizeCommand.h b/src/commands/notation/RemoveNotationQuantizeCommand.h index bc61ff8..8fb3b53 100644 --- a/src/commands/notation/RemoveNotationQuantizeCommand.h +++ b/src/commands/notation/RemoveNotationQuantizeCommand.h @@ -27,7 +27,7 @@ #define _RG_ADJUSTMENUREMOVENOTATIONQUANTIZECOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -46,7 +46,7 @@ public: BasicSelectionCommand(getGlobalName(), selection, true), m_selection(&selection) { } - static QString getGlobalName() { return i18n("Remo&ve Notation Quantization"); } + static TQString getGlobalName() { return i18n("Remo&ve Notation Quantization"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/ResetDisplacementsCommand.cpp b/src/commands/notation/ResetDisplacementsCommand.cpp index dff8549..cb38387 100644 --- a/src/commands/notation/ResetDisplacementsCommand.cpp +++ b/src/commands/notation/ResetDisplacementsCommand.cpp @@ -28,7 +28,7 @@ #include "base/Selection.h" #include "document/BasicSelectionCommand.h" #include "base/BaseProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/ResetDisplacementsCommand.h b/src/commands/notation/ResetDisplacementsCommand.h index b1d165b..701ed91 100644 --- a/src/commands/notation/ResetDisplacementsCommand.h +++ b/src/commands/notation/ResetDisplacementsCommand.h @@ -27,7 +27,7 @@ #define _RG_RESETDISPLACEMENTSCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -46,7 +46,7 @@ public: BasicSelectionCommand(getGlobalName(), selection, true), m_selection(&selection) { } - static QString getGlobalName() { return i18n("Restore Positions"); } + static TQString getGlobalName() { return i18n("Restore Positions"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/RespellCommand.cpp b/src/commands/notation/RespellCommand.cpp index c410707..6264a0e 100644 --- a/src/commands/notation/RespellCommand.cpp +++ b/src/commands/notation/RespellCommand.cpp @@ -30,7 +30,7 @@ #include "base/Selection.h" #include "document/BasicSelectionCommand.h" #include "base/BaseProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden @@ -44,7 +44,7 @@ RespellCommand::getGlobalName(Type type, Accidental accidental) switch (type) { case Set: { - QString s(i18n("Respell with %1")); + TQString s(i18n("Respell with %1")); //!!! should be in notationstrings: if (accidental == DoubleSharp) { s = s.arg(i18n("Do&uble Sharp")); diff --git a/src/commands/notation/RespellCommand.h b/src/commands/notation/RespellCommand.h index e2c414f..4f98dff 100644 --- a/src/commands/notation/RespellCommand.h +++ b/src/commands/notation/RespellCommand.h @@ -27,7 +27,7 @@ #define _RG_RESPELLCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> @@ -55,7 +55,7 @@ public: m_type(type), m_accidental(acc) { } - static QString getGlobalName(Type type, Accidental acc); + static TQString getGlobalName(Type type, Accidental acc); protected: virtual void modifySegment(); diff --git a/src/commands/notation/RestoreSlursCommand.cpp b/src/commands/notation/RestoreSlursCommand.cpp index 4cb2ec8..f6dd19d 100644 --- a/src/commands/notation/RestoreSlursCommand.cpp +++ b/src/commands/notation/RestoreSlursCommand.cpp @@ -29,7 +29,7 @@ #include "base/Selection.h" #include "document/BasicSelectionCommand.h" #include "gui/editors/notation/NotationProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/RestoreSlursCommand.h b/src/commands/notation/RestoreSlursCommand.h index 687d016..ed6bc4c 100644 --- a/src/commands/notation/RestoreSlursCommand.h +++ b/src/commands/notation/RestoreSlursCommand.h @@ -27,7 +27,7 @@ #define _RG_ADJUSTMENURESTORESLURSCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -46,7 +46,7 @@ public: BasicSelectionCommand(getGlobalName(), selection, true), m_selection(&selection) { } - static QString getGlobalName() { return i18n("&Restore Slur Positions"); } + static TQString getGlobalName() { return i18n("&Restore Slur Positions"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/RestoreStemsCommand.cpp b/src/commands/notation/RestoreStemsCommand.cpp index 99709f3..fadd82e 100644 --- a/src/commands/notation/RestoreStemsCommand.cpp +++ b/src/commands/notation/RestoreStemsCommand.cpp @@ -29,7 +29,7 @@ #include "base/Selection.h" #include "document/BasicSelectionCommand.h" #include "gui/editors/notation/NotationProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/RestoreStemsCommand.h b/src/commands/notation/RestoreStemsCommand.h index 94dd0cf..add54ce 100644 --- a/src/commands/notation/RestoreStemsCommand.h +++ b/src/commands/notation/RestoreStemsCommand.h @@ -27,7 +27,7 @@ #define _RG_ADJUSTMENURESTORESTEMSCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -46,7 +46,7 @@ public: BasicSelectionCommand(getGlobalName(), selection, true), m_selection(&selection) { } - static QString getGlobalName() { return i18n("&Restore Stems"); } + static TQString getGlobalName() { return i18n("&Restore Stems"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/RestoreTiesCommand.cpp b/src/commands/notation/RestoreTiesCommand.cpp index 6402361..2430524 100644 --- a/src/commands/notation/RestoreTiesCommand.cpp +++ b/src/commands/notation/RestoreTiesCommand.cpp @@ -30,7 +30,7 @@ #include "document/BasicSelectionCommand.h" #include "base/BaseProperties.h" #include "gui/editors/notation/NotationProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/RestoreTiesCommand.h b/src/commands/notation/RestoreTiesCommand.h index d3ffef9..5bd35e5 100644 --- a/src/commands/notation/RestoreTiesCommand.h +++ b/src/commands/notation/RestoreTiesCommand.h @@ -27,7 +27,7 @@ #define _RG_ADJUSTMENURESTORETIESCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -46,7 +46,7 @@ public: BasicSelectionCommand(getGlobalName(), selection, true), m_selection(&selection) { } - static QString getGlobalName() { return i18n("&Restore Tie Positions"); } + static TQString getGlobalName() { return i18n("&Restore Tie Positions"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/SetVisibilityCommand.cpp b/src/commands/notation/SetVisibilityCommand.cpp index c7f49f3..d66e476 100644 --- a/src/commands/notation/SetVisibilityCommand.cpp +++ b/src/commands/notation/SetVisibilityCommand.cpp @@ -28,7 +28,7 @@ #include "base/Selection.h" #include "document/BasicSelectionCommand.h" #include "base/BaseProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/SetVisibilityCommand.h b/src/commands/notation/SetVisibilityCommand.h index 6aef5ef..6aece6a 100644 --- a/src/commands/notation/SetVisibilityCommand.h +++ b/src/commands/notation/SetVisibilityCommand.h @@ -27,7 +27,7 @@ #define _RG_SETVISIBILITYCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -47,7 +47,7 @@ public: m_selection(&selection), m_visible(visible) { } - static QString getGlobalName() { return i18n("Set Visibility"); } + static TQString getGlobalName() { return i18n("Set Visibility"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/SustainInsertionCommand.cpp b/src/commands/notation/SustainInsertionCommand.cpp index f3c3917..4f12aa1 100644 --- a/src/commands/notation/SustainInsertionCommand.cpp +++ b/src/commands/notation/SustainInsertionCommand.cpp @@ -29,7 +29,7 @@ #include "base/MidiTypes.h" #include "base/Segment.h" #include "document/BasicCommand.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/SustainInsertionCommand.h b/src/commands/notation/SustainInsertionCommand.h index ddb93b4..235e2e5 100644 --- a/src/commands/notation/SustainInsertionCommand.h +++ b/src/commands/notation/SustainInsertionCommand.h @@ -27,7 +27,7 @@ #define _RG_SUSTAININSERTIONCOMMAND_H_ #include "document/BasicCommand.h" -#include <qstring.h> +#include <tqstring.h> #include "base/Event.h" #include <klocale.h> @@ -51,7 +51,7 @@ public: int controllerNumber); virtual ~SustainInsertionCommand(); - static QString getGlobalName(bool down) { + static TQString getGlobalName(bool down) { if (down) { return i18n("Add Pedal &Press"); } else { diff --git a/src/commands/notation/TieNotesCommand.cpp b/src/commands/notation/TieNotesCommand.cpp index 18b8188..ff7f3ab 100644 --- a/src/commands/notation/TieNotesCommand.cpp +++ b/src/commands/notation/TieNotesCommand.cpp @@ -30,7 +30,7 @@ #include "base/Selection.h" #include "document/BasicSelectionCommand.h" #include "base/BaseProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/TieNotesCommand.h b/src/commands/notation/TieNotesCommand.h index 2f1874f..b46470b 100644 --- a/src/commands/notation/TieNotesCommand.h +++ b/src/commands/notation/TieNotesCommand.h @@ -27,7 +27,7 @@ #define _RG_NOTESMENUTIENOTESCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -46,7 +46,7 @@ public: BasicSelectionCommand(getGlobalName(), selection, true), m_selection(&selection) { } - static QString getGlobalName() { return i18n("&Tie"); } + static TQString getGlobalName() { return i18n("&Tie"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/TupletCommand.cpp b/src/commands/notation/TupletCommand.cpp index b46fff5..2597424 100644 --- a/src/commands/notation/TupletCommand.cpp +++ b/src/commands/notation/TupletCommand.cpp @@ -30,7 +30,7 @@ #include "base/SegmentNotationHelper.h" #include "document/BasicCommand.h" #include "base/BaseProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/TupletCommand.h b/src/commands/notation/TupletCommand.h index b08a204..fcf5840 100644 --- a/src/commands/notation/TupletCommand.h +++ b/src/commands/notation/TupletCommand.h @@ -27,7 +27,7 @@ #define _RG_ADJUSTMENUTUPLETCOMMAND_H_ #include "document/BasicCommand.h" -#include <qstring.h> +#include <tqstring.h> #include "base/Event.h" #include <klocale.h> @@ -49,7 +49,7 @@ public: int untupled = 3, int tupled = 2, bool groupHasTimingAlready = false); - static QString getGlobalName(bool simple = true) { + static TQString getGlobalName(bool simple = true) { if (simple) return i18n("&Triplet"); else return i18n("Tu&plet..."); } diff --git a/src/commands/notation/UnGraceCommand.cpp b/src/commands/notation/UnGraceCommand.cpp index 7eb0343..d88365e 100644 --- a/src/commands/notation/UnGraceCommand.cpp +++ b/src/commands/notation/UnGraceCommand.cpp @@ -27,7 +27,7 @@ #include "base/Selection.h" #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/UnGraceCommand.h b/src/commands/notation/UnGraceCommand.h index cdaf244..535843e 100644 --- a/src/commands/notation/UnGraceCommand.h +++ b/src/commands/notation/UnGraceCommand.h @@ -27,7 +27,7 @@ #define _RG_ADJUSTMENUUNGRACECOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -45,7 +45,7 @@ public: UnGraceCommand(EventSelection &selection) : BasicSelectionCommand(getGlobalName(), selection) { } - static QString getGlobalName() { return i18n("Ung&race"); } + static TQString getGlobalName() { return i18n("Ung&race"); } protected: virtual void modifySegment(); diff --git a/src/commands/notation/UnTupletCommand.cpp b/src/commands/notation/UnTupletCommand.cpp index 0a4b85e..d502529 100644 --- a/src/commands/notation/UnTupletCommand.cpp +++ b/src/commands/notation/UnTupletCommand.cpp @@ -28,7 +28,7 @@ #include "base/Selection.h" #include "document/BasicSelectionCommand.h" #include "base/BaseProperties.h" -#include <qstring.h> +#include <tqstring.h> namespace Rosegarden diff --git a/src/commands/notation/UnTupletCommand.h b/src/commands/notation/UnTupletCommand.h index 76aabe4..866069c 100644 --- a/src/commands/notation/UnTupletCommand.h +++ b/src/commands/notation/UnTupletCommand.h @@ -27,7 +27,7 @@ #define _RG_ADJUSTMENUUNTUPLETCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -46,7 +46,7 @@ public: BasicSelectionCommand(getGlobalName(), selection, true), m_selection(&selection) { } - static QString getGlobalName() { + static TQString getGlobalName() { return i18n("&Untuplet"); } diff --git a/src/commands/notation/UntieNotesCommand.cpp b/src/commands/notation/UntieNotesCommand.cpp index e32d605..9bd85c7 100644 --- a/src/commands/notation/UntieNotesCommand.cpp +++ b/src/commands/notation/UntieNotesCommand.cpp @@ -27,7 +27,7 @@ #include "base/Selection.h" #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include "base/BaseProperties.h" diff --git a/src/commands/notation/UntieNotesCommand.h b/src/commands/notation/UntieNotesCommand.h index 3f57413..8d0ca67 100644 --- a/src/commands/notation/UntieNotesCommand.h +++ b/src/commands/notation/UntieNotesCommand.h @@ -27,7 +27,7 @@ #define _RG_ADJUSTMENUUNTIENOTESCOMMAND_H_ #include "document/BasicSelectionCommand.h" -#include <qstring.h> +#include <tqstring.h> #include <klocale.h> @@ -46,7 +46,7 @@ public: BasicSelectionCommand(getGlobalName(), selection, true), m_selection(&selection) { } - static QString getGlobalName() { return i18n("&Untie"); } + static TQString getGlobalName() { return i18n("&Untie"); } protected: virtual void modifySegment(); |