From a315402ab232e3e4398f0b1c1d6910bdcefaec4f Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 2 Jan 2020 09:39:07 +0100 Subject: abstractdeclarative.cpp: Fix deprecation warnings Use QHash::contains() instead of checking for presence via value(), fixing: abstractdeclarative.cpp:681:48: warning: 'QList QHash::values(const Key&) const [with Key = QQuickWindow*; T = bool]' is deprecated: Use QMultiHash for hashes storing multiple values with the same key. [-Wdeprecated-declarations] abstractdeclarative.cpp:694:45: warning: 'QList QHash::values(const Key&) const [with Key = QQuickWindow*; T = bool]' is deprecated: Use QMultiHash for hashes storing multiple values with the same key. [-Wdeprecated-declarations] Change-Id: Ic858949514a647f62e74bff6ece346851dce413b Reviewed-by: Lars Knoll --- src/datavisualizationqml2/abstractdeclarative.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index 03d1f41d..4cec3bc8 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -678,7 +678,7 @@ void AbstractDeclarative::checkWindowList(QQuickWindow *window) } if (oldWindow && !windowList.contains(oldWindow) - && windowClearList.values(oldWindow).size() != 0) { + && windowClearList.contains(oldWindow)) { // Return window clear value oldWindow->setClearBeforeRendering(windowClearList.value(oldWindow)); windowClearList.remove(oldWindow); @@ -691,7 +691,7 @@ void AbstractDeclarative::checkWindowList(QQuickWindow *window) if ((m_renderMode == RenderDirectToBackground || m_renderMode == RenderDirectToBackground_NoClear) - && windowClearList.values(window).size() == 0) { + && !windowClearList.contains(window)) { // Save old clear value windowClearList[window] = window->clearBeforeRendering(); // Disable clearing of the window as we render underneath -- cgit v1.2.3