XCB: replace header guards with #pragma once

Following qtbase/1c8884fc277c5916a420a3c14de68547a391f9fc's making
syncqt error out when an installable header contains #pragma once, we
can now flip the coin and use #pragma once as a static assertion that
the given header is not going to be installed, making it easier to
understand which headers are "public", which ones are "private" and
which ones are "neither, since never installed".

Do this for the XCB platform support files.

In qxcbglintegration.h, the header guard was actually broken (had only
#ifndef and #endif, was missing the actual #define).

As a drive-by, normalize vertical whitespace.

Pick-to: 6.9 6.8 6.5
Change-Id: Iede0605c38cda7606edfc7155bd8bfc95990c5bc
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>

src/plugins/platforms/xcb/gl_integrations/qxcbglintegration.h

@@ -1,7 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBGLINTEGRATION_H
+#pragma once
 
 #include "qxcbexport.h"
 #include "qxcbwindow.h"
@@ -37,5 +37,3 @@ public:
 };
 
 QT_END_NAMESPACE
-
-#endif //QXCBGLINTEGRATION_H

src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationfactory.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBGLINTEGRATIONFACTORY_H
+#pragma once
-#define QXCBGLINTEGRATIONFACTORY_H
 
 #include <QtCore/qstringlist.h>
 
@@ -17,6 +16,3 @@ public:
 };
 
 QT_END_NAMESPACE
-
-#endif //QXCBGLINTEGRATIONFACTORY_H
-

src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationplugin.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBGLINTEGRATIONPLUGIN_H
+#pragma once
-#define QXCBGLINTEGRATIONPLUGIN_H
 
 #include "qxcbexport.h"
 #include <QtCore/qplugin.h>
@@ -28,5 +27,3 @@ public:
     QXcbGlIntegration *create(const QString &) { return create(); }
 };
 QT_END_NAMESPACE
-
-#endif //QXCBGLINTEGRATIONPLUGIN_H

src/plugins/platforms/xcb/gl_integrations/qxcbnativeinterfacehandler.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBNATIVEINTERFACEHANDLER_H
+#pragma once
-#define QXCBNATIVEINTERFACEHANDLER_H
 
 #include <QtCore/QByteArray>
 #include <QtGui/qpa/qplatformnativeinterface.h>
@@ -30,5 +29,3 @@ protected:
 };
 
 QT_END_NAMESPACE
-
-#endif //QXCBNATIVEINTERFACEHANDLER_H

src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglcontext.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBEGLCONTEXT_H
+#pragma once
-#define QXCBEGLCONTEXT_H
 
 #include "qxcbeglwindow.h"
 #include <QtGui/private/qeglplatformcontext_p.h>
@@ -52,5 +51,3 @@ public:
 };
 
 QT_END_NAMESPACE
-#endif //QXCBEGLCONTEXT_H
-

src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglinclude.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBINCLUDE_H
+#pragma once
-#define QXCBINCLUDE_H
 
 #include <QtGui/QPalette>
 #include <QtCore/QTextStream>
@@ -14,5 +13,3 @@
 QT_BEGIN_NAMESPACE
 
 QT_END_NAMESPACE
-
-#endif //QXCBINCLUDE_H

src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBEGLINTEGRATION_H
+#pragma once
-#define QXCBEGLINTEGRATION_H
 
 #include "qxcbglintegration.h"
 
@@ -51,4 +50,3 @@ private:
 };
 
 QT_END_NAMESPACE
-#endif //QXCBEGLINTEGRATION_H

src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglnativeinterfacehandler.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBEGLNATIVEINTERFACEHANDLER_H
+#pragma once
-#define QXCBEGLNATIVEINTERFACEHANDLER_H
 
 #include "qxcbnativeinterfacehandler.h"
 
@@ -30,5 +29,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif //QXCBEGLNATIVEINTERFACEHANDLER_H

src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglwindow.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBEGLWINDOW_H
+#pragma once
-#define QXCBEGLWINDOW_H
 
 #include "qxcbwindow.h"
 
@@ -34,4 +33,3 @@ private:
 };
 
 QT_END_NAMESPACE
-#endif //QXCBEGLWINDOW_H

src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QGLXINTEGRATION_H
+#pragma once
-#define QGLXINTEGRATION_H
 
 #include "qxcbwindow.h"
 #include "qxcbscreen.h"
@@ -76,5 +75,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif

src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBGLXINTEGRATION_H
+#pragma once
-#define QXCBGLXINTEGRATION_H
 
 #include "qxcbglintegration.h"
 
@@ -36,5 +35,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif //QXCBGLXINTEGRATION_H

