From 4715ca7bc54fc1f30dd7e603a396c876d667c92c Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Date: Sun, 3 Feb 2019 17:09:10 +0100
Subject: Cleanup QtCore examples

Cleanup QtCore examples:
 - use new signal/slot syntax
 - use 0 instead nullptr
 - remove unneeded includes
 - use initializer lists
 - replace foreach with range-based-for loop

Change-Id: I5581f485fa0e9ccf3f4ce6f643908832bc6959bb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 examples/corelib/ipc/localfortuneclient/client.h   | 4 +---
 examples/corelib/ipc/localfortuneserver/main.cpp   | 3 ---
 examples/corelib/ipc/localfortuneserver/server.cpp | 8 ++------
 examples/corelib/ipc/sharedmemory/dialog.cpp       | 9 ++++-----
 examples/corelib/ipc/sharedmemory/dialog.h         | 6 +++---
 5 files changed, 10 insertions(+), 20 deletions(-)

(limited to 'examples/corelib/ipc')

diff --git a/examples/corelib/ipc/localfortuneclient/client.h b/examples/corelib/ipc/localfortuneclient/client.h
index 0c1ede94c9..7248428440 100644
--- a/examples/corelib/ipc/localfortuneclient/client.h
+++ b/examples/corelib/ipc/localfortuneclient/client.h
@@ -53,14 +53,12 @@
 
 #include <QDialog>
 #include <QDataStream>
-
-#include <qlocalsocket.h>
+#include <QLocalSocket>
 
 QT_BEGIN_NAMESPACE
 class QLabel;
 class QLineEdit;
 class QPushButton;
-class QLocalSocket;
 QT_END_NAMESPACE
 
 class Client : public QDialog
diff --git a/examples/corelib/ipc/localfortuneserver/main.cpp b/examples/corelib/ipc/localfortuneserver/main.cpp
index 6f8ec539fe..430005a1d3 100644
--- a/examples/corelib/ipc/localfortuneserver/main.cpp
+++ b/examples/corelib/ipc/localfortuneserver/main.cpp
@@ -49,9 +49,6 @@
 ****************************************************************************/
 
 #include <QApplication>
-#include <QtCore>
-
-#include <stdlib.h>
 
 #include "server.h"
 
diff --git a/examples/corelib/ipc/localfortuneserver/server.cpp b/examples/corelib/ipc/localfortuneserver/server.cpp
index be8d4750d6..9be5ed5051 100644
--- a/examples/corelib/ipc/localfortuneserver/server.cpp
+++ b/examples/corelib/ipc/localfortuneserver/server.cpp
@@ -48,15 +48,11 @@
 **
 ****************************************************************************/
 
+#include "server.h"
+
 #include <QtWidgets>
 #include <QtNetwork>
 
-#include <stdlib.h>
-
-#include "server.h"
-#include <qlocalserver.h>
-#include <qlocalsocket.h>
-
 Server::Server(QWidget *parent)
     : QDialog(parent)
 {
diff --git a/examples/corelib/ipc/sharedmemory/dialog.cpp b/examples/corelib/ipc/sharedmemory/dialog.cpp
index ce5a4547bb..4e999d1bcf 100644
--- a/examples/corelib/ipc/sharedmemory/dialog.cpp
+++ b/examples/corelib/ipc/sharedmemory/dialog.cpp
@@ -51,7 +51,6 @@
 #include "dialog.h"
 #include <QFileDialog>
 #include <QBuffer>
-#include <QtCore/QDebug>
 
 /*!
   \class Dialog
@@ -81,10 +80,10 @@ Dialog::Dialog(QWidget *parent)
   : QDialog(parent), sharedMemory("QSharedMemoryExample")
 {
     ui.setupUi(this);
-    connect(ui.loadFromFileButton, SIGNAL(clicked()), SLOT(loadFromFile()));
-    connect(ui.loadFromSharedMemoryButton,
-            SIGNAL(clicked()),
-            SLOT(loadFromMemory()));
+    connect(ui.loadFromFileButton, &QPushButton::clicked,
+            this, &Dialog::loadFromFile);
+    connect(ui.loadFromSharedMemoryButton, &QPushButton::clicked,
+            this, &Dialog::loadFromMemory);
     setWindowTitle(tr("SharedMemory Example"));
 }
 //! [0]
diff --git a/examples/corelib/ipc/sharedmemory/dialog.h b/examples/corelib/ipc/sharedmemory/dialog.h
index 1662654441..693333256c 100644
--- a/examples/corelib/ipc/sharedmemory/dialog.h
+++ b/examples/corelib/ipc/sharedmemory/dialog.h
@@ -51,8 +51,8 @@
 #ifndef DIALOG_H
 #define DIALOG_H
 
-#include <qdialog.h>
-#include <qsharedmemory.h>
+#include <QDialog>
+#include <QSharedMemory>
 #include "ui_dialog.h"
 
 //! [0]
@@ -61,7 +61,7 @@ class Dialog : public QDialog
     Q_OBJECT
 
   public:
-    Dialog(QWidget *parent = 0);
+    Dialog(QWidget *parent = nullptr);
 
   public slots:
     void loadFromFile();
-- 
cgit v1.2.3