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

DiffEditor: Remove a bit of fluff

Browse Source 
Change-Id: Ie1b2df8eb336078ced59d1406020ae57d2b53682
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-01-30 11:18:08 +01:00
parent 063251ebbc
commit 250d8abe2d
7 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -263,8 +263,7 @@ DiffEditor::DiffEditor(const QSharedPointer<DiffEditorDocument> &doc)
DiffEditor::~DiffEditor() DiffEditor::~DiffEditor()
{ {
delete m_toolBar; delete m_toolBar;
if (m_widget) delete m_widget;
delete m_widget;
} }
Core::IEditor *DiffEditor::duplicate() Core::IEditor *DiffEditor::duplicate()

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

@@ -53,10 +53,6 @@ DiffEditorDocument::DiffEditorDocument() :
setTemporary(true); setTemporary(true);
} }
DiffEditorDocument::~DiffEditorDocument()
{
}
DiffEditorController *DiffEditorDocument::controller() const DiffEditorController *DiffEditorDocument::controller() const
{ {
return m_controller; return m_controller;

5
src/plugins/diffeditor/diffeditordocument.h
View File

@@ -44,8 +44,7 @@ class DIFFEDITOR_EXPORT DiffEditorDocument : public Core::BaseTextDocument
Q_OBJECT Q_OBJECT
Q_PROPERTY(QString plainText READ plainText STORED false) // For access by code pasters Q_PROPERTY(QString plainText READ plainText STORED false) // For access by code pasters
public: public:
explicit DiffEditorDocument(); DiffEditorDocument();
virtual ~DiffEditorDocument();
DiffEditorController *controller() const; DiffEditorController *controller() const;
@@ -62,7 +61,7 @@ public:
QString plainText() const; QString plainText() const;
private: private:
DiffEditorController *m_controller; DiffEditorController *const m_controller;
}; };
} // namespace DiffEditor } // namespace DiffEditor

3
src/plugins/diffeditor/diffeditorguicontroller.cpp
View File

@@ -33,6 +33,8 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <utils/qtcassert.h>
static const char settingsGroupC[] = "DiffEditor"; static const char settingsGroupC[] = "DiffEditor";
static const char descriptionVisibleKeyC[] = "DescriptionVisible"; static const char descriptionVisibleKeyC[] = "DescriptionVisible";
static const char horizontalScrollBarSynchronizationKeyC[] = static const char horizontalScrollBarSynchronizationKeyC[] =
@@ -49,6 +51,7 @@ DiffEditorGuiController::DiffEditorGuiController(
m_syncScrollBars(true), m_syncScrollBars(true),
m_currentDiffFileIndex(-1) m_currentDiffFileIndex(-1)
{ {
QTC_ASSERT(m_controller, return);
QSettings *s = Core::ICore::settings(); QSettings *s = Core::ICore::settings();
s->beginGroup(QLatin1String(settingsGroupC)); s->beginGroup(QLatin1String(settingsGroupC));
m_descriptionVisible = s->value(QLatin1String(descriptionVisibleKeyC), m_descriptionVisible = s->value(QLatin1String(descriptionVisibleKeyC),

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

@@ -66,7 +66,7 @@ private slots:
void slotUpdateDiffFileIndex(); void slotUpdateDiffFileIndex();
private: private:
DiffEditorController *m_controller; DiffEditorController *const m_controller;
bool m_descriptionVisible; bool m_descriptionVisible;
bool m_syncScrollBars; bool m_syncScrollBars;
int m_currentDiffFileIndex; int m_currentDiffFileIndex;

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

@@ -826,11 +826,6 @@ SideBySideDiffEditorWidget::SideBySideDiffEditorWidget(QWidget *parent)
clear(tr("No controller")); clear(tr("No controller"));
} }
SideBySideDiffEditorWidget::~SideBySideDiffEditorWidget()
{
}
void SideBySideDiffEditorWidget::setDiffEditorGuiController( void SideBySideDiffEditorWidget::setDiffEditorGuiController(
DiffEditorGuiController *controller) DiffEditorGuiController *controller)
{ {
@@ -882,7 +877,6 @@ void SideBySideDiffEditorWidget::setDiffEditorGuiController(
} }
} }
DiffEditorGuiController *SideBySideDiffEditorWidget::diffEditorGuiController() const DiffEditorGuiController *SideBySideDiffEditorWidget::diffEditorGuiController() const
{ {
return m_guiController; return m_guiController;

3
src/plugins/diffeditor/sidebysidediffeditorwidget.h
View File

@@ -55,8 +55,7 @@ class DIFFEDITOR_EXPORT SideBySideDiffEditorWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
SideBySideDiffEditorWidget(QWidget *parent = 0); explicit SideBySideDiffEditorWidget(QWidget *parent = 0);
~SideBySideDiffEditorWidget();
void setDiffEditorGuiController(DiffEditorGuiController *controller); void setDiffEditorGuiController(DiffEditorGuiController *controller);
DiffEditorGuiController *diffEditorGuiController() const; DiffEditorGuiController *diffEditorGuiController() const;