aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/quick/items/qquickgridview.cpp22
-rw-r--r--src/quick/items/qquickitemview.cpp2
-rw-r--r--src/quick/items/qquickitemview_p_p.h2
-rw-r--r--src/quick/items/qquicklistview.cpp41
4 files changed, 34 insertions, 33 deletions
diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index ae391c10b7..ba680ec718 100644
--- a/src/quick/items/qquickgridview.cpp
+++ b/src/quick/items/qquickgridview.cpp
@@ -400,7 +400,7 @@ int QQuickGridViewPrivate::snapIndex() const
if (item->index == -1)
continue;
qreal itemTop = item->position();
- FxGridItemSG *hItem = static_cast<FxGridItemSG*>(highlight);
+ FxGridItemSG *hItem = static_cast<FxGridItemSG*>(highlight.get());
if (itemTop >= hItem->rowPos()-rowSize()/2 && itemTop < hItem->rowPos()+rowSize()/2) {
FxGridItemSG *gridItem = static_cast<FxGridItemSG*>(item);
index = gridItem->index;
@@ -700,10 +700,9 @@ void QQuickGridViewPrivate::createHighlight(bool onDestruction)
{
bool changed = false;
if (highlight) {
- if (trackedItem == highlight)
+ if (trackedItem == highlight.get())
trackedItem = nullptr;
- delete highlight;
- highlight = nullptr;
+ highlight.reset();
delete highlightXAnimator;
delete highlightYAnimator;
@@ -720,7 +719,8 @@ void QQuickGridViewPrivate::createHighlight(bool onDestruction)
if (currentItem) {
QQuickItem *item = createHighlightItem();
if (item) {
- FxGridItemSG *newHighlight = new FxGridItemSG(item, q, true);
+ std::unique_ptr<FxGridItemSG> newHighlight
+ = std::make_unique<FxGridItemSG>(item, q, true);
newHighlight->trackGeometry(true);
if (autoHighlight)
resetHighlightPosition();
@@ -731,7 +731,7 @@ void QQuickGridViewPrivate::createHighlight(bool onDestruction)
highlightYAnimator->target = QQmlProperty(item, QLatin1String("y"));
highlightYAnimator->userDuration = highlightMoveDuration;
- highlight = newHighlight;
+ highlight = std::move(newHighlight);
changed = true;
}
}
@@ -762,7 +762,7 @@ void QQuickGridViewPrivate::resetHighlightPosition()
{
if (highlight && currentItem) {
FxGridItemSG *cItem = static_cast<FxGridItemSG*>(currentItem);
- static_cast<FxGridItemSG*>(highlight)->setPosition(cItem->colPos(), cItem->rowPos());
+ static_cast<FxGridItemSG *>(highlight.get())->setPosition(cItem->colPos(), cItem->rowPos());
}
}
@@ -2096,7 +2096,8 @@ void QQuickGridView::viewportMoved(Qt::Orientations orient)
if (pos != d->highlight->position()) {
d->highlightXAnimator->stop();
d->highlightYAnimator->stop();
- static_cast<FxGridItemSG*>(d->highlight)->setPosition(static_cast<FxGridItemSG*>(d->highlight)->colPos(), pos);
+ FxGridItemSG *sgHighlight = static_cast<FxGridItemSG *>(d->highlight.get());
+ sgHighlight->setPosition(sgHighlight->colPos(), pos);
} else {
d->updateHighlight();
}
@@ -2105,7 +2106,10 @@ void QQuickGridView::viewportMoved(Qt::Orientations orient)
int idx = d->snapIndex();
if (idx >= 0 && idx != d->currentIndex) {
d->updateCurrent(idx);
- if (d->currentItem && static_cast<FxGridItemSG*>(d->currentItem)->colPos() != static_cast<FxGridItemSG*>(d->highlight)->colPos() && d->autoHighlight) {
+ if (d->currentItem
+ && static_cast<FxGridItemSG*>(d->currentItem)->colPos()
+ != static_cast<FxGridItemSG*>(d->highlight.get())->colPos()
+ && d->autoHighlight) {
if (d->flow == FlowLeftToRight)
d->highlightXAnimator->to = d->currentItem->itemX();
else
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
index e37d06f333..51a6ed2384 100644
--- a/src/quick/items/qquickitemview.cpp
+++ b/src/quick/items/qquickitemview.cpp
@@ -2517,7 +2517,7 @@ void QQuickItemViewPrivate::updateTrackedItem()
Q_Q(QQuickItemView);
FxViewItem *item = currentItem;
if (highlight)
- item = highlight;
+ item = highlight.get();
trackedItem = item;
if (trackedItem)
diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h
index b9b129a073..79d10fafc4 100644
--- a/src/quick/items/qquickitemview_p_p.h
+++ b/src/quick/items/qquickitemview_p_p.h
@@ -279,7 +279,7 @@ public:
QPauseAnimationJob bufferPause;
QQmlComponent *highlightComponent;
- FxViewItem *highlight;
+ std::unique_ptr<FxViewItem> highlight;
int highlightRange; // enum value
qreal highlightRangeStart;
qreal highlightRangeEnd;
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index b954f1b107..7edfa01bc6 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -157,9 +157,9 @@ public:
QQuickListView::HeaderPositioning headerPositioning;
QQuickListView::FooterPositioning footerPositioning;
- QSmoothedAnimation *highlightPosAnimator;
- QSmoothedAnimation *highlightWidthAnimator;
- QSmoothedAnimation *highlightHeightAnimator;
+ std::unique_ptr<QSmoothedAnimation> highlightPosAnimator;
+ std::unique_ptr<QSmoothedAnimation> highlightWidthAnimator;
+ std::unique_ptr<QSmoothedAnimation> highlightHeightAnimator;
qreal highlightMoveVelocity;
qreal highlightResizeVelocity;
int highlightResizeDuration;
@@ -202,11 +202,6 @@ public:
{
highlightMoveDuration = -1; //override default value set in base class
}
- ~QQuickListViewPrivate() {
- delete highlightPosAnimator;
- delete highlightWidthAnimator;
- delete highlightHeightAnimator;
- }
friend class QQuickViewSection;
@@ -979,14 +974,13 @@ void QQuickListViewPrivate::createHighlight(bool onDestruction)
{
bool changed = false;
if (highlight) {
- if (trackedItem == highlight)
+ if (trackedItem == highlight.get())
trackedItem = nullptr;
- delete highlight;
- highlight = nullptr;
+ highlight.reset();
- delete highlightPosAnimator;
- delete highlightWidthAnimator;
- delete highlightHeightAnimator;
+ highlightPosAnimator.reset();
+ highlightWidthAnimator.reset();
+ highlightHeightAnimator.reset();
highlightPosAnimator = nullptr;
highlightWidthAnimator = nullptr;
highlightHeightAnimator = nullptr;
@@ -1001,7 +995,8 @@ void QQuickListViewPrivate::createHighlight(bool onDestruction)
if (currentItem) {
QQuickItem *item = createHighlightItem();
if (item) {
- FxListItemSG *newHighlight = new FxListItemSG(item, q, true);
+ std::unique_ptr<FxListItemSG> newHighlight
+ = std::make_unique<FxListItemSG>(item, q, true);
newHighlight->trackGeometry(true);
if (autoHighlight) {
@@ -1009,22 +1004,22 @@ void QQuickListViewPrivate::createHighlight(bool onDestruction)
newHighlight->setPosition(static_cast<FxListItemSG*>(currentItem)->itemPosition());
}
const QLatin1String posProp(orient == QQuickListView::Vertical ? "y" : "x");
- highlightPosAnimator = new QSmoothedAnimation;
+ highlightPosAnimator = std::make_unique<QSmoothedAnimation>();
highlightPosAnimator->target = QQmlProperty(item, posProp);
highlightPosAnimator->velocity = highlightMoveVelocity;
highlightPosAnimator->userDuration = highlightMoveDuration;
- highlightWidthAnimator = new QSmoothedAnimation;
+ highlightWidthAnimator = std::make_unique<QSmoothedAnimation>();
highlightWidthAnimator->velocity = highlightResizeVelocity;
highlightWidthAnimator->userDuration = highlightResizeDuration;
highlightWidthAnimator->target = QQmlProperty(item, QStringLiteral("width"));
- highlightHeightAnimator = new QSmoothedAnimation;
+ highlightHeightAnimator = std::make_unique<QSmoothedAnimation>();
highlightHeightAnimator->velocity = highlightResizeVelocity;
highlightHeightAnimator->userDuration = highlightResizeDuration;
highlightHeightAnimator->target = QQmlProperty(item, QStringLiteral("height"));
- highlight = newHighlight;
+ highlight = std::move(newHighlight);
changed = true;
}
}
@@ -1064,8 +1059,10 @@ void QQuickListViewPrivate::updateHighlight()
void QQuickListViewPrivate::resetHighlightPosition()
{
- if (highlight && currentItem)
- static_cast<FxListItemSG*>(highlight)->setPosition(static_cast<FxListItemSG*>(currentItem)->itemPosition());
+ if (highlight && currentItem) {
+ static_cast<FxListItemSG*>(highlight.get())->setPosition(
+ static_cast<FxListItemSG*>(currentItem)->itemPosition());
+ }
}
bool QQuickListViewPrivate::movingFromHighlight()
@@ -3425,7 +3422,7 @@ void QQuickListView::viewportMoved(Qt::Orientations orient)
pos = viewPos + d->highlightRangeStart;
if (pos != d->highlight->position()) {
d->highlightPosAnimator->stop();
- static_cast<FxListItemSG*>(d->highlight)->setPosition(pos);
+ static_cast<FxListItemSG*>(d->highlight.get())->setPosition(pos);
} else {
d->updateHighlight();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 15:21:04 +0000