Use tdeApp

Signed-off-by: Michele Calgaro <[email protected]>

8 files changed, 16 insertions, 16 deletions

diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp
index 1c311ed8b..fd943a8e5 100644
--- a/ksplashml/themeengine/default/themelegacy.cpp
+++ b/ksplashml/themeengine/default/themelegacy.cpp
@@ -191,7 +191,7 @@ void ThemeDefault::_initUi()
   setFixedHeight( mInactivePixmap->height() +
                   top_label->height() + bottom_label->height() );
 
-  const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect rect = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
   // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
   // kdDebug() << "ThemeDefault::_initUi" << rect << endl;
 
diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp
index 609956592..e7d41d132 100644
--- a/ksplashml/themeengine/objkstheme.cpp
+++ b/ksplashml/themeengine/objkstheme.cpp
@@ -32,9 +32,9 @@ ObjKsTheme::ObjKsTheme( const TQString& theme )
   :mActiveTheme (theme), mThemeDir("/"), mThemeConfig (0L), mThemePrefix( "Themes/" ), d(0)
 {
   // Get Xinerama config.
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
   config->setGroup( "Xinerama" );
-  TQDesktopWidget *desktop = kapp->desktop();
+  TQDesktopWidget *desktop = tdeApp->desktop();
   mXineramaScreen = config->readNumEntry("KSplashScreen", desktop->primaryScreen());
 
   // For Xinerama, let's put the mouse on the first head.  Otherwise it could appear anywhere!
@@ -92,7 +92,7 @@ bool ObjKsTheme::loadThemeRc( const TQString& activeTheme, bool force )
 bool ObjKsTheme::loadLocalConfig( const TQString& activeTheme, bool force )
 {
   //kdDebug() << "ObjKsTheme::loadLocalConfig" << endl;
-  TDEConfig *cfg = kapp->config();
+  TDEConfig *cfg = tdeApp->config();
   return( loadTDEConfig( cfg, activeTheme, force ) );
 }
 
diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp
index 3792d6057..da7665baf 100644
--- a/ksplashml/themeengine/redmond/themeredmond.cpp
+++ b/ksplashml/themeengine/redmond/themeredmond.cpp
@@ -86,7 +86,7 @@ ThemeRedmond::ThemeRedmond( TQWidget *parent, const char *name, const TQStringLi
 
 void ThemeRedmond::_initUi()
 {
-  const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect screen = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
   //TQRect fullScreen = TDEGlobalSettings::desktopGeometry(0L);
 
   mImage.resize( screen.width(), screen.height() );
@@ -275,7 +275,7 @@ void ThemeRedmond::_initUi()
 
 void ThemeRedmond::paintEvent( TQPaintEvent *pe )
 {
-  const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect screen = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
 
   TQPainter p;
   p.begin( this );
@@ -308,7 +308,7 @@ void ThemeRedmond::paintEvent( TQPaintEvent *pe )
 
 void ThemeRedmond::_readSettings()
 {
-  const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect screen = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
   //TQRect fullScreen = TDEGlobalSettings::desktopGeometry(0L);
 
   if( !mTheme )
diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp
index 8fd950eb5..4c62f24a0 100644
--- a/ksplashml/themeengine/standard/themestandard.cpp
+++ b/ksplashml/themeengine/standard/themestandard.cpp
@@ -75,7 +75,7 @@ void ThemeStandard::_initUi()
     resize( 0, 0 );
   }
 
-  const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect rect = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
   // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
 
   move( rect.x() + (rect.width() - size().width())/2,
diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp
index c6c16170c..9f12a5aed 100644
--- a/ksplashml/themeengine/standard/wndicon.cpp
+++ b/ksplashml/themeengine/standard/wndicon.cpp
@@ -65,7 +65,7 @@ WndIcon::WndIcon(
   TQPoint p = determinePosition();
   mGroundX = mPosX = p.x();
   mGroundY = mPosY = p.y();
-  move( p + kapp->desktop()->screenGeometry( mXineramaScreen ).topLeft() );
+  move( p + tdeApp->desktop()->screenGeometry( mXineramaScreen ).topLeft() );
 
   if( mIconJumping )
   {
@@ -98,7 +98,7 @@ TQPoint WndIcon::determinePosition()
   int DW, DH, SBH, wid, X, Y, x, y, nSlot, topshift, bottomshift;
 
   bottomshift = topshift = 0;
-  const TQRect srect = kapp->desktop()->screenGeometry( mXineramaScreen );
+  const TQRect srect = tdeApp->desktop()->screenGeometry( mXineramaScreen );
   // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
   DW = srect.width();
   DH = srect.height();
@@ -301,7 +301,7 @@ void WndIcon::slotJump()
     mPosY = (int)((float)mPosY - mVelocity );
     break;
   }
-  move( TQPoint( mPosX, mPosY ) + kapp->desktop()->screenGeometry( mXineramaScreen ).topLeft() );
+  move( TQPoint( mPosX, mPosY ) + tdeApp->desktop()->screenGeometry( mXineramaScreen ).topLeft() );
 }
 
 void WndIcon::slotStopJumping()
diff --git a/ksplashml/themeengine/standard/wndstatus.cpp b/ksplashml/themeengine/standard/wndstatus.cpp
index db397a055..9567a1028 100644
--- a/ksplashml/themeengine/standard/wndstatus.cpp
+++ b/ksplashml/themeengine/standard/wndstatus.cpp
@@ -46,7 +46,7 @@ WndStatus::WndStatus( TQPalette /*pal*/,
   setCursor( KCursor::blankCursor() );
   setSpacing( 5 );
 
-  const TQRect rect = kapp->desktop()->screenGeometry( xineramaScreen );
+  const TQRect rect = tdeApp->desktop()->screenGeometry( xineramaScreen );
   // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
 
   TQLabel *pix = new TQLabel( this );
diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp
index 7458abefd..e7e34866e 100644
--- a/ksplashml/themeengine/themeengine.cpp
+++ b/ksplashml/themeengine/themeengine.cpp
@@ -44,9 +44,9 @@ ThemeEngine::ThemeEngine( TQWidget *, const char *, const TQStringList& args )
   : TQVBox( 0, "wndSplash", (WFlags)(WStyle_Customize|WX11BypassWM) ), d(0), mUseWM(false)
 {
   d = new ThemeEnginePrivate;
-  kapp->installX11EventFilter( this );
-  kapp->installEventFilter( this );
-  (void)kapp->desktop();
+  tdeApp->installX11EventFilter( this );
+  tdeApp->installEventFilter( this );
+  (void)tdeApp->desktop();
   XWindowAttributes rootAttr;
   XGetWindowAttributes(tqt_xdisplay(), RootWindow(tqt_xdisplay(),
                         tqt_xscreen()), &rootAttr);
diff --git a/ksplashml/themeengine/unified/themeunified.cpp b/ksplashml/themeengine/unified/themeunified.cpp
index e0ba8fb9e..200fb3a30 100644
--- a/ksplashml/themeengine/unified/themeunified.cpp
+++ b/ksplashml/themeengine/unified/themeunified.cpp
@@ -77,7 +77,7 @@ void ThemeUnified::_initUi()
   mSysModalDialog->show();
   mSysModalDialog->setActiveWindow();
 
-  const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
+  const TQRect rect = tdeApp->desktop()->screenGeometry( mTheme->xineramaScreen() );
 
   // Center the dialog
   TQSize sh = sizeHint();