diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-26 21:42:12 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-29 01:06:04 +0100 |
| commit | 07e3bcdc106ac42703ae0fb88b6cac2d2bfdd072 (patch) | |
| tree | f58c7ec452870af2f8aafb69180251646da72ebe /src/network/ssl | |
| parent | 5620f98dc8bb33a029be31677f8a4c33ea4c4ee7 (diff) | |
Remove QT_{BEGIN,END}_HEADER macro usage
The macro was made empty in ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb
and is no longer necessary or used.
Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html
Change-Id: Id2bb2e2cabde059305d4af5f12593344ba30f001
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/network/ssl')
| -rw-r--r-- | src/network/ssl/qssl.h | 4 | ||||
| -rw-r--r-- | src/network/ssl/qsslcertificate.h | 4 | ||||
| -rw-r--r-- | src/network/ssl/qsslcertificateextension.h | 4 | ||||
| -rw-r--r-- | src/network/ssl/qsslcipher.h | 4 | ||||
| -rw-r--r-- | src/network/ssl/qsslconfiguration.h | 4 | ||||
| -rw-r--r-- | src/network/ssl/qsslerror.h | 4 | ||||
| -rw-r--r-- | src/network/ssl/qsslkey.h | 4 | ||||
| -rw-r--r-- | src/network/ssl/qsslsocket.h | 4 |
8 files changed, 0 insertions, 32 deletions
diff --git a/src/network/ssl/qssl.h b/src/network/ssl/qssl.h index 80ccfadecb..06d80965e2 100644 --- a/src/network/ssl/qssl.h +++ b/src/network/ssl/qssl.h @@ -46,8 +46,6 @@ #include <QtCore/qglobal.h> #include <QtCore/QFlags> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -106,6 +104,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QSsl::SslOptions) QT_END_NAMESPACE -QT_END_HEADER - #endif // QSSL_H diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h index 23f9638981..988071eb9d 100644 --- a/src/network/ssl/qsslcertificate.h +++ b/src/network/ssl/qsslcertificate.h @@ -56,8 +56,6 @@ #include <QtCore/qmap.h> #include <QtNetwork/qssl.h> -QT_BEGIN_HEADER - #ifndef QT_NO_SSL QT_BEGIN_NAMESPACE @@ -164,6 +162,4 @@ Q_DECLARE_METATYPE(QSslCertificate) #endif // QT_NO_SSL -QT_END_HEADER - #endif diff --git a/src/network/ssl/qsslcertificateextension.h b/src/network/ssl/qsslcertificateextension.h index ce7ff54941..080b1ccc4e 100644 --- a/src/network/ssl/qsslcertificateextension.h +++ b/src/network/ssl/qsslcertificateextension.h @@ -47,8 +47,6 @@ #include <QtCore/qstring.h> #include <QtCore/qvariant.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -85,8 +83,6 @@ Q_DECLARE_SHARED(QSslCertificateExtension) QT_END_NAMESPACE -QT_END_HEADER - #endif // QSSLCERTIFICATEEXTENSION_H diff --git a/src/network/ssl/qsslcipher.h b/src/network/ssl/qsslcipher.h index 93ae15c3f5..e351d7949b 100644 --- a/src/network/ssl/qsslcipher.h +++ b/src/network/ssl/qsslcipher.h @@ -47,8 +47,6 @@ #include <QtCore/qscopedpointer.h> #include <QtNetwork/qssl.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -97,7 +95,5 @@ Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, const QSslCipher &cipher); QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h index 701dc4cfe1..5bde5cb446 100644 --- a/src/network/ssl/qsslconfiguration.h +++ b/src/network/ssl/qsslconfiguration.h @@ -61,8 +61,6 @@ #include <QtNetwork/qsslsocket.h> #include <QtNetwork/qssl.h> -QT_BEGIN_HEADER - #ifndef QT_NO_SSL QT_BEGIN_NAMESPACE @@ -141,6 +139,4 @@ Q_DECLARE_METATYPE(QSslConfiguration) #endif // QT_NO_SSL -QT_END_HEADER - #endif diff --git a/src/network/ssl/qsslerror.h b/src/network/ssl/qsslerror.h index 847a48cbc1..135ba11ece 100644 --- a/src/network/ssl/qsslerror.h +++ b/src/network/ssl/qsslerror.h @@ -46,8 +46,6 @@ #include <QtCore/qvariant.h> #include <QtNetwork/qsslcertificate.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -126,6 +124,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QList<QSslError>) #endif -QT_END_HEADER - #endif diff --git a/src/network/ssl/qsslkey.h b/src/network/ssl/qsslkey.h index 986b1c41de..145d4a28f1 100644 --- a/src/network/ssl/qsslkey.h +++ b/src/network/ssl/qsslkey.h @@ -48,8 +48,6 @@ #include <QtCore/qsharedpointer.h> #include <QtNetwork/qssl.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -110,6 +108,4 @@ Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, const QSslKey &key); QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index 929e437554..55141243ff 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -50,8 +50,6 @@ # include <QtNetwork/qsslerror.h> #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -223,6 +221,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif |