examples: use QSignalBlocker

Examples should show idiomatic Qt, and QSignalBlocker is idiomatic
since it's inception in Qt 5.3. Just updating the examples was
forgotten.

This commit makes good for that.

Fix coding-style issues as a drive-by.

Change-Id: If138e87ea2ab7a444599734113f7cc6df11fb42d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

1 files changed, 17 insertions, 15 deletions

diff --git a/examples/widgets/widgets/charactermap/mainwindow.cpp b/examples/widgets/widgets/charactermap/mainwindow.cpp
index 02be26c5ce..14784e7d65 100644
--- a/examples/widgets/widgets/charactermap/mainwindow.cpp
+++ b/examples/widgets/widgets/charactermap/mainwindow.cpp
@@ -157,25 +157,27 @@ void MainWindow::findSizes(const QFont &font)
 {
     QFontDatabase fontDatabase;
     QString currentSize = sizeCombo->currentText();
-    sizeCombo->blockSignals(true);
-    sizeCombo->clear();
-
-    int size;
-    if(fontDatabase.isSmoothlyScalable(font.family(), fontDatabase.styleString(font))) {
-        foreach(size, QFontDatabase::standardSizes()) {
-            sizeCombo->addItem(QVariant(size).toString());
-            sizeCombo->setEditable(true);
-        }
 
-    } else {
-        foreach(size, fontDatabase.smoothSizes(font.family(), fontDatabase.styleString(font))) {
-            sizeCombo->addItem(QVariant(size).toString());
-            sizeCombo->setEditable(false);
+    {
+        const QSignalBlocker blocker(sizeCombo);
+        // sizeCombo signals are now blocked until end of scope
+        sizeCombo->clear();
+
+        int size;
+        if (fontDatabase.isSmoothlyScalable(font.family(), fontDatabase.styleString(font))) {
+            foreach (size, QFontDatabase::standardSizes()) {
+                sizeCombo->addItem(QVariant(size).toString());
+                sizeCombo->setEditable(true);
+            }
+
+        } else {
+            foreach (size, fontDatabase.smoothSizes(font.family(), fontDatabase.styleString(font))) {
+                sizeCombo->addItem(QVariant(size).toString());
+                sizeCombo->setEditable(false);
+            }
         }
     }
 
-    sizeCombo->blockSignals(false);
-
     int sizeIndex = sizeCombo->findText(currentSize);
 
     if(sizeIndex == -1)