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

Beautifier: Fix code style

Browse Source 
Change-Id: I991f47d2f6844b153cd47ac856e5a76a7a962c94
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Lorenz Haas
2016-06-01 18:12:51 +02:00
committed by hjk
parent 09029041c9
commit cd00e64e37
10 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/beautifier/artisticstyle/artisticstyle.cpp
View File

@@ -79,7 +79,7 @@ bool ArtisticStyle::initialize()
Core::ActionManager::actionContainer(Constants::MENU_ID)->addMenu(menu); Core::ActionManager::actionContainer(Constants::MENU_ID)->addMenu(menu);
connect(m_settings, &ArtisticStyleSettings::supportedMimeTypesChanged, connect(m_settings, &ArtisticStyleSettings::supportedMimeTypesChanged,
[this](){updateActions(Core::EditorManager::instance()->currentEditor());}); [this] { updateActions(Core::EditorManager::currentEditor()); });
return true; return true;
} }

2
src/plugins/beautifier/beautifierplugin.cpp
View File

@@ -314,7 +314,7 @@ void BeautifierPlugin::formatEditorAsync(TextEditorWidget *editor, const Command
QFutureWatcher<FormatTask> *watcher = new QFutureWatcher<FormatTask>; QFutureWatcher<FormatTask> *watcher = new QFutureWatcher<FormatTask>;
const TextDocument *doc = editor->textDocument(); const TextDocument *doc = editor->textDocument();
connect(doc, &TextDocument::contentsChanged, watcher, &QFutureWatcher<FormatTask>::cancel); connect(doc, &TextDocument::contentsChanged, watcher, &QFutureWatcher<FormatTask>::cancel);
connect(watcher, &QFutureWatcherBase::finished, [this, watcher]() { connect(watcher, &QFutureWatcherBase::finished, [this, watcher] {
if (watcher->isCanceled()) if (watcher->isCanceled())
showError(tr("File was modified.")); showError(tr("File was modified."));
else else

4
src/plugins/beautifier/clangformat/clangformat.cpp
View File

@@ -91,14 +91,14 @@ bool ClangFormat::initialize()
Core::ActionManager::actionContainer(Constants::MENU_ID)->addMenu(menu); Core::ActionManager::actionContainer(Constants::MENU_ID)->addMenu(menu);
connect(m_settings, &ClangFormatSettings::supportedMimeTypesChanged, connect(m_settings, &ClangFormatSettings::supportedMimeTypesChanged,
[this](){updateActions(Core::EditorManager::instance()->currentEditor());}); [this] { updateActions(Core::EditorManager::currentEditor()); });
return true; return true;
} }
void ClangFormat::updateActions(Core::IEditor *editor) void ClangFormat::updateActions(Core::IEditor *editor)
{ {
const bool enabled = (editor && m_settings->isApplicable(editor->document())); const bool enabled = editor && m_settings->isApplicable(editor->document());
m_formatFile->setEnabled(enabled); m_formatFile->setEnabled(enabled);
m_formatRange->setEnabled(enabled); m_formatRange->setEnabled(enabled);
} }

2
src/plugins/beautifier/configurationeditor.cpp
View File

@@ -164,7 +164,7 @@ void ConfigurationEditor::keyPressEvent(QKeyEvent *event)
} }
} }
const bool isShortcut = ((event->modifiers() & Qt::ControlModifier) && key == Qt::Key_Space); const bool isShortcut = (event->modifiers() & Qt::ControlModifier) && key == Qt::Key_Space;
if (!isShortcut) if (!isShortcut)
QPlainTextEdit::keyPressEvent(event); QPlainTextEdit::keyPressEvent(event);

4
src/plugins/beautifier/configurationpanel.cpp
View File

@@ -118,8 +118,8 @@ void ConfigurationPanel::populateConfigurations(const QString &key)
void ConfigurationPanel::updateButtons() void ConfigurationPanel::updateButtons()
{ {
const bool enabled = ((ui->configurations->count() > 0) const bool enabled = (ui->configurations->count() > 0)
&& !m_settings->styleIsReadOnly(ui->configurations->currentText())); && !m_settings->styleIsReadOnly(ui->configurations->currentText());
ui->remove->setEnabled(enabled); ui->remove->setEnabled(enabled);
ui->edit->setEnabled(enabled); ui->edit->setEnabled(enabled);
} }

2
src/plugins/beautifier/generaloptionspage.cpp
View File

@@ -64,7 +64,7 @@ void GeneralOptionsPageWidget::restore()
void GeneralOptionsPageWidget::apply(bool *autoFormatChanged) void GeneralOptionsPageWidget::apply(bool *autoFormatChanged)
{ {
if (autoFormatChanged) if (autoFormatChanged)
*autoFormatChanged = (m_settings->autoFormatOnSave() != ui->autoFormat->isChecked()); *autoFormatChanged = m_settings->autoFormatOnSave() != ui->autoFormat->isChecked();
m_settings->setAutoFormatOnSave(ui->autoFormat->isChecked()); m_settings->setAutoFormatOnSave(ui->autoFormat->isChecked());
m_settings->setAutoFormatTool(ui->autoFormatTool->currentText()); m_settings->setAutoFormatTool(ui->autoFormatTool->currentText());

4
src/plugins/beautifier/uncrustify/uncrustify.cpp
View File

@@ -87,7 +87,7 @@ bool Uncrustify::initialize()
Core::ActionManager::actionContainer(Constants::MENU_ID)->addMenu(menu); Core::ActionManager::actionContainer(Constants::MENU_ID)->addMenu(menu);
connect(m_settings, &UncrustifySettings::supportedMimeTypesChanged, connect(m_settings, &UncrustifySettings::supportedMimeTypesChanged,
[this](){updateActions(Core::EditorManager::instance()->currentEditor());}); [this] { updateActions(Core::EditorManager::currentEditor()); });
return true; return true;
} }
@@ -99,7 +99,7 @@ QString Uncrustify::id() const
void Uncrustify::updateActions(Core::IEditor *editor) void Uncrustify::updateActions(Core::IEditor *editor)
{ {
const bool enabled = (editor && m_settings->isApplicable(editor->document())); const bool enabled = editor && m_settings->isApplicable(editor->document());
m_formatFile->setEnabled(enabled); m_formatFile->setEnabled(enabled);
m_formatRange->setEnabled(enabled); m_formatRange->setEnabled(enabled);
} }