src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxnativeinterfacehandler.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBGLXNATIVEINTERFACEHANDLER_H
+#pragma once
-#define QXCBGLXNATIVEINTERFACEHANDLER_H
 
 #include "qxcbnativeinterfacehandler.h"
 
@@ -25,5 +24,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif //QXCBGLXNATIVEINTERFACEHANDLER_H

src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBGLXWINDOW_H
+#pragma once
-#define QXCBGLXWINDOW_H
 
 #include "qxcbglxintegration.h"
 #include "qxcbwindow.h"
@@ -20,5 +19,3 @@ protected:
 };
 
 QT_END_NAMESPACE
-
-#endif //QXCBGLXWINDOW_H

src/plugins/platforms/xcb/nativepainting/qbackingstore_x11_p.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QBACKINGSTORE_X11_H
+#pragma once
-#define QBACKINGSTORE_X11_H
 
 #include <qpa/qplatformbackingstore.h>
 
@@ -36,5 +35,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif // QBACKINGSTORE_X11_H

src/plugins/platforms/xcb/nativepainting/qcolormap_x11_p.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QCOLORMAP_X11_H
+#pragma once
-#define QCOLORMAP_X11_H
 
 #include <QColor>
 #include <QList>
@@ -41,5 +40,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif // QCOLORMAP_X11_H

src/plugins/platforms/xcb/nativepainting/qpaintengine_x11_p.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QPAINTENGINE_X11_H
+#pragma once
-#define QPAINTENGINE_X11_H
 
 #include <QtGui/QPaintEngine>
 
@@ -84,5 +83,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif // QPAINTENGINE_X11_H

src/plugins/platforms/xcb/nativepainting/qpixmap_x11_p.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QX11PLATFORMPIXMAP_H
+#pragma once
-#define QX11PLATFORMPIXMAP_H
 
 #include <QBitmap>
 #include <QPixmap>
@@ -129,5 +128,3 @@ int qt_x11SetDefaultScreen(int screen);
 void qt_x11SetScreen(QPixmap &pixmap, int screen);
 
 QT_END_NAMESPACE
-
-#endif // QX11PLATFORMPIXMAP_H

src/plugins/platforms/xcb/nativepainting/qpolygonclipper_p.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QPOLYGONCLIPPER_P_H
+#pragma once
-#define QPOLYGONCLIPPER_P_H
 
 //
 //  W A R N I N G
@@ -276,5 +275,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif // QPOLYGONCLIPPER_P_H

src/plugins/platforms/xcb/nativepainting/qt_x11_p.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QT_X11_P_H
+#pragma once
-#define QT_X11_P_H
 
 #define register        /* C++17 deprecated register */
 #include <X11/Xlib.h>
@@ -161,5 +160,3 @@ constexpr inline int lowest_bit(T v) noexcept
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_X11_P_H

src/plugins/platforms/xcb/nativepainting/qtessellator_p.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QTESSELATOR_P_H
+#pragma once
-#define QTESSELATOR_P_H
 
 #include <QPoint>
 #include <QRect>
@@ -49,5 +48,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif

src/plugins/platforms/xcb/nativepainting/qxcbnativepainting.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBNATIVEPAINTING_H
+#pragma once
-#define QXCBNATIVEPAINTING_H
 
 #include <QSharedDataPointer>
 #include "qt_x11_p.h"
@@ -62,5 +61,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif // QXCBNATIVEPAINTING_H

src/plugins/platforms/xcb/qt_xlib_wrapper.h

@@ -1,7 +1,6 @@
 // Copyright (C) 2022 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-#ifndef QT_XLIB_WRAPPER_H
+#pragma once
-#define QT_XLIB_WRAPPER_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -13,5 +12,3 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-
-#endif // QT_XLIB_WRAPPER_H

src/plugins/platforms/xcb/qxcbatom.h

@@ -1,7 +1,6 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-#ifndef QXCBATOM_H
+#pragma once
-#define QXCBATOM_H
 
 #include <xcb/xcb.h>
 
@@ -230,5 +229,3 @@ protected:
 private:
     xcb_atom_t m_allAtoms[QXcbAtom::NAtoms];
 };
-
-#endif // QXCBATOM_H

src/plugins/platforms/xcb/qxcbbackingstore.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBBACKINGSTORE_H
+#pragma once
-#define QXCBBACKINGSTORE_H
 
 #include <qpa/qplatformbackingstore.h>
 #include <QtCore/QStack>
@@ -77,5 +76,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif

src/plugins/platforms/xcb/qxcbclipboard.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBCLIPBOARD_H
+#pragma once
-#define QXCBCLIPBOARD_H
 
 #include <qpa/qplatformclipboard.h>
 #include <qxcbobject.h>
