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

BaseQtVersion: Deduplicate documentation related methods

Browse Source 
Use docsPath() over documentationPath() since that fits better into
the naming scheme of the rest and already returns a FilePath.

Change hasDocumentation() to hasDocs() accordingly.

Change-Id: I619d7c68e612c4e25a830e4dce128d9a1e84c2e2
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2019-09-30 15:54:11 +02:00
parent 67934ccaaa
commit a542f5075f
4 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qtsupport/exampleslistmodel.cpp
View File

@@ -141,7 +141,7 @@ void ExampleSetModel::recreateModel(const QList<BaseQtVersion *> &qtVersions)
foreach (BaseQtVersion *version, qtVersions) {
// sanitize away qt versions that have already been added through extra sets
if (extraManifestDirs.contains(version->documentationPath())) {
if (extraManifestDirs.contains(version->docsPath().toString())) {
if (debugExamples()) {
qWarning() << "Not showing Qt version because manifest path is already added through InstalledExamples settings:"
<< version->displayName();
@@ -172,7 +172,7 @@ int ExampleSetModel::indexForQtVersion(BaseQtVersion *qtVersion) const
}
// check for extra set
const QString &documentationPath = qtVersion->documentationPath();
const QString &documentationPath = qtVersion->docsPath().toString();
for (int i = 0; i < rowCount(); ++i) {
if (getType(i) == ExtraExampleSetType
&& m_extraExampleSets.at(getExtraExampleSetIndex(i)).manifestPath == documentationPath)
@@ -577,7 +577,7 @@ QStringList ExampleSetModel::exampleSources(QString *examplesInstallPath, QStrin
int qtId = getQtId(m_selectedExampleSetIndex);
foreach (BaseQtVersion *version, QtVersionManager::versions()) {
if (version->uniqueId() == qtId) {
manifestScanPath = version->documentationPath();
manifestScanPath = version->docsPath().toString();
examplesPath = version->examplesPath().toString();
demosPath = version->demosPath().toString();
break;