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

DiffEditor: Assert that document is passed in

Browse Source 
Do not bother to check after that assert.

Change-Id: I4d8d8c8aa40420880824b7832005ab3f06df4aa7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-01-30 11:35:31 +01:00
parent d4a32fd6b3
commit e5cb8b1cd8
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/diffeditor/diffeditor.cpp
View File

@@ -45,6 +45,7 @@
#include <texteditor/marginsettings.h> #include <texteditor/marginsettings.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/qtcassert.h>
#include <QStackedWidget> #include <QStackedWidget>
#include <QToolButton> #include <QToolButton>
@@ -217,6 +218,8 @@ DiffEditor::DiffEditor(const QSharedPointer<DiffEditorDocument> &doc)
, m_reloadAction(0) , m_reloadAction(0)
, m_diffEditorSwitcher(0) , m_diffEditorSwitcher(0)
{ {
QTC_ASSERT(m_document, return);
QSplitter *splitter = new Core::MiniSplitter(Qt::Vertical); QSplitter *splitter = new Core::MiniSplitter(Qt::Vertical);
m_descriptionWidget = new Internal::DescriptionEditorWidget(splitter); m_descriptionWidget = new Internal::DescriptionEditorWidget(splitter);
@@ -276,10 +279,6 @@ bool DiffEditor::open(QString *errorString,
const QString &realFileName) const QString &realFileName)
{ {
Q_UNUSED(realFileName) Q_UNUSED(realFileName)
if (!m_document)
return false;
return m_document->open(errorString, fileName); return m_document->open(errorString, fileName);
} }