From a0c61e70eeefbf9d6c632a94d29bcc2a7e97b7d7 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Tue, 24 Oct 2017 09:02:03 -0700 Subject: STL compatibility: use size() instead of count() This is a simple find and replace with manual sanity check. Change-Id: Ia733befe7885dc3c643d5c84e151312bfd86a3c6 Reviewed-by: Christian Kandeler --- tests/fuzzy-test/commandlineparser.cpp | 2 +- tests/fuzzy-test/fuzzytester.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/fuzzy-test') diff --git a/tests/fuzzy-test/commandlineparser.cpp b/tests/fuzzy-test/commandlineparser.cpp index 659cb6f6a..21961540f 100644 --- a/tests/fuzzy-test/commandlineparser.cpp +++ b/tests/fuzzy-test/commandlineparser.cpp @@ -109,7 +109,7 @@ void CommandLineParser::parseDuration() QString choppedDurationString; assignOptionArgument(maxDurationoption(), durationString); choppedDurationString = durationString; - const char suffix = durationString.at(durationString.count() - 1).toLatin1(); + const char suffix = durationString.at(durationString.size() - 1).toLatin1(); const bool hasSuffix = !std::isdigit(suffix); if (hasSuffix) choppedDurationString.chop(1); diff --git a/tests/fuzzy-test/fuzzytester.cpp b/tests/fuzzy-test/fuzzytester.cpp index 16e05ae36..2265592f2 100644 --- a/tests/fuzzy-test/fuzzytester.cpp +++ b/tests/fuzzy-test/fuzzytester.cpp @@ -66,7 +66,7 @@ void FuzzyTester::runTest(const QString &profile, const QString &startCommit, qDebug("Found buildable start commit %s.", qPrintable(workingStartCommit)); QStringList allCommits = findAllCommits(workingStartCommit); qDebug("The test set comprises all %d commits between the start commit and HEAD.", - allCommits.count()); + allCommits.size()); // Shuffle the initial sequence. Otherwise all invocations of the tool with the same start // commit would try the same sequence of commits. @@ -92,7 +92,7 @@ void FuzzyTester::runTest(const QString &profile, const QString &startCommit, m_currentCommit = currentCommit; buildSequence << currentCommit; checkoutCommit(currentCommit); - qDebug("Testing incremental build #%d (%s)", buildSequence.count() - 1, + qDebug("Testing incremental build #%d (%s)", buildSequence.size() - 1, qPrintable(currentCommit)); // Doing "resolve" and "build" separately introduces additional possibilities @@ -157,7 +157,7 @@ QString FuzzyTester::findWorkingStartCommit(const QString &startCommit) const QStringList allCommits = findAllCommits(startCommit); QString qbsError; m_currentActivity = buildFromScratchActivity(); - for (int i = allCommits.count() - 1; i >= 0; --i) { + for (int i = allCommits.size() - 1; i >= 0; --i) { m_currentCommit = allCommits.at(i); if (m_unbuildableCommits.contains(m_currentCommit)) { qDebug("Skipping known bad commit %s.", qPrintable(m_currentCommit)); -- cgit v1.2.3