Commit e7789de2 authored by Lorenz Haas's avatar Lorenz Haas Committed by David Schulz

Beautifier: Add const wherever applicable

Change-Id: Iba3e5793bfd0e4057074e2b04e6353ba09aa4a5f
Reviewed-by: default avatarDavid Schulz <david.schulz@theqtcompany.com>
parent f06482ca
...@@ -82,7 +82,7 @@ bool AbstractSettings::styleExists(const QString &key) const ...@@ -82,7 +82,7 @@ bool AbstractSettings::styleExists(const QString &key) const
bool AbstractSettings::styleIsReadOnly(const QString &key) bool AbstractSettings::styleIsReadOnly(const QString &key)
{ {
QFileInfo fi(m_styleDir.absoluteFilePath(key + m_ending)); const QFileInfo fi(m_styleDir.absoluteFilePath(key + m_ending));
if (!fi.exists()) { if (!fi.exists()) {
// newly added style which was not saved yet., thus it is not read only. // newly added style which was not saved yet., thus it is not read only.
//TODO In a later version when we have predefined styles in Core::ICore::resourcePath() //TODO In a later version when we have predefined styles in Core::ICore::resourcePath()
......
...@@ -142,7 +142,7 @@ QString BeautifierPlugin::format(const QString &text, const Command &command, ...@@ -142,7 +142,7 @@ QString BeautifierPlugin::format(const QString &text, const Command &command,
switch (command.processing()) { switch (command.processing()) {
case Command::FileProcessing: { case Command::FileProcessing: {
// Save text to temporary file // Save text to temporary file
QFileInfo fi(fileName); const QFileInfo fi(fileName);
Utils::TempFileSaver sourceFile(QDir::tempPath() + QLatin1String("/qtc_beautifier_XXXXXXXX.") Utils::TempFileSaver sourceFile(QDir::tempPath() + QLatin1String("/qtc_beautifier_XXXXXXXX.")
+ fi.suffix()); + fi.suffix());
sourceFile.setAutoRemove(true); sourceFile.setAutoRemove(true);
...@@ -396,7 +396,7 @@ void BeautifierPlugin::formatCurrentFileContinue(QObject *watcher) ...@@ -396,7 +396,7 @@ void BeautifierPlugin::formatCurrentFileContinue(QObject *watcher)
// Restore folded blocks // Restore folded blocks
const QTextDocument *doc = textEditor->document(); const QTextDocument *doc = textEditor->document();
foreach (const int blockId, foldedBlocks) { foreach (const int blockId, foldedBlocks) {
QTextBlock block = doc->findBlockByNumber(qMax(0, blockId)); const QTextBlock block = doc->findBlockByNumber(qMax(0, blockId));
if (block.isValid()) if (block.isValid())
TextDocumentLayout::doFoldOrUnfold(block, false); TextDocumentLayout::doFoldOrUnfold(block, false);
} }
......
...@@ -112,11 +112,12 @@ void ClangFormat::formatFile() ...@@ -112,11 +112,12 @@ void ClangFormat::formatFile()
void ClangFormat::formatSelectedText() void ClangFormat::formatSelectedText()
{ {
TextEditor::TextEditorWidget *widget = TextEditor::TextEditorWidget::currentTextEditorWidget(); const TextEditor::TextEditorWidget *widget
= TextEditor::TextEditorWidget::currentTextEditorWidget();
if (!widget) if (!widget)
return; return;
QTextCursor tc = widget->textCursor(); const QTextCursor tc = widget->textCursor();
if (tc.hasSelection()) { if (tc.hasSelection()) {
const int offset = tc.selectionStart(); const int offset = tc.selectionStart();
const int length = tc.selectionEnd() - offset; const int length = tc.selectionEnd() - offset;
......
...@@ -69,7 +69,7 @@ ClangFormatOptionsPageWidget::~ClangFormatOptionsPageWidget() ...@@ -69,7 +69,7 @@ ClangFormatOptionsPageWidget::~ClangFormatOptionsPageWidget()
void ClangFormatOptionsPageWidget::restore() void ClangFormatOptionsPageWidget::restore()
{ {
ui->command->setPath(m_settings->command()); ui->command->setPath(m_settings->command());
int textIndex = ui->predefinedStyle->findText(m_settings->predefinedStyle()); const int textIndex = ui->predefinedStyle->findText(m_settings->predefinedStyle());
if (textIndex != -1) if (textIndex != -1)
ui->predefinedStyle->setCurrentIndex(textIndex); ui->predefinedStyle->setCurrentIndex(textIndex);
ui->formatEntireFileFallback->setChecked(m_settings->formatEntireFileFallback()); ui->formatEntireFileFallback->setChecked(m_settings->formatEntireFileFallback());
......
...@@ -137,9 +137,7 @@ QString ConfigurationDialog::value() const ...@@ -137,9 +137,7 @@ QString ConfigurationDialog::value() const
void ConfigurationDialog::updateOkButton() void ConfigurationDialog::updateOkButton()
{ {
const QString key = ui->name->text().simplified(); const QString key = ui->name->text().simplified();
bool exists = false; const bool exists = m_settings && key != m_currentKey && m_settings->styleExists(key);
if (m_settings && key != m_currentKey)
exists = m_settings->styleExists(key);
ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!(key.isEmpty() || exists)); ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!(key.isEmpty() || exists));
} }
......
...@@ -139,7 +139,7 @@ void ConfigurationEditor::setCommentExpression(const QRegExp &rx) ...@@ -139,7 +139,7 @@ void ConfigurationEditor::setCommentExpression(const QRegExp &rx)
bool ConfigurationEditor::eventFilter(QObject *object, QEvent *event) bool ConfigurationEditor::eventFilter(QObject *object, QEvent *event)
{ {
if (event->type() == QEvent::ShortcutOverride) { if (event->type() == QEvent::ShortcutOverride) {
QKeyEvent *key = static_cast<QKeyEvent *>(event); const QKeyEvent *key = static_cast<const QKeyEvent *>(event);
if (key->key() == Qt::Key_Escape) { if (key->key() == Qt::Key_Escape) {
event->accept(); event->accept();
m_completer->popup()->hide(); m_completer->popup()->hide();
...@@ -176,7 +176,7 @@ void ConfigurationEditor::keyPressEvent(QKeyEvent *event) ...@@ -176,7 +176,7 @@ void ConfigurationEditor::keyPressEvent(QKeyEvent *event)
QPlainTextEdit::keyPressEvent(event); QPlainTextEdit::keyPressEvent(event);
const int cursorPosition = textCursor().position(); const int cursorPosition = textCursor().position();
QTextCursor cursor = cursorForTextUnderCursor(); const QTextCursor cursor = cursorForTextUnderCursor();
const QString prefix = cursor.selectedText(); const QString prefix = cursor.selectedText();
if (!isShortcut && (prefix.length() < 2 || cursorPosition != cursor.position())) { if (!isShortcut && (prefix.length() < 2 || cursorPosition != cursor.position())) {
......
...@@ -65,7 +65,7 @@ void ConfigurationPanel::setSettings(AbstractSettings *settings) ...@@ -65,7 +65,7 @@ void ConfigurationPanel::setSettings(AbstractSettings *settings)
void ConfigurationPanel::setCurrentConfiguration(const QString &text) void ConfigurationPanel::setCurrentConfiguration(const QString &text)
{ {
int textIndex = ui->configurations->findText(text); const int textIndex = ui->configurations->findText(text);
if (textIndex != -1) if (textIndex != -1)
ui->configurations->setCurrentIndex(textIndex); ui->configurations->setCurrentIndex(textIndex);
} }
...@@ -117,7 +117,7 @@ void ConfigurationPanel::populateConfigurations(const QString &key) ...@@ -117,7 +117,7 @@ void ConfigurationPanel::populateConfigurations(const QString &key)
const QString currentText = (!key.isEmpty()) ? key : ui->configurations->currentText(); const QString currentText = (!key.isEmpty()) ? key : ui->configurations->currentText();
ui->configurations->clear(); ui->configurations->clear();
ui->configurations->addItems(m_settings->styles()); ui->configurations->addItems(m_settings->styles());
int textIndex = ui->configurations->findText(currentText); const int textIndex = ui->configurations->findText(currentText);
if (textIndex != -1) if (textIndex != -1)
ui->configurations->setCurrentIndex(textIndex); ui->configurations->setCurrentIndex(textIndex);
updateButtons(); updateButtons();
......
...@@ -130,7 +130,8 @@ void Uncrustify::formatSelectedText() ...@@ -130,7 +130,8 @@ void Uncrustify::formatSelectedText()
return; return;
} }
TextEditor::TextEditorWidget *widget = TextEditor::TextEditorWidget::currentTextEditorWidget(); const TextEditor::TextEditorWidget *widget
= TextEditor::TextEditorWidget::currentTextEditorWidget();
if (!widget) if (!widget)
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment