AndroidManifestEditor: Fix widget hierarchy

Since TextEditorActionHandler has now a virtual function, we can
do a less fancy hierarchy for the AndroidManifestEditor and thus fix

Task-number: QTCREATORBUG-10597
Task-number: QTCREATORBUG-11163

Change-Id: I6c4014ae03b66f0639f8c8973763d690fb062cc4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

1 files changed, 8 insertions, 3 deletions

diff --git a/src/plugins/android/androidmanifesteditor.h b/src/plugins/android/androidmanifesteditor.h
index 98465171c5..d7f51e9160 100644
--- a/src/plugins/android/androidmanifesteditor.h
+++ b/src/plugins/android/androidmanifesteditor.h
@@ -31,6 +31,7 @@
 #define ANDROIDMANIFESTEDITOR_H
 
 #include "androidmanifestdocument.h"
+#include "androidmanifesteditorwidget.h"
 
 #include <coreplugin/editormanager/ieditor.h>
 #include <texteditor/basetexteditor.h>
@@ -41,9 +42,8 @@ QT_END_NAMESPACE
 
 namespace Android {
 namespace Internal {
-class AndroidManifestEditorWidget;
 
-class AndroidManifestEditor : public TextEditor::BaseTextEditor
+class AndroidManifestEditor : public Core::IEditor
 {
     Q_OBJECT
 
@@ -51,13 +51,18 @@ public:
     explicit AndroidManifestEditor(AndroidManifestEditorWidget *editorWidget);
 
     Core::Id id() const;
+    bool open(QString *errorString, const QString &fileName, const QString &realFileName);
+    QWidget *toolBar();
+    AndroidManifestEditorWidget *widget() const;
+    Core::IDocument *document();
+    TextEditor::BaseTextEditorWidget *textEditor() const;
 
 private slots:
     void changeEditorPage(QAction *action);
 
 private:
-    AndroidManifestDocument *m_document;
     QString m_displayName;
+    QToolBar *m_toolBar;
     QActionGroup *m_actionGroup;
 };