feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Simplify code and make sure all members are initialized

Browse Source 
Change-Id: I873737d39865f9a920a5893c9630430e6803a6ee
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
Tobias Hunger
2016-12-05 14:04:54 +01:00
parent c7f19dc0a6
commit de0cf4e92c
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androidconfigurations.cpp
View File

@@ -300,14 +300,6 @@ void AndroidConfig::load(const QSettings &settings)
m_NdkInformationUpToDate = false; m_NdkInformationUpToDate = false;
} }
AndroidConfig::AndroidConfig()
: m_useGradle(false),
m_availableSdkPlatformsUpToDate(false),
m_NdkInformationUpToDate(false)
{
}
void AndroidConfig::save(QSettings &settings) const void AndroidConfig::save(QSettings &settings) const
{ {
QFileInfo fileInfo(sdkSettingsFileName()); QFileInfo fileInfo(sdkSettingsFileName());

12
src/plugins/android/androidconfigurations.h
View File

@@ -85,8 +85,6 @@ public:
class ANDROID_EXPORT AndroidConfig class ANDROID_EXPORT AndroidConfig
{ {
public: public:
AndroidConfig();
void load(const QSettings &settings); void load(const QSettings &settings);
void save(QSettings &settings) const; void save(QSettings &settings) const;
@@ -197,16 +195,16 @@ private:
Utils::FileName m_openJDKLocation; Utils::FileName m_openJDKLocation;
Utils::FileName m_keystoreLocation; Utils::FileName m_keystoreLocation;
QStringList m_makeExtraSearchDirectories; QStringList m_makeExtraSearchDirectories;
unsigned m_partitionSize; unsigned m_partitionSize = 1024;
bool m_automaticKitCreation; bool m_automaticKitCreation = true;
bool m_useGradle; bool m_useGradle = false;
//caches //caches
mutable bool m_availableSdkPlatformsUpToDate; mutable bool m_availableSdkPlatformsUpToDate = false;
mutable QVector<SdkPlatform> m_availableSdkPlatforms; mutable QVector<SdkPlatform> m_availableSdkPlatforms;
static bool sortSdkPlatformByApiLevel(const SdkPlatform &a, const SdkPlatform &b); static bool sortSdkPlatformByApiLevel(const SdkPlatform &a, const SdkPlatform &b);
mutable bool m_NdkInformationUpToDate; mutable bool m_NdkInformationUpToDate = false;
mutable QString m_toolchainHost; mutable QString m_toolchainHost;
mutable QVector<int> m_availableNdkPlatforms; mutable QVector<int> m_availableNdkPlatforms;