From e7d67531cc64c7a4d4f0ddd5ae3190dbabd67878 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 3 May 2023 12:42:28 +0200 Subject: Qt Designer: Fix static analysis warning about overloaded signals Pick-to: 6.5 Change-Id: Ie2cf46d7032f7a019d1a6e386d868e7ab0d413a8 Reviewed-by: Jarek Kobus --- src/designer/src/components/widgetbox/widgetbox.cpp | 2 +- src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp | 2 +- src/designer/src/components/widgetbox/widgetboxcategorylistview.h | 2 +- src/designer/src/components/widgetbox/widgetboxtreewidget.cpp | 4 ++-- src/designer/src/components/widgetbox/widgetboxtreewidget.h | 3 ++- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/designer/src/components/widgetbox/widgetbox.cpp b/src/designer/src/components/widgetbox/widgetbox.cpp index ff80b3283..7294799f9 100644 --- a/src/designer/src/components/widgetbox/widgetbox.cpp +++ b/src/designer/src/components/widgetbox/widgetbox.cpp @@ -85,7 +85,7 @@ WidgetBox::WidgetBox(QDesignerFormEditorInterface *core, QWidget *parent, Qt::Wi l->addWidget(toolBar); // View - connect(m_view, &WidgetBoxTreeWidget::pressed, + connect(m_view, &WidgetBoxTreeWidget::widgetBoxPressed, this, &WidgetBox::handleMousePress); l->addWidget(m_view); diff --git a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp index 392e658eb..ce1ce1a70 100644 --- a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp +++ b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp @@ -382,7 +382,7 @@ void WidgetBoxCategoryListView::slotPressed(const QModelIndex &index) const QDesignerWidgetBoxInterface::Widget wgt = m_model->widgetAt(m_proxyModel->mapToSource(index)); if (wgt.isNull()) return; - emit pressed(wgt.name(), widgetDomXml(wgt), QCursor::pos()); + emit widgetBoxPressed(wgt.name(), widgetDomXml(wgt), QCursor::pos()); } void WidgetBoxCategoryListView::removeCurrentItem() diff --git a/src/designer/src/components/widgetbox/widgetboxcategorylistview.h b/src/designer/src/components/widgetbox/widgetboxcategorylistview.h index 8a851dde1..9223a2f49 100644 --- a/src/designer/src/components/widgetbox/widgetboxcategorylistview.h +++ b/src/designer/src/components/widgetbox/widgetboxcategorylistview.h @@ -54,7 +54,7 @@ public: signals: void scratchPadChanged(); - void pressed(const QString &name, const QString &xml, const QPoint &globalPos); + void widgetBoxPressed(const QString &name, const QString &xml, const QPoint &globalPos); void itemRemoved(); void lastItemRemoved(); diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp index 6f319fd6b..094f6057b 100644 --- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp +++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp @@ -230,8 +230,8 @@ WidgetBoxCategoryListView *WidgetBoxTreeWidget::addCategoryView(QTreeWidgetItem categoryView->setViewMode(iconMode ? QListView::IconMode : QListView::ListMode); connect(categoryView, &WidgetBoxCategoryListView::scratchPadChanged, this, &WidgetBoxTreeWidget::slotSave); - connect(categoryView, &WidgetBoxCategoryListView::pressed, - this, &WidgetBoxTreeWidget::pressed); + connect(categoryView, &WidgetBoxCategoryListView::widgetBoxPressed, + this, &WidgetBoxTreeWidget::widgetBoxPressed); connect(categoryView, &WidgetBoxCategoryListView::itemRemoved, this, &WidgetBoxTreeWidget::slotScratchPadItemDeleted); connect(categoryView, &WidgetBoxCategoryListView::lastItemRemoved, diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.h b/src/designer/src/components/widgetbox/widgetboxtreewidget.h index f8be581a2..88b4b46e5 100644 --- a/src/designer/src/components/widgetbox/widgetboxtreewidget.h +++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.h @@ -57,7 +57,8 @@ public: QIcon iconForWidget(const QString &iconName) const; signals: - void pressed(const QString &name, const QString &dom_xml, const QPoint &global_mouse_pos); + void widgetBoxPressed(const QString &name, const QString &dom_xml, + const QPoint &global_mouse_pos); public slots: void filter(const QString &); -- cgit v1.2.1