alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

QHash::insertMulti is deprecated in qt5.15 => port to QMultiHash

Browse Source 
Summary: Port to QMultiHash

Reviewers: apol

Reviewed By: apol

Subscribers: kde-frameworks-devel

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D26736
This commit is contained in:
Laurent Montel 2020-01-17 20:44:24 +01:00
parent 1c60859999
commit 1e5966147d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plasma/private/svg_p.h
View File

@ -103,7 +103,7 @@ public:
Svg *q; Svg *q;
QPointer<Theme> theme; QPointer<Theme> theme;
QHash<QString, QRectF> localRectCache; QHash<QString, QRectF> localRectCache;
QHash<QString, QSize> elementsWithSizeHints; QMultiHash<QString, QSize> elementsWithSizeHints;
SharedSvgRenderer::Ptr renderer; SharedSvgRenderer::Ptr renderer;
QString themePath; QString themePath;
QString path; QString path;

2
src/plasma/svg.cpp
View File

@ -320,7 +320,7 @@ QPixmap SvgPrivate::findInCache(const QString &elementId, qreal ratio, const QSi
match.capturedRef(2).toInt()); match.capturedRef(2).toInt());
if (sizeHint.isValid()) { if (sizeHint.isValid()) {
elementsWithSizeHints.insertMulti(baseElementId, sizeHint); elementsWithSizeHints.insert(baseElementId, sizeHint);
} }
} }
} }