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/kdualcolorbutton.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/kdualcolorbutton.cpp')
| -rw-r--r-- | tdeui/kdualcolorbutton.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdeui/kdualcolorbutton.cpp b/tdeui/kdualcolorbutton.cpp index f6d49a97e..532e4aaaa 100644 --- a/tdeui/kdualcolorbutton.cpp +++ b/tdeui/kdualcolorbutton.cpp @@ -21,7 +21,7 @@ #include "kcolordrag.h" #include "dcolorarrow.xbm" #include "dcolorreset.xpm" -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tqpainter.h> #include <tqbitmap.h> #include <tqdrawutil.h> @@ -224,7 +224,7 @@ void KDualColorButton::mousePressEvent(TQMouseEvent *ev) void KDualColorButton::mouseMoveEvent(TQMouseEvent *ev) { if(!miniCtlFlag){ - int delay = KGlobalSettings::dndEventDelay(); + int delay = TDEGlobalSettings::dndEventDelay(); if(ev->x() >= mPos.x()+delay || ev->x() <= mPos.x()-delay || ev->y() >= mPos.y()+delay || ev->y() <= mPos.y()-delay) { KColorDrag *d = new KColorDrag( curColor == Foreground ? |