@@ -110,5 +109,3 @@ private:
 #endif // QT_NO_CLIPBOARD
 
 QT_END_NAMESPACE
-
-#endif // QXCBCLIPBOARD_H

src/plugins/platforms/xcb/qxcbconnection.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBCONNECTION_H
+#pragma once
-#define QXCBCONNECTION_H
 
 #include <xcb/xcb.h>
 #include <xcb/randr.h>
@@ -376,5 +375,3 @@ template <typename T>
 struct alignas(32) q_padded_xcb_event : T { };
 
 QT_END_NAMESPACE
-
-#endif

src/plugins/platforms/xcb/qxcbconnection_basic.h

@@ -1,7 +1,7 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-#ifndef QXCBBASICCONNECTION_H
+
-#define QXCBBASICCONNECTION_H
+#pragma once
 
 #include "qxcbatom.h"
 #include "qxcbexport.h"
@@ -137,5 +137,3 @@ struct QStdFreeDeleter {
     )
 
 QT_END_NAMESPACE
-
-#endif // QXCBBASICCONNECTION_H

src/plugins/platforms/xcb/qxcbcursor.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2022 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBCURSOR_H
+#pragma once
-#define QXCBCURSOR_H
 
 #include <qpa/qplatformcursor.h>
 #include "qxcbscreen.h"
@@ -103,5 +102,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif

src/plugins/platforms/xcb/qxcbcursorfont.h

@@ -3,8 +3,7 @@
 
 // copied from <X11/cursorfont.h>
 
-#ifndef QXCBCURSORFONT_H
+#pragma once
-#define QXCBCURSORFONT_H
 
 #define XC_num_glyphs 154
 #define XC_X_cursor 0
@@ -84,5 +83,3 @@
 #define XC_ur_angle 148
 #define XC_watch 150
 #define XC_xterm 152
-
-#endif /* QXCBCURSORFONT_H */

src/plugins/platforms/xcb/qxcbdrag.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBDRAG_H
+#pragma once
-#define QXCBDRAG_H
 
 #include <qpa/qplatformdrag.h>
 #include <private/qsimpledrag_p.h>
@@ -155,5 +154,3 @@ private:
 Q_DECLARE_TYPEINFO(QXcbDrag::Transaction, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
-
-#endif

src/plugins/platforms/xcb/qxcbeventdispatcher.h

@@ -1,7 +1,7 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-#ifndef QXCBEVENTDISPATCHER_H
+
-#define QXCBEVENTDISPATCHER_H
+#pragma once
 
 #include <QtCore/QObject>
 #include <QtCore/QEventLoop>
@@ -68,5 +68,3 @@ public:
 };
 
 QT_END_NAMESPACE
-
-#endif // QXCBEVENTDISPATCHER_H

src/plugins/platforms/xcb/qxcbeventqueue.h

@@ -1,7 +1,7 @@
 // Copyright (C) 2018 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-#ifndef QXCBEVENTQUEUE_H
+
-#define QXCBEVENTQUEUE_H
+#pragma once
 
 #include <QtCore/QThread>
 #include <QtCore/QHash>
@@ -147,5 +147,3 @@ xcb_generic_event_t *QXcbEventQueue::peek(PeekOption option, Peeker &&peeker)
 }
 
 QT_END_NAMESPACE
-
-#endif

src/plugins/platforms/xcb/qxcbexport.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBEXPORT_H
+#pragma once
-#define QXCBEXPORT_H
 
 #include <QtCore/qglobal.h>
 
@@ -15,5 +14,3 @@ QT_BEGIN_NAMESPACE
 #  endif
 
 QT_END_NAMESPACE
-#endif //QXCBEXPORT_H
-

src/plugins/platforms/xcb/qxcbimage.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBIMAGE_H
+#pragma once
-#define QXCBIMAGE_H
 
 #include "qxcbscreen.h"
 #include <QtGui/QImage>
@@ -21,5 +20,3 @@ xcb_cursor_t qt_xcb_createCursorXRender(QXcbScreen *screen, const QImage &image,
                                         const QPoint &spot);
 
 QT_END_NAMESPACE
-
-#endif

src/plugins/platforms/xcb/qxcbintegration.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBINTEGRATION_H
+#pragma once
-#define QXCBINTEGRATION_H
 
 #include <QtGui/private/qtguiglobal_p.h>
 #include <qpa/qplatformintegration.h>
@@ -127,5 +126,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif

src/plugins/platforms/xcb/qxcbkeyboard.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBKEYBOARD_H
+#pragma once
-#define QXCBKEYBOARD_H
 
 #include "qxcbobject.h"
 
