git.iko.soy/unity8
on xenial help sign in
Enable QT_STRICT_ITERATORS
ee14ad3Albert Astals
CMakeLists.txt+3
compare with xenial
unifiedsplit
@@ -87,6 +87,9 @@ endif()
87# "signals" and "slots"
87# "signals" and "slots"
88add_definitions(-DQT_NO_KEYWORDS)
88add_definitions(-DQT_NO_KEYWORDS)
89
89
90+# Save a few container detach and conversions
91+add_definitions(-DQT_STRICT_ITERATORS)
92+
90# Tests
93# Tests
91include(CTest)
94include(CTest)
92enable_testing()
95enable_testing()
tests/mocks/libusermetrics/UserMetrics.cpp+2−2
@@ -238,7 +238,7 @@ void UserMetricsPrivate::setUsername(const QString &username)
238 m_username = username;
238 m_username = username;
239
239
240 m_dataIndex = m_fakeData.constFind(m_username);
240 m_dataIndex = m_fakeData.constFind(m_username);
241− if (m_dataIndex == m_fakeData.end())
241+ if (m_dataIndex == m_fakeData.constEnd())
242 {
242 {
243 m_dataIndex = m_fakeData.constFind("");
243 m_dataIndex = m_fakeData.constFind("");
244 }
244 }
@@ -383,7 +383,7 @@ void UserMetricsPrivate::finishSetFakeData()
383void UserMetricsPrivate::nextFakeData()
383void UserMetricsPrivate::nextFakeData()
384{
384{
385 ++m_dataIndex;
385 ++m_dataIndex;
386− if (m_dataIndex == m_fakeData.end() || m_dataIndex.key() != m_username)
386+ if (m_dataIndex == m_fakeData.constEnd() || m_dataIndex.key() != m_username)
387 {
387 {
388 m_dataIndex = m_fakeData.constFind(m_username);
388 m_dataIndex = m_fakeData.constFind(m_username);
389 }
389 }