Android: Deduplicate string literals and use constants instead

Improves findability of identical string in code (via code model).
Reduces risk of typos.

Change-Id: I0e9d9af8eed5cd9b66bf303cfee99c53513bf314
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Alessandro Portale
2021-02-09 21:37:21 +01:00
parent 67788a90bb
commit 9e2c6fbfca
7 changed files with 33 additions and 22 deletions

View File

@@ -27,22 +27,24 @@
#include "texteditor/codeassist/keywordscompletionassist.h"
#include <android/androidconstants.h>
const TextEditor::Keywords &QmakeProjectManager::Internal::qmakeKeywords()
{
static TextEditor::Keywords keywords(
QStringList{ // variables
"ANDROID_ABIS",
"ANDROID_API_VERSION",
"ANDROID_APPLICATION_ARGUMENTS",
QLatin1String(Android::Constants::ANDROID_APPLICATION_ARGUMENTS),
"ANDROID_BUNDLED_JAR_DEPENDENCIES",
"ANDROID_DEPLOYMENT_DEPENDENCIES",
"ANDROID_DEPLOYMENT_SETTINGS_FILE",
"ANDROID_EXTRA_LIBS",
QLatin1String(Android::Constants::ANDROID_DEPLOYMENT_SETTINGS_FILE),
QLatin1String(Android::Constants::ANDROID_EXTRA_LIBS),
"ANDROID_EXTRA_PLUGINS",
"ANDROID_FEATURES",
"ANDROID_LIB_DEPENDENCIES",
"ANDROID_MIN_SDK_VERSION",
"ANDROID_PACKAGE_SOURCE_DIR",
QLatin1String(Android::Constants::ANDROID_PACKAGE_SOURCE_DIR),
"ANDROID_PERMISSIONS",
"ANDROID_TARGET_SDK_VERSION",
"ANDROID_TARGET_ARCH",