diff options
author | hjk <hjk@qt.io> | 2019-06-12 09:45:13 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-06-12 13:24:19 +0000 |
commit | 5ac71e485ac2b8a480454e5111fc4219ec7efc45 (patch) | |
tree | 6f88acc349219df44896ad999239523b957fd607 | |
parent | ee68a4e7b4e47897619517e629ba4b1ed1c213d6 (diff) | |
download | qt-creator-5ac71e485ac2b8a480454e5111fc4219ec7efc45.tar.gz |
ModelingLib: Use QElapsedTimer instead of QTime
... because of recent deprecation of QTime::elapsed.
Change-Id: I5bb8cd2a613a0258669055471008c5d6b4db1099
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: hjk <hjk@qt.io>
-rw-r--r-- | src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp | 7 | ||||
-rw-r--r-- | src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp index 37e74adeac..3bcc0727fb 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp +++ b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.cpp @@ -173,14 +173,13 @@ void ModelTreeView::dragMoveEvent(QDragMoveEvent *event) if (dynamic_cast<MObject*>(modelElement)) accept = true; if (m_autoDelayIndex == dropIndex) { - if (m_autoDelayStartTime.elapsed() > 1000) { + if (m_autoDelayStartTimer.elapsed() > 1000) { setExpanded(dropIndex, !isExpanded(dropIndex)); - m_autoDelayStartTime.start(); + m_autoDelayStartTimer.start(); } } else { m_autoDelayIndex = dropIndex; - m_autoDelayStartTime = QTime::currentTime(); - m_autoDelayStartTime.start(); + m_autoDelayStartTimer.start(); } } event->setAccepted(accept); diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h index 724097a365..565d3671c2 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h +++ b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h @@ -25,11 +25,11 @@ #pragma once -#include <QTreeView> #include "qmt/infrastructure/qmt_global.h" #include "qmt/model_ui/modeltreeviewinterface.h" -#include <QTime> +#include <QElapsedTimer> +#include <QTreeView> namespace qmt { @@ -70,7 +70,7 @@ private: SortedTreeModel *m_sortedTreeModel = nullptr; IElementTasks *m_elementTasks = nullptr; QModelIndex m_autoDelayIndex; - QTime m_autoDelayStartTime; + QElapsedTimer m_autoDelayStartTimer; }; } // namespace qmt |