@@ -105,5 +104,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif

src/plugins/platforms/xcb/qxcbmime.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBMIME_H
+#pragma once
-#define QXCBMIME_H
 
 #include <QtGui/private/qinternalmimedata_p.h>
 
@@ -30,5 +29,3 @@ public:
 };
 
 QT_END_NAMESPACE
-
-#endif // QXCBMIME_H

src/plugins/platforms/xcb/qxcbnativeinterface.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBNATIVEINTERFACE_H
+#pragma once
-#define QXCBNATIVEINTERFACE_H
 
 #include <qpa/qplatformnativeinterface.h>
 #include <xcb/xcb.h>
@@ -119,5 +118,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif // QXCBNATIVEINTERFACE_H

src/plugins/platforms/xcb/qxcbobject.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBOBJECT_H
+#pragma once
-#define QXCBOBJECT_H
 
 #include "qxcbconnection.h"
 
@@ -24,5 +23,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif

src/plugins/platforms/xcb/qxcbscreen.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBSCREEN_H
+#pragma once
-#define QXCBSCREEN_H
 
 #include <qpa/qplatformscreen.h>
 #include <qpa/qplatformscreen_p.h>
@@ -228,5 +227,3 @@ Q_GUI_EXPORT QDebug operator<<(QDebug, const QXcbScreen *);
 #endif
 
 QT_END_NAMESPACE
-
-#endif

src/plugins/platforms/xcb/qxcbscrollingdevice_p.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2020 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBSCROLLINGDEVICE_P_H
+#pragma once
-#define QXCBSCROLLINGDEVICE_P_H
 
 #include <QtGui/private/qpointingdevice_p.h>
 
@@ -52,5 +51,3 @@ public:
 };
 
 QT_END_NAMESPACE
-
-#endif // QXCBSCROLLINGDEVICE_P_H

src/plugins/platforms/xcb/qxcbsessionmanager.h

@@ -2,8 +2,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBSESSIONMANAGER_H
+#pragma once
-#define QXCBSESSIONMANAGER_H
 
 //
 //  W A R N I N G
@@ -54,5 +53,3 @@ private:
 QT_END_NAMESPACE
 
 #endif //QT_NO_SESSIONMANAGER
-
-#endif //QXCBSESSIONMANAGER_H

src/plugins/platforms/xcb/qxcbsystemtraytracker.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBSYSTEMTRAYTRACKER_H
+#pragma once
-#define QXCBSYSTEMTRAYTRACKER_H
 
 #include "qxcbconnection.h"
 
@@ -45,5 +44,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif // QXCBSYSTEMTRAYTRACKER_H

src/plugins/platforms/xcb/qxcbvulkaninstance.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2017 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBVULKANINSTANCE_H
+#pragma once
-#define QXCBVULKANINSTANCE_H
 
 #if defined(VULKAN_H_) && !defined(VK_USE_PLATFORM_XCB_KHR)
 #error "vulkan.h included without xcb WSI"
@@ -36,5 +35,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif // QXCBVULKANINSTANCE_H

src/plugins/platforms/xcb/qxcbvulkanwindow.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2017 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBVULKANWINDOW_H
+#pragma once
-#define QXCBVULKANWINDOW_H
 
 #include "qxcbwindow.h"
 #include "qxcbvulkaninstance.h"
@@ -25,5 +24,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif // QXCBVULKANWINDOW_H

src/plugins/platforms/xcb/qxcbwindow.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBWINDOW_H
+#pragma once
-#define QXCBWINDOW_H
 
 #include <qpa/qplatformwindow.h>
 #include <qpa/qplatformwindow_p.h>
@@ -281,5 +280,3 @@ QList<xcb_rectangle_t> qRegionToXcbRectangleList(const QRegion &region);
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QXcbWindow*)
-
-#endif

src/plugins/platforms/xcb/qxcbwmsupport.h

@@ -1,7 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-#ifndef QXCBWMSUPPORT_H
+
-#define QXCBWMSUPPORT_H
+#pragma once
 
 #include "qxcbobject.h"
 #include "qxcbconnection.h"
@@ -28,5 +28,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif

src/plugins/platforms/xcb/qxcbxsettings.h

@@ -1,8 +1,7 @@
 // Copyright (C) 2016 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QXCBXSETTINGS_H
+#pragma once
-#define QXCBXSETTINGS_H
 
 #include "qxcbscreen.h"
 
@@ -31,5 +30,3 @@ private:
 };
 
 QT_END_NAMESPACE
-
-#endif // QXCBXSETTINGS_H