diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
| commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
| tree | c76702a7f6310fbe9d437e347535422e836e94e9 /tdeui/kpassivepopup.cpp | |
| parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
| parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
| download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdeui/kpassivepopup.cpp')
| -rw-r--r-- | tdeui/kpassivepopup.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tdeui/kpassivepopup.cpp b/tdeui/kpassivepopup.cpp index 1e86bc57f..ba3459b45 100644 --- a/tdeui/kpassivepopup.cpp +++ b/tdeui/kpassivepopup.cpp @@ -6,7 +6,7 @@ * email : sascha.cunz@tiscali.de */ -#include <kconfig.h> +#include <tdeconfig.h> #include <tqapplication.h> #include <tqlabel.h> @@ -22,7 +22,7 @@ #include <kdialog.h> #include <kpixmap.h> #include <kpixmapeffect.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "config.h" #ifdef Q_WS_X11 @@ -300,7 +300,7 @@ void KPassivePopup::moveNear( TQRect target ) int w = width(); int h = height(); - TQRect r = KGlobalSettings::desktopGeometry(TQPoint(x+w/2,y+h/2)); + TQRect r = TDEGlobalSettings::desktopGeometry(TQPoint(x+w/2,y+h/2)); if( d->popupStyle == Balloon ) { @@ -359,7 +359,7 @@ void KPassivePopup::updateMask() { // get screen-geometry for screen our anchor is on // (geometry can differ from screen to screen! - TQRect deskRect = KGlobalSettings::desktopGeometry(d->anchor); + TQRect deskRect = TDEGlobalSettings::desktopGeometry(d->anchor); int xh = 70, xl = 40; if( width() < 80 ) |