feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Change NodeListPropertyIterator::difference_type to qsizetype

Browse Source 
Should fixes Qt5 <-> Qt6 differences.

Amends I743f942fb0bef9f907b4facbb346264dfeaad778

Change-Id: I7545936e6c5b725cedd0606039008f0c5bdbfdd2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2021-04-26 11:17:38 +02:00
parent f69314b6ae
commit c471b5a3ea
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmldesigner/designercore/include/nodelistproperty.h
View File

@@ -46,13 +46,13 @@ class NodeListPropertyIterator
public: public:
using iterator_category = std::random_access_iterator_tag; using iterator_category = std::random_access_iterator_tag;
using difference_type = int; using difference_type = qsizetype;
using value_type = ModelNode; using value_type = ModelNode;
using pointer = InternalNodeListPropertyPointer; using pointer = InternalNodeListPropertyPointer;
using reference = ModelNode; using reference = ModelNode;
NodeListPropertyIterator() = default; NodeListPropertyIterator() = default;
NodeListPropertyIterator(int currentIndex, NodeListPropertyIterator(difference_type currentIndex,
class InternalNodeListProperty *nodeListProperty, class InternalNodeListProperty *nodeListProperty,
Model *model, Model *model,
AbstractView *view) AbstractView *view)
@@ -68,7 +68,7 @@ public:
return *this; return *this;
} }
NodeListPropertyIterator operator++(difference_type) NodeListPropertyIterator operator++(int)
{ {
auto tmp = *this; auto tmp = *this;
++m_currentIndex; ++m_currentIndex;
@@ -81,7 +81,7 @@ public:
return *this; return *this;
} }
NodeListPropertyIterator operator--(difference_type) NodeListPropertyIterator operator--(int)
{ {
auto tmp = *this; auto tmp = *this;
--m_currentIndex; --m_currentIndex;
@@ -168,7 +168,7 @@ private:
InternalNodeListProperty *m_nodeListProperty{}; InternalNodeListProperty *m_nodeListProperty{};
Model *m_model{}; Model *m_model{};
AbstractView *m_view{}; AbstractView *m_view{};
int m_currentIndex = -1; difference_type m_currentIndex = -1;
}; };
} // namespace Internal } // namespace Internal

2
src/plugins/qmldesigner/designercore/model/nodelistproperty.cpp
View File

@@ -177,7 +177,7 @@ NodeListProperty::iterator NodeListProperty::rotate(NodeListProperty::iterator f
privateModel()->notifyNodeOrderChanged(m_internalNodeListProperty); privateModel()->notifyNodeOrderChanged(m_internalNodeListProperty);
return {int(iter - begin), internalNodeListProperty().data(), model(), view()}; return {iter - begin, internalNodeListProperty().data(), model(), view()};
} }
void NodeListProperty::reverse(NodeListProperty::iterator first, NodeListProperty::iterator last) void NodeListProperty::reverse(NodeListProperty::iterator first, NodeListProperty::iterator last)