From 944a1e8a11b21403be22e220c12ad48806117dac Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 14 Jul 2023 09:23:10 +0200
Subject: [PATCH] Android: Remove a few unnecessay Q_OBJECT

Change-Id: Ic57a7cfc58d741547cb793b24ff1358d900eaf5d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/plugins/android/androidmanifesteditorwidget.h | 1 -
 src/plugins/android/androidsdkmanagerwidget.h     | 2 --
 src/plugins/android/androidsdkmodel.h             | 2 --
 src/plugins/android/androidsignaloperation.h      | 1 -
 src/plugins/android/avddialog.h                   | 3 ++-
 5 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/plugins/android/androidmanifesteditorwidget.h b/src/plugins/android/androidmanifesteditorwidget.h
index 1cce7157e44..23b8cdce05d 100644
--- a/src/plugins/android/androidmanifesteditorwidget.h
+++ b/src/plugins/android/androidmanifesteditorwidget.h
@@ -37,7 +37,6 @@ class SplashScreenContainerWidget;
 
 class PermissionsModel: public QAbstractListModel
 {
-    Q_OBJECT
 public:
     PermissionsModel(QObject *parent = nullptr);
     void setPermissions(const QStringList &permissions);
diff --git a/src/plugins/android/androidsdkmanagerwidget.h b/src/plugins/android/androidsdkmanagerwidget.h
index 9346bfcd944..718d5390d69 100644
--- a/src/plugins/android/androidsdkmanagerwidget.h
+++ b/src/plugins/android/androidsdkmanagerwidget.h
@@ -43,8 +43,6 @@ class AndroidSdkModel;
 
 class OptionsDialog : public QDialog
 {
-    Q_OBJECT
-
 public:
     OptionsDialog(AndroidSdkManager *sdkManager, const QStringList &args,
                   QWidget *parent = nullptr);
diff --git a/src/plugins/android/androidsdkmodel.h b/src/plugins/android/androidsdkmodel.h
index 49bdef0ded1..36dbe27b312 100644
--- a/src/plugins/android/androidsdkmodel.h
+++ b/src/plugins/android/androidsdkmodel.h
@@ -15,7 +15,6 @@ class AndroidSdkManager;
 
 class AndroidSdkModel : public QAbstractItemModel
 {
-    Q_OBJECT
 public:
     enum PackageColumn {
         packageNameColumn = 0,
@@ -53,7 +52,6 @@ private:
     void clearContainers();
     void refreshData();
 
-private:
     const AndroidConfig &m_config;
     AndroidSdkManager *m_sdkManager;
     QList<const SdkPlatform *> m_sdkPlatforms;
diff --git a/src/plugins/android/androidsignaloperation.h b/src/plugins/android/androidsignaloperation.h
index 1c3bb48454c..2a6e3ddb6cf 100644
--- a/src/plugins/android/androidsignaloperation.h
+++ b/src/plugins/android/androidsignaloperation.h
@@ -13,7 +13,6 @@ namespace Internal {
 
 class AndroidSignalOperation : public ProjectExplorer::DeviceProcessSignalOperation
 {
-    Q_OBJECT
 public:
     ~AndroidSignalOperation() override;
     void killProcess(qint64 pid) override;
diff --git a/src/plugins/android/avddialog.h b/src/plugins/android/avddialog.h
index b7888b1db9d..4cd03870443 100644
--- a/src/plugins/android/avddialog.h
+++ b/src/plugins/android/avddialog.h
@@ -24,10 +24,11 @@ class AndroidConfig;
 class SdkPlatform;
 
 namespace Internal {
+
 class AndroidSdkManager;
+
 class AvdDialog : public QDialog
 {
-    Q_OBJECT
 public:
     explicit AvdDialog(const AndroidConfig &config, QWidget *parent = nullptr);
     int exec() override;