rename the following methods:

tqparent parent
tqmask mask

1 files changed, 5 insertions, 5 deletions

diff --git a/experimental/tqtinterface/qt4/src/kernel/tqbitmap.cpp b/experimental/tqtinterface/qt4/src/kernel/tqbitmap.cpp
index 3e2ee39f0..e44b37e61 100644
--- a/experimental/tqtinterface/qt4/src/kernel/tqbitmap.cpp
+++ b/experimental/tqtinterface/qt4/src/kernel/tqbitmap.cpp
@@ -128,8 +128,8 @@ void TQBitmap::resize_helper(const QSize s)
     }
 
     // Mask too....
-    if (!mask().isNull()) {
-        TQBitmap m = mask();
+    if (!QBitmap::mask().isNull()) {
+        TQBitmap m = QBitmap::mask();
         if (m.size() != QSize(w,h)) {
             TQBitmap pmr(QSize(w, h));
             pmr.fill(Qt::color0);
@@ -153,8 +153,8 @@ void TQBitmap::resize_helper(const QSize s)
 }
 
 // This is the only correct way to return a pointer to an object returned by another function
-const TQBitmap *TQBitmap::tqmask() const {
-	const QBitmap& ptrRef = mask();
+const TQBitmap *TQBitmap::mask() const {
+	const QBitmap& ptrRef = QBitmap::mask();
 	if (ptrRef.isNull() == true) {
 		return 0;
 	}
@@ -196,7 +196,7 @@ TQBitmap &TQBitmap::operator=( const TQImage &image )
     using the  TQColor objects \c TQt::color0 and \c TQt::color1.
     Painting with \c color0 sets the bitmap bits to 0, and painting
     with \c color1 sets the bits to 1. For a bitmap, 0-bits indicate
-    background (or transtqparent) and 1-bits indicate foreground (or
+    background (or transparent) and 1-bits indicate foreground (or
     opaque). Using the \c black and \c white TQColor objects make no
     sense because the TQColor::pixel() value is not necessarily 0 for
     black and 1 for white.