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

TextEditor: Fix crash due to setting up fall back editor twice

Browse Source 
Change-Id: Id1287a1b1b33924c490b664d81c661b1481a3e4f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-09-01 10:35:06 +02:00
committed by Eike Ziller
parent 350bd8f9cb
commit a59fdc8096
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/diffeditor/selectabletexteditorwidget.cpp
View File

@@ -35,11 +35,11 @@
namespace DiffEditor {
SelectableTextEditorWidget::SelectableTextEditorWidget(QWidget *parent)
SelectableTextEditorWidget::SelectableTextEditorWidget(Core::Id id, QWidget *parent)
: BaseTextEditorWidget(parent)
{
setFrameStyle(QFrame::NoFrame);
setupFallBackEditor("DiffEditor.UnifiedDiffEditor");
setupFallBackEditor(id);
}
SelectableTextEditorWidget::~SelectableTextEditorWidget()

2
src/plugins/diffeditor/selectabletexteditorwidget.h
View File

@@ -52,7 +52,7 @@ class DIFFEDITOR_EXPORT SelectableTextEditorWidget
{
Q_OBJECT
public:
SelectableTextEditorWidget(QWidget *parent = 0);
SelectableTextEditorWidget(Core::Id id, QWidget *parent = 0);
~SelectableTextEditorWidget();
void setSelections(const QMap<int, QList<DiffSelection> > &selections) {
m_selections = selections;

4
src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
View File

@@ -281,12 +281,10 @@ void MultiHighlighter::highlightBlock(const QString &text)
////////////////////////
SideDiffEditorWidget::SideDiffEditorWidget(QWidget *parent)
: SelectableTextEditorWidget(parent),
: SelectableTextEditorWidget("DiffEditor.SideDiffEditor", parent),
m_lineNumberDigits(1),
m_inPaintEvent(false)
{
setupFallBackEditor("DiffEditor.SideDiffEditor");
DisplaySettings settings = displaySettings();
settings.m_textWrapping = false;
settings.m_displayLineNumbers = true;

4
src/plugins/diffeditor/unifieddiffeditorwidget.cpp
View File

@@ -72,7 +72,7 @@ using namespace TextEditor;
namespace DiffEditor {
UnifiedDiffEditorWidget::UnifiedDiffEditorWidget(QWidget *parent)
: SelectableTextEditorWidget(parent)
: SelectableTextEditorWidget("DiffEditor.UnifiedDiffEditor", parent)
, m_guiController(0)
, m_controller(0)
, m_ignoreCurrentIndexChange(false)
@@ -81,8 +81,6 @@ UnifiedDiffEditorWidget::UnifiedDiffEditorWidget(QWidget *parent)
, m_leftLineNumberDigits(1)
, m_rightLineNumberDigits(1)
{
setupFallBackEditor(Id());
DisplaySettings settings = displaySettings();
settings.m_textWrapping = false;
settings.m_displayLineNumbers = true;