diff options
author | jkobus <jaroslaw.kobus@digia.com> | 2014-02-11 13:00:35 +0100 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2014-02-18 13:46:49 +0100 |
commit | 73cf43f32370d8986b4c06511b95771582cc421d (patch) | |
tree | 1506c433ca50511420c0332b2b9f432a180ccbb3 /src/plugins/diffeditor/diffeditor.h | |
parent | 84e8a79c814dc6e788cad9643d0e225c7a92e76d (diff) |
Add DiffEditorManager, refactoring.
GitDiffSwitcher operates now on IDocument.
GitDiffHandler operates now on DiffEditorController.
"source" property now attached to editor's document (VcsBasePlugin).
Change-Id: Ie2570a597b8b992ac1dc33b9179eca459c8a751a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditor.h')
-rw-r--r-- | src/plugins/diffeditor/diffeditor.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/plugins/diffeditor/diffeditor.h b/src/plugins/diffeditor/diffeditor.h index 73c28b212f..0e9b3dfd00 100644 --- a/src/plugins/diffeditor/diffeditor.h +++ b/src/plugins/diffeditor/diffeditor.h @@ -45,9 +45,9 @@ QT_END_NAMESPACE namespace TextEditor { class BaseTextEditorWidget; } namespace DiffEditor { -class SideBySideDiffEditorWidget; -namespace Internal { class DiffEditorDocument; } +class DiffEditorDocument; +class SideBySideDiffEditorWidget; class DIFFEDITOR_EXPORT DiffEditor : public Core::IEditor { @@ -58,11 +58,7 @@ public: virtual ~DiffEditor(); public: - void setDiff(const QList<DiffEditorController::DiffFilesContents> &diffFileList, - const QString &workingDirectory = QString()); - void setDescription(const QString &description); - void setDescriptionEnabled(bool on); - void clear(const QString &message); + DiffEditorController *controller() const; // Core::IEditor bool duplicateSupported() const { return false; } @@ -71,7 +67,6 @@ public: bool open(QString *errorString, const QString &fileName, const QString &realFileName); Core::IDocument *document(); Core::Id id() const; - QTextCodec *codec() const; QWidget *toolBar(); @@ -79,6 +74,9 @@ public slots: void activateEntry(int index); private slots: + void slotCleared(const QString &message); + void slotDiffContentsChanged(const QList<DiffEditorController::DiffFilesContents> &diffFileList, + const QString &workingDirectory); void entryActivated(int index); void slotDescriptionChanged(const QString &description); void slotDescriptionVisibilityChanged(); @@ -87,7 +85,7 @@ private: void ctor(); void updateEntryToolTip(); - QSharedPointer<Internal::DiffEditorDocument> m_document; + QSharedPointer<DiffEditorDocument> m_document; TextEditor::BaseTextEditorWidget *m_descriptionWidget; SideBySideDiffEditorWidget *m_diffWidget; DiffEditorController *m_diffEditorController; |