summaryrefslogtreecommitdiffstats
path: root/src/commands/notation
diff options
context:
space:
mode:
Diffstat (limited to 'src/commands/notation')
-rw-r--r--src/commands/notation/AddFingeringMarkCommand.cpp8
-rw-r--r--src/commands/notation/AddIndicationCommand.cpp4
-rw-r--r--src/commands/notation/AddIndicationCommand.h2
-rw-r--r--src/commands/notation/AddMarkCommand.cpp6
-rw-r--r--src/commands/notation/ChangeStyleCommand.cpp2
-rw-r--r--src/commands/notation/ClefInsertionCommand.cpp6
-rw-r--r--src/commands/notation/ClefInsertionCommand.h2
-rw-r--r--src/commands/notation/EraseEventCommand.cpp8
-rw-r--r--src/commands/notation/EraseEventCommand.h4
-rw-r--r--src/commands/notation/FixNotationQuantizeCommand.h4
-rw-r--r--src/commands/notation/InterpretCommand.cpp2
-rw-r--r--src/commands/notation/InterpretCommand.h2
-rw-r--r--src/commands/notation/KeyInsertionCommand.h2
-rw-r--r--src/commands/notation/MakeAccidentalsCautionaryCommand.cpp2
-rw-r--r--src/commands/notation/MultiKeyInsertionCommand.h2
-rw-r--r--src/commands/notation/RemoveNotationQuantizeCommand.h4
-rw-r--r--src/commands/notation/RespellCommand.cpp14
-rw-r--r--src/commands/notation/TieNotesCommand.cpp2
18 files changed, 38 insertions, 38 deletions
diff --git a/src/commands/notation/AddFingeringMarkCommand.cpp b/src/commands/notation/AddFingeringMarkCommand.cpp
index e8031ff..49ec03c 100644
--- a/src/commands/notation/AddFingeringMarkCommand.cpp
+++ b/src/commands/notation/AddFingeringMarkCommand.cpp
@@ -38,7 +38,7 @@
namespace Rosegarden
{
-QString
+TQString
AddFingeringMarkCommand::getGlobalName(TQString fingering)
{
if (fingering == "")
@@ -46,7 +46,7 @@ AddFingeringMarkCommand::getGlobalName(TQString fingering)
else if (fingering == "0")
return i18n("Add Fingering &0 (Thumb)");
else
- return i18n("Add Fingering &%1").arg(fingering);
+ return i18n("Add Fingering &%1").tqarg(fingering);
}
void
@@ -84,7 +84,7 @@ AddFingeringMarkCommand::modifySegment()
for (Chord::iterator ci = chord.begin();
ci != chord.end(); ++ci) {
- if (!m_selection->contains(**ci))
+ if (!m_selection->tqcontains(**ci))
continue;
if (attempt < 2 &&
@@ -104,7 +104,7 @@ AddFingeringMarkCommand::modifySegment()
break;
for (Chord::iterator ci = chord.begin();
ci != chord.end(); ++ci) {
- if (m_selection->contains(**ci)) {
+ if (m_selection->tqcontains(**ci)) {
Marks::removeMark
(***ci,
Marks::getFingeringMark(***ci));
diff --git a/src/commands/notation/AddIndicationCommand.cpp b/src/commands/notation/AddIndicationCommand.cpp
index 73aceb6..fd24930 100644
--- a/src/commands/notation/AddIndicationCommand.cpp
+++ b/src/commands/notation/AddIndicationCommand.cpp
@@ -138,7 +138,7 @@ AddIndicationCommand::modifySegment()
}
}
-QString
+TQString
AddIndicationCommand::getGlobalName(std::string indicationType)
{
if (indicationType == Indication::Slur) {
@@ -164,7 +164,7 @@ AddIndicationCommand::getGlobalName(std::string indicationType)
return i18n("Add &Glissando");
}
- TQString n = i18n("Add &%1%2").arg((char)toupper(indicationType[0])).arg(strtoqstr(indicationType.substr(1)));
+ TQString n = i18n("Add &%1%2").tqarg((char)toupper(indicationType[0])).tqarg(strtoqstr(indicationType.substr(1)));
return n;
}
diff --git a/src/commands/notation/AddIndicationCommand.h b/src/commands/notation/AddIndicationCommand.h
index 396a488..1b31760 100644
--- a/src/commands/notation/AddIndicationCommand.h
+++ b/src/commands/notation/AddIndicationCommand.h
@@ -55,7 +55,7 @@ public:
Event *getLastInsertedEvent() {
return m_lastInsertedEvent;
}
- virtual timeT getRelayoutEndTime() {
+ virtual timeT getRetqlayoutEndTime() {
return getStartTime() + m_indicationDuration;
}
diff --git a/src/commands/notation/AddMarkCommand.cpp b/src/commands/notation/AddMarkCommand.cpp
index 0fa8268..5386eac 100644
--- a/src/commands/notation/AddMarkCommand.cpp
+++ b/src/commands/notation/AddMarkCommand.cpp
@@ -38,7 +38,7 @@ namespace Rosegarden
using namespace BaseProperties;
-QString
+TQString
AddMarkCommand::getGlobalName(Mark markType)
{
TQString m = strtoqstr(markType);
@@ -81,12 +81,12 @@ AddMarkCommand::getGlobalName(Mark markType)
else if (markType == Marks::MordentLongInverted)
m = i18n("Lon&g Inverted Mordent");
else
- m = i18n("&%1%2").arg(m[0].upper()).arg(m.right(m.length() - 1));
+ m = i18n("&%1%2").tqarg(m[0].upper()).tqarg(m.right(m.length() - 1));
// FIXME: That last i18n has very little chance of working, unless
// by some miracle the exact same string was translated elsewhere already
// but we'll leave it as a warning
- m = i18n("Add %1").arg(m);
+ m = i18n("Add %1").tqarg(m);
return m;
}
diff --git a/src/commands/notation/ChangeStyleCommand.cpp b/src/commands/notation/ChangeStyleCommand.cpp
index f4b3456..f6a3464 100644
--- a/src/commands/notation/ChangeStyleCommand.cpp
+++ b/src/commands/notation/ChangeStyleCommand.cpp
@@ -37,7 +37,7 @@
namespace Rosegarden
{
-QString
+TQString
ChangeStyleCommand::getGlobalName(NoteStyleName style)
{
return strtoqstr(style);
diff --git a/src/commands/notation/ClefInsertionCommand.cpp b/src/commands/notation/ClefInsertionCommand.cpp
index c2c5738..8752e8b 100644
--- a/src/commands/notation/ClefInsertionCommand.cpp
+++ b/src/commands/notation/ClefInsertionCommand.cpp
@@ -61,14 +61,14 @@ ClefInsertionCommand::~ClefInsertionCommand()
// nothing
}
-QString
+TQString
ClefInsertionCommand::getGlobalName(Clef *)
{
/* doesn't handle octave offset -- leave it for now
if (clef) {
TQString name(strtoqstr(clef->getClefType()));
name = name.left(1).upper() + name.right(name.length()-1);
- return i18n("Change to %1 Cle&f...").arg(name);
+ return i18n("Change to %1 Cle&f...").tqarg(name);
} else {
*/
return i18n("Add Cle&f Change...");
@@ -78,7 +78,7 @@ ClefInsertionCommand::getGlobalName(Clef *)
}
timeT
-ClefInsertionCommand::getRelayoutEndTime()
+ClefInsertionCommand::getRetqlayoutEndTime()
{
// Inserting a clef can change the y-coord of every subsequent note
return getSegment().getEndTime();
diff --git a/src/commands/notation/ClefInsertionCommand.h b/src/commands/notation/ClefInsertionCommand.h
index 9cacdfb..e3c91a5 100644
--- a/src/commands/notation/ClefInsertionCommand.h
+++ b/src/commands/notation/ClefInsertionCommand.h
@@ -52,7 +52,7 @@ public:
virtual ~ClefInsertionCommand();
static TQString getGlobalName(Clef *clef = 0);
- virtual timeT getRelayoutEndTime();
+ virtual timeT getRetqlayoutEndTime();
Event *getLastInsertedEvent() { return m_lastInsertedEvent; }
diff --git a/src/commands/notation/EraseEventCommand.cpp b/src/commands/notation/EraseEventCommand.cpp
index e599079..a3479dd 100644
--- a/src/commands/notation/EraseEventCommand.cpp
+++ b/src/commands/notation/EraseEventCommand.cpp
@@ -47,7 +47,7 @@ EraseEventCommand::EraseEventCommand(Segment &segment,
true),
m_collapseRest(collapseRest),
m_event(event),
- m_relayoutEndTime(getEndTime())
+ m_retqlayoutEndTime(getEndTime())
{
// nothing
}
@@ -67,9 +67,9 @@ EraseEventCommand::makeName(std::string e)
}
timeT
-EraseEventCommand::getRelayoutEndTime()
+EraseEventCommand::getRetqlayoutEndTime()
{
- return m_relayoutEndTime;
+ return m_retqlayoutEndTime;
}
void
@@ -80,7 +80,7 @@ EraseEventCommand::modifySegment()
if (m_event->isa(Clef::EventType) ||
m_event->isa(Key ::EventType)) {
- m_relayoutEndTime = helper.segment().getEndTime();
+ m_retqlayoutEndTime = helper.segment().getEndTime();
} else if (m_event->isa(Indication::EventType)) {
diff --git a/src/commands/notation/EraseEventCommand.h b/src/commands/notation/EraseEventCommand.h
index 07043fa..4584e5f 100644
--- a/src/commands/notation/EraseEventCommand.h
+++ b/src/commands/notation/EraseEventCommand.h
@@ -48,7 +48,7 @@ public:
bool collapseRest);
virtual ~EraseEventCommand();
- virtual timeT getRelayoutEndTime();
+ virtual timeT getRetqlayoutEndTime();
protected:
virtual void modifySegment();
@@ -56,7 +56,7 @@ protected:
bool m_collapseRest;
Event *m_event; // only used on 1st execute (cf bruteForceRedo)
- timeT m_relayoutEndTime;
+ timeT m_retqlayoutEndTime;
std::string makeName(std::string);
};
diff --git a/src/commands/notation/FixNotationQuantizeCommand.h b/src/commands/notation/FixNotationQuantizeCommand.h
index 3a5d334..05ea393 100644
--- a/src/commands/notation/FixNotationQuantizeCommand.h
+++ b/src/commands/notation/FixNotationQuantizeCommand.h
@@ -23,8 +23,8 @@
COPYING included with this distribution for more information.
*/
-#ifndef _RG_ADJUSTMENUFIXNOTATIONQUANTIZECOMMAND_H_
-#define _RG_ADJUSTMENUFIXNOTATIONQUANTIZECOMMAND_H_
+#ifndef _RG_ADJUSTMENUFIXNOTATIONTQUANTIZECOMMAND_H_
+#define _RG_ADJUSTMENUFIXNOTATIONTQUANTIZECOMMAND_H_
#include "document/BasicSelectionCommand.h"
#include <tqstring.h>
diff --git a/src/commands/notation/InterpretCommand.cpp b/src/commands/notation/InterpretCommand.cpp
index 6d1b18b..1652b2f 100644
--- a/src/commands/notation/InterpretCommand.cpp
+++ b/src/commands/notation/InterpretCommand.cpp
@@ -154,7 +154,7 @@ InterpretCommand::applyTextDynamics()
}
if (t >= startTime &&
- (*i)->isa(Note::EventType) && m_selection->contains(*i)) {
+ (*i)->isa(Note::EventType) && m_selection->tqcontains(*i)) {
(*i)->set
<Int>(VELOCITY, velocity);
}
diff --git a/src/commands/notation/InterpretCommand.h b/src/commands/notation/InterpretCommand.h
index a50a0f7..445bc5c 100644
--- a/src/commands/notation/InterpretCommand.h
+++ b/src/commands/notation/InterpretCommand.h
@@ -48,7 +48,7 @@ class Event;
class InterpretCommand : public BasicSelectionCommand
{
public:
- // bit masks: pass an OR of these to the constructor
+ // bit tqmasks: pass an OR of these to the constructor
static const int NoInterpretation;
static const int GuessDirections; // allegro, rit, pause &c: kinda bogus
static const int ApplyTextDynamics; // mp, ff
diff --git a/src/commands/notation/KeyInsertionCommand.h b/src/commands/notation/KeyInsertionCommand.h
index 1a03383..7adfd6b 100644
--- a/src/commands/notation/KeyInsertionCommand.h
+++ b/src/commands/notation/KeyInsertionCommand.h
@@ -62,7 +62,7 @@ public:
static TQString getGlobalName(Key *key = 0) {
if (key) {
- return i18n("Change to &Key %1...").arg(strtoqstr(key->getName()));
+ return i18n("Change to &Key %1...").tqarg(strtoqstr(key->getName()));
} else {
return i18n("Add &Key Change...");
}
diff --git a/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp b/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp
index 73ebffb..611419f 100644
--- a/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp
+++ b/src/commands/notation/MakeAccidentalsCautionaryCommand.cpp
@@ -36,7 +36,7 @@
namespace Rosegarden
{
-QString
+TQString
MakeAccidentalsCautionaryCommand::getGlobalName(bool cautionary)
{
if (cautionary)
diff --git a/src/commands/notation/MultiKeyInsertionCommand.h b/src/commands/notation/MultiKeyInsertionCommand.h
index 644e877..9683589 100644
--- a/src/commands/notation/MultiKeyInsertionCommand.h
+++ b/src/commands/notation/MultiKeyInsertionCommand.h
@@ -60,7 +60,7 @@ public:
static TQString getGlobalName(Key *key = 0) {
if (key) {
- return i18n("Change all to &Key %1...").arg(strtoqstr(key->getName()));
+ return i18n("Change all to &Key %1...").tqarg(strtoqstr(key->getName()));
} else {
return i18n("Add &Key Change...");
}
diff --git a/src/commands/notation/RemoveNotationQuantizeCommand.h b/src/commands/notation/RemoveNotationQuantizeCommand.h
index 8fb3b53..3a5f946 100644
--- a/src/commands/notation/RemoveNotationQuantizeCommand.h
+++ b/src/commands/notation/RemoveNotationQuantizeCommand.h
@@ -23,8 +23,8 @@
COPYING included with this distribution for more information.
*/
-#ifndef _RG_ADJUSTMENUREMOVENOTATIONQUANTIZECOMMAND_H_
-#define _RG_ADJUSTMENUREMOVENOTATIONQUANTIZECOMMAND_H_
+#ifndef _RG_ADJUSTMENUREMOVENOTATIONTQUANTIZECOMMAND_H_
+#define _RG_ADJUSTMENUREMOVENOTATIONTQUANTIZECOMMAND_H_
#include "document/BasicSelectionCommand.h"
#include <tqstring.h>
diff --git a/src/commands/notation/RespellCommand.cpp b/src/commands/notation/RespellCommand.cpp
index 6264a0e..81e635f 100644
--- a/src/commands/notation/RespellCommand.cpp
+++ b/src/commands/notation/RespellCommand.cpp
@@ -38,7 +38,7 @@ namespace Rosegarden
using namespace BaseProperties;
using namespace Accidentals;
-QString
+TQString
RespellCommand::getGlobalName(Type type, Accidental accidental)
{
switch (type) {
@@ -47,17 +47,17 @@ RespellCommand::getGlobalName(Type type, Accidental accidental)
TQString s(i18n("Respell with %1"));
//!!! should be in notationstrings:
if (accidental == DoubleSharp) {
- s = s.arg(i18n("Do&uble Sharp"));
+ s = s.tqarg(i18n("Do&uble Sharp"));
} else if (accidental == Sharp) {
- s = s.arg(i18n("&Sharp"));
+ s = s.tqarg(i18n("&Sharp"));
} else if (accidental == Flat) {
- s = s.arg(i18n("&Flat"));
+ s = s.tqarg(i18n("&Flat"));
} else if (accidental == DoubleFlat) {
- s = s.arg(i18n("Dou&ble Flat"));
+ s = s.tqarg(i18n("Dou&ble Flat"));
} else if (accidental == Natural) {
- s = s.arg(i18n("&Natural"));
+ s = s.tqarg(i18n("&Natural"));
} else {
- s = s.arg(i18n("N&one"));
+ s = s.tqarg(i18n("N&one"));
}
return s;
}
diff --git a/src/commands/notation/TieNotesCommand.cpp b/src/commands/notation/TieNotesCommand.cpp
index ff7f3ab..e65865d 100644
--- a/src/commands/notation/TieNotesCommand.cpp
+++ b/src/commands/notation/TieNotesCommand.cpp
@@ -59,7 +59,7 @@ TieNotesCommand::modifySegment()
Segment::iterator sj;
while ((sj = helper.getNextAdjacentNote(si, true, false)) !=
segment.end()) {
- if (!m_selection->contains(*sj))
+ if (!m_selection->tqcontains(*sj))
break;
(*si)->set<Bool>(TIED_FORWARD, true);
(*si)->unset(TIE_IS_ABOVE);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-18 17:07:17 +0000