diff options
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/dialogs/qdialog.cpp | 2 | ||||
-rw-r--r-- | src/widgets/graphicsview/qgraphicsscene.cpp | 4 | ||||
-rw-r--r-- | src/widgets/itemviews/qabstractitemview_p.h | 4 | ||||
-rw-r--r-- | src/widgets/kernel/qaction.cpp | 2 | ||||
-rw-r--r-- | src/widgets/kernel/qapplication.cpp | 6 | ||||
-rw-r--r-- | src/widgets/kernel/qwidget.cpp | 2 | ||||
-rw-r--r-- | src/widgets/kernel/qwidgetwindow_qpa_p.h | 4 | ||||
-rw-r--r-- | src/widgets/widgets/qdatetimeedit.cpp | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qdatetimeedit_p.h | 2 | ||||
-rw-r--r-- | src/widgets/widgets/qmenu.cpp | 2 |
10 files changed, 15 insertions, 15 deletions
diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index 97a5b6d454..0e57a16757 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -624,7 +624,7 @@ void QDialog::contextMenuEvent(QContextMenuEvent *e) while (w && w->whatsThis().size() == 0 && !w->testAttribute(Qt::WA_CustomWhatsThis)) w = w->isWindow() ? 0 : w->parentWidget(); if (w) { - QWeakPointer<QMenu> p = new QMenu(this); + QPointer<QMenu> p = new QMenu(this); QAction *wt = p.data()->addAction(tr("What's This?")); if (p.data()->exec(e->globalPos()) == wt) { QHelpEvent e(QEvent::WhatsThis, w->rect().center(), diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp index a63403a039..6feeb943b7 100644 --- a/src/widgets/graphicsview/qgraphicsscene.cpp +++ b/src/widgets/graphicsview/qgraphicsscene.cpp @@ -6067,7 +6067,7 @@ void QGraphicsScenePrivate::gestureEventHandler(QGestureEvent *event) // initial gesture targets if (!conflictedGestures.isEmpty()) { for (int i = 0; i < cachedTargetItems.size(); ++i) { - QWeakPointer<QGraphicsObject> item = cachedTargetItems.at(i); + QPointer<QGraphicsObject> item = cachedTargetItems.at(i); // get gestures to deliver to the current item QSet<QGesture *> gestures = conflictedGestures & cachedItemGestures.value(item.data()); @@ -6153,7 +6153,7 @@ void QGraphicsScenePrivate::gestureEventHandler(QGestureEvent *event) } qSort(cachedTargetItems.begin(), cachedTargetItems.end(), qt_closestItemFirst); for (int i = 0; i < cachedTargetItems.size(); ++i) { - QWeakPointer<QGraphicsObject> receiver = cachedTargetItems.at(i); + QPointer<QGraphicsObject> receiver = cachedTargetItems.at(i); QSet<QGesture *> gestures = undeliveredGestures & cachedItemGestures.value(receiver.data()); gestures -= cachedAlreadyDeliveredGestures.value(receiver.data()); diff --git a/src/widgets/itemviews/qabstractitemview_p.h b/src/widgets/itemviews/qabstractitemview_p.h index 3826f3b4e9..63f7488704 100644 --- a/src/widgets/itemviews/qabstractitemview_p.h +++ b/src/widgets/itemviews/qabstractitemview_p.h @@ -71,10 +71,10 @@ QT_BEGIN_NAMESPACE struct QEditorInfo { - QEditorInfo(QWidget *e, bool s): widget(QWeakPointer<QWidget>(e)), isStatic(s) {} + QEditorInfo(QWidget *e, bool s): widget(QPointer<QWidget>(e)), isStatic(s) {} QEditorInfo(): isStatic(false) {} - QWeakPointer<QWidget> widget; + QPointer<QWidget> widget; bool isStatic; }; diff --git a/src/widgets/kernel/qaction.cpp b/src/widgets/kernel/qaction.cpp index 0d500c81d6..05d250e73a 100644 --- a/src/widgets/kernel/qaction.cpp +++ b/src/widgets/kernel/qaction.cpp @@ -1181,7 +1181,7 @@ void QAction::activate(ActionEvent event) { Q_D(QAction); if(event == Trigger) { - QWeakPointer<QObject> guard = this; + QPointer<QObject> guard = this; if(d->checkable) { // the checked action of an exclusive group cannot be unchecked if (d->checked && (d->group && d->group->isExclusive() diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 1ca30c5819..e9003e8c14 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -3425,7 +3425,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) bool acceptTouchEvents = widget->testAttribute(Qt::WA_AcceptTouchEvents); touchEvent->setTarget(widget); touchEvent->setAccepted(acceptTouchEvents); - QWeakPointer<QWidget> p = widget; + QPointer<QWidget> p = widget; res = acceptTouchEvents && d->notify_helper(widget, touchEvent); eventAccepted = touchEvent->isAccepted(); if (p.isNull()) { @@ -4369,14 +4369,14 @@ void QApplicationPrivate::translateRawTouchEvent(QWidget *window, touchPoint.d = touchPoint.d->detach(); // update state - QWeakPointer<QObject> target; + QPointer<QObject> target; ActiveTouchPointsKey touchInfoKey(device, touchPoint.id()); ActiveTouchPointsValue &touchInfo = d->activeTouchPoints[touchInfoKey]; if (touchPoint.state() == Qt::TouchPointPressed) { if (device->type() == QTouchDevice::TouchPad) { // on touch-pads, send all touch points to the same widget target = d->activeTouchPoints.isEmpty() - ? QWeakPointer<QObject>() + ? QPointer<QObject>() : d->activeTouchPoints.constBegin().value().target; } diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 454ffd5eb7..e6a760abde 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -2459,7 +2459,7 @@ void QWidgetPrivate::setStyle_helper(QStyle *newStyle, bool propagate, bool Q_Q(QWidget); QStyle *oldStyle = q->style(); #ifndef QT_NO_STYLE_STYLESHEET - QWeakPointer<QStyle> origStyle; + QPointer<QStyle> origStyle; #endif #ifdef Q_WS_MAC diff --git a/src/widgets/kernel/qwidgetwindow_qpa_p.h b/src/widgets/kernel/qwidgetwindow_qpa_p.h index d4fd37c456..8afa3f33cd 100644 --- a/src/widgets/kernel/qwidgetwindow_qpa_p.h +++ b/src/widgets/kernel/qwidgetwindow_qpa_p.h @@ -95,9 +95,9 @@ private: void updateGeometry(); QWidget *m_widget; - QWeakPointer<QWidget> m_implicit_mouse_grabber; + QPointer<QWidget> m_implicit_mouse_grabber; #ifndef QT_NO_DRAGANDDROP - QWeakPointer<QWidget> m_dragTarget; + QPointer<QWidget> m_dragTarget; #endif }; diff --git a/src/widgets/widgets/qdatetimeedit.cpp b/src/widgets/widgets/qdatetimeedit.cpp index 4c418bde9e..b916212871 100644 --- a/src/widgets/widgets/qdatetimeedit.cpp +++ b/src/widgets/widgets/qdatetimeedit.cpp @@ -2598,7 +2598,7 @@ void QCalendarPopup::setCalendarWidget(QCalendarWidget *cw) widgetLayout->setSpacing(0); } delete calendar.data(); - calendar = QWeakPointer<QCalendarWidget>(cw); + calendar = QPointer<QCalendarWidget>(cw); widgetLayout->addWidget(cw); connect(cw, SIGNAL(activated(QDate)), this, SLOT(dateSelected(QDate))); diff --git a/src/widgets/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h index 35f0f57f54..f7e6861677 100644 --- a/src/widgets/widgets/qdatetimeedit_p.h +++ b/src/widgets/widgets/qdatetimeedit_p.h @@ -173,7 +173,7 @@ protected: private: QCalendarWidget *verifyCalendarInstance(); - QWeakPointer<QCalendarWidget> calendar; + QPointer<QCalendarWidget> calendar; QDate oldDate; bool dateChanged; }; diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 8d50b03edb..4747d1c661 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -1098,7 +1098,7 @@ void QMenuPrivate::_q_actionTriggered() { Q_Q(QMenu); if (QAction *action = qobject_cast<QAction *>(q->sender())) { - QWeakPointer<QAction> actionGuard = action; + QPointer<QAction> actionGuard = action; emit q->triggered(action); if (!activationRecursionGuard && actionGuard) { //in case the action has not been activated by the mouse |