diff options
Diffstat (limited to 'src/widgets/kernel')
-rw-r--r-- | src/widgets/kernel/qapplication_p.h | 4 | ||||
-rw-r--r-- | src/widgets/kernel/qgesturemanager.cpp | 6 | ||||
-rw-r--r-- | src/widgets/kernel/qgesturemanager_p.h | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index 7a880986bf..ae4f0c2044 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -313,7 +313,7 @@ public: QPointer<QWSManager> last_manager; QWSServerCleaner qwsServerCleaner; # ifndef QT_NO_DIRECTPAINTER - QMap<WId, QDirectPainter *> *directPainters; + QHash<WId, QDirectPainter *> *directPainters; # endif QRect maxWindowRect(const QScreen *screen) const { return maxWindowRects[screen]; } void setMaxWindowRect(const QScreen *screen, int screenNo, const QRect &rect); @@ -393,7 +393,7 @@ public: private: #ifdef Q_WS_QWS - QMap<const QScreen*, QRect> maxWindowRects; + QHash<const QScreen*, QRect> maxWindowRects; #endif static QApplicationPrivate *self; diff --git a/src/widgets/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp index 2e9edb1481..296d8d31e7 100644 --- a/src/widgets/kernel/qgesturemanager.cpp +++ b/src/widgets/kernel/qgesturemanager.cpp @@ -541,8 +541,8 @@ bool QGestureManager::filterEvent(QObject *receiver, QEvent *event) } void QGestureManager::getGestureTargets(const QSet<QGesture*> &gestures, - QMap<QWidget *, QList<QGesture *> > *conflicts, - QMap<QWidget *, QList<QGesture *> > *normal) + QHash<QWidget *, QList<QGesture *> > *conflicts, + QHash<QWidget *, QList<QGesture *> > *normal) { typedef QHash<Qt::GestureType, QHash<QWidget *, QGesture *> > GestureByTypes; GestureByTypes gestureByTypes; @@ -588,7 +588,7 @@ void QGestureManager::deliverEvents(const QSet<QGesture *> &gestures, if (gestures.isEmpty()) return; - typedef QMap<QWidget *, QList<QGesture *> > GesturesPerWidget; + typedef QHash<QWidget *, QList<QGesture *> > GesturesPerWidget; GesturesPerWidget conflictedGestures; GesturesPerWidget normalStartedGestures; diff --git a/src/widgets/kernel/qgesturemanager_p.h b/src/widgets/kernel/qgesturemanager_p.h index 68945a7b66..9f59550bb1 100644 --- a/src/widgets/kernel/qgesturemanager_p.h +++ b/src/widgets/kernel/qgesturemanager_p.h @@ -138,8 +138,8 @@ private: void deliverEvents(const QSet<QGesture *> &gestures, QSet<QGesture *> *undeliveredGestures); void getGestureTargets(const QSet<QGesture*> &gestures, - QMap<QWidget *, QList<QGesture *> > *conflicts, - QMap<QWidget *, QList<QGesture *> > *normal); + QHash<QWidget *, QList<QGesture *> > *conflicts, + QHash<QWidget *, QList<QGesture *> > *normal); void cancelGesturesForChildren(QGesture *originatingGesture); }; |