From 27430f06c6cc2187c639f59f342f07f1fde91a8b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:46 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- noatun/modules/simple/userinterface.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'noatun/modules/simple') diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp index 2661f27c..d89c1e3f 100644 --- a/noatun/modules/simple/userinterface.cpp +++ b/noatun/modules/simple/userinterface.cpp @@ -83,7 +83,7 @@ SimpleUI::SimpleUI() extra_height = (height() - video->height()); // Load configuration - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); config.setGroup( "Simple" ); TQString str = config.readEntry( "View", "NormalSize" ); @@ -104,7 +104,7 @@ SimpleUI::SimpleUI() SimpleUI::~SimpleUI() { - KConfig &config = *KGlobal::config(); + KConfig &config = *TDEGlobal::config(); saveMainWindowSettings( &config, "Simple" ); config.setGroup( "Simple" ); TQString str; @@ -359,7 +359,7 @@ void SimpleUI::slotVolumeFrame() int y = -(volumeFrame->height() + 5); TQPoint point( volumeButton->mapToGlobal( TQPoint( x, y ) ) ); - TQRect deskRect = KGlobalSettings::desktopGeometry( point ); + TQRect deskRect = TDEGlobalSettings::desktopGeometry( point ); bool bottom = (point.y() + volumeFrame->height()) > (deskRect.y() + deskRect.height()); bool right = (point.x() + volumeFrame->width()) > (deskRect.x() + deskRect.width()); -- cgit v1.2.1