diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:20:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:20:14 -0600 |
| commit | 68156265e3eecc8d7bab9204d1ae3143b46acc87 (patch) | |
| tree | 38ecde320d6bb732a02466c483f8d834a4aa3eb0 | |
| parent | 3e27b9798f1c33f14ac298c2fc8921ed5cf7025a (diff) | |
| download | kdbusnotification-68156265e3eecc8d7bab9204d1ae3143b46acc87.tar.gz kdbusnotification-68156265e3eecc8d7bab9204d1ae3143b46acc87.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
| -rw-r--r-- | src/daemon/daemon.cpp | 8 |
1 files 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(); } |