From d79c9fe044c9a4237e8b15e1d3695a82c2ca1873 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 29 Jul 2024 17:28:58 +0200
Subject: [PATCH] Android: Merge manifesteditorwidget.* into manifesteditor.*
 (2/2)

Rename the merged content in manifesteditorwidget.* to
manifesteditor.*

Change-Id: I417b427ea7ecbe1f76364a08981a45cfef2ca562
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/android/CMakeLists.txt                            | 2 +-
 src/plugins/android/android.qbs                               | 4 ++--
 src/plugins/android/androidmanifestdocument.cpp               | 2 +-
 ...roidmanifesteditorwidget.cpp => androidmanifesteditor.cpp} | 3 ++-
 ...{androidmanifesteditorwidget.h => androidmanifesteditor.h} | 0
 src/plugins/android/androidplugin.cpp                         | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)
 rename src/plugins/android/{androidmanifesteditorwidget.cpp => androidmanifesteditor.cpp} (99%)
 rename src/plugins/android/{androidmanifesteditorwidget.h => androidmanifesteditor.h} (100%)

diff --git a/src/plugins/android/CMakeLists.txt b/src/plugins/android/CMakeLists.txt
index c79134828ad..11f890b44b3 100644
--- a/src/plugins/android/CMakeLists.txt
+++ b/src/plugins/android/CMakeLists.txt
@@ -17,7 +17,7 @@ add_qtc_plugin(Android
     androidglobal.h
     androidmanager.cpp androidmanager.h
     androidmanifestdocument.cpp androidmanifestdocument.h
-    androidmanifesteditorwidget.cpp androidmanifesteditorwidget.h
+    androidmanifesteditor.cpp androidmanifesteditor.h
     androidmanifesteditoriconwidget.cpp androidmanifesteditoriconwidget.h
     androidmanifesteditoriconcontainerwidget.cpp androidmanifesteditoriconcontainerwidget.h
     androidpackageinstallationstep.cpp androidpackageinstallationstep.h
diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index 7c9c8f3bdb8..b7822d54540 100644
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -44,8 +44,8 @@ QtcPlugin {
         "androidmanifesteditoriconwidget.h",
         "androidmanifesteditoriconcontainerwidget.cpp",
         "androidmanifesteditoriconcontainerwidget.h",
-        "androidmanifesteditorwidget.cpp",
-        "androidmanifesteditorwidget.h",
+        "androidmanifesteditor.cpp",
+        "androidmanifesteditor.h",
         "androidpackageinstallationstep.cpp",
         "androidpackageinstallationstep.h",
         "androidplugin.cpp",
diff --git a/src/plugins/android/androidmanifestdocument.cpp b/src/plugins/android/androidmanifestdocument.cpp
index 8f759d717e6..6fd3533b0b3 100644
--- a/src/plugins/android/androidmanifestdocument.cpp
+++ b/src/plugins/android/androidmanifestdocument.cpp
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "androidmanifestdocument.h"
-#include "androidmanifesteditorwidget.h"
+#include "androidmanifesteditor.h"
 #include "androidconstants.h"
 
 #include <coreplugin/editormanager/ieditor.h>
diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditor.cpp
similarity index 99%
rename from src/plugins/android/androidmanifesteditorwidget.cpp
rename to src/plugins/android/androidmanifesteditor.cpp
index bc18f03debe..4087246be59 100644
--- a/src/plugins/android/androidmanifesteditorwidget.cpp
+++ b/src/plugins/android/androidmanifesteditor.cpp
@@ -1,12 +1,13 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
+#include "androidmanifesteditor.h"
+
 #include "androidconfigurations.h"
 #include "androidconstants.h"
 #include "androidmanager.h"
 #include "androidmanifestdocument.h"
 #include "androidmanifesteditoriconcontainerwidget.h"
-#include "androidmanifesteditorwidget.h"
 #include "androidtr.h"
 #include "splashscreencontainerwidget.h"
 
diff --git a/src/plugins/android/androidmanifesteditorwidget.h b/src/plugins/android/androidmanifesteditor.h
similarity index 100%
rename from src/plugins/android/androidmanifesteditorwidget.h
rename to src/plugins/android/androidmanifesteditor.h
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index f55d01f1da5..5f860134f8f 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -7,7 +7,7 @@
 #include "androiddebugsupport.h"
 #include "androiddeployqtstep.h"
 #include "androiddevice.h"
-#include "androidmanifesteditorwidget.h"
+#include "androidmanifesteditor.h"
 #include "androidpackageinstallationstep.h"
 #include "androidpotentialkit.h"
 #include "androidqmltoolingsupport.h"