From ae0843eca0e7102390ceec43236cfe8c5724d278 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Thu, 25 Oct 2018 13:48:34 +0200
Subject: Tablet example: Fix warning about switch/fallthrough

Add Q_FALLTHROUGH(), fixing:
tabletcanvas.cpp:222:55: warning: this statement may fall through [-Wimplicit-fallthrough=]

Change-Id: I573f4add56774218e28a7c5f1dac09c5402333c0
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
 examples/widgets/widgets/tablet/tabletcanvas.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/widgets/widgets/tablet')

diff --git a/examples/widgets/widgets/tablet/tabletcanvas.cpp b/examples/widgets/widgets/tablet/tabletcanvas.cpp
index bfcc84e182..dc56702142 100644
--- a/examples/widgets/widgets/tablet/tabletcanvas.cpp
+++ b/examples/widgets/widgets/tablet/tabletcanvas.cpp
@@ -224,7 +224,7 @@ void TabletCanvas::paintPixmap(QPainter &painter, QTabletEvent *event)
                 qWarning() << error;
 #endif
             }
-            // FALL-THROUGH
+            Q_FALLTHROUGH();
         case QTabletEvent::Stylus:
             painter.setPen(m_pen);
             painter.drawLine(lastPoint.pos, event->posF());
-- 
cgit v1.2.3


From aa32510430d6a5e58cb456faeb072d9f189872fe Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Date: Sun, 2 Dec 2018 14:11:13 +0100
Subject: Cleanup Widgets examples - nullptr

Cleanup the widgets examples - replace 0 with nullptr

Change-Id: Id4bf119b9a41f6d10117f3a613a6e604128fa196
Reviewed-by: Konstantin Shegunov <kshegunov@gmail.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
---
 examples/widgets/widgets/tablet/tabletapplication.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'examples/widgets/widgets/tablet')

diff --git a/examples/widgets/widgets/tablet/tabletapplication.h b/examples/widgets/widgets/tablet/tabletapplication.h
index 6b3b2a1730..9b4a4f1886 100644
--- a/examples/widgets/widgets/tablet/tabletapplication.h
+++ b/examples/widgets/widgets/tablet/tabletapplication.h
@@ -61,15 +61,14 @@ class TabletApplication : public QApplication
     Q_OBJECT
 
 public:
-    TabletApplication(int &argv, char **args)
-    : QApplication(argv, args) {}
+    using QApplication::QApplication;
 
     bool event(QEvent *event) override;
     void setCanvas(TabletCanvas *canvas)
         { m_canvas = canvas; }
 
 private:
-    TabletCanvas *m_canvas;
+    TabletCanvas *m_canvas = nullptr;
 };
 //! [0]
 
-- 
cgit v1.2.3


From 004d7168a335219b19805badae0590b0f5dcfad0 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Date: Sun, 2 Dec 2018 14:18:38 +0100
Subject: Cleanup Widgets examples - includes

Cleanup the Widgets examples - adjust includes to Qt coding style and
remove unused includes and formward declarations

Change-Id: I9f2e513284ad631337ff52ec9c0b98645055dcca
Reviewed-by: Konstantin Shegunov <kshegunov@gmail.com>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
---
 examples/widgets/widgets/tablet/tabletapplication.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'examples/widgets/widgets/tablet')

diff --git a/examples/widgets/widgets/tablet/tabletapplication.cpp b/examples/widgets/widgets/tablet/tabletapplication.cpp
index 2e5ac07c95..37be018276 100644
--- a/examples/widgets/widgets/tablet/tabletapplication.cpp
+++ b/examples/widgets/widgets/tablet/tabletapplication.cpp
@@ -48,10 +48,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "tabletapplication.h"
 
+#include <QtWidgets>
+
 //! [0]
 bool TabletApplication::event(QEvent *event)
 {
-- 
cgit v1.2.3