TQt4 port kdegraphics

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 18 insertions, 18 deletions

diff --git a/kolourpaint/pixmapfx/kppixmapfx.h b/kolourpaint/pixmapfx/kppixmapfx.h
index ac52e992..738d82fa 100644
--- a/kolourpaint/pixmapfx/kppixmapfx.h
+++ b/kolourpaint/pixmapfx/kppixmapfx.h
@@ -87,7 +87,7 @@ public:
 
 
     //
-    // QPixmap/TQImage Conversion Functions
+    // TQPixmap/TQImage Conversion Functions
     //
 
     //
@@ -100,7 +100,7 @@ public:
     //          <result> is slightly differently colored to <pixmap>.
     //
     //          KolourPaint needs to convert to TQImage occasionally as
-    //          TQImage allows KolourPaint to read pixels and because the QImage
+    //          TQImage allows KolourPaint to read pixels and because the TQImage
     //          methods give reliable results and pixel-identical results on
     //          all platforms.  The TQPixmap paint engine has no such guarantee
     //          and even depends on the quality of the video driver.
@@ -128,7 +128,7 @@ public:
         //
         //           " contains translucency which is not fully"
         //           " supported. The translucency data will be"
-        //           " approximated with a 1-bit transparency mask.")
+        //           " approximated with a 1-bit transparency tqmask.")
         //
         // <moreColorsThanDisplayMessage>:
         //     i18n ("The (image \"example.jpg\"|image from the clipboard)"
@@ -140,21 +140,21 @@ public:
         //     i18n ("The (image \"example.jpg\"|image from the clipboard)"
         //           " contains translucency which is not fully"
         //           " supported. The translucency data will be"
-        //           " approximated with a 1-bit transparency mask.")
+        //           " approximated with a 1-bit transparency tqmask.")
         //
         // <dontAskAgainPrefix>:
         //
         //     Don'tAskAgain ID for dialog.
         //
-        // <parent>:
+        // <tqparent>:
         //
-        //     Dialog parent
+        //     Dialog tqparent
         //
         WarnAboutLossInfo (const TQString &moreColorsThanDisplayAndHasAlphaChannelMessage,
                 const TQString &moreColorsThanDisplayMessage,
                 const TQString &hasAlphaChannelMessage,
                 const TQString &dontAskAgainPrefix,
-                TQWidget *parent)
+                TQWidget *tqparent)
             :
                 m_moreColorsThanDisplayAndHasAlphaChannelMessage (
                     moreColorsThanDisplayAndHasAlphaChannelMessage),
@@ -164,7 +164,7 @@ public:
                     hasAlphaChannelMessage),
                 m_dontAskAgainPrefix (
                     dontAskAgainPrefix),
-                m_parent (parent),
+                m_parent (tqparent),
                 m_isValid (true)
         {
         }
@@ -227,7 +227,7 @@ public:
 
     // Sets the RGB values of the pixels where <pixmap> is transparent to
     // <transparentColor>.  This has visually no effect on the <pixmap>
-    // unless the mask is lost.
+    // unless the tqmask is lost.
     static TQPixmap pixmapWithDefinedTransparentPixels (const TQPixmap &pixmap,
         const TQColor &transparentColor);
 
@@ -238,19 +238,19 @@ public:
 
 
     //
-    // Returns the pixel and mask data found at the <rect> in <pm>.
+    // Returns the pixel and tqmask data found at the <rect> in <pm>.
     //
     static TQPixmap getPixmapAt (const TQPixmap &pm, const TQRect &rect);
 
     //
-    // Sets the pixel and mask data at <destRect> in <*destPixmapPtr>
+    // Sets the pixel and tqmask data at <destRect> in <*destPixmapPtr>
     // to <srcPixmap>.
     //
     static void setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect,
                              const TQPixmap &srcPixmap);
 
     //
-    // Sets the pixel and mask data at the rectangle in <*destPixmapPtr>,
+    // Sets the pixel and tqmask data at the rectangle in <*destPixmapPtr>,
     // with the top-left <destAt> and dimensions <srcPixmap.rect()>,
     // to <srcPixmap>.
     //
@@ -261,7 +261,7 @@ public:
 
     //
     // Draws <srcPixmap> on top of <*destPixmapPtr> at <destAt>.
-    // The mask of <*destPixmapPtr> is adjusted so that all opaque
+    // The tqmask of <*destPixmapPtr> is adjusted so that all opaque
     // pixels in <srcPixmap> will be opaque in <*destPixmapPtr>.
     //
     static void paintPixmapAt (TQPixmap *destPixmapPtr, const TQPoint &destAt,
@@ -293,16 +293,16 @@ public:
 
     //
     // Removes <*destPixmapPtr>'s Alpha Channel and attempts to convert it
-    // to a mask.  KolourPaint - and TQPixmap to a great extent - does not
-    // support Alpha Channels - only masks.  Call this whenever you get
+    // to a tqmask.  KolourPaint - and TQPixmap to a great extent - does not
+    // support Alpha Channels - only tqmasks.  Call this whenever you get
     // a pixmap from a foreign source; else all KolourPaint code will
     // exhibit "undefined behaviour".
     //
     static void ensureNoAlphaChannel (TQPixmap *destPixmapPtr);
 
     //
-    // Returns <pm>'s mask or a fully opaque mask (with <pm>'s dimensions)
-    // if <pm> does not have a mask.
+    // Returns <pm>'s tqmask or a fully opaque tqmask (with <pm>'s dimensions)
+    // if <pm> does not have a tqmask.
     //
     static TQBitmap getNonNullMask (const TQPixmap &pm);
 
@@ -312,7 +312,7 @@ public:
     static void ensureTransparentAt (TQPixmap *destPixmapPtr, const TQRect &destRect);
 
     //
-    // Sets the mask of <*destPixmapPtr> at the rectangle, with the
+    // Sets the tqmask of <*destPixmapPtr> at the rectangle, with the
     // top-left <destAt> and dimensions <srcMaskBitmap.rect()>,
     // to transparent where <brushBitmap> is opaque.
     //