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

1 files changed, 9 insertions, 9 deletions

diff --git a/src/base/LayoutEngine.h b/src/base/LayoutEngine.h
index 179d119..2116013 100644
--- a/src/base/LayoutEngine.h
+++ b/src/base/LayoutEngine.h
@@ -31,7 +31,7 @@ class TimeSignature;
 
 
 /**
- * Base classes for layout engines.  The intention is that
+ * Base classes for tqlayout engines.  The intention is that
  * different sorts of renderers (piano-roll, score etc) can be
  * implemented by simply plugging different implementations
  * of Staff and LayoutEngine into a single view class.
@@ -58,9 +58,9 @@ public:
                             timeT endTime = 0) = 0;
 
     /**
-     * Precomputes layout data for a single staff, updating any
+     * Precomputes tqlayout data for a single staff, updating any
      * internal data stores associated with that staff and updating
-     * any layout-related properties in the events on the staff's
+     * any tqlayout-related properties in the events on the staff's
      * segment.
      * 
      * If startTime == endTime, act on the whole staff; otherwise only
@@ -71,10 +71,10 @@ public:
                            timeT endTime = 0) = 0;
 
     /**
-     * Computes any layout data that may depend on the results of
+     * Computes any tqlayout data that may depend on the results of
      * scanning more than one staff.  This may mean doing most of
-     * the layout (likely for horizontal layout) or nothing at all
-     * (likely for vertical layout).
+     * the tqlayout (likely for horizontal tqlayout) or nothing at all
+     * (likely for vertical tqlayout).
      * 
      * If startTime == endTime, act on the whole staff; otherwise only
      * the given section.
@@ -82,7 +82,7 @@ public:
     virtual void finishLayout(timeT startTime = 0,
                               timeT endTime = 0) = 0;
 
-    unsigned int getStatus() const { return m_status; }
+    unsigned int gettqStatus() const { return m_status; }
 
 protected:
     unsigned int m_status;
@@ -97,9 +97,9 @@ public:
     virtual ~HorizontalLayoutEngine();
 
     /**
-     * Sets a page width for the layout.
+     * Sets a page width for the tqlayout.
      *
-     * A layout implementation does not have to use this.  Some might
+     * A tqlayout implementation does not have to use this.  Some might
      * use it (for example) to ensure that bar lines fall precisely at
      * the right-hand margin of each page.  The computed x-coordinates
      * will still require to be wrapped into lines by the staff or