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>
This commit is contained in:
Kai Köhne 2022-12-20 14:14:21 +01:00 committed by Qt Cherry-pick Bot
parent 15b35c7dab
commit e9479d2a22
10 changed files with 1 additions and 41 deletions

View File

@ -6,17 +6,11 @@
#include <QDialog> #include <QDialog>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace Ui { namespace Ui {
class AddressDialog; class AddressDialog;
} }
QT_END_NAMESPACE QT_END_NAMESPACE
QT_USE_NAMESPACE
class AddressDialog : public QDialog class AddressDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT

View File

@ -3,8 +3,6 @@
#include "association.h" #include "association.h"
QT_BEGIN_NAMESPACE
DtlsAssociation::DtlsAssociation(const QHostAddress &address, quint16 port, DtlsAssociation::DtlsAssociation(const QHostAddress &address, quint16 port,
const QString &connectionName) const QString &connectionName)
: name(connectionName), : name(connectionName),
@ -151,5 +149,3 @@ void DtlsAssociation::pingTimeout()
++ping; ++ping;
} }
//! [10] //! [10]
QT_END_NAMESPACE

View File

@ -6,8 +6,6 @@
#include <QtNetwork> #include <QtNetwork>
#include <QtCore> #include <QtCore>
QT_BEGIN_NAMESPACE
//! [0] //! [0]
class DtlsAssociation : public QObject class DtlsAssociation : public QObject
{ {
@ -45,6 +43,4 @@ private:
}; };
//! [0] //! [0]
QT_END_NAMESPACE
#endif // ASSOCIATION_H #endif // ASSOCIATION_H

View File

@ -7,8 +7,6 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
QT_USE_NAMESPACE
QApplication app(argc, argv); QApplication app(argc, argv);
MainWindow window; MainWindow window;
window.show(); window.show();

View File

@ -8,21 +8,15 @@
#include <QList> #include <QList>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace Ui { namespace Ui {
class MainWindow; class MainWindow;
} }
class QHostAddress; class QHostAddress;
class QHostInfo; class QHostInfo;
class DtlsAssociation;
QT_END_NAMESPACE QT_END_NAMESPACE
QT_USE_NAMESPACE class DtlsAssociation;
class MainWindow : public QMainWindow class MainWindow : public QMainWindow
{ {

View File

@ -7,8 +7,6 @@
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
QT_USE_NAMESPACE
QApplication a(argc, argv); QApplication a(argc, argv);
MainWindow w; MainWindow w;
w.show(); w.show();

View File

@ -8,15 +8,11 @@
#include <QMainWindow> #include <QMainWindow>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace Ui { namespace Ui {
class MainWindow; class MainWindow;
} }
QT_END_NAMESPACE QT_END_NAMESPACE
QT_USE_NAMESPACE
class MainWindow : public QMainWindow class MainWindow : public QMainWindow
{ {
Q_OBJECT Q_OBJECT

View File

@ -9,15 +9,11 @@
#include <QList> #include <QList>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace Ui { namespace Ui {
class NicSelector; class NicSelector;
} }
QT_END_NAMESPACE QT_END_NAMESPACE
QT_USE_NAMESPACE
class NicSelector : public QDialog class NicSelector : public QDialog
{ {
Q_OBJECT Q_OBJECT

View File

@ -5,8 +5,6 @@
#include <algorithm> #include <algorithm>
QT_BEGIN_NAMESPACE
namespace { namespace {
QString peer_info(const QHostAddress &address, quint16 port) QString peer_info(const QHostAddress &address, quint16 port)
@ -219,5 +217,3 @@ void DtlsServer::shutdown()
serverSocket.close(); serverSocket.close();
} }
//! [14] //! [14]
QT_END_NAMESPACE

View File

@ -9,8 +9,6 @@
#include <vector> #include <vector>
#include <memory> #include <memory>
QT_BEGIN_NAMESPACE
//! [0] //! [0]
class DtlsServer : public QObject class DtlsServer : public QObject
{ {
@ -55,6 +53,4 @@ private:
}; };
//! [0] //! [0]
QT_END_NAMESPACE
#endif // SERVER_H #endif // SERVER_H