feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Meson: partially clang-format all files

Browse Source 
Change-Id: Ie621792417e89aa732311129f0cfa99a5147183a
Reviewed-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Alexis Jeandet
2020-10-27 22:36:27 +01:00
committed by hjk
parent e35dfd592f
commit 09eeab7737
8 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/mesonprojectmanager/exewrappers/mesontools.h
View File

@@ -46,7 +46,6 @@ class MesonTools : public QObject
public: public:
using Tool_t = std::shared_ptr<ToolWrapper>; using Tool_t = std::shared_ptr<ToolWrapper>;
static bool isMesonWrapper(const Tool_t &tool); static bool isMesonWrapper(const Tool_t &tool);
static bool isNinjaWrapper(const Tool_t &tool); static bool isNinjaWrapper(const Tool_t &tool);

3
src/plugins/mesonprojectmanager/mesoninfoparser/parsers/buildsystemfilesparser.h
View File

@@ -38,8 +38,7 @@ namespace Internal {
class BuildSystemFilesParser class BuildSystemFilesParser
{ {
std::vector<Utils::FilePath> m_files; std::vector<Utils::FilePath> m_files;
static void appendFiles(const Utils::optional<QJsonArray> &arr, static void appendFiles(const Utils::optional<QJsonArray> &arr, std::vector<Utils::FilePath> &dest)
std::vector<Utils::FilePath> &dest)
{ {
if (arr) if (arr)
std::transform(std::cbegin(*arr), std::transform(std::cbegin(*arr),

4
src/plugins/mesonprojectmanager/mesoninfoparser/parsers/common.h
View File

@@ -101,9 +101,7 @@ inline Utils::optional<QJsonObject> get<QJsonObject>(const QJsonObject &obj, con
} }
template<typename T, typename... Strings> template<typename T, typename... Strings>
inline Utils::optional<T> get(const QJsonObject &obj, inline Utils::optional<T> get(const QJsonObject &obj, const QString &firstPath, const Strings &...path)
const QString &firstPath,
const Strings &... path)
{ {
if (obj.contains(firstPath)) if (obj.contains(firstPath))
return get<T>(obj[firstPath].toObject(), path...); return get<T>(obj[firstPath].toObject(), path...);

1
src/plugins/mesonprojectmanager/project/buildoptions/mesonbuildsettingswidget.h
View File

@@ -32,7 +32,6 @@
#include <QTimer> #include <QTimer>
#include <QWidget> #include <QWidget>
namespace MesonProjectManager { namespace MesonProjectManager {
namespace Internal { namespace Internal {

1
src/plugins/mesonprojectmanager/settings/tools/toolsmodel.cpp
View File

@@ -87,7 +87,6 @@ void ToolsModel::apply()
while (!m_itemsToRemove.isEmpty()) { while (!m_itemsToRemove.isEmpty()) {
MesonTools::removeTool(m_itemsToRemove.dequeue()); MesonTools::removeTool(m_itemsToRemove.dequeue());
} }
} }
void ToolsModel::addMesonTool(const MesonTools::Tool_t &tool) void ToolsModel::addMesonTool(const MesonTools::Tool_t &tool)

2
src/plugins/mesonprojectmanager/settings/tools/tooltreeitem.h
View File

@@ -26,8 +26,8 @@
#pragma once #pragma once
#include "toolssettingspage.h" #include "toolssettingspage.h"
#include <exewrappers/mesontools.h> #include <exewrappers/mesontools.h>
#include <utils/id.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/id.h>
#include <utils/optional.h> #include <utils/optional.h>
#include <utils/treemodel.h> #include <utils/treemodel.h>
#include <QCoreApplication> #include <QCoreApplication>