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

2 files changed, 5 insertions, 5 deletions

diff --git a/src/commands/matrix/MatrixEraseCommand.cpp b/src/commands/matrix/MatrixEraseCommand.cpp
index c35259e..3285e84 100644
--- a/src/commands/matrix/MatrixEraseCommand.cpp
+++ b/src/commands/matrix/MatrixEraseCommand.cpp
@@ -44,14 +44,14 @@ MatrixEraseCommand::MatrixEraseCommand(Segment &segment,
                      event->getAbsoluteTime() + event->getDuration(),
                      true),
         m_event(event),
-        m_relayoutEndTime(getEndTime())
+        m_retqlayoutEndTime(getEndTime())
 {
     // nothing
 }
 
-timeT MatrixEraseCommand::getRelayoutEndTime()
+timeT MatrixEraseCommand::getRetqlayoutEndTime()
 {
-    return m_relayoutEndTime;
+    return m_retqlayoutEndTime;
 }
 
 void MatrixEraseCommand::modifySegment()
diff --git a/src/commands/matrix/MatrixEraseCommand.h b/src/commands/matrix/MatrixEraseCommand.h
index 244c0f9..9e126a4 100644
--- a/src/commands/matrix/MatrixEraseCommand.h
+++ b/src/commands/matrix/MatrixEraseCommand.h
@@ -45,13 +45,13 @@ public:
     MatrixEraseCommand(Segment &segment,
                        Event *event);
 
-    virtual timeT getRelayoutEndTime();
+    virtual timeT getRetqlayoutEndTime();
 
 protected:
     virtual void modifySegment();
 
     Event *m_event; // only used on 1st execute (cf bruteForceRedo)
-    timeT m_relayoutEndTime;
+    timeT m_retqlayoutEndTime;
 };
 
 //------------------------------