diff options
| author | David Schulz <david.schulz@theqtcompany.com> | 2016-01-13 14:32:23 +0100 |
|---|---|---|
| committer | David Schulz <david.schulz@theqtcompany.com> | 2016-02-24 12:03:12 +0000 |
| commit | 9aa51d4857702c22d359014356d06c9d92677904 (patch) | |
| tree | 79d73774ac0541e65fbe03e44592a43fc95ba152 /src/plugins/texteditor/tabsettings.h | |
| parent | bc921b46a2946294b467e1d2bcafb147ee77361a (diff) | |
Editor: Fix whitespace cleaning.
Task-number: QTCREATORBUG-7994
Change-Id: I6c197ccc3a148555018e8f8184d116c88d7ea400
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/texteditor/tabsettings.h')
| -rw-r--r-- | src/plugins/texteditor/tabsettings.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/plugins/texteditor/tabsettings.h b/src/plugins/texteditor/tabsettings.h index a13a2ff87b..f0b60584b7 100644 --- a/src/plugins/texteditor/tabsettings.h +++ b/src/plugins/texteditor/tabsettings.h @@ -55,7 +55,9 @@ public: ContinuationAlignWithIndent = 2 }; - TabSettings(); + TabSettings() = default; + TabSettings(TabPolicy tabPolicy, int tabSize, + int indentSize, ContinuationAlignBehavior continuationAlignBehavior); void toSettings(const QString &category, QSettings *s) const; void fromSettings(const QString &category, const QSettings *s); @@ -68,7 +70,7 @@ public: int positionAtColumn(const QString &text, int column, int *offset = 0, bool allowOverstep = false) const; int columnCountForText(const QString &text, int startColumn = 0) const; int indentedColumn(int column, bool doIndent = true) const; - QString indentationString(int startColumn, int targetColumn, const QTextBlock ¤tBlock = QTextBlock()) const; + QString indentationString(int startColumn, int targetColumn, int padding, const QTextBlock ¤tBlock = QTextBlock()) const; QString indentationString(const QString &text) const; int indentationColumn(const QString &text) const; static int maximumPadding(const QString &text); @@ -76,7 +78,7 @@ public: void indentLine(QTextBlock block, int newIndent, int padding = 0) const; void reindentLine(QTextBlock block, int delta) const; - bool isIndentationClean(const QTextBlock &block) const; + bool isIndentationClean(const QTextBlock &block, const int indent) const; bool guessSpacesForTabs(const QTextBlock &block) const; static int firstNonSpace(const QString &text); @@ -86,10 +88,10 @@ public: static int trailingWhitespaces(const QString &text); static void removeTrailingWhitespace(QTextCursor cursor, QTextBlock &block); - TabPolicy m_tabPolicy; - int m_tabSize; - int m_indentSize; - ContinuationAlignBehavior m_continuationAlignBehavior; + TabPolicy m_tabPolicy = SpacesOnlyTabPolicy; + int m_tabSize = 8; + int m_indentSize = 4; + ContinuationAlignBehavior m_continuationAlignBehavior = ContinuationAlignWithSpaces; bool equals(const TabSettings &ts) const; }; @@ -100,5 +102,7 @@ inline bool operator!=(const TabSettings &t1, const TabSettings &t2) { return !t } // namespace TextEditor Q_DECLARE_METATYPE(TextEditor::TabSettings) +Q_DECLARE_METATYPE(TextEditor::TabSettings::TabPolicy) +Q_DECLARE_METATYPE(TextEditor::TabSettings::ContinuationAlignBehavior) #endif // TABSETTINGS_H |