diff --git a/src/SeerEditorConfigPage.cpp b/src/SeerEditorConfigPage.cpp index 867c910..c7a24f4 100644 --- a/src/SeerEditorConfigPage.cpp +++ b/src/SeerEditorConfigPage.cpp @@ -145,7 +145,7 @@ void SeerEditorConfigPage::setHighlighterSettings (const SeerHighlighterSettings highlighterTableWidget->resizeColumnToContents(2); // Foreground color highlighterTableWidget->resizeColumnToContents(3); // Background color - highlighterSuffixesLineEdit->setText(_highlighterSettings.sourceSuffixes()); + highlighterSuffixesLineEdit->setText(_highlighterSettings.cppSourceSuffixes()); highlighterSuffixesLineEdit->setCursorPosition(0); // Update our sample editor. diff --git a/src/SeerHighlighterSettings.cpp b/src/SeerHighlighterSettings.cpp index 7330363..0f0dc9c 100644 --- a/src/SeerHighlighterSettings.cpp +++ b/src/SeerHighlighterSettings.cpp @@ -19,7 +19,7 @@ SeerHighlighterSettings& SeerHighlighterSettings::operator= (const SeerHighlight _keys = rhs._keys; _formats = rhs._formats; - _sourceSuffixes = rhs._sourceSuffixes; + _cppSourceSuffixes = rhs._cppSourceSuffixes; return *this; } @@ -72,12 +72,12 @@ int SeerHighlighterSettings::count () const { void SeerHighlighterSettings::setSourceSuffixes (const QString& suffixes) { - _sourceSuffixes = suffixes; + _cppSourceSuffixes = suffixes; } -const QString& SeerHighlighterSettings::sourceSuffixes () { +const QString& SeerHighlighterSettings::cppSourceSuffixes () { - return _sourceSuffixes; + return _cppSourceSuffixes; } QStringList SeerHighlighterSettings::themeNames() { diff --git a/src/SeerHighlighterSettings.h b/src/SeerHighlighterSettings.h index e6c3831..e7be692 100644 --- a/src/SeerHighlighterSettings.h +++ b/src/SeerHighlighterSettings.h @@ -24,7 +24,7 @@ class SeerHighlighterSettings { void add (const QString& name, QTextCharFormat& format); int count () const; void setSourceSuffixes (const QString& suffixes); - const QString& sourceSuffixes (); + const QString& cppSourceSuffixes (); static QStringList themeNames (); static SeerHighlighterSettings populate (const QString& themeName); @@ -34,6 +34,6 @@ class SeerHighlighterSettings { private: QList _keys; QList _formats; - QString _sourceSuffixes; + QString _cppSourceSuffixes; }; diff --git a/src/SeerMainWindow.cpp b/src/SeerMainWindow.cpp index fbc8c53..66807cd 100644 --- a/src/SeerMainWindow.cpp +++ b/src/SeerMainWindow.cpp @@ -1552,7 +1552,7 @@ void SeerMainWindow::writeConfigSettings () { } settings.endGroup(); } - settings.setValue("suffixes", highlighter.sourceSuffixes()); + settings.setValue("suffixes", highlighter.cppSourceSuffixes()); } settings.endGroup(); } settings.endGroup(); diff --git a/src/SeerSourceHighlighter.cpp b/src/SeerSourceHighlighter.cpp index 9c3dee3..7f28233 100644 --- a/src/SeerSourceHighlighter.cpp +++ b/src/SeerSourceHighlighter.cpp @@ -14,7 +14,7 @@ const SeerHighlighterSettings& SeerSourceHighlighter::highlighterSettings() { } SeerSourceHighlighter* getSourceHighlighter(QString const& file, SeerHighlighterSettings settings) { - QRegularExpression cpp_re("(?:" + settings.sourceSuffixes() + ")$"); + QRegularExpression cpp_re("(?:" + settings.cppSourceSuffixes() + ")$"); if (file.contains(cpp_re)) { return new SeerCppSourceHighlighter(0); }