diff options
author | Kai Köhne <kai.koehne@qt.io> | 2024-01-05 08:12:46 +0100 |
---|---|---|
committer | Kai Köhne <kai.koehne@qt.io> | 2024-01-10 10:23:01 +0100 |
commit | 16837bf1f16d877e1f58e98ba88d599eb128762f (patch) | |
tree | 89dcbe2ead928dc9988c7c955b4fa854a5ddfb31 /examples/nfc | |
parent | 619c20be1274778ff3a9344cd7f5b13f085bc956 (diff) |
Examples: Use Qt's canonical CamelCase headers
These are the names also given in the online documentation,
so let's use them in the examples.
Pick-to: 6.7
Change-Id: Ia10af880a0f2495094a5eb626b568da670e2848d
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Diffstat (limited to 'examples/nfc')
-rw-r--r-- | examples/nfc/annotatedurl/annotatedurl.cpp | 32 | ||||
-rw-r--r-- | examples/nfc/annotatedurl/annotatedurl.h | 8 | ||||
-rw-r--r-- | examples/nfc/annotatedurl/main.cpp | 8 | ||||
-rw-r--r-- | examples/nfc/annotatedurl/mainwindow.cpp | 12 | ||||
-rw-r--r-- | examples/nfc/annotatedurl/mainwindow.h | 5 |
5 files changed, 34 insertions, 31 deletions
diff --git a/examples/nfc/annotatedurl/annotatedurl.cpp b/examples/nfc/annotatedurl/annotatedurl.cpp index c3cfec0e..33d5109e 100644 --- a/examples/nfc/annotatedurl/annotatedurl.cpp +++ b/examples/nfc/annotatedurl/annotatedurl.cpp @@ -2,22 +2,22 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #include "annotatedurl.h" -#include <QtCore/qdebug.h> -#include <QtCore/qlocale.h> -#include <QtCore/qurl.h> - -#include <QtGui/qdesktopservices.h> -#include <QtGui/qevent.h> - -#include <QtNfc/qndefmessage.h> -#include <QtNfc/qndefnfctextrecord.h> -#include <QtNfc/qndefnfcurirecord.h> -#include <QtNfc/qndefrecord.h> -#include <QtNfc/qnearfieldmanager.h> -#include <QtNfc/qnearfieldtarget.h> - -#include <QtWidgets/qgridlayout.h> -#include <QtWidgets/qlabel.h> +#include <QDebug> +#include <QLocale> +#include <QUrl> + +#include <QDesktopServices> +#include <QEvent> + +#include <QNdefMessage> +#include <QNdefNfcTextRecord> +#include <QNdefNfcUriRecord> +#include <QNdefRecord> +#include <QNearFieldManager> +#include <QNearFieldTarget> + +#include <QGridLayout> +#include <QLabel> AnnotatedUrl::AnnotatedUrl(QObject *parent) : QObject(parent), diff --git a/examples/nfc/annotatedurl/annotatedurl.h b/examples/nfc/annotatedurl/annotatedurl.h index 887e82d5..95404e55 100644 --- a/examples/nfc/annotatedurl/annotatedurl.h +++ b/examples/nfc/annotatedurl/annotatedurl.h @@ -4,11 +4,11 @@ #ifndef ANNOTATEDURL_H #define ANNOTATEDURL_H -#include <QtNfc/qndeffilter.h> -#include <QtNfc/qndefmessage.h> -#include <QtNfc/qnearfieldmanager.h> +#include <QNdefFilter> +#include <QNdefMessage> +#include <QNearFieldManager> -#include <QtCore/qobject.h> +#include <QObject> QT_FORWARD_DECLARE_CLASS(QNearFieldTarget) QT_FORWARD_DECLARE_CLASS(QPixmap) diff --git a/examples/nfc/annotatedurl/main.cpp b/examples/nfc/annotatedurl/main.cpp index 199d7c7c..352a959b 100644 --- a/examples/nfc/annotatedurl/main.cpp +++ b/examples/nfc/annotatedurl/main.cpp @@ -4,11 +4,11 @@ #include "annotatedurl.h" #include "mainwindow.h" -#include <QtNfc/qnearfieldmanager.h> -#include <QtNfc/qndefnfctextrecord.h> -#include <QtNfc/qndefnfcurirecord.h> +#include <QNearFieldManager> +#include <QNdefNfcTextRecord> +#include <QNdefNfcUriRecord> -#include <QtWidgets/qapplication.h> +#include <QApplication> //! [0] int main(int argc, char *argv[]) diff --git a/examples/nfc/annotatedurl/mainwindow.cpp b/examples/nfc/annotatedurl/mainwindow.cpp index 233c7fb5..7b418360 100644 --- a/examples/nfc/annotatedurl/mainwindow.cpp +++ b/examples/nfc/annotatedurl/mainwindow.cpp @@ -3,11 +3,13 @@ #include "mainwindow.h" -#include <QtCore/qurl.h> -#include <QtGui/qdesktopservices.h> -#include <QtGui/qscreen.h> -#include <QtWidgets/qlabel.h> -#include <QtWidgets/qlayout.h> +#include <QUrl> + +#include <QDesktopServices> +#include <QScreen> + +#include <QLabel> +#include <QLayout> MainWindow::MainWindow(QWidget *parent) : QWidget(parent), diff --git a/examples/nfc/annotatedurl/mainwindow.h b/examples/nfc/annotatedurl/mainwindow.h index 13c214ac..059c7038 100644 --- a/examples/nfc/annotatedurl/mainwindow.h +++ b/examples/nfc/annotatedurl/mainwindow.h @@ -4,8 +4,9 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <QtGui/qpixmap.h> -#include <QtWidgets/qwidget.h> +#include <QPixmap> + +#include <QWidget> QT_FORWARD_DECLARE_CLASS(QMouseEvent) QT_FORWARD_DECLARE_CLASS(QUrl) |