diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2021-08-30 10:58:08 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2021-09-01 14:53:58 +0000 |
| commit | 284817fae6514701902ccdb834c2faa46462f2e8 (patch) | |
| tree | 44a8c7d9813dc110b61c4639036366c7696bd7e9 /src/plugins/glsleditor/glslindenter.cpp | |
| parent | 3e1fa0f170d523971d2c3c12da15a6e291f56511 (diff) | |
Merge CppTools into CppEditor
There was no proper separation of responsibilities between these
plugins. In particular, CppTools had lots of editor-related
functionality, so it's not clear why it was separated out in the first
place.
In fact, for a lot of code, it seemed quite arbitrary where it was put
(just one example: switchHeaderSource() was in CppTools, wheras
switchDeclarationDefinition() was in CppEditor).
Merging the plugins will enable us to get rid of various convoluted
pseudo-abstractions that were only introduced to keep up the artificial
separation.
Change-Id: Iafc3bce625b4794f6d4aa03df6cddc7f2d26716a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/glsleditor/glslindenter.cpp')
| -rw-r--r-- | src/plugins/glsleditor/glslindenter.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/glsleditor/glslindenter.cpp b/src/plugins/glsleditor/glslindenter.cpp index 91229d5a5a..d8ac66d929 100644 --- a/src/plugins/glsleditor/glslindenter.cpp +++ b/src/plugins/glsleditor/glslindenter.cpp @@ -25,9 +25,9 @@ #include "glslindenter.h" -#include <cpptools/cppcodeformatter.h> -#include <cpptools/cpptoolssettings.h> -#include <cpptools/cppcodestylepreferences.h> +#include <cppeditor/cppcodeformatter.h> +#include <cppeditor/cpptoolssettings.h> +#include <cppeditor/cppcodestylepreferences.h> #include <texteditor/tabsettings.h> #include <QChar> @@ -55,9 +55,9 @@ void GlslIndenter::indentBlock(const QTextBlock &block, int /*cursorPositionInEditor*/) { // TODO: do something with it - CppTools::QtStyleCodeFormatter + CppEditor::QtStyleCodeFormatter codeFormatter(tabSettings, - CppTools::CppToolsSettings::instance()->cppCodeStyle()->codeStyleSettings()); + CppEditor::CppToolsSettings::instance()->cppCodeStyle()->codeStyleSettings()); codeFormatter.updateStateUntil(block); int indent; @@ -87,8 +87,8 @@ void GlslIndenter::indent(const QTextCursor &cursor, const QTextBlock end = m_doc->findBlock(cursor.selectionEnd()).next(); // TODO: do something with it - CppTools::QtStyleCodeFormatter codeFormatter(tabSettings, - CppTools::CppToolsSettings::instance() + CppEditor::QtStyleCodeFormatter codeFormatter(tabSettings, + CppEditor::CppToolsSettings::instance() ->cppCodeStyle() ->codeStyleSettings()); codeFormatter.updateStateUntil(block); @@ -113,9 +113,9 @@ int GlslIndenter::indentFor(const QTextBlock &block, const TextEditor::TabSettings &tabSettings, int /*cursorPositionInEditor*/) { - CppTools::QtStyleCodeFormatter + CppEditor::QtStyleCodeFormatter codeFormatter(tabSettings, - CppTools::CppToolsSettings::instance()->cppCodeStyle()->codeStyleSettings()); + CppEditor::CppToolsSettings::instance()->cppCodeStyle()->codeStyleSettings()); codeFormatter.updateStateUntil(block); int indent; @@ -130,9 +130,9 @@ TextEditor::IndentationForBlock GlslIndenter::indentationForBlocks( const TextEditor::TabSettings &tabSettings, int /*cursorPositionInEditor*/) { - CppTools::QtStyleCodeFormatter + CppEditor::QtStyleCodeFormatter codeFormatter(tabSettings, - CppTools::CppToolsSettings::instance()->cppCodeStyle()->codeStyleSettings()); + CppEditor::CppToolsSettings::instance()->cppCodeStyle()->codeStyleSettings()); codeFormatter.updateStateUntil(blocks.last()); |