aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/diffeditor/diffeditor.h
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@nokia.com>2014-01-31 09:01:49 +0100
committerJarek Kobus <jaroslaw.kobus@digia.com>2014-02-10 10:33:39 +0100
commitf156c3e013dfdf4938e4bc1ea569705fd03b75b6 (patch)
treecccb34ca76ea97fb32288f7ac10fc7771e333df8 /src/plugins/diffeditor/diffeditor.h
parent97895e9026fa6586cdd8c541e481a1fada189bb2 (diff)
Move DiffEditorController into DiffEditorDocument.
Prepare for making diff editor splittable. Change-Id: I285ad46d095a98f2707d385558dfda0b10b77c1f Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditor.h')
-rw-r--r--src/plugins/diffeditor/diffeditor.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/plugins/diffeditor/diffeditor.h b/src/plugins/diffeditor/diffeditor.h
index f149f8e58e..73c28b212f 100644
--- a/src/plugins/diffeditor/diffeditor.h
+++ b/src/plugins/diffeditor/diffeditor.h
@@ -53,7 +53,8 @@ class DIFFEDITOR_EXPORT DiffEditor : public Core::IEditor
{
Q_OBJECT
public:
- explicit DiffEditor(SideBySideDiffEditorWidget *editorWidget);
+ DiffEditor();
+ DiffEditor(DiffEditor *other);
virtual ~DiffEditor();
public:
@@ -64,6 +65,9 @@ public:
void clear(const QString &message);
// Core::IEditor
+ bool duplicateSupported() const { return false; }
+ Core::IEditor *duplicate();
+
bool open(QString *errorString, const QString &fileName, const QString &realFileName);
Core::IDocument *document();
Core::Id id() const;
@@ -79,16 +83,15 @@ private slots:
void slotDescriptionChanged(const QString &description);
void slotDescriptionVisibilityChanged();
-protected:
- QToolBar *m_toolWidget;
-
private:
+ void ctor();
void updateEntryToolTip();
- Internal::DiffEditorDocument *m_document;
+ QSharedPointer<Internal::DiffEditorDocument> m_document;
TextEditor::BaseTextEditorWidget *m_descriptionWidget;
SideBySideDiffEditorWidget *m_diffWidget;
DiffEditorController *m_diffEditorController;
+ QToolBar *m_toolBar;
QComboBox *m_entriesComboBox;
QAction *m_toggleDescriptionAction;
};