summaryrefslogtreecommitdiffstats
path: root/examples/widgets/widgets
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2019-05-14 20:42:01 +0200
committerMarc Mutz <marc.mutz@kdab.com>2019-05-15 11:03:53 +0200
commitfbb2ed150585ec3aee936eba21b770a8d2b66a4d (patch)
tree4d1c2e18464442d315a4e82ffe8b3541e4a51214 /examples/widgets/widgets
parent404bee752c5058506900c23faa9d577a38b300f1 (diff)
Icons example: use std::unique_ptr instead of QScopedPointer
There's talk that QScopedPointer may be deprecated. Don't use it in examples anymore. Change-Id: Ia50ef66de84dae2885f71a9dd83c5909bfa253f0 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'examples/widgets/widgets')
-rw-r--r--examples/widgets/widgets/icons/mainwindow.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/examples/widgets/widgets/icons/mainwindow.cpp b/examples/widgets/widgets/icons/mainwindow.cpp
index 0cf11c978d..91e98ff896 100644
--- a/examples/widgets/widgets/icons/mainwindow.cpp
+++ b/examples/widgets/widgets/icons/mainwindow.cpp
@@ -55,6 +55,8 @@
#include "imagedelegate.h"
#include "mainwindow.h"
+#include <memory>
+
//! [40]
enum { OtherSize = QStyle::PM_CustomBase };
//! [40]
@@ -514,8 +516,8 @@ void MainWindow::checkCurrentStyle()
const QList<QAction *> actions = styleActionGroup->actions();
for (QAction *action : actions) {
const QString styleName = action->data().toString();
- QScopedPointer<QStyle> candidate(QStyleFactory::create(styleName));
- Q_ASSERT(!candidate.isNull());
+ const std::unique_ptr<QStyle> candidate{QStyleFactory::create(styleName)};
+ Q_ASSERT(candidate);
if (candidate->metaObject()->className()
== QApplication::style()->metaObject()->className()) {
action->trigger();