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/dbus | |
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/dbus')
-rw-r--r-- | src/dbus/qdbusabstractadaptor.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusabstractinterface.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusargument.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusconnection.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusconnectioninterface.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbuscontext.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbuserror.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusextratypes.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusinterface.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusmacros.h | 2 | ||||
-rw-r--r-- | src/dbus/qdbusmessage.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusmetatype.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbuspendingcall.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbuspendingreply.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusreply.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusserver.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusservicewatcher.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusunixfiledescriptor.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusutil_p.h | 4 | ||||
-rw-r--r-- | src/dbus/qdbusvirtualobject.h | 4 |
20 files changed, 0 insertions, 78 deletions
diff --git a/src/dbus/qdbusabstractadaptor.h b/src/dbus/qdbusabstractadaptor.h index 1f414b0d92..2a32344de5 100644 --- a/src/dbus/qdbusabstractadaptor.h +++ b/src/dbus/qdbusabstractadaptor.h @@ -47,8 +47,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -72,8 +70,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusabstractinterface.h b/src/dbus/qdbusabstractinterface.h index ae094c000b..8f014ce151 100644 --- a/src/dbus/qdbusabstractinterface.h +++ b/src/dbus/qdbusabstractinterface.h @@ -53,8 +53,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -161,7 +159,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index dc79843d1e..a3a6f990fc 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -55,8 +55,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -417,7 +415,5 @@ inline const QDBusArgument &operator>>(const QDBusArgument &arg, QPair<T1, T2> & QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h index 35559ba37a..20a579f8d6 100644 --- a/src/dbus/qdbusconnection.h +++ b/src/dbus/qdbusconnection.h @@ -47,8 +47,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -208,7 +206,5 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QDBusConnection::VirtualObjectRegisterOptions) QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusconnectioninterface.h b/src/dbus/qdbusconnectioninterface.h index 6c45201445..b900d2a64c 100644 --- a/src/dbus/qdbusconnectioninterface.h +++ b/src/dbus/qdbusconnectioninterface.h @@ -49,8 +49,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -125,7 +123,5 @@ QT_END_NAMESPACE Q_DECLARE_BUILTIN_METATYPE(UInt, QMetaType::UInt, QDBusConnectionInterface::RegisterServiceReply) -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbuscontext.h b/src/dbus/qdbuscontext.h index 4578c30626..82dc7783bf 100644 --- a/src/dbus/qdbuscontext.h +++ b/src/dbus/qdbuscontext.h @@ -47,8 +47,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -80,7 +78,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h index ae738d0860..2c4ec6ce71 100644 --- a/src/dbus/qdbuserror.h +++ b/src/dbus/qdbuserror.h @@ -47,8 +47,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - struct DBusError; QT_BEGIN_NAMESPACE @@ -129,7 +127,5 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QDBusError) -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index 0c68c79ac1..ba99d45c0d 100644 --- a/src/dbus/qdbusextratypes.h +++ b/src/dbus/qdbusextratypes.h @@ -51,8 +51,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -177,7 +175,5 @@ Q_DECLARE_METATYPE(QDBusVariant) Q_DECLARE_METATYPE(QDBusObjectPath) Q_DECLARE_METATYPE(QDBusSignature) -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusinterface.h b/src/dbus/qdbusinterface.h index 5750feb027..d2bb1da369 100644 --- a/src/dbus/qdbusinterface.h +++ b/src/dbus/qdbusinterface.h @@ -47,8 +47,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -75,7 +73,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusmacros.h b/src/dbus/qdbusmacros.h index f2c0fafa8f..5a95f53261 100644 --- a/src/dbus/qdbusmacros.h +++ b/src/dbus/qdbusmacros.h @@ -57,7 +57,6 @@ #include <QtCore/qvector.h> #endif -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #ifndef QT_NO_DBUS @@ -75,6 +74,5 @@ QT_BEGIN_NAMESPACE #endif // QT_NO_DBUS QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h index 8560440881..92553544eb 100644 --- a/src/dbus/qdbusmessage.h +++ b/src/dbus/qdbusmessage.h @@ -49,8 +49,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -126,8 +124,6 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QDBusMessage) -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusmetatype.h b/src/dbus/qdbusmetatype.h index af73902ee5..bc556a0157 100644 --- a/src/dbus/qdbusmetatype.h +++ b/src/dbus/qdbusmetatype.h @@ -47,8 +47,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -93,7 +91,5 @@ int qDBusRegisterMetaType( QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbuspendingcall.h b/src/dbus/qdbuspendingcall.h index 9fa78f3702..19bc34c26b 100644 --- a/src/dbus/qdbuspendingcall.h +++ b/src/dbus/qdbuspendingcall.h @@ -51,8 +51,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -122,7 +120,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h index c7a030d78f..d92c817a0a 100644 --- a/src/dbus/qdbuspendingreply.h +++ b/src/dbus/qdbuspendingreply.h @@ -49,8 +49,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -208,7 +206,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusreply.h b/src/dbus/qdbusreply.h index 22242bc97d..1d73e61cc4 100644 --- a/src/dbus/qdbusreply.h +++ b/src/dbus/qdbusreply.h @@ -53,8 +53,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -192,7 +190,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusserver.h b/src/dbus/qdbusserver.h index 0fbb96d206..d455f8e0ec 100644 --- a/src/dbus/qdbusserver.h +++ b/src/dbus/qdbusserver.h @@ -47,8 +47,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -78,7 +76,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusservicewatcher.h b/src/dbus/qdbusservicewatcher.h index 5f14b5e64c..0988d82550 100644 --- a/src/dbus/qdbusservicewatcher.h +++ b/src/dbus/qdbusservicewatcher.h @@ -47,8 +47,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -99,7 +97,5 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QDBusServiceWatcher::WatchMode) QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif // QDBUSSERVICEWATCHER_H diff --git a/src/dbus/qdbusunixfiledescriptor.h b/src/dbus/qdbusunixfiledescriptor.h index 74c2ba307e..5e8f60817f 100644 --- a/src/dbus/qdbusunixfiledescriptor.h +++ b/src/dbus/qdbusunixfiledescriptor.h @@ -52,8 +52,6 @@ # include <utility> #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -97,7 +95,5 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QDBusUnixFileDescriptor) -QT_END_HEADER - #endif // QT_NO_DBUS #endif // QDBUSUNIXFILEDESCRIPTOR_H diff --git a/src/dbus/qdbusutil_p.h b/src/dbus/qdbusutil_p.h index c77d8791df..5d8b3a1293 100644 --- a/src/dbus/qdbusutil_p.h +++ b/src/dbus/qdbusutil_p.h @@ -61,8 +61,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE namespace QDBusUtil @@ -161,7 +159,5 @@ namespace QDBusUtil QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusvirtualobject.h b/src/dbus/qdbusvirtualobject.h index ada800940d..da63082c70 100644 --- a/src/dbus/qdbusvirtualobject.h +++ b/src/dbus/qdbusvirtualobject.h @@ -48,8 +48,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -74,7 +72,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif |