aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/diffeditor/diffeditor.h
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-08-21 21:12:04 +0200
committerhjk <hjk121@nokiamail.com>2014-08-22 13:04:40 +0200
commita13ef73db5633f221a181ee9c67de44c3eda3769 (patch)
treef76470727786d753cec2c4736901f7a99f079f74 /src/plugins/diffeditor/diffeditor.h
parentceb6f543bf0353a7ee8e717b2cd1d86252136ba4 (diff)
DiffEditor: Merge the two construction paths
Change-Id: I3c0c750517c9000dffe13de724b063008fd426b7 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditor.h')
-rw-r--r--src/plugins/diffeditor/diffeditor.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/diffeditor/diffeditor.h b/src/plugins/diffeditor/diffeditor.h
index 8be9cb1a81..66a045305a 100644
--- a/src/plugins/diffeditor/diffeditor.h
+++ b/src/plugins/diffeditor/diffeditor.h
@@ -55,10 +55,10 @@ class UnifiedDiffEditorWidget;
class DIFFEDITOR_EXPORT DiffEditor : public Core::IEditor
{
Q_OBJECT
+
public:
- DiffEditor();
- DiffEditor(DiffEditor *other);
- virtual ~DiffEditor();
+ DiffEditor(const QSharedPointer<DiffEditorDocument> &doc);
+ ~DiffEditor();
public:
DiffEditorController *controller() const;
@@ -86,7 +86,6 @@ private slots:
void slotDiffEditorSwitched();
private:
- void ctor();
void updateEntryToolTip();
void showDiffEditor(QWidget *newEditor);
void updateDiffEditorSwitcher();