diff options
author | Kai Köhne <kai.koehne@qt.io> | 2022-12-20 14:14:21 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-01-02 22:16:40 +0000 |
commit | e9479d2a2249f3fa8cc5a7a8b4d32da4ab1943f6 (patch) | |
tree | 336fd491b21a114bacf2ee18365cd02f27042f8e /examples/network | |
parent | 15b35c7dabbc26e879c483fd51864fbc273fdb5b (diff) | |
download | qtbase-e9479d2a2249f3fa8cc5a7a8b4d32da4ab1943f6.tar.gz |
Examples: Do not wrap custom types in Qt namespace
The Qt namespace should be used for types defined in the Qt library,
not for user types.
Change-Id: I6df0ca054888f4a65b19a9cb44324321d1dcfad8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 25c67c608a7a6e8673eee27a105b11d723f9a9b1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples/network')
-rw-r--r-- | examples/network/secureudpclient/addressdialog.h | 6 | ||||
-rw-r--r-- | examples/network/secureudpclient/association.cpp | 4 | ||||
-rw-r--r-- | examples/network/secureudpclient/association.h | 4 | ||||
-rw-r--r-- | examples/network/secureudpclient/main.cpp | 2 | ||||
-rw-r--r-- | examples/network/secureudpclient/mainwindow.h | 8 | ||||
-rw-r--r-- | examples/network/secureudpserver/main.cpp | 2 | ||||
-rw-r--r-- | examples/network/secureudpserver/mainwindow.h | 4 | ||||
-rw-r--r-- | examples/network/secureudpserver/nicselector.h | 4 | ||||
-rw-r--r-- | examples/network/secureudpserver/server.cpp | 4 | ||||
-rw-r--r-- | examples/network/secureudpserver/server.h | 4 |
10 files changed, 1 insertions, 41 deletions
diff --git a/examples/network/secureudpclient/addressdialog.h b/examples/network/secureudpclient/addressdialog.h index aab387cf19..4081f44709 100644 --- a/examples/network/secureudpclient/addressdialog.h +++ b/examples/network/secureudpclient/addressdialog.h @@ -6,17 +6,11 @@ #include <QDialog> QT_BEGIN_NAMESPACE - namespace Ui { - class AddressDialog; - } - QT_END_NAMESPACE -QT_USE_NAMESPACE - class AddressDialog : public QDialog { Q_OBJECT diff --git a/examples/network/secureudpclient/association.cpp b/examples/network/secureudpclient/association.cpp index b76a6a7155..ede8393913 100644 --- a/examples/network/secureudpclient/association.cpp +++ b/examples/network/secureudpclient/association.cpp @@ -3,8 +3,6 @@ #include "association.h" -QT_BEGIN_NAMESPACE - DtlsAssociation::DtlsAssociation(const QHostAddress &address, quint16 port, const QString &connectionName) : name(connectionName), @@ -151,5 +149,3 @@ void DtlsAssociation::pingTimeout() ++ping; } //! [10] - -QT_END_NAMESPACE diff --git a/examples/network/secureudpclient/association.h b/examples/network/secureudpclient/association.h index 8bb7bbc011..4822d7c0c9 100644 --- a/examples/network/secureudpclient/association.h +++ b/examples/network/secureudpclient/association.h @@ -6,8 +6,6 @@ #include <QtNetwork> #include <QtCore> -QT_BEGIN_NAMESPACE - //! [0] class DtlsAssociation : public QObject { @@ -45,6 +43,4 @@ private: }; //! [0] -QT_END_NAMESPACE - #endif // ASSOCIATION_H diff --git a/examples/network/secureudpclient/main.cpp b/examples/network/secureudpclient/main.cpp index 827778769d..d0499728c8 100644 --- a/examples/network/secureudpclient/main.cpp +++ b/examples/network/secureudpclient/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char *argv[]) { - QT_USE_NAMESPACE - QApplication app(argc, argv); MainWindow window; window.show(); diff --git a/examples/network/secureudpclient/mainwindow.h b/examples/network/secureudpclient/mainwindow.h index 4e55d0f156..8b68f5787e 100644 --- a/examples/network/secureudpclient/mainwindow.h +++ b/examples/network/secureudpclient/mainwindow.h @@ -8,21 +8,15 @@ #include <QList> QT_BEGIN_NAMESPACE - namespace Ui { - class MainWindow; - } class QHostAddress; class QHostInfo; - -class DtlsAssociation; - QT_END_NAMESPACE -QT_USE_NAMESPACE +class DtlsAssociation; class MainWindow : public QMainWindow { diff --git a/examples/network/secureudpserver/main.cpp b/examples/network/secureudpserver/main.cpp index b144f6571c..7ec6a29aec 100644 --- a/examples/network/secureudpserver/main.cpp +++ b/examples/network/secureudpserver/main.cpp @@ -7,8 +7,6 @@ int main(int argc, char *argv[]) { - QT_USE_NAMESPACE - QApplication a(argc, argv); MainWindow w; w.show(); diff --git a/examples/network/secureudpserver/mainwindow.h b/examples/network/secureudpserver/mainwindow.h index 77cba00b5e..7c69a9b414 100644 --- a/examples/network/secureudpserver/mainwindow.h +++ b/examples/network/secureudpserver/mainwindow.h @@ -8,15 +8,11 @@ #include <QMainWindow> QT_BEGIN_NAMESPACE - namespace Ui { class MainWindow; } - QT_END_NAMESPACE -QT_USE_NAMESPACE - class MainWindow : public QMainWindow { Q_OBJECT diff --git a/examples/network/secureudpserver/nicselector.h b/examples/network/secureudpserver/nicselector.h index 1cbe56e85e..4f8bf9a85f 100644 --- a/examples/network/secureudpserver/nicselector.h +++ b/examples/network/secureudpserver/nicselector.h @@ -9,15 +9,11 @@ #include <QList> QT_BEGIN_NAMESPACE - namespace Ui { class NicSelector; } - QT_END_NAMESPACE -QT_USE_NAMESPACE - class NicSelector : public QDialog { Q_OBJECT diff --git a/examples/network/secureudpserver/server.cpp b/examples/network/secureudpserver/server.cpp index 8684c66c74..4aa22c606b 100644 --- a/examples/network/secureudpserver/server.cpp +++ b/examples/network/secureudpserver/server.cpp @@ -5,8 +5,6 @@ #include <algorithm> -QT_BEGIN_NAMESPACE - namespace { QString peer_info(const QHostAddress &address, quint16 port) @@ -219,5 +217,3 @@ void DtlsServer::shutdown() serverSocket.close(); } //! [14] - -QT_END_NAMESPACE diff --git a/examples/network/secureudpserver/server.h b/examples/network/secureudpserver/server.h index 05e41d4532..a8b6a727c8 100644 --- a/examples/network/secureudpserver/server.h +++ b/examples/network/secureudpserver/server.h @@ -9,8 +9,6 @@ #include <vector> #include <memory> -QT_BEGIN_NAMESPACE - //! [0] class DtlsServer : public QObject { @@ -55,6 +53,4 @@ private: }; //! [0] -QT_END_NAMESPACE - #endif // SERVER_H |