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, 6 insertions, 6 deletions

diff --git a/src/gui/editors/notation/NotePixmapFactory.h b/src/gui/editors/notation/NotePixmapFactory.h
index 20d2ae6..cfc93dc 100644
--- a/src/gui/editors/notation/NotePixmapFactory.h
+++ b/src/gui/editors/notation/NotePixmapFactory.h
@@ -58,7 +58,7 @@ class Clef;
 class TrackHeader;
 
 /**
- * Generates QCanvasPixmaps for various notation items.
+ * Generates TQCanvasPixmaps for various notation items.
  */
 
 class NotePixmapFactory 
@@ -140,7 +140,7 @@ public:
     TQCanvasPixmap* makeTrackHeaderPixmap(int width, int height,
                                             TrackHeader *header);
 
-    // Bounding box and other geometry methods:
+    // Bounding box and other tqgeometry methods:
 
     int getNoteBodyWidth (Note::Type =
                           Note::Crotchet) const;
@@ -199,7 +199,7 @@ public:
 
 
     /**
-     * We need this function because as of Qt 3.1, QCanvasPixmap
+     * We need this function because as of TQt 3.1, TQCanvasPixmap
      * is no longer copyable by value, while TQPixmap still is.
      *
      * So all the makeXXPixmap are now returning TQCanvasPixmap*
@@ -207,7 +207,7 @@ public:
      * convert them to TQPixmap, since we use them that
      * way quite often (to generate toolbar button icons for instance).
      */
-    static TQPixmap toQPixmap(TQCanvasPixmap*);
+    static TQPixmap toTQPixmap(TQCanvasPixmap*);
     static void dumpStats(std::ostream &);
 
 
@@ -276,8 +276,8 @@ protected:
     TQCanvasPixmap* makeAnnotationPixmap(const Text &text, const bool isLilyPondDirective);
 
     void createPixmapAndMask(int width, int height,
-                             int maskWidth = -1,
-                             int maskHeight = -1);
+                             int tqmaskWidth = -1,
+                             int tqmaskHeight = -1);
     TQCanvasPixmap* makeCanvasPixmap(TQPoint hotspot, bool generateMask = false);
 
     enum ColourType {