forked from qt-creator/qt-creator
ClangFormat: Add disable option
- Added a possibility to disable ClangFormat plugin - Removed unneeded properties from clangformatsettings Change-Id: If71f46670e4fd3d2dac6d18c97df5a811504ed5e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -40,14 +40,11 @@ ClangFormatSettings::ClangFormatSettings()
|
||||
{
|
||||
QSettings *settings = Core::ICore::settings();
|
||||
settings->beginGroup(QLatin1String(Constants::SETTINGS_ID));
|
||||
m_formatCodeInsteadOfIndent
|
||||
= settings->value(QLatin1String(Constants::FORMAT_CODE_INSTEAD_OF_INDENT_ID), false).toBool();
|
||||
m_formatWhileTyping = settings->value(QLatin1String(Constants::FORMAT_WHILE_TYPING_ID), false)
|
||||
.toBool();
|
||||
m_formatOnSave = settings->value(QLatin1String(Constants::FORMAT_CODE_ON_SAVE_ID), false)
|
||||
.toBool();
|
||||
m_overrideDefaultFile = settings->value(QLatin1String(Constants::OVERRIDE_FILE_ID), false)
|
||||
.toBool();
|
||||
m_mode = static_cast<ClangFormatSettings::Mode>(
|
||||
settings->value(QLatin1String(Constants::MODE_ID), ClangFormatSettings::Mode::Indenting)
|
||||
.toInt());
|
||||
settings->endGroup();
|
||||
}
|
||||
|
||||
@@ -55,44 +52,11 @@ void ClangFormatSettings::write() const
|
||||
{
|
||||
QSettings *settings = Core::ICore::settings();
|
||||
settings->beginGroup(QLatin1String(Constants::SETTINGS_ID));
|
||||
settings->setValue(QLatin1String(Constants::FORMAT_CODE_INSTEAD_OF_INDENT_ID),
|
||||
m_formatCodeInsteadOfIndent);
|
||||
settings->setValue(QLatin1String(Constants::FORMAT_WHILE_TYPING_ID), m_formatWhileTyping);
|
||||
settings->setValue(QLatin1String(Constants::FORMAT_CODE_ON_SAVE_ID), m_formatOnSave);
|
||||
settings->setValue(QLatin1String(Constants::OVERRIDE_FILE_ID), m_overrideDefaultFile);
|
||||
settings->setValue(QLatin1String(Constants::MODE_ID), static_cast<int>(m_mode));
|
||||
settings->endGroup();
|
||||
}
|
||||
|
||||
void ClangFormatSettings::setFormatCodeInsteadOfIndent(bool enable)
|
||||
{
|
||||
m_formatCodeInsteadOfIndent = enable;
|
||||
}
|
||||
|
||||
bool ClangFormatSettings::formatCodeInsteadOfIndent() const
|
||||
{
|
||||
return m_formatCodeInsteadOfIndent;
|
||||
}
|
||||
|
||||
void ClangFormatSettings::setFormatWhileTyping(bool enable)
|
||||
{
|
||||
m_formatWhileTyping = enable;
|
||||
}
|
||||
|
||||
bool ClangFormatSettings::formatWhileTyping() const
|
||||
{
|
||||
return m_formatWhileTyping;
|
||||
}
|
||||
|
||||
void ClangFormatSettings::setFormatOnSave(bool enable)
|
||||
{
|
||||
m_formatOnSave = enable;
|
||||
}
|
||||
|
||||
bool ClangFormatSettings::formatOnSave() const
|
||||
{
|
||||
return m_formatOnSave;
|
||||
}
|
||||
|
||||
void ClangFormatSettings::setOverrideDefaultFile(bool enable)
|
||||
{
|
||||
m_overrideDefaultFile = enable;
|
||||
@@ -103,4 +67,14 @@ bool ClangFormatSettings::overrideDefaultFile() const
|
||||
return m_overrideDefaultFile;
|
||||
}
|
||||
|
||||
void ClangFormatSettings::setMode(Mode mode)
|
||||
{
|
||||
m_mode = mode;
|
||||
}
|
||||
|
||||
ClangFormatSettings::Mode ClangFormatSettings::mode() const
|
||||
{
|
||||
return m_mode;
|
||||
}
|
||||
|
||||
} // namespace ClangFormat
|
||||
|
||||
Reference in New Issue
Block a user