From 23ff4e838a41dbcf23ac10c28f9a35219367b78d Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 29 Jul 2024 17:36:53 +0200 Subject: [PATCH] Android: Merge androidmanifestdocument.* into androidmanifesteditor.cpp Change-Id: I09ef23d740cefbc49d9c24f0d32cb185029abef0 Reviewed-by: Alessandro Portale --- src/plugins/android/CMakeLists.txt | 1 - src/plugins/android/android.qbs | 2 - .../android/androidmanifestdocument.cpp | 46 ------------------- src/plugins/android/androidmanifestdocument.h | 31 ------------- src/plugins/android/androidmanifesteditor.cpp | 37 ++++++++++++++- 5 files changed, 36 insertions(+), 81 deletions(-) delete mode 100644 src/plugins/android/androidmanifestdocument.cpp delete mode 100644 src/plugins/android/androidmanifestdocument.h diff --git a/src/plugins/android/CMakeLists.txt b/src/plugins/android/CMakeLists.txt index 11f890b44b3..bd662a216d0 100644 --- a/src/plugins/android/CMakeLists.txt +++ b/src/plugins/android/CMakeLists.txt @@ -16,7 +16,6 @@ add_qtc_plugin(Android androidextralibrarylistmodel.cpp androidextralibrarylistmodel.h androidglobal.h androidmanager.cpp androidmanager.h - androidmanifestdocument.cpp androidmanifestdocument.h androidmanifesteditor.cpp androidmanifesteditor.h androidmanifesteditoriconwidget.cpp androidmanifesteditoriconwidget.h androidmanifesteditoriconcontainerwidget.cpp androidmanifesteditoriconcontainerwidget.h diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs index b7822d54540..328209816b2 100644 --- a/src/plugins/android/android.qbs +++ b/src/plugins/android/android.qbs @@ -38,8 +38,6 @@ QtcPlugin { "androidglobal.h", "androidmanager.cpp", "androidmanager.h", - "androidmanifestdocument.cpp", - "androidmanifestdocument.h", "androidmanifesteditoriconwidget.cpp", "androidmanifesteditoriconwidget.h", "androidmanifesteditoriconcontainerwidget.cpp", diff --git a/src/plugins/android/androidmanifestdocument.cpp b/src/plugins/android/androidmanifestdocument.cpp deleted file mode 100644 index 6fd3533b0b3..00000000000 --- a/src/plugins/android/androidmanifestdocument.cpp +++ /dev/null @@ -1,46 +0,0 @@ -// 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 "androidmanifestdocument.h" -#include "androidmanifesteditor.h" -#include "androidconstants.h" - -#include -#include - -#include - -#include - -using namespace Android; -using namespace Android::Internal; - -AndroidManifestDocument::AndroidManifestDocument(AndroidManifestEditorWidget *editorWidget) - : m_editorWidget(editorWidget) -{ - setId(Constants::ANDROID_MANIFEST_EDITOR_ID); - setMimeType(QLatin1String(Constants::ANDROID_MANIFEST_MIME_TYPE)); - setSuspendAllowed(false); - connect(editorWidget, &AndroidManifestEditorWidget::guiChanged, - this, &Core::IDocument::changed); -} - -bool AndroidManifestDocument::saveImpl(QString *errorString, - const Utils::FilePath &filePath, - bool autoSave) -{ - m_editorWidget->preSave(); - bool result = TextDocument::saveImpl(errorString, filePath, autoSave); - m_editorWidget->postSave(); - return result; -} - -bool AndroidManifestDocument::isModified() const -{ - return TextDocument::isModified() || m_editorWidget->isModified(); -} - -bool AndroidManifestDocument::isSaveAsAllowed() const -{ - return false; -} diff --git a/src/plugins/android/androidmanifestdocument.h b/src/plugins/android/androidmanifestdocument.h deleted file mode 100644 index 2e5735da858..00000000000 --- a/src/plugins/android/androidmanifestdocument.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#pragma once - -#include - -namespace Android { -namespace Internal { - -class AndroidManifestEditorWidget; - -class AndroidManifestDocument : public TextEditor::TextDocument -{ -public: - explicit AndroidManifestDocument(AndroidManifestEditorWidget *editorWidget); - - bool isModified() const override; - bool isSaveAsAllowed() const override; - -protected: - bool saveImpl(QString *errorString, - const Utils::FilePath &filePath, - bool autoSave = false) override; - -private: - AndroidManifestEditorWidget *m_editorWidget; -}; - -} // namespace Internal -} // namespace Android diff --git a/src/plugins/android/androidmanifesteditor.cpp b/src/plugins/android/androidmanifesteditor.cpp index 4087246be59..f58afe2b4a0 100644 --- a/src/plugins/android/androidmanifesteditor.cpp +++ b/src/plugins/android/androidmanifesteditor.cpp @@ -6,7 +6,6 @@ #include "androidconfigurations.h" #include "androidconstants.h" #include "androidmanager.h" -#include "androidmanifestdocument.h" #include "androidmanifesteditoriconcontainerwidget.h" #include "androidtr.h" #include "splashscreencontainerwidget.h" @@ -25,6 +24,7 @@ #include #include +#include #include #include @@ -1421,6 +1421,41 @@ int PermissionsModel::rowCount(const QModelIndex &parent) const return m_permissions.count(); } +// AndroidManifestDocument + +class AndroidManifestDocument : public TextEditor::TextDocument +{ +public: + explicit AndroidManifestDocument(AndroidManifestEditorWidget *editorWidget) + : m_editorWidget(editorWidget) + { + setId(Constants::ANDROID_MANIFEST_EDITOR_ID); + setMimeType(QLatin1String(Constants::ANDROID_MANIFEST_MIME_TYPE)); + setSuspendAllowed(false); + connect(editorWidget, &AndroidManifestEditorWidget::guiChanged, + this, &Core::IDocument::changed); + } + +private: + bool isModified() const override + { + return TextDocument::isModified() || m_editorWidget->isModified(); + } + + bool isSaveAsAllowed() const override { return false; } + + bool saveImpl(QString *errorString, const FilePath &filePath, bool autoSave = false) override + { + m_editorWidget->preSave(); + bool result = TextDocument::saveImpl(errorString, filePath, autoSave); + m_editorWidget->postSave(); + return result; + } + + AndroidManifestEditorWidget *m_editorWidget; +}; + +// AndroidManifestEditorWidget AndroidManifestTextEditorWidget::AndroidManifestTextEditorWidget(AndroidManifestEditorWidget *parent) : TextEditor::TextEditorWidget(parent)