1 files changed, 19 insertions, 21 deletions
diff --git a/examples/nfc/annotatedurl/annotatedurl.cpp b/examples/nfc/annotatedurl/annotatedurl.cpp
index 7f63f44b..5c4a0527 100644
--- a/examples/nfc/annotatedurl/annotatedurl.cpp
+++ b/examples/nfc/annotatedurl/annotatedurl.cpp
@@ -47,24 +47,22 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
 #include "annotatedurl.h"
 
-#include <qnearfieldmanager.h>
-#include <qnearfieldtarget.h>
-#include <qndefmessage.h>
-#include <qndefrecord.h>
-#include <qndefnfctextrecord.h>
-#include <qndefnfcurirecord.h>
-
-#include <QtCore/QUrl>
+#include <QtNfc/qnearfieldmanager.h>
+#include <QtNfc/qnearfieldtarget.h>
+#include <QtNfc/qndefmessage.h>
+#include <QtNfc/qndefrecord.h>
+#include <QtNfc/qndefnfctextrecord.h>
+#include <QtNfc/qndefnfcurirecord.h>
+
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QLabel>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QDesktopServices>
+#include <QtCore/QDebug>
 #include <QtCore/QLocale>
-
-#include <QGridLayout>
-#include <QLabel>
-#include <QMouseEvent>
-#include <QDesktopServices>
-#include <QDebug>
+#include <QtCore/QUrl>
 
 AnnotatedUrl::AnnotatedUrl(QObject *parent)
 :   QObject(parent)
@@ -91,10 +89,10 @@ AnnotatedUrl::AnnotatedUrl(QObject *parent)
         qWarning() << "Platform does not support NDEF message handler registration";
 
     manager->startTargetDetection();
-    connect(manager, SIGNAL(targetDetected(QNearFieldTarget*)),
-            this, SLOT(targetDetected(QNearFieldTarget*)));
-    connect(manager, SIGNAL(targetLost(QNearFieldTarget*)),
-            this, SLOT(targetLost(QNearFieldTarget*)));
+    connect(manager, &QNearFieldManager::targetDetected,
+            this, &AnnotatedUrl::targetDetected);
+    connect(manager, &QNearFieldManager::targetLost,
+            this, &AnnotatedUrl::targetLost);
 }
 
 AnnotatedUrl::~AnnotatedUrl()
@@ -107,8 +105,8 @@ void AnnotatedUrl::targetDetected(QNearFieldTarget *target)
     if (!target)
         return;
 
-    connect(target, SIGNAL(ndefMessageRead(QNdefMessage)),
-            this, SLOT(handlePolledNdefMessage(QNdefMessage)));
+    connect(target, &QNearFieldTarget::ndefMessageRead,
+            this, &AnnotatedUrl::handlePolledNdefMessage);
     target->readNdefMessages();
 }