diff options
author | Robert Griebl <robert.griebl@qt.io> | 2024-03-04 21:58:34 +0100 |
---|---|---|
committer | Robert Griebl <robert.griebl@qt.io> | 2024-03-05 09:49:45 +0100 |
commit | eaf92a7983b481ab6bcd125aff10ff678de1288a (patch) | |
tree | 04b1c3efede950e18d2c192790af258b77027132 /src/window-lib | |
parent | 076b2cf8a6fb7ab08c4d10e8aa0112385c293076 (diff) |
Replace all #pragma once with old-style #ifdef include guards
Change-Id: I1805fbccf4d9398fddfe8f4ab977236afc49ca45
Fixes: QTBUG-122951
Pick-to: 6.7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Diffstat (limited to 'src/window-lib')
-rw-r--r-- | src/window-lib/inprocesswindow.h | 5 | ||||
-rw-r--r-- | src/window-lib/systemframetimerimpl.h | 5 | ||||
-rw-r--r-- | src/window-lib/waylandcompositor.h | 5 | ||||
-rw-r--r-- | src/window-lib/waylandqtamserverextension_p.h | 5 | ||||
-rw-r--r-- | src/window-lib/waylandwindow.h | 5 | ||||
-rw-r--r-- | src/window-lib/window.h | 5 | ||||
-rw-r--r-- | src/window-lib/windowitem.h | 5 | ||||
-rw-r--r-- | src/window-lib/windowmanager.h | 5 | ||||
-rw-r--r-- | src/window-lib/windowmanager_p.h | 5 |
9 files changed, 36 insertions, 9 deletions
diff --git a/src/window-lib/inprocesswindow.h b/src/window-lib/inprocesswindow.h index f63914e0..29ec094b 100644 --- a/src/window-lib/inprocesswindow.h +++ b/src/window-lib/inprocesswindow.h @@ -3,7 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#pragma once +#ifndef INPROCESSWINDOW_H +#define INPROCESSWINDOW_H #include <QtCore/QObject> #include <QtCore/QSharedPointer> @@ -52,3 +53,5 @@ private: }; QT_END_NAMESPACE_AM + +#endif // INPROCESSWINDOW_H diff --git a/src/window-lib/systemframetimerimpl.h b/src/window-lib/systemframetimerimpl.h index 4cfe507b..e2193312 100644 --- a/src/window-lib/systemframetimerimpl.h +++ b/src/window-lib/systemframetimerimpl.h @@ -3,7 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#pragma once +#ifndef SYSTEMFRAMETIMERIMPL_H +#define SYSTEMFRAMETIMERIMPL_H #include <QtCore/QPointer> #include <QtAppManSharedMain/frametimerimpl.h> @@ -30,3 +31,5 @@ private: }; QT_END_NAMESPACE_AM + +#endif // SYSTEMFRAMETIMERIMPL_H diff --git a/src/window-lib/waylandcompositor.h b/src/window-lib/waylandcompositor.h index 68c0b73c..9711384d 100644 --- a/src/window-lib/waylandcompositor.h +++ b/src/window-lib/waylandcompositor.h @@ -4,7 +4,8 @@ // Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#pragma once +#ifndef WAYLANDCOMPOSITOR_H +#define WAYLANDCOMPOSITOR_H #include <QtAppManCommon/global.h> @@ -123,3 +124,5 @@ protected: QT_END_NAMESPACE_AM #endif // QT_CONFIG(am_multi_process) + +#endif // WAYLANDCOMPOSITOR_H diff --git a/src/window-lib/waylandqtamserverextension_p.h b/src/window-lib/waylandqtamserverextension_p.h index 128c3f5b..334ef987 100644 --- a/src/window-lib/waylandqtamserverextension_p.h +++ b/src/window-lib/waylandqtamserverextension_p.h @@ -3,7 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#pragma once +#ifndef WAYLANDQTAMSERVEREXTENSION_P_H +#define WAYLANDQTAMSERVEREXTENSION_P_H #include <QtWaylandCompositor/QWaylandCompositorExtensionTemplate> #include <QtCore/QVariant> @@ -49,3 +50,5 @@ private: }; QT_END_NAMESPACE_AM + +#endif // WAYLANDQTAMSERVEREXTENSION_P_H diff --git a/src/window-lib/waylandwindow.h b/src/window-lib/waylandwindow.h index c8f69b83..f44e12de 100644 --- a/src/window-lib/waylandwindow.h +++ b/src/window-lib/waylandwindow.h @@ -3,7 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#pragma once +#ifndef WAYLANDWINDOW_H +#define WAYLANDWINDOW_H #include <QtAppManWindow/window.h> @@ -72,3 +73,5 @@ private: QT_END_NAMESPACE_AM #endif // QT_CONFIG(am_multi_process) + +#endif // WAYLANDWINDOW_H diff --git a/src/window-lib/window.h b/src/window-lib/window.h index 27c50c36..36c3ad4d 100644 --- a/src/window-lib/window.h +++ b/src/window-lib/window.h @@ -3,7 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#pragma once +#ifndef WINDOW_H +#define WINDOW_H #include <QtCore/QObject> #include <QtCore/QVariantMap> @@ -90,3 +91,5 @@ protected: QT_END_NAMESPACE_AM Q_DECLARE_METATYPE(QtAM::Window*) + +#endif // WINDOW_H diff --git a/src/window-lib/windowitem.h b/src/window-lib/windowitem.h index aca03db1..3007b22c 100644 --- a/src/window-lib/windowitem.h +++ b/src/window-lib/windowitem.h @@ -3,7 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#pragma once +#ifndef WINDOWITEM_H +#define WINDOWITEM_H #if 0 #pragma qt_sync_skip_header_check @@ -151,3 +152,5 @@ private: }; QT_END_NAMESPACE_AM + +#endif // WINDOWITEM_H diff --git a/src/window-lib/windowmanager.h b/src/window-lib/windowmanager.h index eb93699c..c1366cdc 100644 --- a/src/window-lib/windowmanager.h +++ b/src/window-lib/windowmanager.h @@ -3,7 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#pragma once +#ifndef WINDOWMANAGER_H +#define WINDOWMANAGER_H #include <functional> #include <QtCore/QAbstractListModel> @@ -138,3 +139,5 @@ private: }; QT_END_NAMESPACE_AM + +#endif // WINDOWMANAGER_H diff --git a/src/window-lib/windowmanager_p.h b/src/window-lib/windowmanager_p.h index ddf10778..6cc03e7b 100644 --- a/src/window-lib/windowmanager_p.h +++ b/src/window-lib/windowmanager_p.h @@ -3,7 +3,8 @@ // Copyright (C) 2018 Pelagicore AG // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only -#pragma once +#ifndef WINDOWMANAGER_P_H +#define WINDOWMANAGER_P_H #include <QVector> #include <QMap> @@ -50,3 +51,5 @@ public: QT_END_NAMESPACE_AM // We mean it. Dummy comment since syncqt needs this also for completely private Qt modules. + +#endif // WINDOWMANAGER_P_H |