ee14ad3 · unity8 · git.iko.soy

git.iko.soy/unity8

Enable QT_STRICT_ITERATORS

Saves a few container detachments and iteration conversions See https://qt-project.org/wiki/QtIterators#5cd4b9e70d5e81bdab42ae2613538a21

commitee14ad32e3e95d0025cfa4ecaac58cf70d823739 authorAlbert Astals <albert.astals@canonical.com> dateWed 1 Oct 2014, 13:09 (12 years ago) parentfd316dc

2 files changed+5−2

compare with xenial

unifiedsplit

CMakeLists.txt+3 tests/mocks/libusermetrics/UserMetrics.cpp+2−2

CMakeLists.txt+3

@@ -87,6 +87,9 @@ endif()

8787# "signals" and "slots"

8888add_definitions(-DQT_NO_KEYWORDS)

8989

90+# Save a few container detach and conversions

91+add_definitions(-DQT_STRICT_ITERATORS)

92+

9093# Tests

9194include(CTest)

9295enable_testing()

tests/mocks/libusermetrics/UserMetrics.cpp+2−2

@@ -238,7 +238,7 @@ void UserMetricsPrivate::setUsername(const QString &username)

238238 m_username = username;

239239

240240 m_dataIndex = m_fakeData.constFind(m_username);

241− if (m_dataIndex == m_fakeData.end())

241+ if (m_dataIndex == m_fakeData.constEnd())

242242 {

243243 m_dataIndex = m_fakeData.constFind("");

244244 }

@@ -383,7 +383,7 @@ void UserMetricsPrivate::finishSetFakeData()

383383void UserMetricsPrivate::nextFakeData()

384384{

385385 ++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)

387387 {

388388 m_dataIndex = m_fakeData.constFind(m_username);

389389 }