1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QStyleSheetStyle: port a local QSet to QDuplicateTracker

Browse Source 
Apart from a more fitting, minimal, API, QDuplicateTracker also
transparently uses C++17 pmr::monotonic_buffer_resource to avoid, or
at least reduce, memory allocations.

Change-Id: Ice3ebf1891141d2ac1ec9dd069fb40e98d4056c6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Marc Mutz 2020-05-02 23:03:39 +02:00
parent a96900eea5
commit c3ca27d02c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/widgets/styles/qstylesheetstyle.cpp
View File

@ -123,6 +123,8 @@
#include <QtGui/qpainterpath.h> #include <QtGui/qpainterpath.h>
#include <QtGui/qscreen.h> #include <QtGui/qscreen.h>
#include <QtCore/private/qduplicatetracker_p.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
using namespace QCss; using namespace QCss;
@ -2582,15 +2584,14 @@ void QStyleSheetStyle::setProperties(QWidget *w)
{ {
// scan decls for final occurrence of each "qproperty" // scan decls for final occurrence of each "qproperty"
QSet<const QString> propertySet; QDuplicateTracker<QString> propertySet;
propertySet.reserve(decls.size());
for (int i = decls.count() - 1; i >= 0; --i) { for (int i = decls.count() - 1; i >= 0; --i) {
const QString property = decls.at(i).d->property; const QString property = decls.at(i).d->property;
if (!property.startsWith(QLatin1String("qproperty-"), Qt::CaseInsensitive)) if (!property.startsWith(QLatin1String("qproperty-"), Qt::CaseInsensitive))
continue; continue;
if (!propertySet.contains(property)) { if (!propertySet.hasSeen(property))
propertySet.insert(property);
finals.append(i); finals.append(i);
}
} }
} }