diff --git a/src/plugins/beautifier/configurationdialog.cpp b/src/plugins/beautifier/configurationdialog.cpp index 9d3cf5f5cc8..9f37fe5225b 100644 --- a/src/plugins/beautifier/configurationdialog.cpp +++ b/src/plugins/beautifier/configurationdialog.cpp @@ -114,14 +114,6 @@ void ConfigurationDialog::setSettings(AbstractSettings *settings) m_editor->setSettings(m_settings); } -void ConfigurationDialog::clear() -{ - m_name->clear(); - m_editor->clear(); - m_currentKey.clear(); - updateOkButton(); -} - QString ConfigurationDialog::key() const { return m_name->text().simplified(); diff --git a/src/plugins/beautifier/configurationdialog.h b/src/plugins/beautifier/configurationdialog.h index 417541fbd95..f739154a3ad 100644 --- a/src/plugins/beautifier/configurationdialog.h +++ b/src/plugins/beautifier/configurationdialog.h @@ -24,7 +24,6 @@ public: ~ConfigurationDialog() override; void setSettings(AbstractSettings *settings); - void clear(); QString key() const; void setKey(const QString &key); QString value() const; diff --git a/src/plugins/beautifier/configurationeditor.cpp b/src/plugins/beautifier/configurationeditor.cpp index 1a365dc4e7c..6d244a6544b 100644 --- a/src/plugins/beautifier/configurationeditor.cpp +++ b/src/plugins/beautifier/configurationeditor.cpp @@ -22,8 +22,6 @@ ConfigurationSyntaxHighlighter::ConfigurationSyntaxHighlighter(QTextDocument *pa const TextEditor::FontSettings fs = TextEditor::TextEditorSettings::fontSettings(); m_formatKeyword = fs.toTextCharFormat(TextEditor::C_FIELD); m_formatComment = fs.toTextCharFormat(TextEditor::C_COMMENT); - - m_expressionComment.setPattern("#[^\\n]*"); } void ConfigurationSyntaxHighlighter::setKeywords(const QStringList &keywords) @@ -41,11 +39,6 @@ void ConfigurationSyntaxHighlighter::setKeywords(const QStringList &keywords) m_expressionKeyword.setPattern("(?:\\s|^)(" + pattern.join('|') + ")(?=\\s|\\:|\\=|\\,|$)"); } -void ConfigurationSyntaxHighlighter::setCommentExpression(const QRegularExpression &rx) -{ - m_expressionComment = rx; -} - void ConfigurationSyntaxHighlighter::highlightBlock(const QString &text) { QRegularExpressionMatchIterator it = m_expressionKeyword.globalMatch(text); @@ -54,7 +47,8 @@ void ConfigurationSyntaxHighlighter::highlightBlock(const QString &text) setFormat(match.capturedStart(), match.capturedLength(), m_formatKeyword); } - it = m_expressionComment.globalMatch(text); + static const QRegularExpression expressionComment("#[^\\n]*"); + it = expressionComment.globalMatch(text); while (it.hasNext()) { const QRegularExpressionMatch match = it.next(); setFormat(match.capturedStart(), match.capturedLength(), m_formatComment); @@ -93,11 +87,6 @@ void ConfigurationEditor::setSettings(AbstractSettings *settings) m_model->setStringList(keywords); } -void ConfigurationEditor::setCommentExpression(const QRegularExpression &rx) -{ - m_highlighter->setCommentExpression(rx); -} - // Workaround for handling "ESC" right when popup is shown. bool ConfigurationEditor::eventFilter(QObject *object, QEvent *event) { diff --git a/src/plugins/beautifier/configurationeditor.h b/src/plugins/beautifier/configurationeditor.h index 35b21d72866..03571fd7b93 100644 --- a/src/plugins/beautifier/configurationeditor.h +++ b/src/plugins/beautifier/configurationeditor.h @@ -25,14 +25,12 @@ class ConfigurationSyntaxHighlighter : public QSyntaxHighlighter public: explicit ConfigurationSyntaxHighlighter(QTextDocument *parent); void setKeywords(const QStringList &keywords); - void setCommentExpression(const QRegularExpression &rx); protected: void highlightBlock(const QString &text) override; private: QRegularExpression m_expressionKeyword; - QRegularExpression m_expressionComment; QTextCharFormat m_formatKeyword; QTextCharFormat m_formatComment; }; @@ -44,7 +42,6 @@ class ConfigurationEditor : public QPlainTextEdit public: explicit ConfigurationEditor(QWidget *parent = nullptr); void setSettings(AbstractSettings *settings); - void setCommentExpression(const QRegularExpression &rx); protected: bool eventFilter(QObject *object, QEvent *event) override;