From 458efa7b0c935cbaafa2791021a5f8f7241aa876 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 2 May 2011 22:38:52 +0000 Subject: Initial TQt4 port of Rosegarden This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1230242 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/commands/edit/CopyCommand.cpp | 4 ++-- src/commands/edit/EraseCommand.cpp | 8 ++++---- src/commands/edit/EraseCommand.h | 4 ++-- src/commands/edit/EventQuantizeCommand.cpp | 2 +- src/commands/edit/EventQuantizeCommand.h | 5 +++-- src/commands/edit/EventUnquantizeCommand.cpp | 2 +- src/commands/edit/EventUnquantizeCommand.h | 4 ++-- src/commands/edit/MoveAcrossSegmentsCommand.cpp | 2 +- src/commands/edit/MoveCommand.cpp | 2 +- src/commands/edit/PasteEventsCommand.cpp | 12 ++++++------ src/commands/edit/PasteEventsCommand.h | 6 +++--- src/commands/edit/SetLyricsCommand.cpp | 4 ++-- 12 files changed, 28 insertions(+), 27 deletions(-) (limited to 'src/commands/edit') diff --git a/src/commands/edit/CopyCommand.cpp b/src/commands/edit/CopyCommand.cpp index cd86359..34534db 100644 --- a/src/commands/edit/CopyCommand.cpp +++ b/src/commands/edit/CopyCommand.cpp @@ -57,11 +57,11 @@ CopyCommand::CopyCommand(SegmentSelection &selection, for (SegmentSelection::iterator i = selection.begin(); i != selection.end(); ++i) { TQString newLabel = strtoqstr((*i)->getLabel()); - if (newLabel.contains(i18n("(copied)"))) { + if (newLabel.tqcontains(i18n("(copied)"))) { m_sourceClipboard->newSegment(*i); } else { m_sourceClipboard->newSegment(*i)-> - setLabel(qstrtostr(i18n("%1 (copied)").arg(newLabel))); + setLabel(qstrtostr(i18n("%1 (copied)").tqarg(newLabel))); } } } diff --git a/src/commands/edit/EraseCommand.cpp b/src/commands/edit/EraseCommand.cpp index 246eb5f..3a3df26 100644 --- a/src/commands/edit/EraseCommand.cpp +++ b/src/commands/edit/EraseCommand.cpp @@ -38,7 +38,7 @@ namespace Rosegarden EraseCommand::EraseCommand(EventSelection &selection) : BasicSelectionCommand(getGlobalName(), selection, true), m_selection(&selection), - m_relayoutEndTime(getEndTime()) + m_retqlayoutEndTime(getEndTime()) { // nothing else } @@ -56,7 +56,7 @@ EraseCommand::modifySegment() if ((*i)->isa(Clef::EventType) || (*i)->isa(Key ::EventType)) { - m_relayoutEndTime = getSegment().getEndTime(); + m_retqlayoutEndTime = getSegment().getEndTime(); } // We used to do this by calling SegmentNotationHelper::deleteEvent @@ -78,9 +78,9 @@ EraseCommand::modifySegment() } timeT -EraseCommand::getRelayoutEndTime() +EraseCommand::getRetqlayoutEndTime() { - return m_relayoutEndTime; + return m_retqlayoutEndTime; } } diff --git a/src/commands/edit/EraseCommand.h b/src/commands/edit/EraseCommand.h index a662640..e54139b 100644 --- a/src/commands/edit/EraseCommand.h +++ b/src/commands/edit/EraseCommand.h @@ -49,14 +49,14 @@ public: static TQString getGlobalName() { return i18n("&Erase"); } - virtual timeT getRelayoutEndTime(); + virtual timeT getRetqlayoutEndTime(); protected: virtual void modifySegment(); private: EventSelection *m_selection;// only used on 1st execute (cf bruteForceRedo) - timeT m_relayoutEndTime; + timeT m_retqlayoutEndTime; }; diff --git a/src/commands/edit/EventQuantizeCommand.cpp b/src/commands/edit/EventQuantizeCommand.cpp index 95943ba..de033ef 100644 --- a/src/commands/edit/EventQuantizeCommand.cpp +++ b/src/commands/edit/EventQuantizeCommand.cpp @@ -106,7 +106,7 @@ EventQuantizeCommand::~EventQuantizeCommand() delete m_quantizer; } -QString +TQString EventQuantizeCommand::getGlobalName(Quantizer *quantizer) { if (quantizer) { diff --git a/src/commands/edit/EventQuantizeCommand.h b/src/commands/edit/EventQuantizeCommand.h index 0d50678..aa9dd58 100644 --- a/src/commands/edit/EventQuantizeCommand.h +++ b/src/commands/edit/EventQuantizeCommand.h @@ -23,8 +23,8 @@ COPYING included with this distribution for more information. */ -#ifndef _RG_EVENQUANTIZECOMMAND_H_ -#define _RG_EVENQUANTIZECOMMAND_H_ +#ifndef _RG_EVENTQUANTIZECOMMAND_H_ +#define _RG_EVENTQUANTIZECOMMAND_H_ #include "document/BasicCommand.h" #include @@ -45,6 +45,7 @@ class EventSelection; class EventQuantizeCommand : public TQObject, public BasicCommand { Q_OBJECT + TQ_OBJECT public: /// Quantizer must be on heap (EventQuantizeCommand dtor will delete) diff --git a/src/commands/edit/EventUnquantizeCommand.cpp b/src/commands/edit/EventUnquantizeCommand.cpp index 7e7ce58..3fe2eb2 100644 --- a/src/commands/edit/EventUnquantizeCommand.cpp +++ b/src/commands/edit/EventUnquantizeCommand.cpp @@ -67,7 +67,7 @@ EventUnquantizeCommand::~EventUnquantizeCommand() delete m_quantizer; } -QString +TQString EventUnquantizeCommand::getGlobalName(Quantizer *) { /*!!! diff --git a/src/commands/edit/EventUnquantizeCommand.h b/src/commands/edit/EventUnquantizeCommand.h index 4203726..9bb2718 100644 --- a/src/commands/edit/EventUnquantizeCommand.h +++ b/src/commands/edit/EventUnquantizeCommand.h @@ -23,8 +23,8 @@ COPYING included with this distribution for more information. */ -#ifndef _RG_EVENTUNQUANTIZECOMMAND_H_ -#define _RG_EVENTUNQUANTIZECOMMAND_H_ +#ifndef _RG_EVENTUNTQUANTIZECOMMAND_H_ +#define _RG_EVENTUNTQUANTIZECOMMAND_H_ #include "document/BasicCommand.h" #include diff --git a/src/commands/edit/MoveAcrossSegmentsCommand.cpp b/src/commands/edit/MoveAcrossSegmentsCommand.cpp index f0b954a..ed73360 100644 --- a/src/commands/edit/MoveAcrossSegmentsCommand.cpp +++ b/src/commands/edit/MoveAcrossSegmentsCommand.cpp @@ -67,7 +67,7 @@ MoveAcrossSegmentsCommand::~MoveAcrossSegmentsCommand() delete m_clipboard; } -QString +TQString MoveAcrossSegmentsCommand::getGlobalName() { return i18n("&Move Events to Other Segment"); diff --git a/src/commands/edit/MoveCommand.cpp b/src/commands/edit/MoveCommand.cpp index 58667fc..aa6b891 100644 --- a/src/commands/edit/MoveCommand.cpp +++ b/src/commands/edit/MoveCommand.cpp @@ -52,7 +52,7 @@ MoveCommand::MoveCommand(Segment &s, timeT delta, bool useNotationTimings, // nothing else } -QString +TQString MoveCommand::getGlobalName(timeT delta) { if (delta == 0) { diff --git a/src/commands/edit/PasteEventsCommand.cpp b/src/commands/edit/PasteEventsCommand.cpp index 2e2e458..9b84ee7 100644 --- a/src/commands/edit/PasteEventsCommand.cpp +++ b/src/commands/edit/PasteEventsCommand.cpp @@ -47,14 +47,14 @@ PasteEventsCommand::PasteEventsCommand(Segment &segment, PasteType pasteType) : BasicCommand(getGlobalName(), segment, pasteTime, getEffectiveEndTime(segment, clipboard, pasteTime)), - m_relayoutEndTime(getEndTime()), + m_retqlayoutEndTime(getEndTime()), m_clipboard(new Clipboard(*clipboard)), m_pasteType(pasteType), m_pastedEvents(segment) { if (pasteType != OpenAndPaste) { - // paste clef or key -> relayout to end + // paste clef or key -> retqlayout to end if (clipboard->isSingleSegment()) { @@ -62,7 +62,7 @@ PasteEventsCommand::PasteEventsCommand(Segment &segment, for (Segment::iterator i = s->begin(); i != s->end(); ++i) { if ((*i)->isa(Clef::EventType) || (*i)->isa(Key::EventType)) { - m_relayoutEndTime = s->getEndTime(); + m_retqlayoutEndTime = s->getEndTime(); break; } } @@ -76,7 +76,7 @@ PasteEventsCommand::PasteEventsCommand(Segment &segment, timeT pasteEndTime, PasteType pasteType) : BasicCommand(getGlobalName(), segment, pasteTime, pasteEndTime), - m_relayoutEndTime(getEndTime()), + m_retqlayoutEndTime(getEndTime()), m_clipboard(new Clipboard(*clipboard)), m_pasteType(pasteType), m_pastedEvents(segment) @@ -138,9 +138,9 @@ PasteEventsCommand::getEffectiveEndTime(Segment &segment, } timeT -PasteEventsCommand::getRelayoutEndTime() +PasteEventsCommand::getRetqlayoutEndTime() { - return m_relayoutEndTime; + return m_retqlayoutEndTime; } bool diff --git a/src/commands/edit/PasteEventsCommand.h b/src/commands/edit/PasteEventsCommand.h index 66aea6d..2817d84 100644 --- a/src/commands/edit/PasteEventsCommand.h +++ b/src/commands/edit/PasteEventsCommand.h @@ -60,7 +60,7 @@ public: static PasteTypeMap getPasteTypes(); // type, descrip /** - * Construct a Paste command from a clipboard that already contains + * Construct a Paste command from a clipboard that already tqcontains * the events to be pasted. */ PasteEventsCommand(Segment &segment, @@ -92,14 +92,14 @@ public: /// Determine whether this paste will succeed (without executing it yet) bool isPossible(); - virtual timeT getRelayoutEndTime(); + virtual timeT getRetqlayoutEndTime(); protected: virtual void modifySegment(); timeT getEffectiveEndTime(Segment &, Clipboard *, timeT); - timeT m_relayoutEndTime; + timeT m_retqlayoutEndTime; Clipboard *m_clipboard; PasteType m_pasteType; EventSelection m_pastedEvents; diff --git a/src/commands/edit/SetLyricsCommand.cpp b/src/commands/edit/SetLyricsCommand.cpp index cfee2bf..f10d746 100644 --- a/src/commands/edit/SetLyricsCommand.cpp +++ b/src/commands/edit/SetLyricsCommand.cpp @@ -106,7 +106,7 @@ SetLyricsCommand::execute() std::pair barRange = comp->getBarRange(barNo++); TQString syllables = *bsi; - syllables.replace(TQRegExp("\\[\\d+\\] "), " "); + syllables.tqreplace(TQRegExp("\\[\\d+\\] "), " "); TQStringList syllableList = TQStringList::split(" ", syllables); // no empties i = m_segment->findTime(barRange.first); @@ -131,7 +131,7 @@ SetLyricsCommand::execute() } TQString syllable = *ssi; - syllable.replace(TQRegExp("~"), " "); + syllable.tqreplace(TQRegExp("~"), " "); syllable = syllable.simplifyWhiteSpace(); if (syllable == "") continue; -- cgit v1.2.1