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

ProjectExplorer: De-Q_OBJECT-ify FilterTreeView

Browse Source 
... and rename some local variables.

Change-Id: Ia54a96a4f40c7f4b5ded29df34a12e718d86bd3c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2023-08-22 08:31:00 +02:00
parent 201b28f362
commit 45bae4b525
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/projectexplorer/filterkitaspectsdialog.cpp
View File

@@ -18,26 +18,25 @@
using namespace Utils; using namespace Utils;
namespace ProjectExplorer { namespace ProjectExplorer::Internal {
namespace Internal {
class FilterTreeItem : public TreeItem class FilterTreeItem : public TreeItem
{ {
public: public:
FilterTreeItem(const KitAspectFactory *aspect, bool enabled) : m_aspect(aspect), m_enabled(enabled) FilterTreeItem(const KitAspectFactory *factory, bool enabled) : m_factory(factory), m_enabled(enabled)
{ } { }
QString displayName() const { QString displayName() const {
if (m_aspect->displayName().indexOf('<') < 0) if (m_factory->displayName().indexOf('<') < 0)
return m_aspect->displayName(); return m_factory->displayName();
// removing HTML tag because KitAspect::displayName could contain html // removing HTML tag because KitAspect::displayName could contain html
// e.g. "CMake <a href=\"generator\">generator</a>" (CMakeGeneratorKitAspect) // e.g. "CMake <a href=\"generator\">generator</a>" (CMakeGeneratorKitAspect)
QTextDocument html; QTextDocument html;
html.setHtml(m_aspect->displayName()); html.setHtml(m_factory->displayName());
return html.toPlainText(); return html.toPlainText();
} }
Utils::Id id() const { return m_aspect->id(); } Utils::Id id() const { return m_factory->id(); }
bool enabled() const { return m_enabled; } bool enabled() const { return m_enabled; }
private: private:
@@ -53,7 +52,7 @@ private:
bool setData(int column, const QVariant &data, int role) override bool setData(int column, const QVariant &data, int role) override
{ {
QTC_ASSERT(column == 1 && !m_aspect->isEssential(), return false); QTC_ASSERT(column == 1 && !m_factory->isEssential(), return false);
if (role == Qt::CheckStateRole) { if (role == Qt::CheckStateRole) {
m_enabled = data.toInt() == Qt::Checked; m_enabled = data.toInt() == Qt::Checked;
return true; return true;
@@ -65,14 +64,14 @@ private:
{ {
QTC_ASSERT(column < 2, return Qt::ItemFlags()); QTC_ASSERT(column < 2, return Qt::ItemFlags());
Qt::ItemFlags flags = Qt::ItemIsSelectable; Qt::ItemFlags flags = Qt::ItemIsSelectable;
if (column == 0 || !m_aspect->isEssential()) if (column == 0 || !m_factory->isEssential())
flags |= Qt::ItemIsEnabled; flags |= Qt::ItemIsEnabled;
if (column == 1 && !m_aspect->isEssential()) if (column == 1 && !m_factory->isEssential())
flags |= Qt::ItemIsUserCheckable; flags |= Qt::ItemIsUserCheckable;
return flags; return flags;
} }
const KitAspectFactory * const m_aspect; const KitAspectFactory * const m_factory;
bool m_enabled; bool m_enabled;
}; };
@@ -148,5 +147,4 @@ QSet<Utils::Id> FilterKitAspectsDialog::irrelevantAspects() const
return static_cast<FilterKitAspectsModel *>(m_model)->disabledItems(); return static_cast<FilterKitAspectsModel *>(m_model)->disabledItems();
} }
} // namespace Internal } // ProjectExplorer::Internal
} // namespace ProjectExplorer

1
src/plugins/projectexplorer/filterkitaspectsdialog.h
View File

@@ -15,7 +15,6 @@ namespace Internal {
class FilterKitAspectsDialog : public QDialog class FilterKitAspectsDialog : public QDialog
{ {
Q_OBJECT
public: public:
FilterKitAspectsDialog(const Kit *kit, QWidget *parent); FilterKitAspectsDialog(const Kit *kit, QWidget *parent);
QSet<Utils::Id> irrelevantAspects() const; QSet<Utils::Id> irrelevantAspects() const;