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

ProjectExplorer: Rename Base*Aspect to *Aspect

Browse Source 
In most cases they are used directly, so there's not much Base* in that.

Added the old name as alias as porting help for a while.

Change-Id: I494a8a560b8996bcf74915ea3570b504df6a6b4c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-08-13 09:16:00 +02:00
parent e62044aa29
commit 51e7bce109
54 changed files with 381 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,15 +114,15 @@ AndroidRunConfiguration::AndroidRunConfiguration(Target *target, Utils::Id id)
addAspect<ArgumentsAspect>();
auto amStartArgsAspect = addAspect<BaseStringAspect>();
auto amStartArgsAspect = addAspect<StringAspect>();
amStartArgsAspect->setId(Constants::ANDROID_AMSTARTARGS);
amStartArgsAspect->setSettingsKey("Android.AmStartArgsKey");
amStartArgsAspect->setLabelText(tr("Activity manager start options:"));
amStartArgsAspect->setDisplayStyle(BaseStringAspect::LineEditDisplay);
amStartArgsAspect->setDisplayStyle(StringAspect::LineEditDisplay);
amStartArgsAspect->setHistoryCompleter("Android.AmStartArgs.History");
auto warning = addAspect<BaseStringAspect>();
warning->setDisplayStyle(BaseStringAspect::LabelDisplay);
auto warning = addAspect<StringAspect>();
warning->setDisplayStyle(StringAspect::LabelDisplay);
warning->setLabelPixmap(Icons::WARNING.pixmap());
warning->setValue(tr("If the \"am start\" options conflict, the application might not start.\n"
"%1 uses: am start -n <package_name>/<Activity_name> [-D].")

2
src/plugins/android/androidrunnerworker.cpp
View File

@@ -289,7 +289,7 @@ AndroidRunnerWorker::AndroidRunnerWorker(RunWorker *runner, const QString &packa
m_extraAppParams = runControl->runnable().commandLineArguments;
if (auto aspect = runControl->aspect(Constants::ANDROID_AMSTARTARGS)) {
const QString startArgs = static_cast<BaseStringAspect *>(aspect)->value();
const QString startArgs = static_cast<StringAspect *>(aspect)->value();
m_amStartExtraArgs = QtcProcess::splitArgs(startArgs, OsTypeOtherUnix);
}