Renamed variables used for mask bitmaps to remove historical typo and clarify their purpose.

Signed-off-by: Daniel Würl <trinity@dwrl.de>
(cherry picked from commit 73e9a06f2fb1558fb3e0348c2b6d4002d6fa4533)

2 files changed, 35 insertions, 35 deletions

diff --git a/client/deKoratorclient.cpp b/client/deKoratorclient.cpp
index efc2b36..b33c66a 100644
--- a/client/deKoratorclient.cpp
+++ b/client/deKoratorclient.cpp
@@ -699,15 +699,15 @@ void DeKoratorFactory::loadPixmaps()
 
 
     //masks
-    topLeftCornerBitmap_ = TQBitmap( masksPixDir + "/topLeftCornerBitmap.png" );
-    topMidBitmap_ = TQBitmap( masksPixDir + "/topMidBitmap.png" );
-    topRightCornerBitmap_ = TQBitmap( masksPixDir + "/topRightCornerBitmap.png" );
-    buttomLeftCornerBitmap_ = TQBitmap( masksPixDir + "/buttomLeftCornerBitmap.png" );
-    buttomMidBitmap_ = TQBitmap( masksPixDir + "/buttomMidBitmap.png" );
-    buttomRightCornerBitmap_ = TQBitmap( masksPixDir + "/buttomRightCornerBitmap.png" );
-    buttomShadedLeftCornerBitmap_ = TQBitmap( masksPixDir + "/buttomShadedLeftCornerBitmap.png" );
-    buttomShadedMidBitmap_ = TQBitmap( masksPixDir + "/buttomShadedMidBitmap.png" );
-    buttomShadedRightCornerBitmap_ = TQBitmap( masksPixDir + "/buttomShadedRightCornerBitmap.png" );
+    topLeftCornerMaskBitmap_ = TQBitmap( masksPixDir + "/topLeftCornerBitmap.png" );
+    topMidMaskBitmap_ = TQBitmap( masksPixDir + "/topMidBitmap.png" );
+    topRightCornerMaskBitmap_ = TQBitmap( masksPixDir + "/topRightCornerBitmap.png" );
+    buttomLeftCornerMaskBitmap_ = TQBitmap( masksPixDir + "/buttomLeftCornerBitmap.png" );
+    buttomMidMaskBitmap_ = TQBitmap( masksPixDir + "/buttomMidBitmap.png" );
+    buttomRightCornerMaskBitmap_ = TQBitmap( masksPixDir + "/buttomRightCornerBitmap.png" );
+    buttomShadedLeftCornerMaskBitmap_ = TQBitmap( masksPixDir + "/buttomShadedLeftCornerBitmap.png" );
+    buttomShadedMidMaskBitmap_ = TQBitmap( masksPixDir + "/buttomShadedMidBitmap.png" );
+    buttomShadedRightCornerMaskBitmap_ = TQBitmap( masksPixDir + "/buttomShadedRightCornerBitmap.png" );
 
     determineSizes();
 
@@ -771,22 +771,22 @@ void DeKoratorFactory::determineSizes()
     BTNMENUHEIGHT = BUTTONSARR[ menu ][ regular ][ normal ] ->height();
 
     // masks
