Commit bd144ab0 authored by David Schulz's avatar David Schulz
Browse files

Editor: TabSettings: Make some functions static.



Change-Id: I99597a22b333c44346eb890ebe615193bdbe66d6
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent a6c81584
...@@ -581,7 +581,6 @@ void BaseTextEditorWidgetPrivate::foldLicenseHeader() ...@@ -581,7 +581,6 @@ void BaseTextEditorWidgetPrivate::foldLicenseHeader()
BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(doc->documentLayout()); BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(doc->documentLayout());
QTC_ASSERT(documentLayout, return); QTC_ASSERT(documentLayout, return);
QTextBlock block = doc->firstBlock(); QTextBlock block = doc->firstBlock();
const TabSettings &ts = m_document->tabSettings();
while (block.isValid() && block.isVisible()) { while (block.isValid() && block.isVisible()) {
QString text = block.text(); QString text = block.text();
if (BaseTextDocumentLayout::canFold(block) && block.next().isVisible()) { if (BaseTextDocumentLayout::canFold(block) && block.next().isVisible()) {
...@@ -593,7 +592,7 @@ void BaseTextEditorWidgetPrivate::foldLicenseHeader() ...@@ -593,7 +592,7 @@ void BaseTextEditorWidgetPrivate::foldLicenseHeader()
break; break;
} }
} }
if (ts.firstNonSpace(text) < text.size()) if (TabSettings::firstNonSpace(text) < text.size())
break; break;
block = block.next(); block = block.next();
} }
...@@ -5937,14 +5936,13 @@ QMimeData *BaseTextEditorWidget::createMimeDataFromSelection() const ...@@ -5937,14 +5936,13 @@ QMimeData *BaseTextEditorWidget::createMimeDataFromSelection() const
selstart.setPosition(cursor.selectionStart()); selstart.setPosition(cursor.selectionStart());
QTextCursor selend = cursor; QTextCursor selend = cursor;
selend.setPosition(cursor.selectionEnd()); selend.setPosition(cursor.selectionEnd());
const TabSettings &ts = d->m_document->tabSettings();
bool startOk = ts.cursorIsAtBeginningOfLine(selstart); bool startOk = TabSettings::cursorIsAtBeginningOfLine(selstart);
bool multipleBlocks = (selend.block() != selstart.block()); bool multipleBlocks = (selend.block() != selstart.block());
if (startOk && multipleBlocks) { if (startOk && multipleBlocks) {
selstart.movePosition(QTextCursor::StartOfBlock); selstart.movePosition(QTextCursor::StartOfBlock);
if (ts.cursorIsAtBeginningOfLine(selend)) if (TabSettings::cursorIsAtBeginningOfLine(selend))
selend.movePosition(QTextCursor::StartOfBlock); selend.movePosition(QTextCursor::StartOfBlock);
cursor.setPosition(selstart.position()); cursor.setPosition(selstart.position());
cursor.setPosition(selend.position(), QTextCursor::KeepAnchor); cursor.setPosition(selend.position(), QTextCursor::KeepAnchor);
......
...@@ -87,7 +87,7 @@ void TabSettings::fromMap(const QString &prefix, const QVariantMap &map) ...@@ -87,7 +87,7 @@ void TabSettings::fromMap(const QString &prefix, const QVariantMap &map)
map.value(prefix + QLatin1String(paddingModeKey), m_continuationAlignBehavior).toInt(); map.value(prefix + QLatin1String(paddingModeKey), m_continuationAlignBehavior).toInt();
} }
bool TabSettings::cursorIsAtBeginningOfLine(const QTextCursor &cursor) const bool TabSettings::cursorIsAtBeginningOfLine(const QTextCursor &cursor)
{ {
QString text = cursor.block().text(); QString text = cursor.block().text();
int fns = firstNonSpace(text); int fns = firstNonSpace(text);
...@@ -106,7 +106,7 @@ int TabSettings::lineIndentPosition(const QString &text) const ...@@ -106,7 +106,7 @@ int TabSettings::lineIndentPosition(const QString &text) const
return i - (column % m_indentSize); return i - (column % m_indentSize);
} }
int TabSettings::firstNonSpace(const QString &text) const int TabSettings::firstNonSpace(const QString &text)
{ {
int i = 0; int i = 0;
while (i < text.size()) { while (i < text.size()) {
...@@ -128,7 +128,7 @@ int TabSettings::indentationColumn(const QString &text) const ...@@ -128,7 +128,7 @@ int TabSettings::indentationColumn(const QString &text) const
return columnAt(text, firstNonSpace(text)); return columnAt(text, firstNonSpace(text));
} }
int TabSettings::maximumPadding(const QString &text) const int TabSettings::maximumPadding(const QString &text)
{ {
int fns = firstNonSpace(text); int fns = firstNonSpace(text);
int i = fns; int i = fns;
...@@ -141,7 +141,7 @@ int TabSettings::maximumPadding(const QString &text) const ...@@ -141,7 +141,7 @@ int TabSettings::maximumPadding(const QString &text) const
} }
int TabSettings::trailingWhitespaces(const QString &text) const int TabSettings::trailingWhitespaces(const QString &text)
{ {
int i = 0; int i = 0;
while (i < text.size()) { while (i < text.size()) {
...@@ -152,7 +152,7 @@ int TabSettings::trailingWhitespaces(const QString &text) const ...@@ -152,7 +152,7 @@ int TabSettings::trailingWhitespaces(const QString &text) const
return i; return i;
} }
void TabSettings::removeTrailingWhitespace(QTextCursor cursor, QTextBlock &block) const void TabSettings::removeTrailingWhitespace(QTextCursor cursor, QTextBlock &block)
{ {
if (const int trailing = trailingWhitespaces(block.text())) { if (const int trailing = trailingWhitespaces(block.text())) {
cursor.setPosition(block.position() + block.length() - 1); cursor.setPosition(block.position() + block.length() - 1);
...@@ -213,7 +213,7 @@ int TabSettings::positionAtColumn(const QString &text, int column, int *offset) ...@@ -213,7 +213,7 @@ int TabSettings::positionAtColumn(const QString &text, int column, int *offset)
return i; return i;
} }
int TabSettings::spacesLeftFromPosition(const QString &text, int position) const int TabSettings::spacesLeftFromPosition(const QString &text, int position)
{ {
int i = position; int i = position;
while (i > 0) { while (i > 0) {
......
...@@ -68,27 +68,27 @@ public: ...@@ -68,27 +68,27 @@ public:
void fromMap(const QString &prefix, const QVariantMap &map); void fromMap(const QString &prefix, const QVariantMap &map);
int lineIndentPosition(const QString &text) const; int lineIndentPosition(const QString &text) const;
int firstNonSpace(const QString &text) const;
inline bool onlySpace(const QString &text) const { return firstNonSpace(text) == text.length(); }
int columnAt(const QString &text, int position) const; int columnAt(const QString &text, int position) const;
int positionAtColumn(const QString &text, int column, int *offset = 0) const; int positionAtColumn(const QString &text, int column, int *offset = 0) const;
int spacesLeftFromPosition(const QString &text, int position) const;
int indentedColumn(int column, bool doIndent = true) const; int indentedColumn(int column, bool doIndent = true) const;
QString indentationString(int startColumn, int targetColumn, const QTextBlock &currentBlock = QTextBlock()) const; QString indentationString(int startColumn, int targetColumn, const QTextBlock &currentBlock = QTextBlock()) const;
QString indentationString(const QString &text) const; QString indentationString(const QString &text) const;
int indentationColumn(const QString &text) const; int indentationColumn(const QString &text) const;
int maximumPadding(const QString &text) const; static int maximumPadding(const QString &text);
bool cursorIsAtBeginningOfLine(const QTextCursor &cursor) const;
void indentLine(QTextBlock block, int newIndent, int padding = 0) const; void indentLine(QTextBlock block, int newIndent, int padding = 0) const;
void reindentLine(QTextBlock block, int delta) const; void reindentLine(QTextBlock block, int delta) const;
int trailingWhitespaces(const QString &text) const;
void removeTrailingWhitespace(QTextCursor cursor, QTextBlock &block) const;
bool isIndentationClean(const QTextBlock &block) const; bool isIndentationClean(const QTextBlock &block) const;
bool guessSpacesForTabs(const QTextBlock &block) const; bool guessSpacesForTabs(const QTextBlock &block) const;
static int firstNonSpace(const QString &text);
static inline bool onlySpace(const QString &text) { return firstNonSpace(text) == text.length(); }
static int spacesLeftFromPosition(const QString &text, int position);
static bool cursorIsAtBeginningOfLine(const QTextCursor &cursor);
static int trailingWhitespaces(const QString &text);
static void removeTrailingWhitespace(QTextCursor cursor, QTextBlock &block);
TabPolicy m_tabPolicy; TabPolicy m_tabPolicy;
int m_tabSize; int m_tabSize;
int m_indentSize; int m_indentSize;
......
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