diff options
Diffstat (limited to 'src/platformsupport/linuxaccessibility')
7 files changed, 1 insertions, 15 deletions
diff --git a/src/platformsupport/linuxaccessibility/application_p.h b/src/platformsupport/linuxaccessibility/application_p.h index 754d98495a..e8684ab2b5 100644 --- a/src/platformsupport/linuxaccessibility/application_p.h +++ b/src/platformsupport/linuxaccessibility/application_p.h @@ -47,7 +47,6 @@ #include <QtDBus/QDBusConnection> #include <QtGui/QAccessibleInterface> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE /* @@ -82,6 +81,5 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor_p.h b/src/platformsupport/linuxaccessibility/atspiadaptor_p.h index b7a29fdc15..0bc3290baa 100644 --- a/src/platformsupport/linuxaccessibility/atspiadaptor_p.h +++ b/src/platformsupport/linuxaccessibility/atspiadaptor_p.h @@ -48,12 +48,11 @@ #include <QtCore/qsharedpointer.h> #include <QtDBus/qdbusvirtualobject.h> #include <QtGui/qaccessible.h> -#include <QtGui/qaccessible2.h> +#include <QtGui/private/qaccessible2_p.h> #include "dbusconnection_p.h" #include "struct_marshallers_p.h" -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QAccessibleInterface; @@ -216,6 +215,5 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/platformsupport/linuxaccessibility/bridge_p.h b/src/platformsupport/linuxaccessibility/bridge_p.h index aed437b1e2..8a02847d3d 100644 --- a/src/platformsupport/linuxaccessibility/bridge_p.h +++ b/src/platformsupport/linuxaccessibility/bridge_p.h @@ -48,7 +48,6 @@ class DeviceEventControllerAdaptor; -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class DBusConnection; @@ -81,6 +80,5 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/platformsupport/linuxaccessibility/cache_p.h b/src/platformsupport/linuxaccessibility/cache_p.h index 25680cd8e8..a8128d9320 100644 --- a/src/platformsupport/linuxaccessibility/cache_p.h +++ b/src/platformsupport/linuxaccessibility/cache_p.h @@ -46,7 +46,6 @@ #include <QtCore/QObject> #include "struct_marshallers_p.h" -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QSpiDBusCache : public QObject @@ -67,6 +66,5 @@ public Q_SLOTS: }; QT_END_NAMESPACE -QT_END_HEADER #endif /* Q_SPI_CACHE_H */ diff --git a/src/platformsupport/linuxaccessibility/constant_mappings_p.h b/src/platformsupport/linuxaccessibility/constant_mappings_p.h index 7410f5f94f..a0287a910b 100644 --- a/src/platformsupport/linuxaccessibility/constant_mappings_p.h +++ b/src/platformsupport/linuxaccessibility/constant_mappings_p.h @@ -95,7 +95,6 @@ #define QSPI_REGISTRY_NAME "org.a11y.atspi.Registry" -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE struct RoleNames { @@ -133,6 +132,5 @@ QSpiUIntList spiStateSetFromSpiStates(quint64 states); AtspiRelationType qAccessibleRelationToAtSpiRelation(QAccessible::Relation relation); QT_END_NAMESPACE -QT_END_HEADER #endif /* Q_SPI_CONSTANT_MAPPINGS_H */ diff --git a/src/platformsupport/linuxaccessibility/dbusconnection_p.h b/src/platformsupport/linuxaccessibility/dbusconnection_p.h index 2875dd89d8..2d55ccb547 100644 --- a/src/platformsupport/linuxaccessibility/dbusconnection_p.h +++ b/src/platformsupport/linuxaccessibility/dbusconnection_p.h @@ -47,7 +47,6 @@ #include <QtDBus/QDBusConnection> #include <QtDBus/QDBusVariant> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QDBusServiceWatcher; @@ -83,6 +82,5 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // DBUSCONNECTION_H diff --git a/src/platformsupport/linuxaccessibility/struct_marshallers_p.h b/src/platformsupport/linuxaccessibility/struct_marshallers_p.h index 60d06cebb4..0b775d5521 100644 --- a/src/platformsupport/linuxaccessibility/struct_marshallers_p.h +++ b/src/platformsupport/linuxaccessibility/struct_marshallers_p.h @@ -49,7 +49,6 @@ #include <QtDBus/QDBusConnection> #include <QtDBus/QDBusObjectPath> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE typedef QList <int> QSpiIntList; @@ -173,5 +172,4 @@ Q_DECLARE_METATYPE(QSpiAttributeSet) Q_DECLARE_METATYPE(QSpiAppUpdate) Q_DECLARE_METATYPE(QSpiDeviceEvent) -QT_END_HEADER #endif /* Q_SPI_STRUCT_MARSHALLERS_H */ |