diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-03-11 15:22:40 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-04-10 14:14:57 +0000 |
| commit | ee7d0a7bf7d4d23611c6f7eb049bae1ea3dea0c8 (patch) | |
| tree | 12f487c6ced1e3a8e03176a193a42dcaa5c2beb6 /src/plugins/diffeditor/diffeditor.h | |
| parent | 0f5fdbe0f2b25256a682fcc0d003d3ecac2e697c (diff) | |
DiffEditor: Do not load settings when splitting views
Change-Id: I7fac89714ff9a603af29e19664b091e5e62be22f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditor.h')
| -rw-r--r-- | src/plugins/diffeditor/diffeditor.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/diffeditor/diffeditor.h b/src/plugins/diffeditor/diffeditor.h index 3be67972e4..9987571229 100644 --- a/src/plugins/diffeditor/diffeditor.h +++ b/src/plugins/diffeditor/diffeditor.h @@ -59,10 +59,9 @@ class DiffEditor : public Core::IEditor Q_OBJECT public: - DiffEditor(const QSharedPointer<DiffEditorDocument> &doc); + DiffEditor(DiffEditorDocument *doc); ~DiffEditor(); -public: Core::IEditor *duplicate(); bool open(QString *errorString, @@ -86,7 +85,10 @@ private slots: void toggleSync(); private: - void loadSettings(); + DiffEditor(); + void setDocument(QSharedPointer<DiffEditorDocument> doc); + + IDiffView *loadSettings(); void saveSetting(const QString &key, const QVariant &value) const; void updateEntryToolTip(); void showDiffView(IDiffView *view); |