aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/language
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/corelib/language')
-rw-r--r--src/lib/corelib/language/language.cpp2
-rw-r--r--src/lib/corelib/language/moduleloader.cpp3
-rw-r--r--src/lib/corelib/language/projectresolver.cpp3
3 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp
index 53715fd57..8608e08c7 100644
--- a/src/lib/corelib/language/language.cpp
+++ b/src/lib/corelib/language/language.cpp
@@ -356,7 +356,7 @@ FileTags ResolvedProduct::fileTagsForFileName(const QString &fileName) const
return result;
}
} else {
- priority.reset(new int(tagger->priority()));
+ priority = std::make_unique<int>(tagger->priority());
}
result.unite(tagger->fileTags());
break;
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index 5568febbd..1aeca0411 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -79,6 +79,7 @@
#include <QtScript/qscriptvalueiterator.h>
#include <algorithm>
+#include <memory>
#include <utility>
namespace qbs {
@@ -292,7 +293,7 @@ ModuleLoaderResult ModuleLoader::load(const SetupProjectParameters &parameters)
= m_elapsedTimePropertyChecking = 0;
m_elapsedTimeProbes = 0;
m_probesEncountered = m_probesRun = m_probesCachedCurrent = m_probesCachedOld = 0;
- m_settings.reset(new Settings(parameters.settingsDirectory()));
+ m_settings = std::make_unique<Settings>(parameters.settingsDirectory());
const auto keys = m_parameters.overriddenValues().keys();
for (const QString &key : keys) {
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp
index 868ad32af..6b678cb8f 100644
--- a/src/lib/corelib/language/projectresolver.cpp
+++ b/src/lib/corelib/language/projectresolver.cpp
@@ -71,6 +71,7 @@
#include <QtCore/qregexp.h>
#include <algorithm>
+#include <memory>
#include <queue>
namespace qbs {
@@ -810,7 +811,7 @@ void ProjectResolver::resolveGroupFully(Item *item, ProjectResolver::ProjectCont
group->targetOfModule = moduleProp->value().toString();
ErrorInfo fileError;
if (!patterns.empty()) {
- group->wildcards = std::unique_ptr<SourceWildCards>(new SourceWildCards);
+ group->wildcards = std::make_unique<SourceWildCards>();
SourceWildCards *wildcards = group->wildcards.get();
wildcards->group = group.get();
wildcards->excludePatterns = m_evaluator->stringListValue(