From 17f4adfe1840f507ada69fa6f25238c4c72064c3 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Fri, 29 Jun 2018 16:31:31 +0300 Subject: Use std::unique_ptr for memory management in QMimeDataBasePrivate This change simplifies memory management as long as it doesn't requires manuall calls to qDeleteAll and manual deleting/nulling pointers. Change-Id: Id0dc563d0b1e74ae33939d90d4b39999020cd7ce Reviewed-by: Giuseppe D'Angelo --- src/corelib/mimetypes/qmimedatabase_p.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/corelib/mimetypes/qmimedatabase_p.h') diff --git a/src/corelib/mimetypes/qmimedatabase_p.h b/src/corelib/mimetypes/qmimedatabase_p.h index 4260718af6..05267d83c5 100644 --- a/src/corelib/mimetypes/qmimedatabase_p.h +++ b/src/corelib/mimetypes/qmimedatabase_p.h @@ -63,6 +63,8 @@ #include #include +#include + QT_BEGIN_NAMESPACE class QIODevice; @@ -102,7 +104,7 @@ public: bool mimeInherits(const QString &mime, const QString &parent); private: - using Providers = std::vector; + using Providers = std::vector>; const Providers &providers(); bool shouldCheck(); void loadProviders(); -- cgit v1.2.3