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

7 files changed, 39 insertions, 39 deletions

diff --git a/ksplashml/themeengine/standard/Preview.png b/ksplashml/themeengine/standard/Preview.png
index da08b938e..58603e1e6 100644
--- a/ksplashml/themeengine/standard/Preview.png
+++ b/ksplashml/themeengine/standard/Preview.png
diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp
index 0c72b7222..c7e9220e2 100644
--- a/ksplashml/themeengine/standard/themestandard.cpp
+++ b/ksplashml/themeengine/standard/themestandard.cpp
@@ -81,7 +81,7 @@ void ThemeStandard::_initUi()
   move( rect.x() + (rect.width() - size().width())/2,
         rect.y() + (rect.height() - size().height())/2 );
 
-  mtqStatus = new WndtqStatus( TQPalette(), mTheme->xineramaScreen(), mSbAtTop, mSbPbVisible, mSbFont, mSbFg, mSbBg, mSbIcon );
+  mStatus = new WndStatus( TQPalette(), mTheme->xineramaScreen(), mSbAtTop, mSbPbVisible, mSbFont, mSbFg, mSbBg, mSbIcon );
 }
 
 void ThemeStandard::showEvent( TQShowEvent * )
@@ -91,8 +91,8 @@ void ThemeStandard::showEvent( TQShowEvent * )
 
   if( mSbVisible )
   {
-    mtqStatus->show();
-    mStatusBarHeight = mtqStatus->height();
+    mStatus->show();
+    mStatusBarHeight = mStatus->height();
   }
   else
   {
@@ -143,22 +143,22 @@ void ThemeStandard::_readSettings()
   //  return;
   cfg->setGroup( TQString("KSplash Theme: %1").arg(mTheme->theme()) );
 
-  TQString sbpos = cfg->readEntry( "tqStatusbar Position", "Bottom" ).upper();
+  TQString sbpos = cfg->readEntry( "Statusbar Position", "Bottom" ).upper();
   mSbAtTop = ( sbpos == "TOP" );
-  mSbVisible = cfg->readBoolEntry( "tqStatusbar Visible", true);
+  mSbVisible = cfg->readBoolEntry( "Statusbar Visible", true);
   mSbPbVisible = cfg->readBoolEntry( "Progress Visible", true);
 
-  mSbFontName = cfg->readEntry( "tqStatusbar Font", "Sans Serif" );
-  mSbFontSz = cfg->readNumEntry( "tqStatusbar Font Size", 16 );
-  mSbFontBold = cfg->readBoolEntry( "tqStatusbar Font Bold", true );
-  mSbFontItalic = cfg->readBoolEntry( "tqStatusbar Font Italic", false );
+  mSbFontName = cfg->readEntry( "Statusbar Font", "Sans Serif" );
+  mSbFontSz = cfg->readNumEntry( "Statusbar Font Size", 16 );
+  mSbFontBold = cfg->readBoolEntry( "Statusbar Font Bold", true );
+  mSbFontItalic = cfg->readBoolEntry( "Statusbar Font Italic", false );
   mSbFont = TQFont( mSbFontName, mSbFontSz, ( mSbFontBold? TQFont::Bold : TQFont::Normal ) );
   if( mSbFontItalic )
     mSbFont.setItalic( true );
 
-  mSbFg = cfg->readColorEntry( "tqStatusbar Foreground", &Qt::white );
-  mSbBg = cfg->readColorEntry( "tqStatusbar Background", &Qt::black );
-  mSbIcon = cfg->readEntry( "tqStatusbar Icon", "run" );
+  mSbFg = cfg->readColorEntry( "Statusbar Foreground", &Qt::white );
+  mSbBg = cfg->readColorEntry( "Statusbar Background", &Qt::black );
+  mSbIcon = cfg->readEntry( "Statusbar Icon", "run" );
   mIconsVisible = cfg->readBoolEntry( "Icons Visible", true);
   mIconsJumping = cfg->readBoolEntry( "Icons Jumping", true);
   mIconPos = (WndIcon::Position)cfg->readNumEntry( "Icon Position", 0 );
diff --git a/ksplashml/themeengine/standard/themestandard.h b/ksplashml/themeengine/standard/themestandard.h
index 7bdcc4c1e..2e5d1aeb0 100644
--- a/ksplashml/themeengine/standard/themestandard.h
+++ b/ksplashml/themeengine/standard/themestandard.h
@@ -50,15 +50,15 @@ public:
 public slots:
   inline void slotUpdateProgress( int i )
   {
-    if( mtqStatus ) mtqStatus->slotUpdateProgress( i );
+    if( mStatus ) mStatus->slotUpdateProgress( i );
   }
   inline void slotUpdateSteps( int i )
   {
-    if( mtqStatus ) mtqStatus->slotUpdateSteps( i );
+    if( mStatus ) mStatus->slotUpdateSteps( i );
   }
   inline void slotSetText( const TQString& s )
   {
-    if( mtqStatus ) mtqStatus->slotSetMessage( s );
+    if( mStatus ) mStatus->slotSetMessage( s );
   }
   void slotSetPixmap( const TQString& );
 
@@ -67,7 +67,7 @@ private:
   void _readSettings();
   void _initUi();
 
-  WndtqStatus *mtqStatus;
+  WndStatus *mStatus;
   WndIcon *mIcon, *mPrevIcon;
   int mIconCount;
   int mStatusBarHeight;
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
diff --git a/ksplashml/themeengine/standard/wndicon.h b/ksplashml/themeengine/standard/wndicon.h
index d6b907c95..d488f85df 100644
--- a/ksplashml/themeengine/standard/wndicon.h
+++ b/ksplashml/themeengine/standard/wndicon.h
@@ -58,13 +58,13 @@ private:
   TQPoint determinePosition();
 
 protected:
-  TQString mtqStatusText;
+  TQString mStatusText;
   Position mIconPos;
   int mXineramaScreen;
   int mPosX, mPosY, mGroundX, mGroundY;
   float mVelocity, mInitialVelocity, mGravity;
-  int mIconNum, mtqStatusHeight, mIconSize;
-  bool mtqStatusAtTop, mStopJump, mIconJumping;
+  int mIconNum, mStatusHeight, mIconSize;
+  bool mStatusAtTop, mStopJump, mIconJumping;
 };
 
 #endif
