From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 7 Jan 2011 04:10:07 +0000
Subject: Revert automated changes Sorry guys, they are just not ready for
 prime time Work will continue as always

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 ksplashml/themeengine/standard/wndicon.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'ksplashml/themeengine/standard/wndicon.cpp')

diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp
index 70dda6408..ce153e461 100644
--- a/ksplashml/themeengine/standard/wndicon.cpp
+++ b/ksplashml/themeengine/standard/wndicon.cpp
@@ -43,9 +43,9 @@ WndIcon::WndIcon(
   bool statusAtTop,
   bool iconsJumping )
     :TQHBox( 0, "wndSplash", WStyle_Customize|WX11BypassWM ),
-     mtqStatusText(text), mIconPos(icon_position), mXineramaScreen( xineramaScreen ), mPosX(0), mPosY(0), mGroundX(0), mGroundY(0),
+     mStatusText(text), mIconPos(icon_position), mXineramaScreen( xineramaScreen ), mPosX(0), mPosY(0), mGroundX(0), mGroundY(0),
      mVelocity(8.0), mInitialVelocity(8.0), mGravity(0.8),
-     mIconNum(icon_num), mtqStatusHeight(status_height), mIconSize(icon_std_width), mtqStatusAtTop(statusAtTop),
+     mIconNum(icon_num), mStatusHeight(status_height), mIconSize(icon_std_width), mStatusAtTop(statusAtTop),
      mStopJump(false), mIconJumping(iconsJumping)
 {
   setFrameStyle( TQFrame::NoFrame );
@@ -53,10 +53,10 @@ WndIcon::WndIcon(
   TQLabel *w = new TQLabel( this );
   w->setFixedSize( pix.width(), pix.height() );
   w->setPixmap( pix );
-  if(pix.tqmask())
+  if(pix.mask())
   {
-    setMask(*pix.tqmask());
-    w->setMask(*pix.tqmask());
+    setMask(*pix.mask());
+    w->setMask(*pix.mask());
   }
 
   resize( pix.width(), pix.height() );
@@ -77,14 +77,14 @@ WndIcon::WndIcon(
 
 void WndIcon::show()
 {
-  emit setStatusText( mtqStatusText );
+  emit setStatusText( mStatusText );
   TQHBox::show();
 }
 
 // Emit our EXTRA signal without becoming visible.
 void WndIcon::noshow()
 {
-  emit setStatusText( mtqStatusText );
+  emit setStatusText( mStatusText );
 }
 
 /*
@@ -102,15 +102,15 @@ TQPoint WndIcon::determinePosition()
   // KGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
   DW = srect.width();
   DH = srect.height();
-  SBH = mtqStatusHeight;
+  SBH = mStatusHeight;
   wid = mIconSize;
   x = mIconNum;
   y = 1;
 
-  if(mtqStatusAtTop)
-    topshift = mtqStatusHeight;
+  if(mStatusAtTop)
+    topshift = mStatusHeight;
   else
-    bottomshift = mtqStatusHeight;
+    bottomshift = mStatusHeight;
 
   // Different starting positions require different positioning
   // rules. The horizontal rules and the vertical rules can be
-- 
cgit v1.2.1