feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Don't access static functions/fields via instance

Browse Source 
Courtesy of readability-static-accessed-through-instance

Change-Id: I71f54244f1e091315dac2943d9e1bfad6efa56a9
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Alessandro Portale
2020-11-18 22:42:51 +01:00
parent 0c0347ce61
commit b2a766a79a
52 changed files with 126 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/texteditor/texteditor.cpp
View File

@@ -3425,16 +3425,16 @@ void TextEditorWidgetPrivate::setupDocumentSignals()
q, &TextEditorWidget::setExtraEncodingSettings);
// Apply current settings
m_document->setFontSettings(settings->fontSettings());
m_document->setTabSettings(settings->codeStyle()->tabSettings()); // also set through code style ???
q->setTypingSettings(settings->typingSettings());
q->setStorageSettings(settings->storageSettings());
q->setBehaviorSettings(settings->behaviorSettings());
q->setMarginSettings(settings->marginSettings());
q->setDisplaySettings(settings->displaySettings());
q->setCompletionSettings(settings->completionSettings());
q->setExtraEncodingSettings(settings->extraEncodingSettings());
q->setCodeStyle(settings->codeStyle(m_tabSettingsId));
m_document->setFontSettings(TextEditorSettings::fontSettings());
m_document->setTabSettings(TextEditorSettings::codeStyle()->tabSettings()); // also set through code style ???
q->setTypingSettings(TextEditorSettings::typingSettings());
q->setStorageSettings(TextEditorSettings::storageSettings());
q->setBehaviorSettings(TextEditorSettings::behaviorSettings());
q->setMarginSettings(TextEditorSettings::marginSettings());
q->setDisplaySettings(TextEditorSettings::displaySettings());
q->setCompletionSettings(TextEditorSettings::completionSettings());
q->setExtraEncodingSettings(TextEditorSettings::extraEncodingSettings());
q->setCodeStyle(TextEditorSettings::codeStyle(m_tabSettingsId));
}
bool TextEditorWidgetPrivate::snippetCheckCursor(const QTextCursor &cursor)
@@ -6119,7 +6119,7 @@ void TextEditorWidgetPrivate::handleBackspaceKey()
QTextBlock currentBlock = cursor.block();
int positionInBlock = pos - currentBlock.position();
const QString blockText = currentBlock.text();
if (cursor.atBlockStart() || tabSettings.firstNonSpace(blockText) < positionInBlock) {
if (cursor.atBlockStart() || TabSettings::firstNonSpace(blockText) < positionInBlock) {
if (cursorWithinSnippet)
cursor.beginEditBlock();
cursor.deletePreviousChar();
@@ -6140,7 +6140,7 @@ void TextEditorWidgetPrivate::handleBackspaceKey()
continue;
previousIndent =
tabSettings.columnAt(previousNonEmptyBlockText,
tabSettings.firstNonSpace(previousNonEmptyBlockText));
TabSettings::firstNonSpace(previousNonEmptyBlockText));
if (previousIndent < indent) {
cursor.beginEditBlock();
cursor.setPosition(currentBlock.position(), QTextCursor::KeepAnchor);