-    TOPLEFTMASKWIDTH = topLeftCornerBitmap_.width();
-    TOPMIDMASKWIDTH = topMidBitmap_.width();
-    TOPRIGHTMASKWIDTH = topRightCornerBitmap_.width();
-    BOTTOMLEFTMASKWIDTH = buttomLeftCornerBitmap_.width();
-    BOTTOMMIDMASKWIDTH = buttomMidBitmap_.width();
-    BOTTOMRIGHTMASKWIDTH = buttomRightCornerBitmap_.width();
-    BOTTOMSHADEDLEFTMASKWIDTH = buttomShadedLeftCornerBitmap_.width();
-    BOTTOMSHADEDMIDMASKWIDTH = buttomShadedMidBitmap_.width();
-    BOTTOMSHADEDRIGHTMASKWIDTH = buttomShadedRightCornerBitmap_.width();
-
-    BOTTOMLEFTMASKHEIGHT = buttomLeftCornerBitmap_.height();
-    BOTTOMMIDMASKHEIGHT = buttomMidBitmap_.height();
-    BOTTOMRIGHTMASKHEIGHT = buttomRightCornerBitmap_.height();
-    BOTTOMSHADEDLEFTMASKHEIGHT = buttomShadedLeftCornerBitmap_.height();
-    BOTTOMSHADEDMIDMASKHEIGHT = buttomShadedMidBitmap_.height();
-    BOTTOMSHADEDRIGHTMASKHEIGHT = buttomShadedRightCornerBitmap_.height();
+    TOPLEFTMASKWIDTH = topLeftCornerMaskBitmap_.width();
+    TOPMIDMASKWIDTH = topMidMaskBitmap_.width();
+    TOPRIGHTMASKWIDTH = topRightCornerMaskBitmap_.width();
+    BOTTOMLEFTMASKWIDTH = buttomLeftCornerMaskBitmap_.width();
+    BOTTOMMIDMASKWIDTH = buttomMidMaskBitmap_.width();
+    BOTTOMRIGHTMASKWIDTH = buttomRightCornerMaskBitmap_.width();
+    BOTTOMSHADEDLEFTMASKWIDTH = buttomShadedLeftCornerMaskBitmap_.width();
+    BOTTOMSHADEDMIDMASKWIDTH = buttomShadedMidMaskBitmap_.width();
+    BOTTOMSHADEDRIGHTMASKWIDTH = buttomShadedRightCornerMaskBitmap_.width();
+
+    BOTTOMLEFTMASKHEIGHT = buttomLeftCornerMaskBitmap_.height();
+    BOTTOMMIDMASKHEIGHT = buttomMidMaskBitmap_.height();
+    BOTTOMRIGHTMASKHEIGHT = buttomRightCornerMaskBitmap_.height();
+    BOTTOMSHADEDLEFTMASKHEIGHT = buttomShadedLeftCornerMaskBitmap_.height();
+    BOTTOMSHADEDMIDMASKHEIGHT = buttomShadedMidMaskBitmap_.height();
+    BOTTOMSHADEDRIGHTMASKHEIGHT = buttomShadedRightCornerMaskBitmap_.height();
 
 }
 
@@ -2944,7 +2944,7 @@ void DeKoratorClient::doShape()
 
         // top left
         TQRegion mtr;
-        TQRegion m = TQRegion( decoFactory_->topLeftCornerBitmap_ );
+        TQRegion m = TQRegion( decoFactory_->topLeftCornerMaskBitmap_ );
         mask -= TQRegion( m );
 
 
@@ -2953,7 +2953,7 @@ void DeKoratorClient::doShape()
         {
             int pos = TOPLEFTMASKWIDTH;
             int rep = ( w - TOPLEFTMASKWIDTH - TOPRIGHTMASKWIDTH ) / TOPMIDMASKWIDTH;
-            m = TQRegion( decoFactory_->topMidBitmap_ );
+            m = TQRegion( decoFactory_->topMidMaskBitmap_ );
             TQRegion mBak = m;
 
             for ( int i = 0 ; i < rep ; i++ )
@@ -2973,7 +2973,7 @@ void DeKoratorClient::doShape()
         }
 
         //top right
-        m = TQRegion( decoFactory_->topRightCornerBitmap_ );
+        m = TQRegion( decoFactory_->topRightCornerMaskBitmap_ );
         m.translate( width() - TOPRIGHTMASKWIDTH, 0 );
         mask -= TQRegion( m );
 
