forked from qt-creator/qt-creator
Utils: More forward declarations / drop unused headers [D-G]
Round 1 - focus on headers. For classes with initial in range [D-G]. Try to keep the same separators between different kind of headers. Change-Id: Id42cd7b3743a816f75cecb6b576c0e37cb057473 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -26,6 +26,7 @@
|
||||
#include "environment.h"
|
||||
|
||||
#include "algorithm.h"
|
||||
#include "fileutils.h"
|
||||
#include "qtcassert.h"
|
||||
|
||||
#include <QDebug>
|
||||
@@ -34,12 +35,12 @@
|
||||
#include <QSet>
|
||||
#include <QCoreApplication>
|
||||
|
||||
Q_GLOBAL_STATIC_WITH_ARGS(Utils::Environment, staticSystemEnvironment,
|
||||
namespace Utils {
|
||||
|
||||
Q_GLOBAL_STATIC_WITH_ARGS(Environment, staticSystemEnvironment,
|
||||
(QProcessEnvironment::systemEnvironment().toStringList()))
|
||||
|
||||
Q_GLOBAL_STATIC(QVector<Utils::EnvironmentProvider>, environmentProviders)
|
||||
|
||||
namespace Utils {
|
||||
Q_GLOBAL_STATIC(QVector<EnvironmentProvider>, environmentProviders)
|
||||
|
||||
QProcessEnvironment Environment::toProcessEnvironment() const
|
||||
{
|
||||
@@ -126,7 +127,7 @@ void Environment::prependOrSetLibrarySearchPath(const FilePath &value)
|
||||
|
||||
void Environment::prependOrSetLibrarySearchPaths(const FilePaths &values)
|
||||
{
|
||||
Utils::reverseForeach(values, [this](const FilePath &value) {
|
||||
reverseForeach(values, [this](const FilePath &value) {
|
||||
prependOrSetLibrarySearchPath(value);
|
||||
});
|
||||
}
|
||||
@@ -406,7 +407,7 @@ FilePath Environment::expandVariables(const FilePath &variables) const
|
||||
|
||||
QStringList Environment::expandVariables(const QStringList &variables) const
|
||||
{
|
||||
return Utils::transform(variables, [this](const QString &i) { return expandVariables(i); });
|
||||
return transform(variables, [this](const QString &i) { return expandVariables(i); });
|
||||
}
|
||||
|
||||
void EnvironmentProvider::addProvider(EnvironmentProvider &&provider)
|
||||
|
||||
Reference in New Issue
Block a user