From c8c48d899f91e7c9a44389860d7afb8af35eadd0 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 25 Apr 2023 10:00:07 +0200 Subject: [PATCH] Locator: Fix style and reuse LocatorFilterEntries Fix names of private members of LocatorModel to have one common style. Reuse LocatorFilterEntries where possible. Change-Id: Icca1e396b9fafd165adf35939dd7859032f90c0c Reviewed-by: Reviewed-by: Qt CI Bot Reviewed-by: Eike Ziller --- .../coreplugin/locator/locatorfiltertest.cpp | 2 +- .../coreplugin/locator/locatorfiltertest.h | 2 +- .../coreplugin/locator/locatorwidget.cpp | 50 +++++++++---------- src/plugins/cppeditor/cppmodelmanager.cpp | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/plugins/coreplugin/locator/locatorfiltertest.cpp b/src/plugins/coreplugin/locator/locatorfiltertest.cpp index 2a901f8669e..152ac117336 100644 --- a/src/plugins/coreplugin/locator/locatorfiltertest.cpp +++ b/src/plugins/coreplugin/locator/locatorfiltertest.cpp @@ -30,7 +30,7 @@ bool ResultData::operator==(const ResultData &other) const return textColumn1 == other.textColumn1 && textColumn2 == other.textColumn2 && highlightEqual; } -ResultData::ResultDataList ResultData::fromFilterEntryList(const QList &entries) +ResultData::ResultDataList ResultData::fromFilterEntryList(const LocatorFilterEntries &entries) { ResultDataList result; for (const LocatorFilterEntry &entry : entries) { diff --git a/src/plugins/coreplugin/locator/locatorfiltertest.h b/src/plugins/coreplugin/locator/locatorfiltertest.h index 5003f1e9ff0..2ad18ac2363 100644 --- a/src/plugins/coreplugin/locator/locatorfiltertest.h +++ b/src/plugins/coreplugin/locator/locatorfiltertest.h @@ -21,7 +21,7 @@ public: bool operator==(const ResultData &other) const; - static ResultDataList fromFilterEntryList(const QList &entries); + static ResultDataList fromFilterEntryList(const LocatorFilterEntries &entries); /// For debugging and creating reference data static void printFilterEntries(const ResultDataList &entries, const QString &msg = QString()); diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp index 6de120b4dc6..28114297dc5 100644 --- a/src/plugins/coreplugin/locator/locatorwidget.cpp +++ b/src/plugins/coreplugin/locator/locatorwidget.cpp @@ -57,8 +57,8 @@ public: LocatorModel(QObject *parent = nullptr) : QAbstractListModel(parent) - , mBackgroundColor(Utils::creatorTheme()->color(Utils::Theme::TextColorHighlightBackground)) - , mForegroundColor(Utils::creatorTheme()->color(Utils::Theme::TextColorNormal)) + , m_backgroundColor(Utils::creatorTheme()->color(Utils::Theme::TextColorHighlightBackground)) + , m_foregroundColor(Utils::creatorTheme()->color(Utils::Theme::TextColorNormal)) {} void clear(); @@ -66,13 +66,13 @@ public: int columnCount(const QModelIndex &parent = QModelIndex()) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; - void addEntries(const QList &entries); + void addEntries(const LocatorFilterEntries &entries); private: - mutable QList mEntries; - bool hasExtraInfo = false; - QColor mBackgroundColor; - QColor mForegroundColor; + mutable LocatorFilterEntries m_entries; + bool m_hasExtraInfo = false; + QColor m_backgroundColor; + QColor m_foregroundColor; }; class CompletionDelegate : public HighlightingItemDelegate @@ -134,8 +134,8 @@ protected: void LocatorModel::clear() { beginResetModel(); - mEntries.clear(); - hasExtraInfo = false; + m_entries.clear(); + m_hasExtraInfo = false; endResetModel(); } @@ -143,30 +143,30 @@ int LocatorModel::rowCount(const QModelIndex & parent) const { if (parent.isValid()) return 0; - return mEntries.size(); + return m_entries.size(); } int LocatorModel::columnCount(const QModelIndex &parent) const { if (parent.isValid()) return 0; - return hasExtraInfo ? ColumnCount : 1; + return m_hasExtraInfo ? ColumnCount : 1; } QVariant LocatorModel::data(const QModelIndex &index, int role) const { - if (!index.isValid() || index.row() >= mEntries.size()) + if (!index.isValid() || index.row() >= m_entries.size()) return QVariant(); switch (role) { case Qt::DisplayRole: if (index.column() == DisplayNameColumn) - return mEntries.at(index.row()).displayName; + return m_entries.at(index.row()).displayName; else if (index.column() == ExtraInfoColumn) - return mEntries.at(index.row()).extraInfo; + return m_entries.at(index.row()).extraInfo; break; case Qt::ToolTipRole: { - const LocatorFilterEntry &entry = mEntries.at(index.row()); + const LocatorFilterEntry &entry = m_entries.at(index.row()); QString toolTip = entry.displayName; if (!entry.extraInfo.isEmpty()) toolTip += "\n\n" + entry.extraInfo; @@ -176,7 +176,7 @@ QVariant LocatorModel::data(const QModelIndex &index, int role) const } case Qt::DecorationRole: if (index.column() == DisplayNameColumn) { - LocatorFilterEntry &entry = mEntries[index.row()]; + LocatorFilterEntry &entry = m_entries[index.row()]; if (!entry.displayIcon && !entry.filePath.isEmpty()) entry.displayIcon = FileIconProvider::icon(entry.filePath); return entry.displayIcon ? entry.displayIcon.value() : QIcon(); @@ -187,10 +187,10 @@ QVariant LocatorModel::data(const QModelIndex &index, int role) const return QColor(Qt::darkGray); break; case LocatorEntryRole: - return QVariant::fromValue(mEntries.at(index.row())); + return QVariant::fromValue(m_entries.at(index.row())); case int(HighlightingItemRole::StartColumn): case int(HighlightingItemRole::Length): { - const LocatorFilterEntry &entry = mEntries[index.row()]; + const LocatorFilterEntry &entry = m_entries[index.row()]; auto highlights = [&](LocatorFilterEntry::HighlightInfo::DataType type){ const bool startIndexRole = role == int(HighlightingItemRole::StartColumn); return startIndexRole ? QVariant::fromValue(entry.highlightInfo.starts(type)) @@ -204,7 +204,7 @@ QVariant LocatorModel::data(const QModelIndex &index, int role) const } case int(HighlightingItemRole::DisplayExtra): { if (index.column() == LocatorFilterEntry::HighlightInfo::DisplayName) { - LocatorFilterEntry &entry = mEntries[index.row()]; + LocatorFilterEntry &entry = m_entries[index.row()]; if (!entry.displayExtra.isEmpty()) return QString(" (" + entry.displayExtra + ')'); } @@ -213,9 +213,9 @@ QVariant LocatorModel::data(const QModelIndex &index, int role) const case int(HighlightingItemRole::DisplayExtraForeground): return QColor(Qt::darkGray); case int(HighlightingItemRole::Background): - return mBackgroundColor; + return m_backgroundColor; case int(HighlightingItemRole::Foreground): - return mForegroundColor; + return m_foregroundColor; } return QVariant(); @@ -223,14 +223,14 @@ QVariant LocatorModel::data(const QModelIndex &index, int role) const void LocatorModel::addEntries(const QList &entries) { - beginInsertRows(QModelIndex(), mEntries.size(), mEntries.size() + entries.size() - 1); - mEntries.append(entries); + beginInsertRows(QModelIndex(), m_entries.size(), m_entries.size() + entries.size() - 1); + m_entries.append(entries); endInsertRows(); - if (hasExtraInfo) + if (m_hasExtraInfo) return; if (Utils::anyOf(entries, [](const LocatorFilterEntry &e) { return !e.extraInfo.isEmpty();})) { beginInsertColumns(QModelIndex(), 1, 1); - hasExtraInfo = true; + m_hasExtraInfo = true; endInsertColumns(); } } diff --git a/src/plugins/cppeditor/cppmodelmanager.cpp b/src/plugins/cppeditor/cppmodelmanager.cpp index 0de793bfc4e..07b4e67d270 100644 --- a/src/plugins/cppeditor/cppmodelmanager.cpp +++ b/src/plugins/cppeditor/cppmodelmanager.cpp @@ -556,7 +556,7 @@ void CppModelManager::findUnusedFunctions(const FilePath &folder) return; } Links links; - const auto entries = matcher->outputData(); + const LocatorFilterEntries entries = matcher->outputData(); for (const LocatorFilterEntry &entry : entries) { static const QStringList prefixBlacklist{"main(", "~", "qHash(", "begin()", "end()", "cbegin()", "cend()", "constBegin()", "constEnd()"};