diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-17 09:08:20 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-17 10:22:04 +0100 |
| commit | 0e3d8473da888755f03abc71160050de9beaab7f (patch) | |
| tree | dea24daef893c5365ae60a5fb392386f0fa62c39 /src/quicktemplates2 | |
| parent | bf67116a6f69462adad3edd2dd64aa05e00a41bd (diff) | |
Port from QScopedPointer to std::unique_ptr
Fix compiler warning about deprecated QScopedPointer::take.
Change-Id: I7300e0a4eab5fca101b8b3127abf12e88359a5ca
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2')
| -rw-r--r-- | src/quicktemplates2/qquicktheme.cpp | 4 | ||||
| -rw-r--r-- | src/quicktemplates2/qquicktheme_p_p.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquicktheme.cpp b/src/quicktemplates2/qquicktheme.cpp index 5ddc6f30..b94b4198 100644 --- a/src/quicktemplates2/qquicktheme.cpp +++ b/src/quicktemplates2/qquicktheme.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -QScopedPointer<QQuickTheme> QQuickThemePrivate::instance; +std::unique_ptr<QQuickTheme> QQuickThemePrivate::instance; static void cleanup_instance() { @@ -117,7 +117,7 @@ QQuickTheme::~QQuickTheme() QQuickTheme *QQuickTheme::instance() { - return QQuickThemePrivate::instance.data(); + return QQuickThemePrivate::instance.get(); } QFont QQuickTheme::font(Scope scope) diff --git a/src/quicktemplates2/qquicktheme_p_p.h b/src/quicktemplates2/qquicktheme_p_p.h index 29058bc8..b2c40eeb 100644 --- a/src/quicktemplates2/qquicktheme_p_p.h +++ b/src/quicktemplates2/qquicktheme_p_p.h @@ -60,7 +60,7 @@ public: return theme->d_func(); } - static QScopedPointer<QQuickTheme> instance; + static std::unique_ptr<QQuickTheme> instance; static const int NScopes = QQuickTheme::Tumbler + 1; |