From 68156265e3eecc8d7bab9204d1ae3143b46acc87 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:20:14 -0600 Subject: [PATCH] Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- src/daemon/daemon.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp index 138ccd3..1693e0a 100644 --- a/src/daemon/daemon.cpp +++ b/src/daemon/daemon.cpp @@ -51,7 +51,7 @@ NotifierContainer::NotifierContainer() : TQWidget() { // Determine bottom of desktop TQPoint cursorPos = TQCursor::pos(); - TQRect r = KGlobalSettings::desktopGeometry(cursorPos); + TQRect r = TDEGlobalSettings::desktopGeometry(cursorPos); mTopOfStack = r.height(); mRightOfStack = r.width(); } @@ -65,7 +65,7 @@ void NotifierContainer::handleGTKMain() { void NotifierContainer::displayMessage(TQString title, TQString message, TQString icon, int x, int y) { TQPixmap px; - KIconLoader* il = KGlobal::iconLoader(); + KIconLoader* il = TDEGlobal::iconLoader(); px = il->loadIcon( icon, KIcon::NoGroup ); // if (px.isNull()) { // px = il->loadIcon( "gnome_apps", KIcon::NoGroup ); @@ -80,7 +80,7 @@ void NotifierContainer::displayMessage(TQString title, TQString message, TQStrin if (mPopupList.isEmpty()) { // Determine bottom of desktop TQPoint cursorPos = TQCursor::pos(); - TQRect r = KGlobalSettings::desktopGeometry(cursorPos); + TQRect r = TDEGlobalSettings::desktopGeometry(cursorPos); mTopOfStack = r.height(); mRightOfStack = r.width(); } @@ -108,7 +108,7 @@ void NotifierContainer::popupClosed(KPassivePopup* popup) { if (mPopupList.isEmpty()) { // Determine bottom of desktop TQPoint cursorPos = TQCursor::pos(); - TQRect r = KGlobalSettings::desktopGeometry(cursorPos); + TQRect r = TDEGlobalSettings::desktopGeometry(cursorPos); mTopOfStack = r.height(); mRightOfStack = r.width(); }