Updated formatting for lambda

This commit is contained in:
Eism 2020-12-23 11:26:43 +02:00 committed by Igor Korsukov
parent 6fdcf30b23
commit 30ec4a7433
75 changed files with 708 additions and 697 deletions

View file

@ -24,7 +24,8 @@
using namespace mu::framework;
static XmlReader::TokenType convertTokenType(QXmlStreamReader::TokenType type) {
static XmlReader::TokenType convertTokenType(QXmlStreamReader::TokenType type)
{
switch (type) {
case QXmlStreamReader::TokenType::NoToken:
case QXmlStreamReader::TokenType::Invalid:

View file

@ -21,7 +21,6 @@
#include "libmscore/score.h"
namespace Ms {
//---------------------------------------------------------
// Event::Event
//---------------------------------------------------------

View file

@ -41,7 +41,8 @@ public:
IncludeSubdirs
};
virtual RetVal<io::paths> scanFiles(const io::path& rootDir, const QStringList& filters, ScanMode mode = ScanMode::IncludeSubdirs) const = 0;
virtual RetVal<io::paths> scanFiles(const io::path& rootDir, const QStringList& filters,
ScanMode mode = ScanMode::IncludeSubdirs) const = 0;
virtual RetVal<QByteArray> readFile(const io::path& filePath) const = 0;
};

View file

@ -30,7 +30,8 @@ public:
Ret makePath(const io::path& path) const override;
RetVal<io::paths> scanFiles(const io::path& rootDir, const QStringList& filters, ScanMode mode = ScanMode::IncludeSubdirs) const override;
RetVal<io::paths> scanFiles(const io::path& rootDir, const QStringList& filters,
ScanMode mode = ScanMode::IncludeSubdirs) const override;
RetVal<QByteArray> readFile(const io::path& filePath) const override;

View file

@ -25,13 +25,12 @@
#include "framework/global/modularity/imodulesetup.h"
namespace mu::testing {
class Environment
{
public:
using Modules = std::vector<framework::IModuleSetup*>;
using PostInit = std::function<void()>;
using PostInit = std::function<void ()>;
Environment() = default;
@ -49,12 +48,12 @@ class SuiteEnvironment
{
public:
SuiteEnvironment(const Environment::Modules& dependencyModules, const Environment::PostInit& postInit = nullptr) {
SuiteEnvironment(const Environment::Modules& dependencyModules, const Environment::PostInit& postInit = nullptr)
{
Environment::setDependency(dependencyModules);
Environment::setPostInit(postInit);
}
};
}
#endif // MU_TESTING_ENVIRONMENT_H

View file

@ -103,7 +103,7 @@ void VSTDevTools::makeArpeggio()
noteOn.setNote(n);
noteOn.setVelocity(velocity);
if (pitch) {
noteOn.setPitchNote(n + 12, 1.f);//1 octave + 1 semitone
noteOn.setPitchNote(n + 12, 1.f); //1 octave + 1 semitone
}
velocity -= 5461;
chunk.events.insert({ note_time, noteOn });

View file

@ -74,4 +74,3 @@ private:
}
#endif // MU_WORKSPACE_WORKSPACELISTMODEL_H

View file

@ -25,7 +25,6 @@
#include "val.h"
namespace mu::workspace {
enum class WorkspaceTag
{
UiArrangement,

View file

@ -47,7 +47,6 @@
#include "libmscore/volta.h"
#include "libmscore/segment.h"
namespace Bww {
/**
The writer that imports into MuseScore.

View file

@ -1891,7 +1891,7 @@ void GuitarPro6::readBars(QDomNode* barList, Measure* measure, ClefType oldClefI
int staffIdx = 0;
// used to keep track of tuplets
std::vector<Tuplet*> tuplets(staves * VOICES);
std::vector<Tuplet*> tuplets(staves* VOICES);
for (int track = 0; track < staves * VOICES; ++track) {
tuplets[track] = 0;
}

View file

@ -581,7 +581,6 @@ static void setPartInstruments(MxmlLogger* logger, const QXmlStreamReader* const
Convert SMuFL code points to MuseScore <sym>...</sym>
*/
namespace xmlpass2 {
static QString text2syms(const QString& t)
{
//QTime time;
@ -652,7 +651,6 @@ static QString text2syms(const QString& t)
*/
namespace xmlpass2 {
static QString decodeEntities(const QString& src)
{
QString ret(src);
@ -666,7 +664,6 @@ static QString decodeEntities(const QString& src)
}
return ret;
}
}
//---------------------------------------------------------
@ -680,7 +677,6 @@ static QString decodeEntities(const QString& src)
*/
namespace xmlpass2 {
static QString nextPartOfFormattedString(QXmlStreamReader& e)
{
//QString lang = e.attribute(QString("xml:lang"), "it");
@ -743,7 +739,6 @@ static QString nextPartOfFormattedString(QXmlStreamReader& e)
//qDebug("importedtext '%s'", qPrintable(importedtext));
return importedtext;
}
}
//---------------------------------------------------------

View file

@ -21,7 +21,8 @@ InspectorListModel::InspectorListModel(QObject* parent)
void InspectorListModel::buildModelsForSelectedElements(const QSet<Ms::ElementType>& selectedElementSet)
{
static QList<AbstractInspectorModel::InspectorSectionType> persistentSectionList = { AbstractInspectorModel::InspectorSectionType::SECTION_GENERAL };
static QList<AbstractInspectorModel::InspectorSectionType> persistentSectionList
= { AbstractInspectorModel::InspectorSectionType::SECTION_GENERAL };
removeUnusedModels(selectedElementSet, persistentSectionList);
@ -38,8 +39,10 @@ void InspectorListModel::buildModelsForSelectedElements(const QSet<Ms::ElementTy
void InspectorListModel::buildModelsForEmptySelection(const QSet<Ms::ElementType>& selectedElementSet)
{
static QList<AbstractInspectorModel::InspectorSectionType> persistentSectionList = { AbstractInspectorModel::InspectorSectionType::SECTION_SCORE_DISPLAY,
AbstractInspectorModel::InspectorSectionType::SECTION_SCORE_APPEARANCE
static QList<AbstractInspectorModel::InspectorSectionType> persistentSectionList
= { AbstractInspectorModel::InspectorSectionType::SECTION_SCORE_DISPLAY,
AbstractInspectorModel::InspectorSectionType::
SECTION_SCORE_APPEARANCE
};
removeUnusedModels(selectedElementSet, persistentSectionList);

View file

@ -28,5 +28,5 @@ static mu::testing::SuiteEnvironment libmscore_se(
},
[]() {
LOGI() << "libmscore tests suite post init";
}
}
);

View file

@ -100,6 +100,7 @@ ModulesSetup::ModulesSetup()
#ifdef BUILD_VST
<< new mu::vst::VSTModule()
#endif
//<< new mu::importexport::ImportExportModule()
<< new mu::inspector::InspectorModule()
<< new mu::palette::PaletteModule()

View file

@ -264,7 +264,6 @@ struct PaletteTree
};
using PaletteTreePtr = std::shared_ptr<PaletteTree>;
} // namespace Ms
Q_DECLARE_METATYPE(const Ms::PaletteCell*)

View file

@ -1577,6 +1577,21 @@ pp_if_indent_code = false # false/true
# Whether to indent '#define' at the brace level (true) or from column 1 (false)
pp_define_at_level = false # false/true
#
# Use or Do not Use options
#
# The value might be used twice:
# - at the assignment
# - at the opening brace
#
# To prevent the double use of the indentation value, use this option with the
# value 'true'.
#
# true: indentation will be used only once
# false: indentation will be used every time (default)
indent_cpp_lambda_only_once = true # true/false
# You can force a token to be a type with the 'type' option.
# Example:
# type myfoo1 myfoo2