diff --git a/ksplashml/themeengine/standard/wndstatus.cpp b/ksplashml/themeengine/standard/wndstatus.cpp
index f8bc3d964..04685d9cf 100644
--- a/ksplashml/themeengine/standard/wndstatus.cpp
+++ b/ksplashml/themeengine/standard/wndstatus.cpp
@@ -27,17 +27,17 @@
 #include "wndstatus.h"
 #include "wndstatus.moc"
 
-// WndtqStatus::WndtqStatus(): Display a nifty status bar at
+// WndStatus::WndStatus(): Display a nifty status bar at
 // the bottom of the screen, so the user always knows what's
 // happening to his system.
-WndtqStatus::WndtqStatus( TQPalette /*pal*/,
+WndStatus::WndStatus( TQPalette /*pal*/,
                       int xineramaScreen,
                       bool atTop, bool pbVisible,
                       const TQFont& font,
                       const TQColor& fgc, const TQColor & bgc,
                       const TQString& icon
                     )
-    :TQHBox( 0, "wndtqStatus", WStyle_Customize|WX11BypassWM )
+    :TQHBox( 0, "wndStatus", WStyle_Customize|WX11BypassWM )
 {
   setFrameStyle( TQFrame::NoFrame );
   //setPalette( pal );
@@ -83,19 +83,19 @@ WndtqStatus::WndtqStatus( TQPalette /*pal*/,
     m_progress->hide();
 }
 
-void WndtqStatus::slotSetMessage( const TQString& msg )
+void WndStatus::slotSetMessage( const TQString& msg )
 {
   raise();
   m_label->setText( msg );
 }
 
-void WndtqStatus::slotUpdateProgress( int i )
+void WndStatus::slotUpdateProgress( int i )
 {
   raise();
   m_progress->setProgress( i );
 }
 
-void WndtqStatus::slotUpdateSteps( int i )
+void WndStatus::slotUpdateSteps( int i )
 {
   m_progress->setTotalSteps( i );
 }
diff --git a/ksplashml/themeengine/standard/wndstatus.h b/ksplashml/themeengine/standard/wndstatus.h
index ddf0f5222..63e253d1d 100644
--- a/ksplashml/themeengine/standard/wndstatus.h
+++ b/ksplashml/themeengine/standard/wndstatus.h
@@ -24,16 +24,16 @@ class TQLabel;
 class KProgress;
 
 /** @short Window displaying status and progress bar. */
-class WndtqStatus:
+class WndStatus:
       public QHBox
 {
   Q_OBJECT
 public:
-  WndtqStatus( TQPalette,
+  WndStatus( TQPalette,
              int, // Xinerama screen
              bool, // At top?
              bool, // Progress indicator visible?
-             const TQFont&, // tqStatus bar font
+             const TQFont&, // Status bar font
              const TQColor&, const TQColor &, // Foreground/Background color
              const TQString& // Icon
            );