diff options
author | David Schulz <david.schulz@theqtcompany.com> | 2016-05-02 09:10:39 +0200 |
---|---|---|
committer | David Schulz <david.schulz@theqtcompany.com> | 2016-05-25 13:56:32 +0000 |
commit | 0ba4f52ca0a862fbf8dab429461ecb6d15d42fcd (patch) | |
tree | 5dbbe2af323f84225bab1b198e7cbf491c5cb3ac /src/plugins/texteditor/completionsettings.cpp | |
parent | 509c977f30bbd0e517c667784db3ed8359a5a883 (diff) |
Editor: Simplify completion settings.
Change-Id: If7840fcac0c620b97082229a9f93874dc7afe738
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/texteditor/completionsettings.cpp')
-rw-r--r-- | src/plugins/texteditor/completionsettings.cpp | 110 |
1 files changed, 53 insertions, 57 deletions
diff --git a/src/plugins/texteditor/completionsettings.cpp b/src/plugins/texteditor/completionsettings.cpp index 83290cc5e1..98b356fab3 100644 --- a/src/plugins/texteditor/completionsettings.cpp +++ b/src/plugins/texteditor/completionsettings.cpp @@ -27,86 +27,82 @@ #include <QSettings> -static const char groupPostfix[] = "Completion"; -static const char caseSensitivityKey[] = "CaseSensitivity"; -static const char completionTriggerKey[] = "CompletionTrigger"; +static const char groupPostfix[] = "Completion"; +static const char caseSensitivityKey[] = "CaseSensitivity"; +static const char completionTriggerKey[] = "CompletionTrigger"; static const char automaticProposalTimeoutKey[] = "AutomaticProposalTimeout"; -static const char autoInsertBracesKey[] = "AutoInsertBraces"; -static const char surroundingAutoBracketsKey[] = "SurroundingAutoBrackets"; -static const char autoInsertQuotesKey[] = "AutoInsertQuotes"; -static const char surroundingAutoQuotesKey[] = "SurroundingAutoQuotes"; -static const char partiallyCompleteKey[] = "PartiallyComplete"; -static const char spaceAfterFunctionNameKey[] = "SpaceAfterFunctionName"; -static const char autoSplitStringsKey[] = "AutoSplitStrings"; +static const char autoInsertBracesKey[] = "AutoInsertBraces"; +static const char surroundingAutoBracketsKey[] = "SurroundingAutoBrackets"; +static const char autoInsertQuotesKey[] = "AutoInsertQuotes"; +static const char surroundingAutoQuotesKey[] = "SurroundingAutoQuotes"; +static const char partiallyCompleteKey[] = "PartiallyComplete"; +static const char spaceAfterFunctionNameKey[] = "SpaceAfterFunctionName"; +static const char autoSplitStringsKey[] = "AutoSplitStrings"; using namespace TextEditor; -CompletionSettings::CompletionSettings() - : m_caseSensitivity(CaseInsensitive) - , m_completionTrigger(AutomaticCompletion) - , m_automaticProposalTimeoutInMs(400) - , m_autoInsertBrackets(true) - , m_surroundingAutoBrackets(true) - , m_autoInsertQuotes(true) - , m_surroundingAutoQuotes(true) - , m_partiallyComplete(true) - , m_spaceAfterFunctionName(false) - , m_autoSplitStrings(true) -{ -} - void CompletionSettings::toSettings(const QString &category, QSettings *s) const { - QString group = QLatin1String(groupPostfix); + QString group(groupPostfix); if (!category.isEmpty()) group.insert(0, category); s->beginGroup(group); - s->setValue(QLatin1String(caseSensitivityKey), (int) m_caseSensitivity); - s->setValue(QLatin1String(completionTriggerKey), (int) m_completionTrigger); - s->setValue(QLatin1String(automaticProposalTimeoutKey), m_automaticProposalTimeoutInMs); - s->setValue(QLatin1String(autoInsertBracesKey), m_autoInsertBrackets); - s->setValue(QLatin1String(surroundingAutoBracketsKey), m_surroundingAutoBrackets); - s->setValue(QLatin1String(autoInsertQuotesKey), m_autoInsertQuotes); - s->setValue(QLatin1String(surroundingAutoQuotesKey), m_surroundingAutoQuotes); - s->setValue(QLatin1String(partiallyCompleteKey), m_partiallyComplete); - s->setValue(QLatin1String(spaceAfterFunctionNameKey), m_spaceAfterFunctionName); - s->setValue(QLatin1String(autoSplitStringsKey), m_autoSplitStrings); + s->setValue(caseSensitivityKey, (int) m_caseSensitivity); + s->setValue(completionTriggerKey, (int) m_completionTrigger); + s->setValue(automaticProposalTimeoutKey, m_automaticProposalTimeoutInMs); + s->setValue(autoInsertBracesKey, m_autoInsertBrackets); + s->setValue(surroundingAutoBracketsKey, m_surroundingAutoBrackets); + s->setValue(autoInsertQuotesKey, m_autoInsertQuotes); + s->setValue(surroundingAutoQuotesKey, m_surroundingAutoQuotes); + s->setValue(partiallyCompleteKey, m_partiallyComplete); + s->setValue(spaceAfterFunctionNameKey, m_spaceAfterFunctionName); + s->setValue(autoSplitStringsKey, m_autoSplitStrings); s->endGroup(); } void CompletionSettings::fromSettings(const QString &category, const QSettings *s) { - QString group = QLatin1String(groupPostfix); + QString group(groupPostfix); if (!category.isEmpty()) group.insert(0, category); - group += QLatin1Char('/'); + group += '/'; *this = CompletionSettings(); // Assign defaults - m_caseSensitivity = (CaseSensitivity) s->value(group + QLatin1String(caseSensitivityKey), m_caseSensitivity).toInt(); - m_completionTrigger = (CompletionTrigger) s->value(group + QLatin1String(completionTriggerKey), m_completionTrigger).toInt(); - m_automaticProposalTimeoutInMs = s->value(group + QLatin1String(automaticProposalTimeoutKey), m_automaticProposalTimeoutInMs).toInt(); - m_autoInsertBrackets = s->value(group + QLatin1String(autoInsertBracesKey), m_autoInsertBrackets).toBool(); - m_surroundingAutoBrackets = s->value(group + QLatin1String(surroundingAutoBracketsKey), m_surroundingAutoBrackets).toBool(); - m_autoInsertQuotes = s->value(group + QLatin1String(autoInsertQuotesKey), m_autoInsertQuotes).toBool(); - m_surroundingAutoQuotes = s->value(group + QLatin1String(surroundingAutoQuotesKey), m_surroundingAutoQuotes).toBool(); - m_partiallyComplete = s->value(group + QLatin1String(partiallyCompleteKey), m_partiallyComplete).toBool(); - m_spaceAfterFunctionName = s->value(group + QLatin1String(spaceAfterFunctionNameKey), m_spaceAfterFunctionName).toBool(); - m_autoSplitStrings = s->value(group + QLatin1String(autoSplitStringsKey), m_autoSplitStrings).toBool(); + m_caseSensitivity = (CaseSensitivity) + s->value(group + caseSensitivityKey, m_caseSensitivity).toInt(); + m_completionTrigger = (CompletionTrigger) + s->value(group + completionTriggerKey, m_completionTrigger).toInt(); + m_automaticProposalTimeoutInMs = + s->value(group + automaticProposalTimeoutKey, m_automaticProposalTimeoutInMs).toInt(); + m_autoInsertBrackets = + s->value(group + autoInsertBracesKey, m_autoInsertBrackets).toBool(); + m_surroundingAutoBrackets = + s->value(group + surroundingAutoBracketsKey, m_surroundingAutoBrackets).toBool(); + m_autoInsertQuotes = + s->value(group + autoInsertQuotesKey, m_autoInsertQuotes).toBool(); + m_surroundingAutoQuotes = + s->value(group + surroundingAutoQuotesKey, m_surroundingAutoQuotes).toBool(); + m_partiallyComplete = + s->value(group + partiallyCompleteKey, m_partiallyComplete).toBool(); + m_spaceAfterFunctionName = + s->value(group + spaceAfterFunctionNameKey, m_spaceAfterFunctionName).toBool(); + m_autoSplitStrings = + s->value(group + autoSplitStringsKey, m_autoSplitStrings).toBool(); } bool CompletionSettings::equals(const CompletionSettings &cs) const { - return m_caseSensitivity == cs.m_caseSensitivity - && m_completionTrigger == cs.m_completionTrigger - && m_automaticProposalTimeoutInMs == cs.m_automaticProposalTimeoutInMs - && m_autoInsertBrackets == cs.m_autoInsertBrackets - && m_surroundingAutoBrackets == cs.m_surroundingAutoBrackets - && m_autoInsertQuotes == cs.m_autoInsertQuotes - && m_surroundingAutoQuotes == cs.m_surroundingAutoQuotes - && m_partiallyComplete == cs.m_partiallyComplete - && m_spaceAfterFunctionName == cs.m_spaceAfterFunctionName - && m_autoSplitStrings == cs.m_autoSplitStrings + return m_caseSensitivity == cs.m_caseSensitivity + && m_completionTrigger == cs.m_completionTrigger + && m_automaticProposalTimeoutInMs == cs.m_automaticProposalTimeoutInMs + && m_autoInsertBrackets == cs.m_autoInsertBrackets + && m_surroundingAutoBrackets == cs.m_surroundingAutoBrackets + && m_autoInsertQuotes == cs.m_autoInsertQuotes + && m_surroundingAutoQuotes == cs.m_surroundingAutoQuotes + && m_partiallyComplete == cs.m_partiallyComplete + && m_spaceAfterFunctionName == cs.m_spaceAfterFunctionName + && m_autoSplitStrings == cs.m_autoSplitStrings ; } |