From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:43:14 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 ksplashml/themeengine/default/themelegacy.cpp    | 2 +-
 ksplashml/themeengine/redmond/themeredmond.cpp   | 6 +++---
 ksplashml/themeengine/standard/themestandard.cpp | 2 +-
 ksplashml/themeengine/standard/wndicon.cpp       | 2 +-
 ksplashml/themeengine/standard/wndstatus.cpp     | 2 +-
 ksplashml/themeengine/unified/themeunified.cpp   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'ksplashml/themeengine')

diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp
index 77274da99..de8aac2b5 100644
--- a/ksplashml/themeengine/default/themelegacy.cpp
+++ b/ksplashml/themeengine/default/themelegacy.cpp
@@ -187,7 +187,7 @@ void ThemeDefault::_initUi()
                   top_label->height() + bottom_label->height() );
 
   const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
-  // KGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
+  // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
   // kdDebug() << "ThemeDefault::_initUi" << rect << endl;
 
   move( rect.x() + (rect.width() - size().width())/2,
diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp
index 5992d1e0a..5e5bf1031 100644
--- a/ksplashml/themeengine/redmond/themeredmond.cpp
+++ b/ksplashml/themeengine/redmond/themeredmond.cpp
@@ -87,7 +87,7 @@ ThemeRedmond::ThemeRedmond( TQWidget *parent, const char *name, const TQStringLi
 void ThemeRedmond::_initUi()
 {
   const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
-  //TQRect fullScreen = KGlobalSettings::desktopGeometry(0L);
+  //TQRect fullScreen = TDEGlobalSettings::desktopGeometry(0L);
 
   mImage.resize( screen.width(), screen.height() );
 
@@ -197,7 +197,7 @@ void ThemeRedmond::_initUi()
     int faceSource = fAdminOnly;
     KConfig *tdmconfig = new KConfig("tdm/tdmrc", true);
     tdmconfig->setGroup("X-*-Greeter");
-    TQString userPicsDir = tdmconfig->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" ) + '/';
+    TQString userPicsDir = tdmconfig->readEntry( "FaceDir", TDEGlobal::dirs()->resourceDirs("data").last() + "tdm/faces" ) + '/';
     TQString fs = tdmconfig->readEntry( "FaceSource" );
     if (fs == TQString::fromLatin1("UserOnly"))
       faceSource = fUserOnly;
@@ -309,7 +309,7 @@ void ThemeRedmond::paintEvent( TQPaintEvent *pe )
 void ThemeRedmond::_readSettings()
 {
   const TQRect screen = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
-  //TQRect fullScreen = KGlobalSettings::desktopGeometry(0L);
+  //TQRect fullScreen = TDEGlobalSettings::desktopGeometry(0L);
 
   if( !mTheme )
     return;
diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp
index b0ceff516..a7c41692f 100644
--- a/ksplashml/themeengine/standard/themestandard.cpp
+++ b/ksplashml/themeengine/standard/themestandard.cpp
@@ -76,7 +76,7 @@ void ThemeStandard::_initUi()
   }
 
   const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
-  // KGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
+  // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
 
   move( rect.x() + (rect.width() - size().width())/2,
         rect.y() + (rect.height() - size().height())/2 );
diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp
index 13c8ea002..7d66bdb6a 100644
--- a/ksplashml/themeengine/standard/wndicon.cpp
+++ b/ksplashml/themeengine/standard/wndicon.cpp
@@ -99,7 +99,7 @@ TQPoint WndIcon::determinePosition()
 
   bottomshift = topshift = 0;
   const TQRect srect = kapp->desktop()->screenGeometry( mXineramaScreen );
-  // KGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
+  // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
   DW = srect.width();
   DH = srect.height();
   SBH = mStatusHeight;
diff --git a/ksplashml/themeengine/standard/wndstatus.cpp b/ksplashml/themeengine/standard/wndstatus.cpp
index 691017e73..07466c56e 100644
--- a/ksplashml/themeengine/standard/wndstatus.cpp
+++ b/ksplashml/themeengine/standard/wndstatus.cpp
@@ -47,7 +47,7 @@ WndStatus::WndStatus( TQPalette /*pal*/,
   setSpacing( 5 );
 
   const TQRect rect = kapp->desktop()->screenGeometry( xineramaScreen );
-  // KGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
+  // TDEGlobalSettings::splashScreenDesktopGeometry(); cannot be used here.
 
   TQLabel *pix = new TQLabel( this );
   TQPixmap _icon( SmallIcon(icon.isNull()||icon.isEmpty()?TQString("run"):icon) );
diff --git a/ksplashml/themeengine/unified/themeunified.cpp b/ksplashml/themeengine/unified/themeunified.cpp
index 782753c82..1e86054f7 100644
--- a/ksplashml/themeengine/unified/themeunified.cpp
+++ b/ksplashml/themeengine/unified/themeunified.cpp
@@ -81,7 +81,7 @@ void ThemeUnified::_initUi()
 
   // Center the dialog
   TQSize sh = sizeHint();
-  TQRect rect1 = KGlobalSettings::desktopGeometry(TQCursor::pos());
+  TQRect rect1 = TDEGlobalSettings::desktopGeometry(TQCursor::pos());
   move(rect1.x() + (rect1.width() - sh.width())/2, rect1.y() + (rect1.height() - sh.height())/2);
 }
 
-- 
cgit v1.2.3