From b4522d4cff373333a567b4274518525e54d1c6e7 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 21 Oct 2012 12:49:39 -0500 Subject: [PATCH] Fix inadvertent tq changes. (cherry picked from commit 307fd320c21738716f416b289eeae1646e69440e) --- src/test/segmenttransposecommand.cpp | 36 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/test/segmenttransposecommand.cpp b/src/test/segmenttransposecommand.cpp index 710ca30..0025529 100644 --- a/src/test/segmenttransposecommand.cpp +++ b/src/test/segmenttransposecommand.cpp @@ -21,10 +21,10 @@ int testSegmentBbtoF() Event * bes = n->getAsNoteEvent(1, 10); segment1->insert(bes); segment1->insert(Key("Bb major").getAsEvent(0)); - SegmentTransposeCommand * tqmockCommand = + SegmentTransposeCommand * mockCommand = new SegmentTransposeCommand(*segment1, true, -3, -5, true); - tqmockCommand->execute(); + mockCommand->execute(); EventSelection m_selection(*segment1, segment1->getStartTime(), segment1->getEndMarkerTime()); EventSelection::eventcontainer::iterator i; @@ -58,10 +58,10 @@ int testGistoAis() Event * gis = n->getAsNoteEvent(1, 8); segment1->insert(gis); segment1->insert(Key("E major").getAsEvent(0)); - SegmentTransposeCommand * tqmockCommand = + SegmentTransposeCommand * mockCommand = new SegmentTransposeCommand(*segment1, true, 1, 2, true); - tqmockCommand->execute(); + mockCommand->execute(); EventSelection m_selection(*segment1, segment1->getStartTime(), segment1->getEndMarkerTime()); EventSelection::eventcontainer::iterator i; @@ -93,10 +93,10 @@ int testSegmentCisToC() Event * cis = n->getAsNoteEvent(1, 13); segment1->insert(cis); segment1->insert(Key("C# major").getAsEvent(0)); - SegmentTransposeCommand * tqmockCommand = + SegmentTransposeCommand * mockCommand = new SegmentTransposeCommand(*segment1, true, 0, -1, true); - tqmockCommand->execute(); + mockCommand->execute(); EventSelection m_selection(*segment1, segment1->getStartTime(), segment1->getEndMarkerTime()); EventSelection::eventcontainer::iterator i; @@ -124,29 +124,29 @@ int testUndo() Segment * segment2 = new Segment(); // transpose once - SegmentTransposeCommand * tqmockCommand1a = + SegmentTransposeCommand * mockCommand1a = new SegmentTransposeCommand(*segment1, true, -1, -2, true); - tqmockCommand1a->execute(); - SegmentTransposeCommand * tqmockCommand1b = + mockCommand1a->execute(); + SegmentTransposeCommand * mockCommand1b = new SegmentTransposeCommand(*segment2, true, -1, -2, true); - tqmockCommand1b->execute(); + mockCommand1b->execute(); // transpose twice - SegmentTransposeCommand * tqmockCommand2a = + SegmentTransposeCommand * mockCommand2a = new SegmentTransposeCommand(*segment1, true, -1, -2, true); - tqmockCommand2a->execute(); - SegmentTransposeCommand * tqmockCommand2b = + mockCommand2a->execute(); + SegmentTransposeCommand * mockCommand2b = new SegmentTransposeCommand(*segment2, true, -1, -2, true); - tqmockCommand2b->execute(); + mockCommand2b->execute(); - tqmockCommand2b->unexecute(); - tqmockCommand2a->unexecute(); - tqmockCommand1b->unexecute(); - tqmockCommand1a->unexecute(); + mockCommand2b->unexecute(); + mockCommand2a->unexecute(); + mockCommand1b->unexecute(); + mockCommand1a->unexecute(); return 0; }