Android: Inline CertificatesModel

Change-Id: I098da61a38674572dc36dc05c893806a71a88981 Reviewed-by: hjk <hjk@qt.io>
author: Jarek Kobus <jaroslaw.kobus@qt.io> 2024-11-12 15:24:13 +0100
committer: Jarek Kobus <jaroslaw.kobus@qt.io> 2024-11-12 16:22:27 +0000
commit: 641faec0f4109604dbd3b4256ef2b60673f30c07 (patch)
tree: ebb711ae2eb01173e17b80b1320bfcb0dfa5fa55
parent: 0244e45f131c3f54f7c0d1aa702b155a720afeb9 (diff)
5 files changed, 43 insertions, 77 deletions
diff --git a/src/plugins/android/CMakeLists.txt b/src/plugins/android/CMakeLists.txt
index 206ec703da5..97cb5e50729 100644
--- a/src/plugins/android/CMakeLists.txt
+++ b/src/plugins/android/CMakeLists.txt
@@ -33,7 +33,6 @@ add_qtc_plugin(Android
     androidutils.cpp androidutils.h
     avddialog.cpp avddialog.h
     avdmanageroutputparser.cpp avdmanageroutputparser.h
-    certificatesmodel.cpp certificatesmodel.h
     createandroidmanifestwizard.cpp createandroidmanifestwizard.h
     javaeditor.cpp javaeditor.h
     javaindenter.cpp javaindenter.h
diff --git a/src/plugins/android/android.qbs b/src/plugins/android/android.qbs
index 056c07737c6..96be929f86f 100644
--- a/src/plugins/android/android.qbs
+++ b/src/plugins/android/android.qbs
@@ -69,8 +69,6 @@ QtcPlugin {
         "avddialog.h",
         "avdmanageroutputparser.cpp",
         "avdmanageroutputparser.h",
-        "certificatesmodel.cpp",
-        "certificatesmodel.h",
         "createandroidmanifestwizard.h",
         "createandroidmanifestwizard.cpp",
         "javaeditor.cpp",
diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp
index 2582afc4b1f..2421bd76a54 100644
--- a/src/plugins/android/androidbuildapkstep.cpp
+++ b/src/plugins/android/androidbuildapkstep.cpp
@@ -10,7 +10,6 @@
 #include "androidsdkmanager.h"
 #include "androidtr.h"
 #include "androidutils.h"
-#include "certificatesmodel.h"
 #include "createandroidmanifestwizard.h"
 #include "javaparser.h"
 
@@ -65,6 +64,49 @@ namespace Android::Internal {
 
 static Q_LOGGING_CATEGORY(buildapkstepLog, "qtc.android.build.androidbuildapkstep", QtWarningMsg)
 
+const QLatin1String AliasString("Alias name:");
+const QLatin1String CertificateSeparator("*******************************************");
+
+class CertificatesModel : public QAbstractListModel
+{
+public:
+    CertificatesModel(const QString &rowCertificates, QObject *parent)
+        : QAbstractListModel(parent)
+    {
+        int from = rowCertificates.indexOf(AliasString);
+        QPair<QString, QString> item;
+        while (from > -1) {
+            from += 11;// strlen(AliasString);
+            const int eol = rowCertificates.indexOf(QLatin1Char('\n'), from);
+            item.first = rowCertificates.mid(from, eol - from).trimmed();
+            const int eoc = rowCertificates.indexOf(CertificateSeparator, eol);
+            item.second = rowCertificates.mid(eol + 1, eoc - eol - 2).trimmed();
+            from = rowCertificates.indexOf(AliasString, eoc);
+            m_certs.push_back(item);
+        }
+    }
+
+protected:
+    int rowCount(const QModelIndex &parent = {}) const override
+    {
+        if (parent.isValid())
+            return 0;
+        return m_certs.size();
+    }
+
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override
+    {
+        if (!index.isValid() || (role != Qt::DisplayRole && role != Qt::ToolTipRole))
+            return {};
+        if (role == Qt::DisplayRole)
+            return m_certs[index.row()].first;
+        return m_certs[index.row()].second;
+    }
+
+private:
+    QList<QPair<QString, QString>> m_certs;
+};
+
 class LibraryListModel : public QAbstractItemModel
 {
     Q_OBJECT
diff --git a/src/plugins/android/certificatesmodel.cpp b/src/plugins/android/certificatesmodel.cpp
deleted file mode 100644
index 7ba86cfafe6..00000000000
--- a/src/plugins/android/certificatesmodel.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (C) 2016 BogDan Vatra <bog_dan_ro@yahoo.com>
-// 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 "certificatesmodel.h"
-
-#include <QComboBox>
-
-namespace Android::Internal {
-
-const QLatin1String AliasString("Alias name:");
-const QLatin1String CertificateSeparator("*******************************************");
-
-CertificatesModel::CertificatesModel(const QString &rowCertificates, QObject *parent)
-    : QAbstractListModel(parent)
-{
-    int from = rowCertificates.indexOf(AliasString);
-    QPair<QString, QString> item;
-    while (from > -1) {
-        from += 11;// strlen(AliasString);
-        const int eol = rowCertificates.indexOf(QLatin1Char('\n'), from);
-        item.first = rowCertificates.mid(from, eol - from).trimmed();
-        const int eoc = rowCertificates.indexOf(CertificateSeparator, eol);
-        item.second = rowCertificates.mid(eol + 1, eoc - eol - 2).trimmed();
-        from = rowCertificates.indexOf(AliasString, eoc);
-        m_certs.push_back(item);
-    }
-}
-
-int CertificatesModel::rowCount(const QModelIndex &parent) const
-{
-    if (parent.isValid())
-        return 0;
-    return m_certs.size();
-}
-
-QVariant CertificatesModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid() || (role != Qt::DisplayRole && role != Qt::ToolTipRole))
-        return {};
-    if (role == Qt::DisplayRole)
-        return m_certs[index.row()].first;
-    return m_certs[index.row()].second;
-}
-
-} // namespace Android::Internal
diff --git a/src/plugins/android/certificatesmodel.h b/src/plugins/android/certificatesmodel.h
deleted file mode 100644
index 5a3b933047c..00000000000
--- a/src/plugins/android/certificatesmodel.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (C) 2016 BogDan Vatra <bog_dan_ro@yahoo.com>
-// 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 <QAbstractListModel>
-#include <QList>
-#include <QPair>
-
-namespace Android::Internal {
-
-class CertificatesModel: public QAbstractListModel
-{
-public:
-    CertificatesModel(const QString &rowCertificates, QObject *parent);
-
-protected:
-    int rowCount(const QModelIndex &parent = {}) const override;
-
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-
-private:
-    QList<QPair<QString, QString>> m_certs;
-};
-
-} // namespace Android::Internal
author	Jarek Kobus <jaroslaw.kobus@qt.io>	2024-11-12 15:24:13 +0100
committer	Jarek Kobus <jaroslaw.kobus@qt.io>	2024-11-12 16:22:27 +0000
commit	641faec0f4109604dbd3b4256ef2b60673f30c07 (patch)
tree	ebb711ae2eb01173e17b80b1320bfcb0dfa5fa55
parent	0244e45f131c3f54f7c0d1aa702b155a720afeb9 (diff)