Revamp Qt NFC examples: ndefeditor example

Align QtNfc Module examples to QML and c++ coding conventions. This
commit is focused on the ndefeditor example.

Task-number: QTBUG-60644
Change-Id: I6c14e1a7965bb335bfea87ed80c442926b6a36a4
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>

7 files changed, 29 insertions, 42 deletions

diff --git a/examples/nfc/ndefeditor/mainwindow.cpp b/examples/nfc/ndefeditor/mainwindow.cpp
index 02a969ae..41077c2d 100644
--- a/examples/nfc/ndefeditor/mainwindow.cpp
+++ b/examples/nfc/ndefeditor/mainwindow.cpp
@@ -55,21 +55,18 @@
 #include "urirecordeditor.h"
 #include "mimeimagerecordeditor.h"
 
-#include <QtCore/QTime>
-#include <QMenu>
-#include <QVBoxLayout>
-#include <QFrame>
-#include <QLabel>
-#include <QFileDialog>
-
-#include <qnearfieldmanager.h>
-#include <qnearfieldtarget.h>
-#include <qndefrecord.h>
-#include <qndefnfctextrecord.h>
-#include <qndefnfcurirecord.h>
-#include <qndefmessage.h>
-
-#include <QtCore/QDebug>
+#include <QtNfc/qndefnfcurirecord.h>
+#include <QtNfc/qndefnfctextrecord.h>
+#include <QtNfc/qndefrecord.h>
+#include <QtNfc/qndefmessage.h>
+#include <QtNfc/qnearfieldmanager.h>
+#include <QtNfc/qnearfieldtarget.h>
+
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QFileDialog>
 
 class EmptyRecordLabel : public QLabel
 {
@@ -239,19 +236,16 @@ void MainWindow::targetDetected(QNearFieldTarget *target)
     case NoAction:
         break;
     case ReadNdef:
-        connect(target, SIGNAL(ndefMessageRead(QNdefMessage)),
-                this, SLOT(ndefMessageRead(QNdefMessage)));
-        connect(target, SIGNAL(error(QNearFieldTarget::Error,QNearFieldTarget::RequestId)),
-                this, SLOT(targetError(QNearFieldTarget::Error,QNearFieldTarget::RequestId)));
+        connect(target, &QNearFieldTarget::ndefMessageRead, this, &MainWindow::ndefMessageRead);
+        connect(target, &QNearFieldTarget::error, this, &MainWindow::targetError);
 
         m_request = target->readNdefMessages();
         if (!m_request.isValid()) // cannot read messages
             targetError(QNearFieldTarget::NdefReadError, m_request);
         break;
     case WriteNdef:
-        connect(target, SIGNAL(ndefMessagesWritten()), this, SLOT(ndefMessageWritten()));
-        connect(target, SIGNAL(error(QNearFieldTarget::Error,QNearFieldTarget::RequestId)),
-                this, SLOT(targetError(QNearFieldTarget::Error,QNearFieldTarget::RequestId)));
+        connect(target, &QNearFieldTarget::ndefMessagesWritten, this, &MainWindow::ndefMessageWritten);
+        connect(target, &QNearFieldTarget::error, this, &MainWindow::targetError);
 
         m_request = target->writeNdefMessages(QList<QNdefMessage>() << ndefMessage());
         if (!m_request.isValid()) // cannot write messages
diff --git a/examples/nfc/ndefeditor/mainwindow.h b/examples/nfc/ndefeditor/mainwindow.h
index ebdb24f0..9018cbfb 100644
--- a/examples/nfc/ndefeditor/mainwindow.h
+++ b/examples/nfc/ndefeditor/mainwindow.h
@@ -51,16 +51,12 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QMainWindow>
+#include <QtNfc/qnearfieldtarget.h>
 
-#include <qnearfieldtarget.h>
+#include <QtWidgets/QMainWindow>
 
-QT_BEGIN_NAMESPACE
-class QNearFieldManager;
-class QNdefMessage;
-QT_END_NAMESPACE
-
-QT_USE_NAMESPACE
+QT_FORWARD_DECLARE_CLASS(QNearFieldManager)
+QT_FORWARD_DECLARE_CLASS(QNdefMessage)
 
 QT_BEGIN_NAMESPACE
 namespace Ui {
diff --git a/examples/nfc/ndefeditor/mimeimagerecordeditor.cpp b/examples/nfc/ndefeditor/mimeimagerecordeditor.cpp
index ef8cf1fd..8044e8a6 100644
--- a/examples/nfc/ndefeditor/mimeimagerecordeditor.cpp
+++ b/examples/nfc/ndefeditor/mimeimagerecordeditor.cpp
@@ -51,9 +51,9 @@
 #include "mimeimagerecordeditor.h"
 #include "ui_mimeimagerecordeditor.h"
 
-#include <QBuffer>
-#include <QFileDialog>
-#include <QImageReader>
+#include <QtGui/QImageReader>
+#include <QtWidgets/QFileDialog>
+#include <QtCore/QBuffer>
 
 static QString imageFormatToMimeType(const QByteArray &format)
 {
diff --git a/examples/nfc/ndefeditor/mimeimagerecordeditor.h b/examples/nfc/ndefeditor/mimeimagerecordeditor.h
index f6089d43..1e810f64 100644
--- a/examples/nfc/ndefeditor/mimeimagerecordeditor.h
+++ b/examples/nfc/ndefeditor/mimeimagerecordeditor.h
@@ -52,9 +52,9 @@
 #ifndef MIMEIMAGERECORDEDITOR_H
 #define MIMEIMAGERECORDEDITOR_H
 
-#include <QWidget>
+#include <QtNfc/qndefrecord.h>
 
-#include <qndefrecord.h>
+#include <QtWidgets/QWidget>
 
 QT_USE_NAMESPACE
 
diff --git a/examples/nfc/ndefeditor/textrecordeditor.cpp b/examples/nfc/ndefeditor/textrecordeditor.cpp
index 390674ad..381ff88f 100644
--- a/examples/nfc/ndefeditor/textrecordeditor.cpp
+++ b/examples/nfc/ndefeditor/textrecordeditor.cpp
@@ -51,8 +51,6 @@
 #include "textrecordeditor.h"
 #include "ui_textrecordeditor.h"
 
-#include <QtCore/QDebug>
-
 TextRecordEditor::TextRecordEditor(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::TextRecordEditor)
diff --git a/examples/nfc/ndefeditor/textrecordeditor.h b/examples/nfc/ndefeditor/textrecordeditor.h
index 65e33fb7..d7bf4d2e 100644
--- a/examples/nfc/ndefeditor/textrecordeditor.h
+++ b/examples/nfc/ndefeditor/textrecordeditor.h
@@ -51,9 +51,9 @@
 #ifndef TEXTRECORDEDITOR_H
 #define TEXTRECORDEDITOR_H
 
-#include <QWidget>
+#include <QtNfc/qndefnfctextrecord.h>
 
-#include <qndefnfctextrecord.h>
+#include <QtWidgets/QWidget>
 
 QT_BEGIN_NAMESPACE
 namespace Ui {
diff --git a/examples/nfc/ndefeditor/urirecordeditor.h b/examples/nfc/ndefeditor/urirecordeditor.h
index ef75065a..7eee55eb 100644
--- a/examples/nfc/ndefeditor/urirecordeditor.h
+++ b/examples/nfc/ndefeditor/urirecordeditor.h
@@ -48,13 +48,12 @@
 **
 ****************************************************************************/
 
-
 #ifndef URIRECORDEDITOR_H
 #define URIRECORDEDITOR_H
 
-#include <QWidget>
+#include <QtNfc/qndefnfcurirecord.h>
 
-#include <qndefnfcurirecord.h>
+#include <QtWidgets/QWidget>
 
 QT_BEGIN_NAMESPACE
 namespace Ui {