summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Feck <[email protected]>2014-10-01 19:14:14 +0200
committerChristoph Feck <[email protected]>2014-10-01 19:14:14 +0200
commitae614c1de40f4a485870f0177a3fa8091cadabb6 (patch)
tree42b0a76ff36aff4353540fbb36594f4ea7398590
parent6e67019bfd8facddb418a6ce70fe31d9f4e8493e (diff)
KGlobalSettings::dndEventDelay -> QApplication::startDragDistance
-rw-r--r--lgpl/generic/widgets/kpColorCellsBase.cpp4
-rw-r--r--widgets/kpDualColorButton.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/lgpl/generic/widgets/kpColorCellsBase.cpp b/lgpl/generic/widgets/kpColorCellsBase.cpp
index e338d0f..2517537 100644
--- a/lgpl/generic/widgets/kpColorCellsBase.cpp
+++ b/lgpl/generic/widgets/kpColorCellsBase.cpp
@@ -25,6 +25,7 @@
#include <kpColorCellsBase.h>
+#include <QApplication>
#include <QDrag>
#include <QDragEnterEvent>
#include <QDragMoveEvent>
@@ -37,7 +38,6 @@
#include <KColorMimeData>
#include <KDebug>
-#include <KGlobalSettings>
class kpColorCellsBase::kpColorCellsBasePrivate
@@ -411,7 +411,7 @@ void kpColorCellsBase::mouseMoveEvent( QMouseEvent *e )
if( !(e->buttons() & Qt::LeftButton)) return;
if(d->inMouse) {
- int delay = KGlobalSettings::dndEventDelay();
+ int delay = QApplication::startDragDistance();
if(e->x() > d->mousePos.x()+delay || e->x() < d->mousePos.x()-delay ||
e->y() > d->mousePos.y()+delay || e->y() < d->mousePos.y()-delay){
// Drag color object
diff --git a/widgets/kpDualColorButton.cpp b/widgets/kpDualColorButton.cpp
index 4105c5f..8b57c8a 100644
--- a/widgets/kpDualColorButton.cpp
+++ b/widgets/kpDualColorButton.cpp
@@ -31,6 +31,7 @@
#include <kpDualColorButton.h>
+#include <QApplication>
#include <QBitmap>
#include <QDrag>
#include <QMouseEvent>
@@ -40,7 +41,6 @@
#include <KColorDialog>
#include <KColorMimeData>
#include <KDebug>
-#include <KGlobalSettings>
#include <KIconLoader>
#include <kpView.h>
@@ -279,7 +279,7 @@ void kpDualColorButton::mouseMoveEvent (QMouseEvent *e)
return;
}
- const int delay = KGlobalSettings::dndEventDelay ();
+ const int delay = QApplication::startDragDistance ();
if (e->x () < m_dragStartPoint.x () - delay ||
e->x () > m_dragStartPoint.x () + delay ||
e->y () < m_dragStartPoint.y () - delay ||