From 2555f4b8ddab2a36c090c94fbd1adb9d003f7350 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 10 Feb 2020 16:02:24 +0200 Subject: [PATCH] Android: Fix UNINIT_CTOR and PASS_BY_VALUE issues Change-Id: Ie77e69226769d9ea0440611f2f5985c5ec08beaa Reviewed-by: Alessandro Portale --- src/plugins/android/androidavdmanager.cpp | 4 ++-- src/plugins/android/androidavdmanager.h | 2 +- src/plugins/android/androidsdkdownloader.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp index a8c194bf046..7e91db6ef84 100644 --- a/src/plugins/android/androidavdmanager.cpp +++ b/src/plugins/android/androidavdmanager.cpp @@ -71,7 +71,7 @@ const int avdCreateTimeoutMs = 30000; \c true if the command is successfully executed. Output is copied into \a output. The function blocks the calling thread. */ -bool AndroidAvdManager::avdManagerCommand(const AndroidConfig config, const QStringList &args, QString *output) +bool AndroidAvdManager::avdManagerCommand(const AndroidConfig &config, const QStringList &args, QString *output) { CommandLine cmd(config.avdManagerToolPath(), args); Utils::SynchronousProcess proc; @@ -112,7 +112,7 @@ static bool checkForTimeout(const chrono::steady_clock::time_point &start, return timedOut; } -static CreateAvdInfo createAvdCommand(const AndroidConfig config, const CreateAvdInfo &info) +static CreateAvdInfo createAvdCommand(const AndroidConfig &config, const CreateAvdInfo &info) { CreateAvdInfo result = info; diff --git a/src/plugins/android/androidavdmanager.h b/src/plugins/android/androidavdmanager.h index 41244b32724..e4df525e0ce 100644 --- a/src/plugins/android/androidavdmanager.h +++ b/src/plugins/android/androidavdmanager.h @@ -54,7 +54,7 @@ public: QString waitForAvd(const QString &avdName, const std::function &cancelChecker = {}) const; bool isAvdBooted(const QString &device) const; - static bool avdManagerCommand(const AndroidConfig config, + static bool avdManagerCommand(const AndroidConfig &config, const QStringList &args, QString *output); diff --git a/src/plugins/android/androidsdkdownloader.h b/src/plugins/android/androidsdkdownloader.h index 0801f763add..7cb1b042026 100644 --- a/src/plugins/android/androidsdkdownloader.h +++ b/src/plugins/android/androidsdkdownloader.h @@ -65,9 +65,9 @@ private: #endif QNetworkAccessManager m_manager; - QNetworkReply *m_reply; + QNetworkReply *m_reply = nullptr; QString m_sdkFilename; - QProgressDialog *m_progressDialog; + QProgressDialog *m_progressDialog = nullptr; QUrl m_sdkUrl; QByteArray m_sha256; };