From 68fbfe671c7c8f520c652a8050a2f7680cb40853 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 28 Jul 2023 18:30:38 +0200 Subject: [PATCH] Ios: Merge settings page related file pairs [1/2] Move all to *widget.cpp, to keep the diff small. Will be renamed in step #2 to *page.cpp again. Change-Id: I391e4c823d796f5af0970067642e1b3eaec2637e Reviewed-by: Eike Ziller --- src/plugins/ios/CMakeLists.txt | 1 - src/plugins/ios/ios.qbs | 2 -- src/plugins/ios/iosplugin.cpp | 2 +- src/plugins/ios/iossettingspage.cpp | 22 -------------- src/plugins/ios/iossettingspage.h | 16 ---------- src/plugins/ios/iossettingswidget.cpp | 43 ++++++++++++++++++++++++++- src/plugins/ios/iossettingswidget.h | 35 ++-------------------- 7 files changed, 45 insertions(+), 76 deletions(-) delete mode 100644 src/plugins/ios/iossettingspage.cpp delete mode 100644 src/plugins/ios/iossettingspage.h diff --git a/src/plugins/ios/CMakeLists.txt b/src/plugins/ios/CMakeLists.txt index ebfaa6fc69b..eaef034cc40 100644 --- a/src/plugins/ios/CMakeLists.txt +++ b/src/plugins/ios/CMakeLists.txt @@ -16,7 +16,6 @@ add_qtc_plugin(Ios iosqtversion.cpp iosqtversion.h iosrunconfiguration.cpp iosrunconfiguration.h iosrunner.cpp iosrunner.h - iossettingspage.cpp iossettingspage.h iossettingswidget.cpp iossettingswidget.h iossimulator.cpp iossimulator.h iostoolhandler.cpp iostoolhandler.h diff --git a/src/plugins/ios/ios.qbs b/src/plugins/ios/ios.qbs index ac4575c4e3d..721151afeb7 100644 --- a/src/plugins/ios/ios.qbs +++ b/src/plugins/ios/ios.qbs @@ -41,8 +41,6 @@ QtcPlugin { "iosrunconfiguration.h", "iosrunner.cpp", "iosrunner.h", - "iossettingspage.cpp", - "iossettingspage.h", "iossettingswidget.cpp", "iossettingswidget.h", "iossimulator.cpp", diff --git a/src/plugins/ios/iosplugin.cpp b/src/plugins/ios/iosplugin.cpp index 9f790aa17f9..f61bd55525f 100644 --- a/src/plugins/ios/iosplugin.cpp +++ b/src/plugins/ios/iosplugin.cpp @@ -12,7 +12,7 @@ #include "iosdsymbuildstep.h" #include "iosqtversion.h" #include "iosrunner.h" -#include "iossettingspage.h" +#include "iossettingswidget.h" #include "iossimulator.h" #include "iostoolhandler.h" #include "iostr.h" diff --git a/src/plugins/ios/iossettingspage.cpp b/src/plugins/ios/iossettingspage.cpp deleted file mode 100644 index 7a4f306f659..00000000000 --- a/src/plugins/ios/iossettingspage.cpp +++ /dev/null @@ -1,22 +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 "iossettingspage.h" - -#include "iosconstants.h" -#include "iossettingswidget.h" -#include "iostr.h" - -#include - -namespace Ios::Internal { - -IosSettingsPage::IosSettingsPage() -{ - setId(Constants::IOS_SETTINGS_ID); - setDisplayName(Tr::tr("iOS")); - setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY); - setWidgetCreator([] { return new IosSettingsWidget; }); -} - -} // Ios::Internal diff --git a/src/plugins/ios/iossettingspage.h b/src/plugins/ios/iossettingspage.h deleted file mode 100644 index b58d8bfb8c6..00000000000 --- a/src/plugins/ios/iossettingspage.h +++ /dev/null @@ -1,16 +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 Ios::Internal { - -class IosSettingsPage final : public Core::IOptionsPage -{ -public: - IosSettingsPage(); -}; - -} // Ios::Internal diff --git a/src/plugins/ios/iossettingswidget.cpp b/src/plugins/ios/iossettingswidget.cpp index bb0bc36d61a..c131de0bac7 100644 --- a/src/plugins/ios/iossettingswidget.cpp +++ b/src/plugins/ios/iossettingswidget.cpp @@ -5,12 +5,14 @@ #include "createsimulatordialog.h" #include "iosconfigurations.h" -#include "iosconfigurations.h" +#include "iosconstants.h" #include "iostr.h" #include "simulatorcontrol.h" #include "simulatorinfomodel.h" #include "simulatoroperationdialog.h" +#include + #include #include #include @@ -32,6 +34,35 @@ using namespace std::placeholders; namespace Ios::Internal { +class IosSettingsWidget final : public Core::IOptionsPageWidget +{ +public: + IosSettingsWidget(); + ~IosSettingsWidget() final; + +private: + void apply() final; + + void saveSettings(); + + void onStart(); + void onCreate(); + void onReset(); + void onRename(); + void onDelete(); + void onScreenshot(); + void onSelectionChanged(); + +private: + Utils::PathChooser *m_pathWidget; + QPushButton *m_startButton; + QPushButton *m_renameButton; + QPushButton *m_deleteButton; + QPushButton *m_resetButton; + QTreeView *m_deviceView; + QCheckBox *m_deviceAskCheckBox; +}; + const int simStartWarnCount = 4; static SimulatorInfoList selectedSimulators(const QTreeView *deviceTreeView) @@ -358,5 +389,15 @@ void IosSettingsWidget::saveSettings() IosConfigurations::setScreenshotDir(m_pathWidget->filePath()); } +// IosSettingsPage + +IosSettingsPage::IosSettingsPage() +{ + setId(Constants::IOS_SETTINGS_ID); + setDisplayName(Tr::tr("iOS")); + setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY); + setWidgetCreator([] { return new IosSettingsWidget; }); +} + } // Ios::Internal diff --git a/src/plugins/ios/iossettingswidget.h b/src/plugins/ios/iossettingswidget.h index 6d315db6906..7617f08207e 100644 --- a/src/plugins/ios/iossettingswidget.h +++ b/src/plugins/ios/iossettingswidget.h @@ -5,43 +5,12 @@ #include -QT_BEGIN_NAMESPACE -class QCheckBox; -class QPushButton; -class QTreeView; -QT_END_NAMESPACE - -namespace Utils { class PathChooser; } - namespace Ios::Internal { -class IosSettingsWidget final : public Core::IOptionsPageWidget +class IosSettingsPage final : public Core::IOptionsPage { public: - IosSettingsWidget(); - ~IosSettingsWidget() final; - -private: - void apply() final; - - void saveSettings(); - - void onStart(); - void onCreate(); - void onReset(); - void onRename(); - void onDelete(); - void onScreenshot(); - void onSelectionChanged(); - -private: - Utils::PathChooser *m_pathWidget; - QPushButton *m_startButton; - QPushButton *m_renameButton; - QPushButton *m_deleteButton; - QPushButton *m_resetButton; - QTreeView *m_deviceView; - QCheckBox *m_deviceAskCheckBox; + IosSettingsPage(); }; } // Ios::Internal