@@ -2983,7 +2983,7 @@ void DeKoratorClient::doShape()
             if ( isShade() && HASBOTTOMSHADEDFRAME )
             {
                 //buttom left
-                m = TQRegion( decoFactory_->buttomShadedLeftCornerBitmap_ );
+                m = TQRegion( decoFactory_->buttomShadedLeftCornerMaskBitmap_ );
                 m.translate( 0, h - BOTTOMSHADEDLEFTMASKHEIGHT );
                 mask -= TQRegion( m );
 
@@ -2993,7 +2993,7 @@ void DeKoratorClient::doShape()
                     int pos = BOTTOMSHADEDLEFTMASKWIDTH;
                     int rep = ( w - BOTTOMSHADEDLEFTMASKWIDTH - BOTTOMSHADEDRIGHTMASKWIDTH ) / BOTTOMSHADEDMIDMASKWIDTH;
                     int hm = h - BOTTOMSHADEDMIDMASKHEIGHT;
-                    m = TQRegion( decoFactory_->buttomShadedMidBitmap_ );
+                    m = TQRegion( decoFactory_->buttomShadedMidMaskBitmap_ );
                     TQRegion mBak = m;
 
                     for ( int i = 0 ; i < rep ; i++ )
@@ -3013,14 +3013,14 @@ void DeKoratorClient::doShape()
                 }
 
                 //buttom right
-                m = TQRegion( decoFactory_->buttomShadedRightCornerBitmap_ );
+                m = TQRegion( decoFactory_->buttomShadedRightCornerMaskBitmap_ );
                 m.translate( width() - BOTTOMSHADEDRIGHTMASKWIDTH, h - BOTTOMSHADEDRIGHTMASKHEIGHT );
                 mask -= TQRegion( m );
             }
             else
             {
                 //buttom left
-                m = TQRegion( decoFactory_->buttomLeftCornerBitmap_ );
+                m = TQRegion( decoFactory_->buttomLeftCornerMaskBitmap_ );
                 m.translate( 0, h - BOTTOMLEFTMASKHEIGHT );
                 mask -= TQRegion( m );
 
@@ -3030,7 +3030,7 @@ void DeKoratorClient::doShape()
                     int pos = BOTTOMLEFTMASKWIDTH;
                     int rep = ( w - BOTTOMLEFTMASKWIDTH - BOTTOMRIGHTMASKWIDTH ) / BOTTOMMIDMASKWIDTH;
                     int hm = h - BOTTOMMIDMASKHEIGHT;
-                    m = TQRegion( decoFactory_->buttomMidBitmap_ );
+                    m = TQRegion( decoFactory_->buttomMidMaskBitmap_ );
                     TQRegion mBak = m;
 
                     for ( int i = 0 ; i < rep ; i++ )
@@ -3050,7 +3050,7 @@ void DeKoratorClient::doShape()
                 }
 
                 //buttom right
-                m = TQRegion( decoFactory_->buttomRightCornerBitmap_ );
+                m = TQRegion( decoFactory_->buttomRightCornerMaskBitmap_ );
                 m.translate( width() - BOTTOMRIGHTMASKWIDTH, h - BOTTOMRIGHTMASKHEIGHT );
                 mask -= TQRegion( m );
             } 
diff --git a/client/deKoratorclient.h b/client/deKoratorclient.h
index 63a0db6..69aa72a 100644
--- a/client/deKoratorclient.h
+++ b/client/deKoratorclient.h
@@ -150,7 +150,7 @@ public:
     virtual bool reset( unsigned long changed );
     static void colorizePixmap( TQPixmap *pix, TQColor col, TQString colorizeMethod );
     static bool initialized();
-	TQBitmap topLeftCornerBitmap_, topMidBitmap_, topRightCornerBitmap_, buttomLeftCornerBitmap_, buttomMidBitmap_, buttomRightCornerBitmap_, buttomShadedLeftCornerBitmap_, buttomShadedMidBitmap_, buttomShadedRightCornerBitmap_;
+	TQBitmap topLeftCornerMaskBitmap_, topMidMaskBitmap_, topRightCornerMaskBitmap_, buttomLeftCornerMaskBitmap_, buttomMidMaskBitmap_, buttomRightCornerMaskBitmap_, buttomShadedLeftCornerMaskBitmap_, buttomShadedMidMaskBitmap_, buttomShadedRightCornerMaskBitmap_;
 
 private:
     bool readConfig();