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

AutoTest: Use using namespace Utils more often

Browse Source 
Change-Id: I9d20cd3496c4719d58a977f8fd53253c86d55463
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2023-01-16 15:00:15 +01:00
parent d05c5b7d07
commit bc3ebef7ce
41 changed files with 343 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/autotest/testsettingspage.cpp
View File

@@ -29,6 +29,8 @@
#include <QTreeWidget>
#include <QWidget>
using namespace Utils;
namespace Autotest {
namespace Internal {
@@ -41,8 +43,8 @@ public:
TestSettings settings() const;
private:
void populateFrameworksListWidget(const QHash<Utils::Id, bool> &frameworks,
const QHash<Utils::Id, bool> &testTools);
void populateFrameworksListWidget(const QHash<Id, bool> &frameworks,
const QHash<Id, bool> &testTools);
void testSettings(TestSettings &settings) const;
void testToolsSettings(TestSettings &settings) const;
void onFrameworkItemChanged();
@@ -61,7 +63,7 @@ private:
QComboBox *m_runAfterBuildCB;
QSpinBox *m_timeoutSpin;
QTreeWidget *m_frameworkTreeWidget;
Utils::InfoLabel *m_frameworksWarn;
InfoLabel *m_frameworksWarn;
};
TestSettingsWidget::TestSettingsWidget(QWidget *parent)
@@ -146,12 +148,12 @@ TestSettingsWidget::TestSettingsWidget(QWidget *parent)
item->setText(1, Tr::tr("Group"));
item->setToolTip(1, Tr::tr("Enables grouping of test cases."));
m_frameworksWarn = new Utils::InfoLabel;
m_frameworksWarn = new InfoLabel;
m_frameworksWarn->setVisible(false);
m_frameworksWarn->setElideMode(Qt::ElideNone);
m_frameworksWarn->setType(Utils::InfoLabel::Warning);
m_frameworksWarn->setType(InfoLabel::Warning);
using namespace Utils::Layouting;
using namespace Layouting;
PushButton resetChoicesButton {
text(Tr::tr("Reset Cached Choices")),
@@ -249,13 +251,13 @@ enum TestBaseInfo
BaseType
};
void TestSettingsWidget::populateFrameworksListWidget(const QHash<Utils::Id, bool> &frameworks,
const QHash<Utils::Id, bool> &testTools)
void TestSettingsWidget::populateFrameworksListWidget(const QHash<Id, bool> &frameworks,
const QHash<Id, bool> &testTools)
{
const TestFrameworks &registered = TestFrameworkManager::registeredFrameworks();
m_frameworkTreeWidget->clear();
for (const ITestFramework *framework : registered) {
const Utils::Id id = framework->id();
const Id id = framework->id();
auto item = new QTreeWidgetItem(m_frameworkTreeWidget, {framework->displayName()});
item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable);
item->setCheckState(0, frameworks.value(id) ? Qt::Checked : Qt::Unchecked);
@@ -272,7 +274,7 @@ void TestSettingsWidget::populateFrameworksListWidget(const QHash<Utils::Id, boo
// ...and now the test tools
const TestTools &registeredTools = TestFrameworkManager::registeredTestTools();
for (const ITestTool *testTool : registeredTools) {
const Utils::Id id = testTool->id();
const Id id = testTool->id();
auto item = new QTreeWidgetItem(m_frameworkTreeWidget, {testTool->displayName()});
item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsUserCheckable);
item->setCheckState(0, testTools.value(id) ? Qt::Checked : Qt::Unchecked);
@@ -289,7 +291,7 @@ void TestSettingsWidget::testSettings(TestSettings &settings) const
QTC_ASSERT(itemCount <= model->rowCount(), return);
for (int row = 0; row < itemCount; ++row) {
QModelIndex idx = model->index(row, 0);
const Utils::Id id = Utils::Id::fromSetting(idx.data(BaseId));
const Id id = Id::fromSetting(idx.data(BaseId));
settings.frameworks.insert(id, idx.data(Qt::CheckStateRole) == Qt::Checked);
idx = model->index(row, 1);
settings.frameworksGrouping.insert(id, idx.data(Qt::CheckStateRole) == Qt::Checked);
@@ -306,7 +308,7 @@ void TestSettingsWidget::testToolsSettings(TestSettings &settings) const
QTC_ASSERT(row <= end, return);
for ( ; row < end; ++row) {
const QModelIndex idx = model->index(row, 0);
const Utils::Id id = Utils::Id::fromSetting(idx.data(BaseId));
const Id id = Id::fromSetting(idx.data(BaseId));
settings.tools.insert(id, idx.data(Qt::CheckStateRole) == Qt::Checked);
}
}
@@ -365,8 +367,8 @@ void TestSettingsPage::apply()
if (!m_widget) // page was not shown at all
return;
const TestSettings newSettings = m_widget->settings();
const QList<Utils::Id> changedIds = Utils::filtered(newSettings.frameworksGrouping.keys(),
[newSettings, this](const Utils::Id &id) {
const QList<Id> changedIds = Utils::filtered(newSettings.frameworksGrouping.keys(),
[newSettings, this](const Id &id) {
return newSettings.frameworksGrouping[id] != m_settings->frameworksGrouping[id];
});
*m_settings = newSettings;