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/standard/themestandard.cpp | 2 +- ksplashml/themeengine/standard/wndicon.cpp | 2 +- ksplashml/themeengine/standard/wndstatus.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ksplashml/themeengine/standard') 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) ); -- cgit v1.2.1