summaryrefslogtreecommitdiffstats
path: root/src/platformsupport
diff options
context:
space:
mode:
Diffstat (limited to 'src/platformsupport')
-rw-r--r--src/platformsupport/dnd/qshapedpixmapdndwindow_p.h4
-rw-r--r--src/platformsupport/dnd/qsimpledrag_p.h4
-rw-r--r--src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h4
-rw-r--r--src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h4
-rw-r--r--src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h4
-rw-r--r--src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h4
-rw-r--r--src/platformsupport/input/evdevmouse/qevdevmousemanager_p.h4
-rw-r--r--src/platformsupport/input/evdevtablet/qevdevtablet_p.h4
-rw-r--r--src/platformsupport/input/evdevtouch/qevdevtouch_p.h4
-rw-r--r--src/platformsupport/linuxaccessibility/application_p.h2
-rw-r--r--src/platformsupport/linuxaccessibility/atspiadaptor_p.h2
-rw-r--r--src/platformsupport/linuxaccessibility/bridge_p.h2
-rw-r--r--src/platformsupport/linuxaccessibility/cache_p.h2
-rw-r--r--src/platformsupport/linuxaccessibility/constant_mappings_p.h2
-rw-r--r--src/platformsupport/linuxaccessibility/dbusconnection_p.h2
-rw-r--r--src/platformsupport/linuxaccessibility/struct_marshallers_p.h2
-rw-r--r--src/platformsupport/services/genericunix/qgenericunixservices_p.h4
-rw-r--r--src/platformsupport/themes/genericunix/qgenericunixthemes_p.h4
18 files changed, 0 insertions, 58 deletions
diff --git a/src/platformsupport/dnd/qshapedpixmapdndwindow_p.h b/src/platformsupport/dnd/qshapedpixmapdndwindow_p.h
index ed0819cf29..20674b6b19 100644
--- a/src/platformsupport/dnd/qshapedpixmapdndwindow_p.h
+++ b/src/platformsupport/dnd/qshapedpixmapdndwindow_p.h
@@ -48,8 +48,6 @@
QT_BEGIN_NAMESPACE
-QT_BEGIN_HEADER
-
class QShapedPixmapWindow : public QWindow
{
Q_OBJECT
@@ -72,8 +70,6 @@ private:
QPoint m_hotSpot;
};
-QT_END_HEADER
-
QT_END_NAMESPACE
#endif // QSHAPEDPIXMAPDNDWINDOW_H
diff --git a/src/platformsupport/dnd/qsimpledrag_p.h b/src/platformsupport/dnd/qsimpledrag_p.h
index 5cf3394919..bb9d215083 100644
--- a/src/platformsupport/dnd/qsimpledrag_p.h
+++ b/src/platformsupport/dnd/qsimpledrag_p.h
@@ -48,8 +48,6 @@
QT_BEGIN_NAMESPACE
-QT_BEGIN_HEADER
-
#ifndef QT_NO_DRAGANDDROP
class QMouseEvent;
@@ -120,8 +118,6 @@ private:
#endif // QT_NO_DRAGANDDROP
-QT_END_HEADER
-
QT_END_NAMESPACE
#endif
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
index d481a3a3e6..e7fec4be14 100644
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h
@@ -54,8 +54,6 @@
#if !defined(Q_WS_MAC) || (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QRawFontPrivate;
@@ -143,8 +141,6 @@ CGAffineTransform qt_transform_from_fontdef(const QFontDef &fontDef);
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif// !defined(Q_WS_MAC) || (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
#endif // QFONTENGINE_CORETEXT_P_H
diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
index 3e5dcb2ac9..1065b05d51 100644
--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler_p.h
@@ -46,8 +46,6 @@
#include <QTimer>
#include <QDataStream>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
namespace QEvdevKeyboardMap {
@@ -198,6 +196,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QEVDEVKEYBOARDHANDLER_P_H
diff --git a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h
index e750f72c3b..37c60c035c 100644
--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h
+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h
@@ -50,8 +50,6 @@
#include <QHash>
#include <QSocketNotifier>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QEvdevKeyboardManager : public QObject
@@ -71,8 +69,6 @@ private:
QDeviceDiscovery *m_deviceDiscovery;
};
-QT_END_HEADER
-
QT_END_NAMESPACE
#endif // QEVDEVKEYBOARDMANAGER_P_H
diff --git a/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h b/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h
index 6e078b2d70..d419a1913e 100644
--- a/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h
+++ b/src/platformsupport/input/evdevmouse/qevdevmousehandler_p.h
@@ -45,8 +45,6 @@
#include <QObject>
#include <QString>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QSocketNotifier;
@@ -83,6 +81,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QEVDEVMOUSEHANDLER_P_H
diff --git a/src/platformsupport/input/evdevmouse/qevdevmousemanager_p.h b/src/platformsupport/input/evdevmouse/qevdevmousemanager_p.h
index a2c83c4a1c..6abe933371 100644
--- a/src/platformsupport/input/evdevmouse/qevdevmousemanager_p.h
+++ b/src/platformsupport/input/evdevmouse/qevdevmousemanager_p.h
@@ -50,8 +50,6 @@
#include <QHash>
#include <QSocketNotifier>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QEvdevMouseManager : public QObject
@@ -79,8 +77,6 @@ private:
int m_yoffset;
};
-QT_END_HEADER
-
QT_END_NAMESPACE
#endif // QEVDEVMOUSEMANAGER_P_H
diff --git a/src/platformsupport/input/evdevtablet/qevdevtablet_p.h b/src/platformsupport/input/evdevtablet/qevdevtablet_p.h
index ce49a01e7b..9222db9907 100644
--- a/src/platformsupport/input/evdevtablet/qevdevtablet_p.h
+++ b/src/platformsupport/input/evdevtablet/qevdevtablet_p.h
@@ -46,8 +46,6 @@
#include <QString>
#include <QThread>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QEvdevTabletData;
@@ -82,6 +80,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QEVDEVTABLET_P_H
diff --git a/src/platformsupport/input/evdevtouch/qevdevtouch_p.h b/src/platformsupport/input/evdevtouch/qevdevtouch_p.h
index b4de2ca088..ceb57bdf05 100644
--- a/src/platformsupport/input/evdevtouch/qevdevtouch_p.h
+++ b/src/platformsupport/input/evdevtouch/qevdevtouch_p.h
@@ -48,8 +48,6 @@
#include <QThread>
#include <qpa/qwindowsysteminterface.h>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QSocketNotifier;
@@ -93,6 +91,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QEVDEVTOUCH_P_H
diff --git a/src/platformsupport/linuxaccessibility/application_p.h b/src/platformsupport/linuxaccessibility/application_p.h
index 9b6763f111..5efd7089ea 100644
--- a/src/platformsupport/linuxaccessibility/application_p.h
+++ b/src/platformsupport/linuxaccessibility/application_p.h
@@ -46,7 +46,6 @@
#include <QtDBus/QDBusConnection>
#include <QtGui/QAccessibleInterface>
-QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
/*
@@ -81,6 +80,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..1c79cc75c8 100644
--- a/src/platformsupport/linuxaccessibility/atspiadaptor_p.h
+++ b/src/platformsupport/linuxaccessibility/atspiadaptor_p.h
@@ -53,7 +53,6 @@
#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 */
diff --git a/src/platformsupport/services/genericunix/qgenericunixservices_p.h b/src/platformsupport/services/genericunix/qgenericunixservices_p.h
index 13cf79de01..92166caf7b 100644
--- a/src/platformsupport/services/genericunix/qgenericunixservices_p.h
+++ b/src/platformsupport/services/genericunix/qgenericunixservices_p.h
@@ -45,8 +45,6 @@
#include <qpa/qplatformservices.h>
#include <QtCore/QString>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class QGenericUnixServices : public QPlatformServices
@@ -66,6 +64,4 @@ private:
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QGENERICUNIXDESKTOPSERVICES_H
diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
index 370b703204..b0ac13efe4 100644
--- a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
+++ b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h
@@ -47,8 +47,6 @@
#include <QtCore/QStringList>
#include <QtGui/QFont>
-QT_BEGIN_HEADER
-
QT_BEGIN_NAMESPACE
class ResourceHelper
@@ -132,6 +130,4 @@ QPlatformTheme *qt_createUnixTheme();
QT_END_NAMESPACE
-QT_END_HEADER
-
#endif // QGENERICUNIXTHEMES_H