From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:43:14 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- ksplashml/themeengine/redmond/themeredmond.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ksplashml/themeengine/redmond') 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; -- cgit v1.2.1