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

@@ -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

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",

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>

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"
 

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"