diff options
author | hjk <hjk@theqtcompany.com> | 2016-03-18 07:55:01 +0100 |
---|---|---|
committer | hjk <hjk@theqtcompany.com> | 2016-03-30 15:20:19 +0000 |
commit | 39a38d5679084b515276285c044d8a27e671adb1 (patch) | |
tree | 8f72b00aa4a7db53eb8e193119033edf1ae9b0e4 /tests | |
parent | 6b805c217273b9d169aa7e8a78949e17179016bf (diff) |
Wholesale conversion to #pragma once
Kudos to cgmb and https://github.com/cgmb/guardonce
Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'tests')
72 files changed, 71 insertions, 296 deletions
diff --git a/tests/auto/cplusplus/cplusplus_global.h b/tests/auto/cplusplus/cplusplus_global.h index 5d911fe132d..42a0bef1ad4 100644 --- a/tests/auto/cplusplus/cplusplus_global.h +++ b/tests/auto/cplusplus/cplusplus_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_GLOBAL_H -#define CPLUSPLUS_GLOBAL_H +#pragma once // // The following "non-latin1" code points are used in the tests: @@ -38,5 +37,3 @@ #define UC_U4E8C "\xe4\xba\x8c" #define UC_U10302 "\xf0\x90\x8c\x82" #define TEST_UNICODE_IDENTIFIER UC_U00FC UC_U4E8C UC_U10302 - -#endif // CPLUSPLUS_GLOBAL_H diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h index 82e515b9465..556fc0ba6fc 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGIN1_H -#define PLUGIN1_H +#pragma once #include <extensionsystem/iplugin.h> @@ -52,5 +51,3 @@ public: }; } // namespace Plugin1 - -#endif // PLUGIN1_H diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h index 04c36449001..e5e38e33005 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGIN2_H -#define PLUGIN2_H +#pragma once #include <extensionsystem/iplugin.h> @@ -52,5 +51,3 @@ public: }; } // Plugin2 - -#endif // PLUGIN2_H diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h index 36e743d87b7..c1ba2d3c932 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGIN3_H -#define PLUGIN3_H +#pragma once #include <extensionsystem/iplugin.h> @@ -52,5 +51,3 @@ public: }; } // namespace Plugin3 - -#endif // PLUGIN3_H diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h index e911f3d420a..6a0d4c7f09a 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGIN1_H -#define PLUGIN1_H +#pragma once #include <extensionsystem/iplugin.h> @@ -55,5 +54,3 @@ private: }; } // namespace Plugin1 - -#endif // PLUGIN1_H diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h index 2068170b6a4..1a5ff1eb5ce 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGIN2_H -#define PLUGIN2_H +#pragma once #include <extensionsystem/iplugin.h> @@ -55,5 +54,3 @@ private: }; } // namespace Plugin2 - -#endif // PLUGIN2_H diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h index 4739ebb997e..a8bfb4e7b64 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGIN3_H -#define PLUGIN3_H +#pragma once #include <extensionsystem/iplugin.h> @@ -55,5 +54,3 @@ private: }; } // namespace Plugin3 - -#endif // PLUGIN3_H diff --git a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.h b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.h index 9a5913edbaf..cc88e8a8d03 100644 --- a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.h +++ b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTPLUGIN_H -#define TESTPLUGIN_H +#pragma once #include "testplugin_global.h" #include <extensionsystem/iplugin.h> @@ -54,5 +53,3 @@ private: }; } // namespace - -#endif // TESTPLUGIN_H diff --git a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin_global.h b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin_global.h index 0bd78078b6a..c693b519759 100644 --- a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin_global.h +++ b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTPLUGIN_GLOBAL_H -#define TESTPLUGIN_GLOBAL_H +#pragma once #include <qglobal.h> @@ -33,5 +32,3 @@ #else # define MYPLUGIN_EXPORT Q_DECL_IMPORT #endif - -#endif // TESTPLUGIN_GLOBAL_H diff --git a/tests/auto/generichighlighter/highlighterengine/formats.h b/tests/auto/generichighlighter/highlighterengine/formats.h index b84dec4c69f..11c3916a8b0 100644 --- a/tests/auto/generichighlighter/highlighterengine/formats.h +++ b/tests/auto/generichighlighter/highlighterengine/formats.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FORMATS_H -#define FORMATS_H +#pragma once #include <QTextCharFormat> @@ -67,5 +66,3 @@ private: QTextCharFormat m_regionMarkerFormat; QTextCharFormat m_othersFormat; }; - -#endif // FORMATS_H diff --git a/tests/auto/generichighlighter/highlighterengine/highlightermock.h b/tests/auto/generichighlighter/highlighterengine/highlightermock.h index 9cc35226a68..09cfcef5bbd 100644 --- a/tests/auto/generichighlighter/highlighterengine/highlightermock.h +++ b/tests/auto/generichighlighter/highlighterengine/highlightermock.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HIGHLIGHTERMOCK_H -#define HIGHLIGHTERMOCK_H +#pragma once #include <texteditor/generichighlighter/highlighter.h> @@ -76,5 +75,3 @@ private: bool m_noTestCall; bool m_considerEmptyLines; }; - -#endif // HIGHLIGHTERMOCK_H diff --git a/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h b/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h index e6c6950595f..45122612c85 100644 --- a/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h +++ b/tests/auto/generichighlighter/highlighterengine/syntaxhighlighter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SYNTAXHIGHLIGHTER_H -#define SYNTAXHIGHLIGHTER_H +#pragma once // Replaces the "real" syntaxhighlighter.h file. The scope of this test is restricted to the // highlight definition's context engine. Using a mock derived from QSyntaxHighlighter as a @@ -51,5 +50,3 @@ protected: }; } - -#endif //SYNTAXHIGHLIGHTER_H diff --git a/tests/auto/generichighlighter/highlighterengine/tabsettings.h b/tests/auto/generichighlighter/highlighterengine/tabsettings.h index 69496e68914..968946be54a 100644 --- a/tests/auto/generichighlighter/highlighterengine/tabsettings.h +++ b/tests/auto/generichighlighter/highlighterengine/tabsettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TABSETTINGS_H -#define TABSETTINGS_H +#pragma once #include <QString> @@ -39,5 +38,3 @@ public: }; } - -#endif // TABSETTINGS_H diff --git a/tests/auto/generichighlighter/highlighterengine/textdocumentlayout.h b/tests/auto/generichighlighter/highlighterengine/textdocumentlayout.h index a9a7c3f5993..c53dd72edee 100644 --- a/tests/auto/generichighlighter/highlighterengine/textdocumentlayout.h +++ b/tests/auto/generichighlighter/highlighterengine/textdocumentlayout.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTDOCUMENTLAYOUT_H -#define TEXTDOCUMENTLAYOUT_H +#pragma once #include <QTextBlockUserData> @@ -66,5 +65,3 @@ void setParentheses(const QTextBlock &, const Parentheses &); } } // namespace TextEditor - -#endif // TEXTDOCUMENTLAYOUT_H diff --git a/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.h b/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.h index 2292c3efbec..fcb9557efe8 100644 --- a/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.h +++ b/tests/auto/qml/qmldesigner/bauhaustests/testbauhaus.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTBAUHAUS_H -#define TESTBAUHAUS_H +#pragma once #include <QObject> @@ -51,5 +50,3 @@ private: QString m_creatorDir; QString m_qtDir; }; - -#endif // TESTBAUHAUS_H diff --git a/tests/auto/qml/qmldesigner/coretests/testrewriterview.h b/tests/auto/qml/qmldesigner/coretests/testrewriterview.h index 9778b59083f..74b5fa384ac 100644 --- a/tests/auto/qml/qmldesigner/coretests/testrewriterview.h +++ b/tests/auto/qml/qmldesigner/coretests/testrewriterview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTREWRITERVIEW_H -#define TESTREWRITERVIEW_H +#pragma once #include <rewriterview.h> #include <model/modeltotextmerger.h> @@ -61,5 +60,3 @@ public: }; } // QmlDesigner - -#endif // TESTREWRITERVIEW_H diff --git a/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.h b/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.h index 4175fc18f11..c405d630cd7 100644 --- a/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.h +++ b/tests/auto/qml/qmldesigner/propertyeditortests/testpropertyeditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTPROPERTYEDITOR_H -#define TESTPROPERTYEDITOR_H +#pragma once #include <QObject> @@ -49,5 +48,3 @@ private slots: void loadWelcomeScreen(); void loadHelloWorld(); }; - -#endif // TESTPROPERTYEDITOR_H diff --git a/tests/auto/qml/qmldesigner/testview.h b/tests/auto/qml/qmldesigner/testview.h index 41efe550ca5..07c9281299d 100644 --- a/tests/auto/qml/qmldesigner/testview.h +++ b/tests/auto/qml/qmldesigner/testview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTVIEW_H -#define TESTVIEW_H +#pragma once #include <qmlmodelview.h> #include <QVariant> @@ -84,5 +83,3 @@ private: bool operator==(TestView::MethodCall call1, TestView::MethodCall call2); QDebug operator<<(QDebug debug, TestView::MethodCall call); - -#endif // TESTVIEW_H diff --git a/tests/auto/timeline/shared/runscenegraph.h b/tests/auto/timeline/shared/runscenegraph.h index 1353de785e8..c3644104db5 100644 --- a/tests/auto/timeline/shared/runscenegraph.h +++ b/tests/auto/timeline/shared/runscenegraph.h @@ -23,11 +23,8 @@ ** ****************************************************************************/ -#ifndef RUNSCENEGRAPH_H -#define RUNSCENEGRAPH_H +#pragma once #include <QSGNode> void runSceneGraph(QSGNode *node); - -#endif //RUNSCENEGRAPH_H diff --git a/tests/auto/valgrind/callgrind/callgrindparsertests.h b/tests/auto/valgrind/callgrind/callgrindparsertests.h index bdcf0e32bef..89f86bfaac3 100644 --- a/tests/auto/valgrind/callgrind/callgrindparsertests.h +++ b/tests/auto/valgrind/callgrind/callgrindparsertests.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CALLGRINDPARSERTESTS_H -#define CALLGRINDPARSERTESTS_H +#pragma once #include <QObject> #include <QPair> @@ -54,5 +53,3 @@ private Q_SLOTS: void testRecursion(); }; - -#endif // CALLGRINDPARSERTESTS_H diff --git a/tests/auto/valgrind/callgrind/modeltest.h b/tests/auto/valgrind/callgrind/modeltest.h index a2155641256..8f5b8c999fe 100644 --- a/tests/auto/valgrind/callgrind/modeltest.h +++ b/tests/auto/valgrind/callgrind/modeltest.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODELTEST_H -#define MODELTEST_H +#pragma once #include <QWidget> @@ -64,5 +63,3 @@ public: QComboBox *m_event; Callgrind::Internal::CallgrindWidgetHandler *m_handler; }; - -#endif // MODELTEST_H diff --git a/tests/auto/valgrind/memcheck/modeldemo.h b/tests/auto/valgrind/memcheck/modeldemo.h index 7e0f44a736d..de95a6c7432 100644 --- a/tests/auto/valgrind/memcheck/modeldemo.h +++ b/tests/auto/valgrind/memcheck/modeldemo.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef MODELDEMO_H -#define MODELDEMO_H +#pragma once #include <QObject> #include <QDebug> @@ -67,5 +66,3 @@ public Q_SLOTS: private: Valgrind::Memcheck::MemcheckRunner *runner; }; - -#endif // MODELDEMO_H diff --git a/tests/auto/valgrind/memcheck/parsertests.h b/tests/auto/valgrind/memcheck/parsertests.h index bea78cbada1..cb65dd85577 100644 --- a/tests/auto/valgrind/memcheck/parsertests.h +++ b/tests/auto/valgrind/memcheck/parsertests.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef PARSERTESTS_H -#define PARSERTESTS_H +#pragma once #include <QObject> #include <QPair> @@ -164,5 +163,3 @@ private: QProcess *m_process; QTcpSocket *m_socket; }; - -#endif // PARSERTESTS_H diff --git a/tests/auto/valgrind/memcheck/testrunner.h b/tests/auto/valgrind/memcheck/testrunner.h index 8312df0186e..79eccf675a6 100644 --- a/tests/auto/valgrind/memcheck/testrunner.h +++ b/tests/auto/valgrind/memcheck/testrunner.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef TESTRUNNER_H -#define TESTRUNNER_H +#pragma once #include <QObject> #include <QStringList> @@ -86,5 +85,3 @@ private: }; } // namespace Valgrind - -#endif // TESTRUNNER_H diff --git a/tests/cppmodelmanager/testdata/include/header.h b/tests/cppmodelmanager/testdata/include/header.h index 689ec038710..6f70f09beec 100644 --- a/tests/cppmodelmanager/testdata/include/header.h +++ b/tests/cppmodelmanager/testdata/include/header.h @@ -1,4 +1 @@ -#ifndef HEADER_H -#define HEADER_H - -#endif // HEADER_H +#pragma once diff --git a/tests/cppmodelmanager/testdata_guiproject1/mainwindow.h b/tests/cppmodelmanager/testdata_guiproject1/mainwindow.h index 6dae9639b63..7930d5f5f88 100644 --- a/tests/cppmodelmanager/testdata_guiproject1/mainwindow.h +++ b/tests/cppmodelmanager/testdata_guiproject1/mainwindow.h @@ -1,7 +1,6 @@ // Copyright license -#ifndef MAINWINDOW_H -#define MAINWINDOW_H +#pragma once #include <QMainWindow> @@ -20,5 +19,3 @@ public: private: Ui::MainWindow *ui; }; - -#endif // MAINWINDOW_H diff --git a/tests/cppmodelmanager/testdata_project1/foo.h b/tests/cppmodelmanager/testdata_project1/foo.h index b4271076331..ea1cfa542af 100644 --- a/tests/cppmodelmanager/testdata_project1/foo.h +++ b/tests/cppmodelmanager/testdata_project1/foo.h @@ -1,12 +1,9 @@ // Copyright header -#ifndef FOO_H -#define FOO_H +#pragma once class Foo { public: Foo(); }; - -#endif // FOO_H diff --git a/tests/cppmodelmanager/testdata_project2/bar.h b/tests/cppmodelmanager/testdata_project2/bar.h index abb6e59877f..45702c5d0a3 100644 --- a/tests/cppmodelmanager/testdata_project2/bar.h +++ b/tests/cppmodelmanager/testdata_project2/bar.h @@ -1,12 +1,9 @@ // Copyright header -#ifndef BAR_H -#define BAR_H +#pragma once class Bar { public: Bar(); }; - -#endif // BAR_H diff --git a/tests/designer/gotoslot_insertIntoCorrectClass_non-pointer/form.h b/tests/designer/gotoslot_insertIntoCorrectClass_non-pointer/form.h index 4f35262beaa..363d990bb0d 100644 --- a/tests/designer/gotoslot_insertIntoCorrectClass_non-pointer/form.h +++ b/tests/designer/gotoslot_insertIntoCorrectClass_non-pointer/form.h @@ -1,7 +1,6 @@ // Copyright header -#ifndef FORM_H -#define FORM_H +#pragma once #include "ui_form.h" @@ -23,5 +22,3 @@ public: private: Ui::Form ui; }; - -#endif // FORM_H diff --git a/tests/designer/gotoslot_insertIntoCorrectClass_pointer/form.h b/tests/designer/gotoslot_insertIntoCorrectClass_pointer/form.h index 3f5ddba5745..0d0b51665d0 100644 --- a/tests/designer/gotoslot_insertIntoCorrectClass_pointer/form.h +++ b/tests/designer/gotoslot_insertIntoCorrectClass_pointer/form.h @@ -1,7 +1,6 @@ // Copyright header -#ifndef FORM_H -#define FORM_H +#pragma once #include <QWidget> @@ -26,5 +25,3 @@ public: private: Ui::Form *ui; }; - -#endif // FORM_H diff --git a/tests/designer/gotoslot_insertIntoCorrectClass_pointer_ns_using/form.h b/tests/designer/gotoslot_insertIntoCorrectClass_pointer_ns_using/form.h index 13fdfa5b23b..00176462848 100644 --- a/tests/designer/gotoslot_insertIntoCorrectClass_pointer_ns_using/form.h +++ b/tests/designer/gotoslot_insertIntoCorrectClass_pointer_ns_using/form.h @@ -1,7 +1,6 @@ // Copyright header -#ifndef N_FORM_H -#define N_FORM_H +#pragma once #include <QWidget> @@ -24,5 +23,3 @@ public: private: Ui::Form *ui; }; - -#endif // N_FORM_H diff --git a/tests/designer/gotoslot_withoutProject/form.h b/tests/designer/gotoslot_withoutProject/form.h index b027afa78d3..f84cc000de5 100644 --- a/tests/designer/gotoslot_withoutProject/form.h +++ b/tests/designer/gotoslot_withoutProject/form.h @@ -1,7 +1,6 @@ // Copyright header -#ifndef FORM_H -#define FORM_H +#pragma once #include <QWidget> @@ -20,5 +19,3 @@ public: private: Ui::Form *ui; }; - -#endif // FORM_H diff --git a/tests/genericprojectmanager/testdata_mixedproject1/Glue.h b/tests/genericprojectmanager/testdata_mixedproject1/Glue.h index dd39049addb..08570566f9e 100644 --- a/tests/genericprojectmanager/testdata_mixedproject1/Glue.h +++ b/tests/genericprojectmanager/testdata_mixedproject1/Glue.h @@ -1,10 +1,7 @@ -#ifndef GLUE_H -#define GLUE_H +#pragma once struct Glue { struct it { static void together(); }; }; - -#endif // GLUE_H diff --git a/tests/genericprojectmanager/testdata_mixedproject1/header.h b/tests/genericprojectmanager/testdata_mixedproject1/header.h index 689ec038710..6f70f09beec 100644 --- a/tests/genericprojectmanager/testdata_mixedproject1/header.h +++ b/tests/genericprojectmanager/testdata_mixedproject1/header.h @@ -1,4 +1 @@ -#ifndef HEADER_H -#define HEADER_H - -#endif // HEADER_H +#pragma once diff --git a/tests/genericprojectmanager/testdata_mixedproject2/header.hpp b/tests/genericprojectmanager/testdata_mixedproject2/header.hpp index ebc2cf627a6..f2acb3bef70 100644 --- a/tests/genericprojectmanager/testdata_mixedproject2/header.hpp +++ b/tests/genericprojectmanager/testdata_mixedproject2/header.hpp @@ -1,6 +1,4 @@ -#ifndef HEADER_HPP -#define HEADER_HPP +#pragma once extern "C" void impl(); -#endif // HEADER_HPP diff --git a/tests/manual/cplusplus-tools/detail/header.h b/tests/manual/cplusplus-tools/detail/header.h index 7670772308d..bc6d2f36c85 100644 --- a/tests/manual/cplusplus-tools/detail/header.h +++ b/tests/manual/cplusplus-tools/detail/header.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HEADER_H -#define HEADER_H +#pragma once #include <QtGlobal> @@ -51,5 +50,3 @@ void freefunc3(T) template <class T> void freefunc3(T, int) {} - -#endif //HEADER_H diff --git a/tests/manual/cplusplus-tools/dummy.h b/tests/manual/cplusplus-tools/dummy.h index 87fe29cccfa..fef4787180f 100644 --- a/tests/manual/cplusplus-tools/dummy.h +++ b/tests/manual/cplusplus-tools/dummy.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DUMMY_H -#define DUMMY_H +#pragma once #include <QString> @@ -71,5 +70,3 @@ class ChildDummy : public Dummy {}; class GrandChildDummy : public Dummy {}; } // namespace test - -#endif // DUMMY_H diff --git a/tests/manual/debugger/gui/mainwindow.h b/tests/manual/debugger/gui/mainwindow.h index b6227c1455a..ab47ada3f3d 100644 --- a/tests/manual/debugger/gui/mainwindow.h +++ b/tests/manual/debugger/gui/mainwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MAINWINDOW_H -#define MAINWINDOW_H +#pragma once #include <QMainWindow> @@ -79,4 +78,3 @@ private: }; } -#endif // MAINWINDOW_H diff --git a/tests/manual/debugger/qquick1/myplugin/myplugin.h b/tests/manual/debugger/qquick1/myplugin/myplugin.h index bf2d86041fe..a902a926a1f 100644 --- a/tests/manual/debugger/qquick1/myplugin/myplugin.h +++ b/tests/manual/debugger/qquick1/myplugin/myplugin.h @@ -1,5 +1,4 @@ -#ifndef MYPLUGIN_H -#define MYPLUGIN_H +#pragma once #include <qdeclarative.h> #include <QDeclarativeExtensionPlugin> @@ -11,5 +10,3 @@ class MyPlugin : public QDeclarativeExtensionPlugin public: void registerTypes(const char *uri); }; - -#endif // MYPLUGIN_H diff --git a/tests/manual/debugger/qquick1/myplugin/mytype.h b/tests/manual/debugger/qquick1/myplugin/mytype.h index 8f4116a2511..30c90c9ef6c 100644 --- a/tests/manual/debugger/qquick1/myplugin/mytype.h +++ b/tests/manual/debugger/qquick1/myplugin/mytype.h @@ -1,5 +1,4 @@ -#ifndef MYTYPE_H -#define MYTYPE_H +#pragma once #include <QObject> #include <QString> @@ -30,6 +29,3 @@ private: Q_DISABLE_COPY(MyType) }; - -#endif // MYTYPE_H - diff --git a/tests/manual/debugger/qquick2/myplugin/myplugin.h b/tests/manual/debugger/qquick2/myplugin/myplugin.h index 053f8bdf153..fd741b8d3c7 100644 --- a/tests/manual/debugger/qquick2/myplugin/myplugin.h +++ b/tests/manual/debugger/qquick2/myplugin/myplugin.h @@ -1,5 +1,4 @@ -#ifndef MYPLUGIN_H -#define MYPLUGIN_H +#pragma once #include <QQmlExtensionPlugin> @@ -10,5 +9,3 @@ class MyPlugin : public QQmlExtensionPlugin public: void registerTypes(const char *uri); }; - -#endif // MYPLUGIN_H diff --git a/tests/manual/debugger/qquick2/myplugin/mytype.h b/tests/manual/debugger/qquick2/myplugin/mytype.h index 8f4116a2511..30c90c9ef6c 100644 --- a/tests/manual/debugger/qquick2/myplugin/mytype.h +++ b/tests/manual/debugger/qquick2/myplugin/mytype.h @@ -1,5 +1,4 @@ -#ifndef MYTYPE_H -#define MYTYPE_H +#pragma once #include <QObject> #include <QString> @@ -30,6 +29,3 @@ private: Q_DISABLE_COPY(MyType) }; - -#endif // MYTYPE_H - diff --git a/tests/manual/dockwidgets/mainwindow.h b/tests/manual/dockwidgets/mainwindow.h index 9e88c54cdeb..3f5f0bfda56 100644 --- a/tests/manual/dockwidgets/mainwindow.h +++ b/tests/manual/dockwidgets/mainwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MAINWINDOW_H -#define MAINWINDOW_H +#pragma once #include <QMainWindow> @@ -42,5 +41,3 @@ private: QLabel *centralWidget; }; - -#endif // MAINWINDOW_H diff --git a/tests/manual/process/mainwindow.h b/tests/manual/process/mainwindow.h index c01dfdff5b2..6dfe3874000 100644 --- a/tests/manual/process/mainwindow.h +++ b/tests/manual/process/mainwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MAINWINDOW_H -#define MAINWINDOW_H +#pragma once #include <QMainWindow> @@ -47,5 +46,3 @@ public slots: private: QPlainTextEdit *m_logWindow; }; - -#endif // MAINWINDOW_H diff --git a/tests/manual/ssh/remoteprocess/argumentscollector.h b/tests/manual/ssh/remoteprocess/argumentscollector.h index efac8af84be..5f195cf1f07 100644 --- a/tests/manual/ssh/remoteprocess/argumentscollector.h +++ b/tests/manual/ssh/remoteprocess/argumentscollector.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ARGUMENTSCOLLECTOR_H -#define ARGUMENTSCOLLECTOR_H +#pragma once #include <ssh/sshconnection.h> @@ -50,5 +49,3 @@ private: const QStringList m_arguments; }; - -#endif // ARGUMENTSCOLLECTOR_H diff --git a/tests/manual/ssh/remoteprocess/remoteprocesstest.h b/tests/manual/ssh/remoteprocess/remoteprocesstest.h index 0e626f26a5a..44c02169e78 100644 --- a/tests/manual/ssh/remoteprocess/remoteprocesstest.h +++ b/tests/manual/ssh/remoteprocess/remoteprocesstest.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTEPROCESSTEST_H -#define REMOTEPROCESSTEST_H +#pragma once #include <ssh/sshremoteprocessrunner.h> @@ -76,6 +75,3 @@ private: State m_state; bool m_started; }; - - -#endif // REMOTEPROCESSTEST_H diff --git a/tests/manual/ssh/sftp/argumentscollector.h b/tests/manual/ssh/sftp/argumentscollector.h index d3f14be9d82..67b69a7f474 100644 --- a/tests/manual/ssh/sftp/argumentscollector.h +++ b/tests/manual/ssh/sftp/argumentscollector.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ARGUMENTSCOLLECTOR_H -#define ARGUMENTSCOLLECTOR_H +#pragma once #include "parameters.h" @@ -51,5 +50,3 @@ private: const QStringList m_arguments; }; - -#endif // ARGUMENTSCOLLECTOR_H diff --git a/tests/manual/ssh/sftp/parameters.h b/tests/manual/ssh/sftp/parameters.h index 86bc4ba6f62..d947fa9d7da 100644 --- a/tests/manual/ssh/sftp/parameters.h +++ b/tests/manual/ssh/sftp/parameters.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PARAMETERS_H -#define PARAMETERS_H +#pragma once #include <ssh/sshconnection.h> @@ -33,5 +32,3 @@ struct Parameters { int smallFileCount; int bigFileSize; }; - -#endif // PARAMETERS_H diff --git a/tests/manual/ssh/sftp/sftptest.h b/tests/manual/ssh/sftp/sftptest.h index 87eaac3def3..1b984c41544 100644 --- a/tests/manual/ssh/sftp/sftptest.h +++ b/tests/manual/ssh/sftp/sftptest.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SFTPTEST_H -#define SFTPTEST_H +#pragma once #include "parameters.h" @@ -102,6 +101,3 @@ private: QSsh::SftpFileInfo m_dirInfo; QList<QSsh::SftpFileInfo> m_dirContents; }; - - -#endif // SFTPTEST_H diff --git a/tests/manual/ssh/shell/shell.h b/tests/manual/ssh/shell/shell.h index 479635321be..3fae9bf18be 100644 --- a/tests/manual/ssh/shell/shell.h +++ b/tests/manual/ssh/shell/shell.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SHELL_H -#define SHELL_H +#pragma once #include <QObject> #include <QSharedPointer> @@ -65,5 +64,3 @@ private: QSharedPointer<QSsh::SshRemoteProcess> m_shell; QFile * const m_stdin; }; - -#endif // SHELL_H diff --git a/tests/manual/ssh/tunnel/argumentscollector.h b/tests/manual/ssh/tunnel/argumentscollector.h index efac8af84be..5f195cf1f07 100644 --- a/tests/manual/ssh/tunnel/argumentscollector.h +++ b/tests/manual/ssh/tunnel/argumentscollector.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ARGUMENTSCOLLECTOR_H -#define ARGUMENTSCOLLECTOR_H +#pragma once #include <ssh/sshconnection.h> @@ -50,5 +49,3 @@ private: const QStringList m_arguments; }; - -#endif // ARGUMENTSCOLLECTOR_H diff --git a/tests/manual/ssh/tunnel/tunnel.h b/tests/manual/ssh/tunnel/tunnel.h index b2bc7b470c8..c01b478c404 100644 --- a/tests/manual/ssh/tunnel/tunnel.h +++ b/tests/manual/ssh/tunnel/tunnel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TUNNEL_H -#define TUNNEL_H +#pragma once #include <QObject> #include <QSharedPointer> @@ -71,5 +70,3 @@ private: QByteArray m_dataReceivedFromClient; bool m_expectingChannelClose; }; - -#endif // TUNNEL_H diff --git a/tests/system/suite_editors/shared/simplePlainCPP/testfile.h b/tests/system/suite_editors/shared/simplePlainCPP/testfile.h index 0fc49694e4b..dbb0bf9d054 100644 --- a/tests/system/suite_editors/shared/simplePlainCPP/testfile.h +++ b/tests/system/suite_editors/shared/simplePlainCPP/testfile.h @@ -8,4 +8,3 @@ public: {\ (X) = 1;\ }\ - diff --git a/tests/unit/echoserver/echoipcserver.h b/tests/unit/echoserver/echoipcserver.h index debc1560381..74d1bd5331f 100644 --- a/tests/unit/echoserver/echoipcserver.h +++ b/tests/unit/echoserver/echoipcserver.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_ECHOIPCSERVER_H -#define CLANGBACKEND_ECHOIPCSERVER_H +#pragma once #include <ipcserverinterface.h> @@ -52,5 +51,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_ECHOIPCSERVER_H diff --git a/tests/unit/mockup/clangcodemodel/clangcompletionassistinterface.h b/tests/unit/mockup/clangcodemodel/clangcompletionassistinterface.h index 9228e1348a3..9596a19e133 100644 --- a/tests/unit/mockup/clangcodemodel/clangcompletionassistinterface.h +++ b/tests/unit/mockup/clangcodemodel/clangcompletionassistinterface.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODEMODEL_INTERNAL_CLANGCOMPLETIONASSISTINTERFACE_H -#define CLANGCODEMODEL_INTERNAL_CLANGCOMPLETIONASSISTINTERFACE_H +#pragma once #include <texteditor/codeassist/assistinterface.h> @@ -50,5 +49,3 @@ private: } // namespace Internal } // namespace ClangCodeModel - -#endif // CLANGCODEMODEL_INTERNAL_CLANGCOMPLETIONASSISTINTERFACE_H diff --git a/tests/unit/mockup/texteditor/assistenums.h b/tests/unit/mockup/texteditor/assistenums.h index d1e068c7f3a..2a5995526d4 100644 --- a/tests/unit/mockup/texteditor/assistenums.h +++ b/tests/unit/mockup/texteditor/assistenums.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ASSISTENUMS_H -#define ASSISTENUMS_H +#pragma once namespace TextEditor { @@ -43,5 +42,3 @@ enum AssistReason }; } // TextEditor - -#endif // ASSISTENUMS_H diff --git a/tests/unit/mockup/texteditor/codeassist/assistinterface.h b/tests/unit/mockup/texteditor/codeassist/assistinterface.h index 9791e71a282..3b3b6704719 100644 --- a/tests/unit/mockup/texteditor/codeassist/assistinterface.h +++ b/tests/unit/mockup/texteditor/codeassist/assistinterface.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ASSISTINTERFACE_H -#define ASSISTINTERFACE_H +#pragma once #include <QTextCursor> @@ -109,6 +108,3 @@ inline QString AssistInterface::fileName() const return fileName_; } } - -#endif // ASSISTINTERFACE_H - diff --git a/tests/unit/mockup/texteditor/quickfix.h b/tests/unit/mockup/texteditor/quickfix.h index b4eb7b1a809..09fd7475788 100644 --- a/tests/unit/mockup/texteditor/quickfix.h +++ b/tests/unit/mockup/texteditor/quickfix.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTEDITORQUICKFIX_H -#define TEXTEDITORQUICKFIX_H +#pragma once #include <QString> @@ -55,6 +54,3 @@ private: }; } - -#endif // TEXTEDITORQUICKFIX_H - diff --git a/tests/unit/mockup/texteditor/refactoringchanges.h b/tests/unit/mockup/texteditor/refactoringchanges.h index 1299fccaf3a..9911bab3cda 100644 --- a/tests/unit/mockup/texteditor/refactoringchanges.h +++ b/tests/unit/mockup/texteditor/refactoringchanges.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REFACTORINGCHANGES_H -#define REFACTORINGCHANGES_H +#pragma once #include <QFile> #include <QSharedPointer> @@ -126,5 +125,3 @@ public: }; } // namespace TextEditor - -#endif // REFACTORINGCHANGES_H diff --git a/tests/unit/mockup/texteditor/semantichighlighter.h b/tests/unit/mockup/texteditor/semantichighlighter.h index dcb792e5f0f..ab4f9fa378a 100644 --- a/tests/unit/mockup/texteditor/semantichighlighter.h +++ b/tests/unit/mockup/texteditor/semantichighlighter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTEDITOR_SEMANTICHIGHLIGHTER_H -#define TEXTEDITOR_SEMANTICHIGHLIGHTER_H +#pragma once #include <texteditor/textstyles.h> @@ -69,5 +68,3 @@ public: }; } // namespace TextEditor - -#endif // TEXTEDITOR_SEMANTICHIGHLIGHTER_H diff --git a/tests/unit/unittest/chunksreportedmonitor.h b/tests/unit/unittest/chunksreportedmonitor.h index 4f082a8bbc9..01058492fca 100644 --- a/tests/unit/unittest/chunksreportedmonitor.h +++ b/tests/unit/unittest/chunksreportedmonitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_CHUNKSREPORTEDMONITOR_H -#define CLANGBACKEND_CHUNKSREPORTEDMONITOR_H +#pragma once #include <QObject> #include <QFuture> @@ -54,5 +53,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_CHUNKSREPORTEDMONITOR_H diff --git a/tests/unit/unittest/data/complete_forwarding_header_1.h b/tests/unit/unittest/data/complete_forwarding_header_1.h index 4905abf3e87..ebd822c41bf 100644 --- a/tests/unit/unittest/data/complete_forwarding_header_1.h +++ b/tests/unit/unittest/data/complete_forwarding_header_1.h @@ -1,6 +1,3 @@ -#ifndef COMPLETE_FORWARDING_HEADER_1_H -#define COMPLETE_FORWARDING_HEADER_1_H +#pragma once #include <complete_target_header.h> - -#endif // COMPLETE_FORWARDING_HEADER_1_H diff --git a/tests/unit/unittest/data/complete_forwarding_header_2.h b/tests/unit/unittest/data/complete_forwarding_header_2.h index dd0c3bc2912..ebd822c41bf 100644 --- a/tests/unit/unittest/data/complete_forwarding_header_2.h +++ b/tests/unit/unittest/data/complete_forwarding_header_2.h @@ -1,7 +1,3 @@ -#ifndef COMPLETE_FORWARDING_HEADER_2_H -#define COMPLETE_FORWARDING_HEADER_2_H +#pragma once #include <complete_target_header.h> - -#endif // COMPLETE_FORWARDING_HEADER_2_H - diff --git a/tests/unit/unittest/data/complete_target_header.h b/tests/unit/unittest/data/complete_target_header.h index 7d0ba1c8455..67bc13701d0 100644 --- a/tests/unit/unittest/data/complete_target_header.h +++ b/tests/unit/unittest/data/complete_target_header.h @@ -1,7 +1,3 @@ -#ifndef COMPLETE_TARGET_HEADER_H -#define COMPLETE_TARGET_HEADER_H +#pragma once void FunctionInIncludedHeader(); - -#endif // COMPLETE_TARGET_HEADER_H - diff --git a/tests/unit/unittest/data/complete_target_header_changed.h b/tests/unit/unittest/data/complete_target_header_changed.h index d631afd91b7..be7ac4e5320 100644 --- a/tests/unit/unittest/data/complete_target_header_changed.h +++ b/tests/unit/unittest/data/complete_target_header_changed.h @@ -1,8 +1,4 @@ -#ifndef COMPLETE_TARGET_HEADER_CHANGED_H -#define COMPLETE_TARGET_HEADER_CHANGED_H +#pragma once void FunctionInIncludedHeader(); void FunctionInIncludedHeaderChanged(); - -#endif // COMPLETE_TARGET_HEADER_CHANGED_H - diff --git a/tests/unit/unittest/data/complete_target_header_unsaved.h b/tests/unit/unittest/data/complete_target_header_unsaved.h index 904a861870e..7007f9b5fe2 100644 --- a/tests/unit/unittest/data/complete_target_header_unsaved.h +++ b/tests/unit/unittest/data/complete_target_header_unsaved.h @@ -1,8 +1,4 @@ -#ifndef COMPLETE_TARGET_HEADER_UNSAVED_H -#define COMPLETE_TARGET_HEADER_UNSAVED_H +#pragma once void FunctionInIncludedHeader(); void FunctionInIncludedHeaderUnsaved(); - -#endif // COMPLETE_TARGET_HEADER_UNSAVED_H - diff --git a/tests/unit/unittest/data/translationunits.h b/tests/unit/unittest/data/translationunits.h index 151a9f28e17..67bc13701d0 100644 --- a/tests/unit/unittest/data/translationunits.h +++ b/tests/unit/unittest/data/translationunits.h @@ -1,7 +1,3 @@ -#ifndef TRANSLATIONUNITS_H -#define TRANSLATIONUNITS_H +#pragma once void FunctionInIncludedHeader(); - -#endif // TRANSLATIONUNITS_H - diff --git a/tests/unit/unittest/gtest-qt-printing.h b/tests/unit/unittest/gtest-qt-printing.h index 8f0d7d14f9b..0e5de633ada 100644 --- a/tests/unit/unittest/gtest-qt-printing.h +++ b/tests/unit/unittest/gtest-qt-printing.h @@ -30,8 +30,7 @@ #include <iostream> -#ifndef GTESTQTPRINTING_H -#define GTESTQTPRINTING_H +#pragma once QT_BEGIN_NAMESPACE class QVariant; @@ -59,5 +58,3 @@ QT_END_NAMESPACE //} //} -#endif // GTESTQTPRINTING_H - diff --git a/tests/unit/unittest/mockipclient.h b/tests/unit/unittest/mockipclient.h index e57c177ee35..447de2c9bd8 100644 --- a/tests/unit/unittest/mockipclient.h +++ b/tests/unit/unittest/mockipclient.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MOCKIPCLIENT_H -#define MOCKIPCLIENT_H +#pragma once #include <ipcclientinterface.h> @@ -50,6 +49,3 @@ public: MOCK_METHOD1(highlightingChanged, void(const ClangBackEnd::HighlightingChangedMessage &message)); }; - -#endif // MOCKIPCLIENT_H - diff --git a/tests/unit/unittest/mockipcserver.h b/tests/unit/unittest/mockipcserver.h index 1589a101578..9f024d40760 100644 --- a/tests/unit/unittest/mockipcserver.h +++ b/tests/unit/unittest/mockipcserver.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MOCKIPCSERVER_H -#define MOCKIPCSERVER_H +#pragma once #include <ipcserverinterface.h> @@ -60,6 +59,3 @@ public: MOCK_METHOD1(updateVisibleTranslationUnits, void(const ClangBackEnd::UpdateVisibleTranslationUnitsMessage &message)); }; - -#endif // MOCKIPCSERVER_H - diff --git a/tests/unit/unittest/mocksenddocumentannotationscallback.h b/tests/unit/unittest/mocksenddocumentannotationscallback.h index 124ff1e8e17..1ab5206ec65 100644 --- a/tests/unit/unittest/mocksenddocumentannotationscallback.h +++ b/tests/unit/unittest/mocksenddocumentannotationscallback.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MOCKSENDDOCUMENTANNOTATIONSCALLBACK_H -#define MOCKSENDDOCUMENTANNOTATIONSCALLBACK_H +#pragma once #include <gmock/gmock.h> #include <gmock/gmock-matchers.h> @@ -45,5 +44,3 @@ public: MOCK_METHOD0(sendDocumentAnnotations, void()); }; - -#endif // MOCKSENDDOCUMENTANNOTATIONSCALLBACK_H diff --git a/tests/unit/unittest/spydummy.h b/tests/unit/unittest/spydummy.h index 175956772cf..0a9f2f5a8bd 100644 --- a/tests/unit/unittest/spydummy.h +++ b/tests/unit/unittest/spydummy.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SPYDUMMY_H -#define SPYDUMMY_H +#pragma once #include <QObject> @@ -40,5 +39,3 @@ signals: void databaseIsOpened(); void databaseIsClosed(); }; - -#endif // SPYDUMMY_H |