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

CppEditor: Move indenter construction to document constructor

Browse Source 
A more direct approach than going through the widget's baseTextDocument,
relying on widget life time.

Change-Id: I62c10e53b1a9a1e6717c6eb3e3cc78dcbfd2868e
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-08-01 18:16:24 +02:00
parent 4a52d8216c
commit 3c3c896d55
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -49,7 +49,6 @@
#include <cpptools/cppcompletionassistprovider.h> #include <cpptools/cppcompletionassistprovider.h>
#include <cpptools/cpphighlightingsupport.h> #include <cpptools/cpphighlightingsupport.h>
#include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cppmodelmanagerinterface.h>
#include <cpptools/cppqtstyleindenter.h>
#include <cpptools/cppsemanticinfo.h> #include <cpptools/cppsemanticinfo.h>
#include <cpptools/cpptoolseditorsupport.h> #include <cpptools/cpptoolseditorsupport.h>
#include <cpptools/cpptoolsplugin.h> #include <cpptools/cpptoolsplugin.h>
@@ -179,7 +178,6 @@ CppEditorWidgetPrivate::CppEditorWidgetPrivate(CppEditorWidget *q)
CppEditorWidget::CppEditorWidget(QWidget *parent) CppEditorWidget::CppEditorWidget(QWidget *parent)
: TextEditor::BaseTextEditorWidget(new CPPEditorDocument(), parent) : TextEditor::BaseTextEditorWidget(new CPPEditorDocument(), parent)
{ {
textDocument()->setIndenter(new CppTools::CppQtStyleIndenter);
ctor(); ctor();
} }

2
src/plugins/cppeditor/cppeditordocument.cpp
View File

@@ -33,6 +33,7 @@
#include "cpphighlighter.h" #include "cpphighlighter.h"
#include <cpptools/cppcodeformatter.h> #include <cpptools/cppcodeformatter.h>
#include <cpptools/cppqtstyleindenter.h>
#include <cpptools/cpptoolsconstants.h> #include <cpptools/cpptoolsconstants.h>
#include <QTextDocument> #include <QTextDocument>
@@ -48,6 +49,7 @@ CPPEditorDocument::CPPEditorDocument()
connect(this, SIGNAL(mimeTypeChanged()), connect(this, SIGNAL(mimeTypeChanged()),
this, SLOT(onMimeTypeChanged())); this, SLOT(onMimeTypeChanged()));
setSyntaxHighlighter(new CppHighlighter); setSyntaxHighlighter(new CppHighlighter);
setIndenter(new CppTools::CppQtStyleIndenter);
onMimeTypeChanged(); onMimeTypeChanged();
} }