diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2015-12-29 11:12:31 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2016-02-17 16:18:08 +0000 |
commit | 24a96e2a3e676e253eac62a2bf50de60751f7d4f (patch) | |
tree | 75da98d46eeee12e8f0fc4f307962c72a42bf407 /src/printsupport/kernel | |
parent | 7ca90e985cd92c9537fec6d523b93b45c5edfdb5 (diff) |
QtPrintSupport: convert some index-based into C++11 range-for loops
Also reserve a QList in QPrinter::supportedPaperSources().
Change-Id: I94d24b81d7adcad2b28d36efdbef5a8726412f1a
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/printsupport/kernel')
-rw-r--r-- | src/printsupport/kernel/qpaintengine_alpha.cpp | 4 | ||||
-rw-r--r-- | src/printsupport/kernel/qprintdevice.cpp | 6 | ||||
-rw-r--r-- | src/printsupport/kernel/qprinter.cpp | 16 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/printsupport/kernel/qpaintengine_alpha.cpp b/src/printsupport/kernel/qpaintengine_alpha.cpp index 4922d210f2..939322cc07 100644 --- a/src/printsupport/kernel/qpaintengine_alpha.cpp +++ b/src/printsupport/kernel/qpaintengine_alpha.cpp @@ -336,8 +336,8 @@ void QAlphaPaintEngine::flushAndInit(bool init) d->resetState(painter()); // fill in the alpha images - for (int i=0; i<rects.size(); ++i) - d->drawAlphaImage(rects.at(i)); + for (const auto &rect : qAsConst(rects)) + d->drawAlphaImage(rect); d->m_alphargn = QRegion(); diff --git a/src/printsupport/kernel/qprintdevice.cpp b/src/printsupport/kernel/qprintdevice.cpp index 29dd0d6529..26799a6f13 100644 --- a/src/printsupport/kernel/qprintdevice.cpp +++ b/src/printsupport/kernel/qprintdevice.cpp @@ -283,10 +283,10 @@ void QPrintDevice::format(QDebug debug) const << ", defaultColorMode="<< defaultColorMode(); # ifndef QT_NO_MIMETYPE const QList<QMimeType> mimeTypes = supportedMimeTypes(); - if (const int mimeTypeCount = mimeTypes.size()) { + if (!mimeTypes.isEmpty()) { debug << ", supportedMimeTypes=("; - for (int i = 0; i < mimeTypeCount; ++i) - debug << " \"" << mimeTypes.at(i).name() << '"'; + for (const auto &mimeType : mimeTypes) + debug << " \"" << mimeType.name() << '"'; debug << ')'; } # endif // !QT_NO_MIMETYPE diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index cc4c8244ae..cbab151ea0 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -1946,13 +1946,12 @@ int QPrinter::winPageSize() const QList<int> QPrinter::supportedResolutions() const { Q_D(const QPrinter); - QList<QVariant> varlist + const QList<QVariant> varlist = d->printEngine->property(QPrintEngine::PPK_SupportedResolutions).toList(); QList<int> intlist; - const int numSupportedResolutions = varlist.size(); - intlist.reserve(numSupportedResolutions); - for (int i = 0; i < numSupportedResolutions; ++i) - intlist << varlist.at(i).toInt(); + intlist.reserve(varlist.size()); + for (auto var : varlist) + intlist << var.toInt(); return intlist; } @@ -2015,10 +2014,11 @@ QList<QPrinter::PaperSource> QPrinter::supportedPaperSources() const Q_D(const QPrinter); QVariant v = d->printEngine->property(QPrintEngine::PPK_PaperSources); - QList<QVariant> variant_list = v.toList(); + const QList<QVariant> variant_list = v.toList(); QList<QPrinter::PaperSource> int_list; - for (int i=0; i<variant_list.size(); ++i) - int_list << (QPrinter::PaperSource) variant_list.at(i).toInt(); + int_list.reserve(variant_list.size()); + for (const auto &variant : variant_list) + int_list << QPrinter::PaperSource(variant.toInt()); return int_list; } |