summaryrefslogtreecommitdiffstats
path: root/noatun/modules/simple
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:46 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:46 -0600
commit27430f06c6cc2187c639f59f342f07f1fde91a8b (patch)
tree493c1095950b7f0a82690cedac1b749666be1b47 /noatun/modules/simple
parent794a886cbd6d6893d62026f3800b95051652fc5a (diff)
downloadtdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.tar.gz
tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'noatun/modules/simple')
-rw-r--r--noatun/modules/simple/userinterface.cpp6
1 files changed, 3 insertions, 3 deletions
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());