aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/modeleditor
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-10-07 14:46:06 +0200
committerMarc Mutz <marc.mutz@qt.io>2022-10-07 13:47:53 +0000
commit8eb4d52342fe3a6ede1c1dce3174d95bfa0cea88 (patch)
tree0f5556c5e4098e75853e3d9ee2620e0306f0cf2a /src/plugins/modeleditor
parent90de29d530dfc2921d5179977b3393c11a3cc238 (diff)
Port from qAsConst() to std::as_const()
We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. Task-number: QTBUG-99313 Change-Id: I88edd91395849574436299b8badda21bb93bea39 Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/modeleditor')
-rw-r--r--src/plugins/modeleditor/modeleditor.cpp4
-rw-r--r--src/plugins/modeleditor/modelsmanager.cpp8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/modeleditor/modeleditor.cpp b/src/plugins/modeleditor/modeleditor.cpp
index e0f1838c582..8180f0ef5b2 100644
--- a/src/plugins/modeleditor/modeleditor.cpp
+++ b/src/plugins/modeleditor/modeleditor.cpp
@@ -1046,7 +1046,7 @@ void ModelEditor::initToolbars()
QList<qmt::Toolbar> toolbars = stereotypeController->toolbars();
std::stable_sort(toolbars.begin(), toolbars.end(),
[=](const qmt::Toolbar &lhs, const qmt::Toolbar &rhs) { return lhs.priority() > rhs.priority(); });
- for (const qmt::Toolbar &toolbar : qAsConst(toolbars)) {
+ for (const qmt::Toolbar &toolbar : std::as_const(toolbars)) {
QWidget *toolBar = toolBars.value(toolbar.id());
QLayout *toolBarLayout = nullptr;
if (!toolBar) {
@@ -1171,7 +1171,7 @@ void ModelEditor::initToolbars()
// add stretch to all layouts and calculate width of tool bar
int maxWidth = 48;
- for (QWidget *toolBar : qAsConst(toolBars)) {
+ for (QWidget *toolBar : std::as_const(toolBars)) {
QMT_ASSERT(toolBar, continue);
auto layout = qobject_cast<QBoxLayout *>(toolBar->layout());
QMT_ASSERT(layout, continue);
diff --git a/src/plugins/modeleditor/modelsmanager.cpp b/src/plugins/modeleditor/modelsmanager.cpp
index 5a5cd67276b..fe7bbc9bbd5 100644
--- a/src/plugins/modeleditor/modelsmanager.cpp
+++ b/src/plugins/modeleditor/modelsmanager.cpp
@@ -145,7 +145,7 @@ void ModelsManager::releaseModel(ExtDocumentController *documentController)
void ModelsManager::openDiagram(const qmt::Uid &modelUid, const qmt::Uid &diagramUid)
{
- for (const ManagedModel &managedModel : qAsConst(d->managedModels)) {
+ for (const ManagedModel &managedModel : std::as_const(d->managedModels)) {
if (managedModel.m_documentController->projectController()->project()->uid() == modelUid) {
qmt::MDiagram *diagram = managedModel.m_documentController->modelController()->findObject<qmt::MDiagram>(diagramUid);
QMT_ASSERT(diagram, continue);
@@ -208,7 +208,7 @@ void ModelsManager::onAboutToShowContextMenu(ProjectExplorer::Node *node)
{
bool canOpenDiagram = false;
- for (const ManagedModel &managedModel : qAsConst(d->managedModels)) {
+ for (const ManagedModel &managedModel : std::as_const(d->managedModels)) {
if (managedModel.m_documentController->pxNodeController()->hasDiagramForExplorerNode(node)) {
canOpenDiagram = true;
break;
@@ -226,7 +226,7 @@ void ModelsManager::onOpenDiagramFromProjectExplorer()
{
if (ProjectExplorer::ProjectTree::currentNode() == d->contextMenuOwnerNode) {
qmt::MDiagram *diagram = nullptr;
- for (const ManagedModel &managedModel : qAsConst(d->managedModels)) {
+ for (const ManagedModel &managedModel : std::as_const(d->managedModels)) {
if ((diagram = managedModel.m_documentController->pxNodeController()->findDiagramForExplorerNode(d->contextMenuOwnerNode))) {
openDiagram(managedModel.m_documentController, diagram);
break;
@@ -245,7 +245,7 @@ void ModelsManager::onOpenDefaultModel(const qmt::Uid &modelUid)
void ModelsManager::openDiagram(ExtDocumentController *documentController,
qmt::MDiagram *diagram)
{
- for (const ManagedModel &managedModel : qAsConst(d->managedModels)) {
+ for (const ManagedModel &managedModel : std::as_const(d->managedModels)) {
if (managedModel.m_documentController == documentController) {
Core::IEditor *editor = Core::EditorManager::activateEditorForDocument(managedModel.m_modelDocument);
if (auto modelEditor = qobject_cast<ModelEditor *>(editor)) {