aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2020-08-26 22:32:00 +0200
committerIvan Komissarov <ABBAPOH@gmail.com>2020-08-27 10:33:54 +0000
commitda6a9c3aafe973f2e14691c1146fe22f0950a7cd (patch)
tree85ab06004e8c1c21b5c7b913c469b1b92461d537 /src
parent1962e1d102c78c85344f717eeb0d751f4d4b09c9 (diff)
Use std::unique_ptr in ItemReader
Change-Id: I7b20cc1b991120ec3d86219c91397558458d5bd9 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/lib/corelib/language/itemreader.cpp8
-rw-r--r--src/lib/corelib/language/itemreader.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/corelib/language/itemreader.cpp b/src/lib/corelib/language/itemreader.cpp
index 578f194bc..bdc5570a0 100644
--- a/src/lib/corelib/language/itemreader.cpp
+++ b/src/lib/corelib/language/itemreader.cpp
@@ -61,14 +61,12 @@ static void makePathsCanonical(QStringList &paths)
paths.erase(it, e);
}
-ItemReader::ItemReader(Logger &logger) : m_visitorState(new ItemReaderVisitorState(logger))
+ItemReader::ItemReader(Logger &logger)
+ : m_visitorState(std::make_unique<ItemReaderVisitorState>(logger))
{
}
-ItemReader::~ItemReader()
-{
- delete m_visitorState;
-}
+ItemReader::~ItemReader() = default;
void ItemReader::setSearchPaths(const QStringList &searchPaths)
{
diff --git a/src/lib/corelib/language/itemreader.h b/src/lib/corelib/language/itemreader.h
index 6ec99fcb5..2a01d7640 100644
--- a/src/lib/corelib/language/itemreader.h
+++ b/src/lib/corelib/language/itemreader.h
@@ -46,6 +46,8 @@
#include <QtCore/qstringlist.h>
+#include <memory>
+
namespace qbs {
namespace Internal {
@@ -89,7 +91,7 @@ private:
QStringList m_searchPaths;
std::vector<QStringList> m_extraSearchPaths;
mutable QStringList m_allSearchPaths;
- ItemReaderVisitorState * const m_visitorState;
+ const std::unique_ptr<ItemReaderVisitorState> m_visitorState;
qint64 m_elapsedTime = -1;
};