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

Help: Use QMultiHash in docsettingspage

Browse Source 
Task-number: QTCREATORBUG-24098
Change-Id: I0f9f04182dfc3608a0b77231d5a546e6e68f2a44
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-07-16 11:56:57 +02:00
parent 1e0b82e77d
commit 65838ae510
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/help/docsettingspage.cpp
View File

@@ -99,7 +99,7 @@ private:
QString m_recentDialogPath; QString m_recentDialogPath;
using NameSpaceToPathHash = QHash<QString, QString>; using NameSpaceToPathHash = QMultiHash<QString, QString>;
NameSpaceToPathHash m_filesToRegister; NameSpaceToPathHash m_filesToRegister;
QHash<QString, bool> m_filesToRegisterUserManaged; QHash<QString, bool> m_filesToRegisterUserManaged;
NameSpaceToPathHash m_filesToUnregister; NameSpaceToPathHash m_filesToUnregister;
@@ -213,7 +213,7 @@ void DocSettingsPageWidget::addDocumentation()
const QString filePath = QDir::cleanPath(file); const QString filePath = QDir::cleanPath(file);
const QString &nameSpace = HelpManager::namespaceFromFile(filePath); const QString &nameSpace = HelpManager::namespaceFromFile(filePath);
if (nameSpace.isEmpty()) { if (nameSpace.isEmpty()) {
docsUnableToRegister.insertMulti("UnknownNamespace", QDir::toNativeSeparators(filePath)); docsUnableToRegister.insert("UnknownNamespace", QDir::toNativeSeparators(filePath));
continue; continue;
} }
@@ -240,7 +240,7 @@ void DocSettingsPageWidget::addDocumentation()
values.remove(filePath); values.remove(filePath);
m_filesToUnregister.remove(nameSpace); m_filesToUnregister.remove(nameSpace);
foreach (const QString &value, values) foreach (const QString &value, values)
m_filesToUnregister.insertMulti(nameSpace, value); m_filesToUnregister.insert(nameSpace, value);
} }
} }
@@ -317,7 +317,7 @@ void DocSettingsPageWidget::removeDocumentation(const QList<QModelIndex> &items)
m_filesToRegister.remove(nameSpace); m_filesToRegister.remove(nameSpace);
m_filesToRegisterUserManaged.remove(nameSpace); m_filesToRegisterUserManaged.remove(nameSpace);
m_filesToUnregister.insertMulti(nameSpace, QDir::cleanPath(HelpManager::fileFromNamespace(nameSpace))); m_filesToUnregister.insert(nameSpace, QDir::cleanPath(HelpManager::fileFromNamespace(nameSpace)));
m_model.removeAt(row); m_model.removeAt(row);
} }