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

diff --git a/src/gui/general/PixmapFunctions.h b/src/gui/general/PixmapFunctions.h
index ea05693..22b743b 100644
--- a/src/gui/general/PixmapFunctions.h
+++ b/src/gui/general/PixmapFunctions.h
@@ -40,9 +40,9 @@ class PixmapFunctions
 {
 public:
     /**
-     * Generate a heuristic mask for the given pixmap.  Unlike
-     * TQPixmap::createHeuristicMask, this removes from the mask all
-     * pixels that are apparently "background" even if they appear in
+     * Generate a heuristic tqmask for the given pixmap.  Unlike
+     * TQPixmap::createHeuristicMask, this removes from the tqmask all
+     * pixels that are aptqparently "background" even if they appear in
      * holes in the middle of the image.  This is more usually what we
      * want than the default behaviour of createHeuristicMask.
      *
@@ -50,12 +50,12 @@ public:
      *
      * This function is slow.
      */
-    static TQBitmap generateMask(const TQPixmap &map, const QRgb &rgb);
+    static TQBitmap generateMask(const TQPixmap &map, const TQRgb &rgb);
 
     /**
-     * Generate a heuristic mask for the given pixmap.  Unlike
-     * TQPixmap::createHeuristicMask, this removes from the mask all
-     * pixels that are apparently "background" even if they appear in
+     * Generate a heuristic tqmask for the given pixmap.  Unlike
+     * TQPixmap::createHeuristicMask, this removes from the tqmask all
+     * pixels that are aptqparently "background" even if they appear in
      * holes in the middle of the image.  This is more usually what we
      * want than the default behaviour of createHeuristicMask.
      *
@@ -78,23 +78,23 @@ public:
      */
     static TQPixmap shadePixmap(const TQPixmap &map);
 
-    /// Return a TQPixmap that is a mirror image of map (including mask)
+    /// Return a TQPixmap that is a mirror image of map (including tqmask)
     static TQPixmap flipVertical(const TQPixmap &map);
 
-    /// Return a TQPixmap that is a mirror image of map (including mask)
+    /// Return a TQPixmap that is a mirror image of map (including tqmask)
     static TQPixmap flipHorizontal(const TQPixmap &map);
 
-    /// Return left and right parts of the QPixmap
+    /// Return left and right parts of the TQPixmap
     static std::pair<TQPixmap, TQPixmap> splitPixmap(const TQPixmap &original, int x);
 
     /**
      * Using TQPainter::drawPixmap to draw one pixmap on another does
-     * not appear to take the mask into account properly.  Background
+     * not appear to take the tqmask into account properly.  Background
      * pixels in the second pixmap erase foreground pixels in the
-     * first one, regardless of whether they're masked or not.  This
+     * first one, regardless of whether they're tqmasked or not.  This
      * function does what I expect.
      *
-     * Note that the source pixmap _must_ have a mask.
+     * Note that the source pixmap _must_ have a tqmask.
      */
     static void drawPixmapMasked(TQPixmap &dest, TQBitmap &destMask,
                                  int x, int y,