From dee951cf3e7973ddea30363c971defb3b79f997d Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 4 Jul 2024 17:44:26 +0200
Subject: [PATCH] Android: Don't override IContext::widget() unnecessarily

Gets in the way of simplifying IContext handling.

Change-Id: I30961202164062743d9b9ddad34f95b25360f395
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/android/androidmanifesteditor.cpp | 10 +++++-----
 src/plugins/android/androidmanifesteditor.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/android/androidmanifesteditor.cpp b/src/plugins/android/androidmanifesteditor.cpp
index 55ce3850e2d..a2bbdf2f9a5 100644
--- a/src/plugins/android/androidmanifesteditor.cpp
+++ b/src/plugins/android/androidmanifesteditor.cpp
@@ -44,9 +44,9 @@ QWidget *AndroidManifestEditor::toolBar()
     return m_toolBar;
 }
 
-AndroidManifestEditorWidget *AndroidManifestEditor::widget() const
+AndroidManifestEditorWidget *AndroidManifestEditor::ownWidget() const
 {
-    return static_cast<AndroidManifestEditorWidget *>(Core::IEditor::widget());
+    return static_cast<AndroidManifestEditorWidget *>(widget());
 }
 
 Core::IDocument *AndroidManifestEditor::document() const
@@ -56,7 +56,7 @@ Core::IDocument *AndroidManifestEditor::document() const
 
 TextEditor::TextEditorWidget *AndroidManifestEditor::textEditor() const
 {
-    return widget()->textEditorWidget();
+    return ownWidget()->textEditorWidget();
 }
 
 int AndroidManifestEditor::currentLine() const
@@ -77,10 +77,10 @@ void AndroidManifestEditor::gotoLine(int line, int column, bool centerLine)
 
 void AndroidManifestEditor::changeEditorPage(QAction *action)
 {
-    if (!widget()->setActivePage(static_cast<AndroidManifestEditorWidget::EditorPage>(action->data().toInt()))) {
+    if (!ownWidget()->setActivePage(static_cast<AndroidManifestEditorWidget::EditorPage>(action->data().toInt()))) {
         const QList<QAction *> actions = m_actionGroup->actions();
         for (QAction *action : actions) {
-            if (action->data().toInt() == widget()->activePage()) {
+            if (action->data().toInt() == ownWidget()->activePage()) {
                 action->setChecked(true);
                 break;
             }
diff --git a/src/plugins/android/androidmanifesteditor.h b/src/plugins/android/androidmanifesteditor.h
index f263503c283..0a6ab678988 100644
--- a/src/plugins/android/androidmanifesteditor.h
+++ b/src/plugins/android/androidmanifesteditor.h
@@ -25,7 +25,6 @@ public:
     explicit AndroidManifestEditor(AndroidManifestEditorWidget *editorWidget);
 
     QWidget *toolBar() override;
-    AndroidManifestEditorWidget *widget() const override;
     Core::IDocument *document() const override;
     TextEditor::TextEditorWidget *textEditor() const;
 
@@ -34,6 +33,7 @@ public:
     void gotoLine(int line, int column = 0, bool centerLine = true)  override;
 
 private:
+    AndroidManifestEditorWidget *ownWidget() const;
     void changeEditorPage(QAction *action);
 
     QString m_displayName;