From 9cc8949cc63e47da3db333a699ff55ffa811783b Mon Sep 17 00:00:00 2001
From: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
Date: Tue, 4 Feb 2020 15:31:25 +0100
Subject: QComboBox: remove deprecated signals

The following signals have been removed:
- void activated(const QString &);
- void highlighted(const QString &);

Task-number: QTBUG-81845
Change-Id: I61b552d9258987d4252202953aaf4909f9bd718e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
---
 examples/widgets/painting/basicdrawing/window.cpp            | 10 +++++-----
 examples/widgets/painting/imagecomposition/imagecomposer.cpp |  2 +-
 examples/widgets/painting/painterpaths/window.cpp            |  8 ++++----
 examples/widgets/painting/transformations/window.cpp         |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'examples/widgets/painting')

diff --git a/examples/widgets/painting/basicdrawing/window.cpp b/examples/widgets/painting/basicdrawing/window.cpp
index 65f6971d13..c3f05dd948 100644
--- a/examples/widgets/painting/basicdrawing/window.cpp
+++ b/examples/widgets/painting/basicdrawing/window.cpp
@@ -157,17 +157,17 @@ Window::Window()
 //! [7]
 
 //! [8]
-    connect(shapeComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(shapeComboBox, &QComboBox::activated,
             this, &Window::shapeChanged);
     connect(penWidthSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
             this, &Window::penChanged);
-    connect(penStyleComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(penStyleComboBox, &QComboBox::activated,
             this, &Window::penChanged);
-    connect(penCapComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(penCapComboBox, &QComboBox::activated,
             this, &Window::penChanged);
-    connect(penJoinComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(penJoinComboBox, &QComboBox::activated,
             this, &Window::penChanged);
-    connect(brushStyleComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(brushStyleComboBox, &QComboBox::activated,
             this, &Window::brushChanged);
     connect(antialiasingCheckBox, &QAbstractButton::toggled,
             renderArea, &RenderArea::setAntialiased);
diff --git a/examples/widgets/painting/imagecomposition/imagecomposer.cpp b/examples/widgets/painting/imagecomposition/imagecomposer.cpp
index ffdc8f433c..f0935147cf 100644
--- a/examples/widgets/painting/imagecomposition/imagecomposer.cpp
+++ b/examples/widgets/painting/imagecomposition/imagecomposer.cpp
@@ -102,7 +102,7 @@ ImageComposer::ImageComposer()
 //! [3]
     connect(sourceButton, &QAbstractButton::clicked,
             this, &ImageComposer::chooseSource);
-    connect(operatorComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(operatorComboBox, &QComboBox::activated,
             this, &ImageComposer::recalculateResult);
     connect(destinationButton, &QAbstractButton::clicked,
             this, &ImageComposer::chooseDestination);
diff --git a/examples/widgets/painting/painterpaths/window.cpp b/examples/widgets/painting/painterpaths/window.cpp
index 6fb3218313..e43a0377af 100644
--- a/examples/widgets/painting/painterpaths/window.cpp
+++ b/examples/widgets/painting/painterpaths/window.cpp
@@ -194,13 +194,13 @@ Window::Window()
 //! [12]
 
 //! [16]
-    connect(fillRuleComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(fillRuleComboBox, &QComboBox::activated,
             this, &Window::fillRuleChanged);
-    connect(fillColor1ComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(fillColor1ComboBox, &QComboBox::activated,
             this, &Window::fillGradientChanged);
-    connect(fillColor2ComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(fillColor2ComboBox, &QComboBox::activated,
             this, &Window::fillGradientChanged);
-    connect(penColorComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(penColorComboBox, &QComboBox::activated,
             this, &Window::penColorChanged);
 
     for (RenderArea *area : qAsConst(renderAreas)) {
diff --git a/examples/widgets/painting/transformations/window.cpp b/examples/widgets/painting/transformations/window.cpp
index 8261c4e12e..a07e4dd5d1 100644
--- a/examples/widgets/painting/transformations/window.cpp
+++ b/examples/widgets/painting/transformations/window.cpp
@@ -79,7 +79,7 @@ Window::Window()
         operationComboBoxes[i]->addItem(tr("Scale to 75%"));
         operationComboBoxes[i]->addItem(tr("Translate by (50, 50)"));
 
-        connect(operationComboBoxes[i], QOverload<int>::of(&QComboBox::activated),
+        connect(operationComboBoxes[i], &QComboBox::activated,
                 this, &Window::operationChanged);
 
         layout->addWidget(transformedRenderAreas[i], 0, i + 1);
@@ -159,7 +159,7 @@ void Window::setupShapes()
     shapes.append(text);
     shapes.append(truck);
 
-    connect(shapeComboBox, QOverload<int>::of(&QComboBox::activated),
+    connect(shapeComboBox, &QComboBox::activated,
             this, &Window::shapeSelected);
 }
 //! [7]
-- 
cgit v1.2.3