diff options
2252 files changed, 2240 insertions, 9056 deletions
diff --git a/doc/api/examples/exampleplugin/example_global.h b/doc/api/examples/exampleplugin/example_global.h index 228343cdf0..00c77e6b16 100644 --- a/doc/api/examples/exampleplugin/example_global.h +++ b/doc/api/examples/exampleplugin/example_global.h @@ -1,5 +1,4 @@ -#ifndef EXAMPLE_GLOBAL_H -#define EXAMPLE_GLOBAL_H +#pragma once #include <QtGlobal> @@ -8,6 +7,3 @@ #else # define EXAMPLESHARED_EXPORT Q_DECL_IMPORT #endif - -#endif // EXAMPLE_GLOBAL_H - diff --git a/doc/api/examples/exampleplugin/exampleconstants.h b/doc/api/examples/exampleplugin/exampleconstants.h index 1fe6b83bc1..fced2e0429 100644 --- a/doc/api/examples/exampleplugin/exampleconstants.h +++ b/doc/api/examples/exampleplugin/exampleconstants.h @@ -1,5 +1,4 @@ -#ifndef EXAMPLECONSTANTS_H -#define EXAMPLECONSTANTS_H +#pragma once namespace Example { namespace Constants { @@ -9,6 +8,3 @@ const char MENU_ID[] = "Example.Menu"; } // namespace Example } // namespace Constants - -#endif // EXAMPLECONSTANTS_H - diff --git a/doc/api/examples/exampleplugin/exampleplugin.h b/doc/api/examples/exampleplugin/exampleplugin.h index 56f04ea746..e858e92180 100644 --- a/doc/api/examples/exampleplugin/exampleplugin.h +++ b/doc/api/examples/exampleplugin/exampleplugin.h @@ -1,5 +1,4 @@ -#ifndef EXAMPLE_H -#define EXAMPLE_H +#pragma once #include "example_global.h" @@ -35,6 +34,3 @@ private: } // namespace Internal } // namespace Example - -#endif // EXAMPLE_H - diff --git a/doc/examples/textfinder/textfinder.h b/doc/examples/textfinder/textfinder.h index 26182be9f4..8351a47377 100644 --- a/doc/examples/textfinder/textfinder.h +++ b/doc/examples/textfinder/textfinder.h @@ -48,8 +48,7 @@ ** ****************************************************************************/ -#ifndef TEXTFINDER_H -#define TEXTFINDER_H +#pragma once #include "ui_textfinder.h" @@ -77,5 +76,3 @@ private: void loadTextFile(); //! [0] }; - -#endif // TEXTFINDER_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.h b/share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.h index c0f366a7c6..669a747be8 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CHANGEAUXILIARYCOMMAND_H -#define CHANGEAUXILIARYCOMMAND_H +#pragma once #include <QMetaType> #include <QVector> @@ -56,5 +55,3 @@ QDebug operator <<(QDebug debug, const ChangeAuxiliaryCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::ChangeAuxiliaryCommand) - -#endif // CHANGEAUXILIARYCOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.h b/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.h index 5a9696b9f5..b2df9e326c 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CHANGEBINDINGSCOMMAND_H -#define CHANGEBINDINGSCOMMAND_H +#pragma once #include <QMetaType> #include <QVector> @@ -56,5 +55,3 @@ QDebug operator <<(QDebug debug, const ChangeBindingsCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::ChangeBindingsCommand) - -#endif // CHANGEBINDINGSCOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.h b/share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.h index 6e20885cb4..5645274fc4 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CHANGEFILEURLCOMMAND_H -#define CHANGEFILEURLCOMMAND_H +#pragma once #include <qmetatype.h> #include <QUrl> @@ -53,5 +52,3 @@ QDebug operator <<(QDebug debug, const ChangeFileUrlCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::ChangeFileUrlCommand) - -#endif // CHANGEFILEURLCOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h b/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h index 80e01c8f46..b92fb3b558 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CHANGEIDSCOMMAND_H -#define CHANGEIDSCOMMAND_H +#pragma once #include <QMetaType> #include <QVector> @@ -57,5 +56,3 @@ QDebug operator <<(QDebug debug, const ChangeIdsCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::ChangeIdsCommand) - -#endif // CHANGEIDSCOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h b/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h index a11e2a8589..e5e2c48ac9 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CHANGENODESOURCECOMMAND_H -#define CHANGENODESOURCECOMMAND_H +#pragma once #include <QMetaType> #include <QString> @@ -56,5 +55,3 @@ QDebug operator <<(QDebug debug, const ChangeNodeSourceCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::ChangeNodeSourceCommand) - -#endif // CHANGENODESOURCECOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/changestatecommand.h b/share/qtcreator/qml/qmlpuppet/commands/changestatecommand.h index 91d74c9ebe..10ef832a32 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/changestatecommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/changestatecommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CHANGESTATECOMMAND_H -#define CHANGESTATECOMMAND_H +#pragma once #include <QMetaType> #include <QVector> @@ -56,5 +55,3 @@ QDebug operator <<(QDebug debug, const ChangeStateCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::ChangeStateCommand) - -#endif // CHANGESTATECOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.h b/share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.h index 3272e54ef3..046e44ab62 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CHANGEVALUESCOMMAND_H -#define CHANGEVALUESCOMMAND_H +#pragma once #include <QMetaType> #include <QVector> @@ -56,5 +55,3 @@ QDebug operator <<(QDebug debug, const ChangeValuesCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::ChangeValuesCommand) - -#endif // CHANGEVALUESCOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.h b/share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.h index a597724f67..d2be1dca86 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CHILDRENCHANGEDCOMMAND_H -#define CHILDRENCHANGEDCOMMAND_H +#pragma once #include <QMetaType> #include <QVector> @@ -62,5 +61,3 @@ QDebug operator <<(QDebug debug, const ChildrenChangedCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::ChildrenChangedCommand) - -#endif // CHILDRENCHANGEDCOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.h b/share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.h index 45ef8e62fe..77c508ad4c 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLEARSCENECOMMAND_H -#define CLEARSCENECOMMAND_H +#pragma once #include <qmetatype.h> @@ -44,5 +43,3 @@ QDebug operator <<(QDebug debug, const ClearSceneCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::ClearSceneCommand) - -#endif // CLEARSCENECOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.h b/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.h index af11ecc069..3eb86d9a13 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMPLETECOMPONENT_H -#define COMPLETECOMPONENT_H +#pragma once #include <QMetaType> #include <QVector> @@ -55,5 +54,3 @@ QDebug operator <<(QDebug debug, const CompleteComponentCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::CompleteComponentCommand) - -#endif // COMPLETECOMPONENT_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.h b/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.h index 5117031d8e..b55434b71a 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMPONENTCOMPLETEDCOMMAND_H -#define COMPONENTCOMPLETEDCOMMAND_H +#pragma once #include <QMetaType> #include <QVector> #include <QDataStream> @@ -57,5 +56,3 @@ QDebug operator <<(QDebug debug, const ComponentCompletedCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::ComponentCompletedCommand) - -#endif // COMPONENTCOMPLETEDCOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.h b/share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.h index 4125ae08ca..d8ec9ba9f3 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CREATEINSTANCESCOMMAND_H -#define CREATEINSTANCESCOMMAND_H +#pragma once #include <QMetaType> #include <QVector> @@ -55,5 +54,3 @@ QDebug operator <<(QDebug debug, const CreateInstancesCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::CreateInstancesCommand) - -#endif // CREATEINSTANCESCOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/createscenecommand.h b/share/qtcreator/qml/qmlpuppet/commands/createscenecommand.h index b11268f635..dc7130bd69 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/createscenecommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/createscenecommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CREATESCENECOMMAND_H -#define CREATESCENECOMMAND_H +#pragma once #include <qmetatype.h> #include <QUrl> @@ -81,5 +80,3 @@ QDebug operator <<(QDebug debug, const CreateSceneCommand &command); } Q_DECLARE_METATYPE(QmlDesigner::CreateSceneCommand) - -#endif // CREATESCENECOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/debugoutputcommand.h b/share/qtcreator/qml/qmlpuppet/commands/debugoutputcommand.h index e9ed4ff2f3..dbb386f23b 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/debugoutputcommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/debugoutputcommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_DEBUGOUTPUTCOMMAND_H -#define QMLDESIGNER_DEBUGOUTPUTCOMMAND_H +#pragma once #include <QMetaType> #include <QString> @@ -68,5 +67,3 @@ QDebug operator <<(QDebug debug, const DebugOutputCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::DebugOutputCommand) - -#endif // QMLDESIGNER_DEBUGOUTPUTCOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h b/share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h index 9648d80cea..7ecee7acf7 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_ENDPUPPETCOMMAND_H -#define QMLDESIGNER_ENDPUPPETCOMMAND_H +#pragma once #include <qmetatype.h> @@ -44,5 +43,3 @@ QDebug operator <<(QDebug debug, const EndPuppetCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::EndPuppetCommand) - -#endif // QMLDESIGNER_ENDPUPPETCOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.h b/share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.h index b4af444f07..a21fae75cb 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INFORMATIONCHANGEDCOMMAND_H -#define INFORMATIONCHANGEDCOMMAND_H +#pragma once #include <QMetaType> #include <QVector> @@ -59,5 +58,3 @@ QDebug operator <<(QDebug debug, const InformationChangedCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::InformationChangedCommand) - -#endif // INFORMATIONCHANGEDCOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.h b/share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.h index 18fd7fec9e..23a246d431 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PIXMAPCHANGEDCOMMAND_H -#define PIXMAPCHANGEDCOMMAND_H +#pragma once #include <QMetaType> #include "imagecontainer.h" @@ -57,5 +56,3 @@ QDebug operator <<(QDebug debug, const PixmapChangedCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::PixmapChangedCommand) - -#endif // PIXMAPCHANGEDCOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/puppetalivecommand.h b/share/qtcreator/qml/qmlpuppet/commands/puppetalivecommand.h index 2f5c471f81..eeb013de6b 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/puppetalivecommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/puppetalivecommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PUPPETALIVECOMMAND_H -#define PUPPETALIVECOMMAND_H +#pragma once #include <QMetaType> #include <QDebug> @@ -48,5 +47,3 @@ QDebug operator <<(QDebug debug, const PuppetAliveCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::PuppetAliveCommand) - -#endif // PUPPETALIVECOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h b/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h index 992a23237c..a92132ff40 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOVEINSTANCESCOMMAND_H -#define REMOVEINSTANCESCOMMAND_H +#pragma once #include <QMetaType> #include <QVector> @@ -57,5 +56,3 @@ QDebug operator <<(QDebug debug, const RemoveInstancesCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::RemoveInstancesCommand) - -#endif // REMOVEINSTANCESCOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.h b/share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.h index e950f392e9..911374c984 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOVEPROPERTIESCOMMAND_H -#define REMOVEPROPERTIESCOMMAND_H +#pragma once #include <QMetaType> #include <QVector> @@ -56,5 +55,3 @@ QDebug operator <<(QDebug debug, const RemovePropertiesCommand &command); } Q_DECLARE_METATYPE(QmlDesigner::RemovePropertiesCommand) - -#endif // REMOVEPROPERTIESCOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/removesharedmemorycommand.h b/share/qtcreator/qml/qmlpuppet/commands/removesharedmemorycommand.h index b43eb56b57..44ab7b5a00 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/removesharedmemorycommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/removesharedmemorycommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_REMOVESHAREDMEMORYCOMMAND_H -#define QMLDESIGNER_REMOVESHAREDMEMORYCOMMAND_H +#pragma once #include <QMetaType> #include <QString> @@ -57,5 +56,3 @@ QDebug operator <<(QDebug debug, const RemoveSharedMemoryCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::RemoveSharedMemoryCommand) - -#endif // QMLDESIGNER_REMOVESHAREDMEMORYCOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.h b/share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.h index b94c362397..62659e2424 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REPARENTINSTANCESCOMMAND_H -#define REPARENTINSTANCESCOMMAND_H +#pragma once #include <QMetaType> #include <QVector> @@ -56,5 +55,3 @@ QDebug operator <<(QDebug debug, const ReparentInstancesCommand &command); } // Q_DECLARE_METATYPE(QmlDesigner::ReparentInstancesCommand) - -#endif // REPARENTINSTANCESCOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.h b/share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.h index 173aaf1fc2..a4d0f8f97b 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef STATEPREVIEWIMAGECHANGEDCOMMAND_H -#define STATEPREVIEWIMAGECHANGEDCOMMAND_H +#pragma once #include <QMetaType> @@ -58,5 +57,3 @@ QDebug operator <<(QDebug debug, const StatePreviewImageChangedCommand &command) } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::StatePreviewImageChangedCommand) - -#endif // STATEPREVIEWIMAGECHANGEDCOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.h b/share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.h index 3adc8e799b..6799ac5519 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SYNCHRONIZECOMMAND_H -#define SYNCHRONIZECOMMAND_H +#pragma once #include <QMetaType> #include <QVector> @@ -57,5 +56,3 @@ QDebug operator <<(QDebug debug, const SynchronizeCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::SynchronizeCommand) - -#endif // SYNCHRONIZECOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/tokencommand.h b/share/qtcreator/qml/qmlpuppet/commands/tokencommand.h index e4ff20b95d..5bde947908 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/tokencommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/tokencommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_TOKENCOMMAND_H -#define QMLDESIGNER_TOKENCOMMAND_H +#pragma once #include <QMetaType> @@ -64,6 +63,3 @@ QDebug operator <<(QDebug debug, const TokenCommand &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::TokenCommand) - - -#endif // QMLDESIGNER_TOKENCOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.h b/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.h index 97d0d00979..96050aee7f 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef VALUESCHANGEDCOMMAND_H -#define VALUESCHANGEDCOMMAND_H +#pragma once #include <QMetaType> #include <QVector> @@ -63,6 +62,3 @@ QDebug operator <<(QDebug debug, const ValuesChangedCommand &instance); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::ValuesChangedCommand) - - -#endif // VALUESCHANGEDCOMMAND_H diff --git a/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.h b/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.h index 6895104899..832b2afbb6 100644 --- a/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.h +++ b/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ADDIMPORTCONTAINER_H -#define ADDIMPORTCONTAINER_H +#pragma once #include <QMetaType> #include <QUrl> @@ -62,5 +61,3 @@ QDebug operator <<(QDebug debug, const AddImportContainer &container); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::AddImportContainer) - -#endif // ADDIMPORTCONTAINER_H diff --git a/share/qtcreator/qml/qmlpuppet/container/idcontainer.h b/share/qtcreator/qml/qmlpuppet/container/idcontainer.h index 1d682695c0..3e1e7c4088 100644 --- a/share/qtcreator/qml/qmlpuppet/container/idcontainer.h +++ b/share/qtcreator/qml/qmlpuppet/container/idcontainer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IDCONTAINER_H -#define IDCONTAINER_H +#pragma once #include <QDataStream> #include <qmetatype.h> @@ -57,5 +56,3 @@ QDebug operator <<(QDebug debug, const IdContainer &container); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::IdContainer) - -#endif // IDCONTAINER_H diff --git a/share/qtcreator/qml/qmlpuppet/container/imagecontainer.h b/share/qtcreator/qml/qmlpuppet/container/imagecontainer.h index 7bc0ea5f17..b0bd3622a9 100644 --- a/share/qtcreator/qml/qmlpuppet/container/imagecontainer.h +++ b/share/qtcreator/qml/qmlpuppet/container/imagecontainer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IMAGECONTAINER_H -#define IMAGECONTAINER_H +#pragma once #include <QMetaType> #include <QImage> @@ -65,5 +64,3 @@ QDebug operator <<(QDebug debug, const ImageContainer &container); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::ImageContainer) - -#endif // IMAGECONTAINER_H diff --git a/share/qtcreator/qml/qmlpuppet/container/informationcontainer.h b/share/qtcreator/qml/qmlpuppet/container/informationcontainer.h index 5340b00b6f..c624e4c5e4 100644 --- a/share/qtcreator/qml/qmlpuppet/container/informationcontainer.h +++ b/share/qtcreator/qml/qmlpuppet/container/informationcontainer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INFORMATIONCONTAINER_H -#define INFORMATIONCONTAINER_H +#pragma once #include <QDataStream> #include <QMetaType> @@ -74,5 +73,3 @@ QDebug operator <<(QDebug debug, const InformationContainer &container); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::InformationContainer) - -#endif // INFORMATIONCONTAINER_H diff --git a/share/qtcreator/qml/qmlpuppet/container/instancecontainer.h b/share/qtcreator/qml/qmlpuppet/container/instancecontainer.h index 6ec57c6efc..f8b4d84680 100644 --- a/share/qtcreator/qml/qmlpuppet/container/instancecontainer.h +++ b/share/qtcreator/qml/qmlpuppet/container/instancecontainer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INSTANCECONTAINER_H -#define INSTANCECONTAINER_H +#pragma once #include <qmetatype.h> #include <QString> @@ -83,4 +82,3 @@ QDebug operator <<(QDebug debug, const InstanceContainer &command); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::InstanceContainer) -#endif // INSTANCECONTAINER_H diff --git a/share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.h b/share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.h index 3889cb8319..df51c3306b 100644 --- a/share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.h +++ b/share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROPERTYABSTRACTCONTAINER_H -#define PROPERTYABSTRACTCONTAINER_H +#pragma once #include <QDataStream> #include <qmetatype.h> @@ -65,4 +64,3 @@ QDebug operator <<(QDebug debug, const PropertyAbstractContainer &container); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::PropertyAbstractContainer) -#endif // PROPERTYABSTRACTCONTAINER_H diff --git a/share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.h b/share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.h index 84bf5f4d8c..fb4a245bdc 100644 --- a/share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.h +++ b/share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROPERTYBINDINGCONTAINER_H -#define PROPERTYBINDINGCONTAINER_H +#pragma once #include <QDataStream> #include <qmetatype.h> @@ -63,4 +62,3 @@ QDebug operator <<(QDebug debug, const PropertyBindingContainer &container); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::PropertyBindingContainer) -#endif // PROPERTYBINDINGCONTAINER_H diff --git a/share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.h b/share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.h index e3f8bcf216..3423066bc1 100644 --- a/share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.h +++ b/share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROPERTYVALUECONTAINER_H -#define PROPERTYVALUECONTAINER_H +#pragma once #include <QDataStream> #include <QMetaType> @@ -68,5 +67,3 @@ QDebug operator <<(QDebug debug, const PropertyValueContainer &container); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::PropertyValueContainer) - -#endif // PROPERTYVALUECONTAINER_H diff --git a/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h b/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h index 2751937485..76d57b577a 100644 --- a/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h +++ b/share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REPARENTCONTAINER_H -#define REPARENTCONTAINER_H +#pragma once #include <qmetatype.h> #include <QString> @@ -65,5 +64,3 @@ QDataStream &operator>>(QDataStream &in, ReparentContainer &container); QDebug operator <<(QDebug debug, const ReparentContainer &container); } // namespace QmlDesigner - -#endif // REPARENTCONTAINER_H diff --git a/share/qtcreator/qml/qmlpuppet/container/sharedmemory.h b/share/qtcreator/qml/qmlpuppet/container/sharedmemory.h index 482d3d86af..9e6dc794e8 100644 --- a/share/qtcreator/qml/qmlpuppet/container/sharedmemory.h +++ b/share/qtcreator/qml/qmlpuppet/container/sharedmemory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_SHAREDMEMORY_H -#define QMLDESIGNER_SHAREDMEMORY_H +#pragma once #include <QSharedMemory> #include <QSystemSemaphore> @@ -88,5 +87,3 @@ private: }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_SHAREDMEMORY_H diff --git a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h index ba55f0cea3..2b75ca3a4b 100644 --- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h +++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NODEINSTANCECLIENTPROXY_H -#define NODEINSTANCECLIENTPROXY_H +#pragma once #include "nodeinstanceclientinterface.h" @@ -123,5 +122,3 @@ private: }; } // namespace QmlDesigner - -#endif // NODEINSTANCECLIENTPROXY_H diff --git a/share/qtcreator/qml/qmlpuppet/interfaces/commondefines.h b/share/qtcreator/qml/qmlpuppet/interfaces/commondefines.h index 37e0b027e8..51010c9a53 100644 --- a/share/qtcreator/qml/qmlpuppet/interfaces/commondefines.h +++ b/share/qtcreator/qml/qmlpuppet/interfaces/commondefines.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMMONDEFINES_H -#define COMMONDEFINES_H +#pragma once #include <QMetaType> #include <QPair> @@ -57,5 +56,3 @@ enum InformationName }; } - -#endif // COMMONDEFINES_H diff --git a/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceclientinterface.h b/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceclientinterface.h index 34600fd174..43c50b510c 100644 --- a/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceclientinterface.h +++ b/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceclientinterface.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NODEINSTANCECLIENTINTERFACE_H -#define NODEINSTANCECLIENTINTERFACE_H +#pragma once #include <QtGlobal> @@ -59,5 +58,3 @@ public: }; } - -#endif // NODEINSTANCECLIENTINTERFACE_H diff --git a/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceglobal.h b/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceglobal.h index ab06fdda33..c7ceef01b2 100644 --- a/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceglobal.h +++ b/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceglobal.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NODEINSTANCEGLOBAL_H -#define NODEINSTANCEGLOBAL_H +#pragma once #include <QByteArray> #include <QList> @@ -36,5 +35,3 @@ typedef QList<PropertyName> PropertyNameList; typedef QByteArray TypeName; } - -#endif // NODEINSTANCEGLOBAL_H diff --git a/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.h b/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.h index 30b779ff7e..e3ac6cd111 100644 --- a/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.h +++ b/share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceserverinterface.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NODEINSTANCESERVERINTERFACE_H -#define NODEINSTANCESERVERINTERFACE_H +#pragma once #include <QObject> @@ -83,4 +82,3 @@ public: }; } -#endif // NODEINSTANCESERVERINTERFACE_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h index 5b7a204067..a9072b6058 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_ANCHORCHANGESNODEINSTANCE_H -#define QMLDESIGNER_ANCHORCHANGESNODEINSTANCE_H +#pragma once #include "objectnodeinstance.h" @@ -64,5 +63,3 @@ protected: } // namespace Internal } // namespace QmlDesigner - -#endif // QMLDESIGNER_ANCHORCHANGESNODEINSTANCE_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h index 6f040db877..b18f4882cb 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEHAVIORNODEINSTANCE_H -#define BEHAVIORNODEINSTANCE_H +#pragma once #include "objectnodeinstance.h" @@ -52,5 +51,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // BEHAVIORNODEINSTANCE_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/childrenchangeeventfilter.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/childrenchangeeventfilter.h index 51df307dd0..659ccf58f3 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/childrenchangeeventfilter.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/childrenchangeeventfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CHILDRENCHANGEEVENTFILTER_H -#define CHILDRENCHANGEEVENTFILTER_H +#pragma once #include <QObject> @@ -48,5 +47,3 @@ protected: } // namespace Internal } // namespace QmlDesigner - -#endif // CHILDRENCHANGEEVENTFILTER_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h index 02ec457fc8..24ae2dd5d2 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMPONENTNODEINSTANCE_H -#define COMPONENTNODEINSTANCE_H +#pragma once #include "objectnodeinstance.h" @@ -54,5 +53,3 @@ private: //function } // Internal } // QmlDesigner - -#endif // COMPONENTNODEINSTANCE_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummycontextobject.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummycontextobject.h index 4048d1ff4a..73320dfcf6 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummycontextobject.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummycontextobject.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DUMMYCONTEXTOBJECT_H -#define DUMMYCONTEXTOBJECT_H +#pragma once #include <QObject> #include <QPointer> @@ -53,4 +52,3 @@ private: } // namespace QmlDesigner QML_DECLARE_TYPE(QmlDesigner::DummyContextObject) -#endif // DUMMYCONTEXTOBJECT_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h index 2e35f841c6..6a1711399e 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DUMMYNODEINSTANCE_H -#define DUMMYNODEINSTANCE_H +#pragma once #include <QWeakPointer> @@ -61,4 +60,3 @@ protected: } } -#endif // DUMMYNODEINSTANCE_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.h index 58d7ec9f90..f7d0d3e3a6 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LAYOUTNODEINSTANCE_H -#define LAYOUTNODEINSTANCE_H +#pragma once #include "quickitemnodeinstance.h" @@ -54,5 +53,3 @@ protected: } // namespace Internal } // namespace QmlDesigner - -#endif // LAYOUTNODEINSTANCE_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h index 00f882deab..6ac34eecf5 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NODEINSTANCESERVER_H -#define NODEINSTANCESERVER_H +#pragma once #include <QUrl> #include <QVector> @@ -225,5 +224,3 @@ private: }; } - -#endif // NODEINSTANCESERVER_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.h index c5ebc58687..066c74f6a3 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NODEINSTANCESIGNALSPY_H -#define NODEINSTANCESIGNALSPY_H +#pragma once #include <QObject> #include <QHash> @@ -63,5 +62,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // NODEINSTANCESIGNALSPY_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h index 200993a80f..cecc9c8ee3 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OBJECTNODEINSTANCE_H -#define OBJECTNODEINSTANCE_H +#pragma once #include "nodeinstanceserver.h" #include "nodeinstancesignalspy.h" @@ -221,5 +220,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // OBJECTNODEINSTANCE_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h index a2ac190148..7575014ea8 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef POSITIONERNODEINSTANCE_H -#define POSITIONERNODEINSTANCE_H +#pragma once #include "quickitemnodeinstance.h" @@ -58,5 +57,3 @@ protected: } // namespace Internal } // namespace QmlDesigner - -#endif // POSITIONERNODEINSTANCE_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h index 72fe51de62..4ea6c896ec 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROPERTYCHANGESNODEINSTANCE_H -#define QMLPROPERTYCHANGESNODEINSTANCE_H +#pragma once #include "objectnodeinstance.h" @@ -60,5 +59,3 @@ protected: } // namespace QmlDesigner //QML_DECLARE_TYPE(QmlDesigner::Internal::QmlPropertyChangesObject) - -#endif // QMLPROPERTYCHANGESNODEINSTANCE_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h index 12bbf25349..5c09bb7ab7 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLSTATENODEINSTANCE_H -#define QMLSTATENODEINSTANCE_H +#pragma once #include "objectnodeinstance.h" @@ -57,5 +56,3 @@ protected: } // namespace Internal } // namespace QmlDesigner - -#endif // QMLSTATENODEINSTANCE_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h index e297e5db35..dc1f01dec4 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLTRANSITIONNODEINSTANCE_H -#define QMLTRANSITIONNODEINSTANCE_H +#pragma once #include "objectnodeinstance.h" @@ -48,4 +47,3 @@ private: }; } } -#endif // QMLTRANSITIONNODEINSTANCE_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h index 2800806638..3f6ecdd94d 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_QT5INFORMATIONNODEINSTANCESERVER_H -#define QMLDESIGNER_QT5INFORMATIONNODEINSTANCESERVER_H +#pragma once #include "qt5nodeinstanceserver.h" #include "tokencommand.h" @@ -58,5 +57,3 @@ private: }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_QT5INFORMATIONNODEINSTANCESERVER_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h index 2a7a272d44..b8efccc7ec 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_QT5NODEINSTANCECLIENTPROXY_H -#define QMLDESIGNER_QT5NODEINSTANCECLIENTPROXY_H +#pragma once #include "nodeinstanceclientproxy.h" @@ -38,5 +37,3 @@ public: }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_QT5NODEINSTANCECLIENTPROXY_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h index 5dcbd1cd7d..d4aaa91ddf 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QT5NODEINSTANCESERVER_H -#define QT5NODEINSTANCESERVER_H +#pragma once #include <QtGlobal> @@ -68,5 +67,3 @@ private: }; } // QmlDesigner - -#endif // QT5NODEINSTANCESERVER_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h index 187617cc9f..c47681ec21 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_QT5PREVIEWNODEINSTANCESERVER_H -#define QMLDESIGNER_QT5PREVIEWNODEINSTANCESERVER_H +#pragma once #include "qt5nodeinstanceserver.h" @@ -51,5 +50,3 @@ private: }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_QT5PREVIEWNODEINSTANCESERVER_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h index 5f885f8b66..1a9fcf624e 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_QT5RENDERNODEINSTANCESERVER_H -#define QMLDESIGNER_QT5RENDERNODEINSTANCESERVER_H +#pragma once #include "qt5nodeinstanceserver.h" @@ -50,5 +49,3 @@ private: }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_QT5RENDERNODEINSTANCESERVER_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.h index 8a8aec7b8b..af30c423d6 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5testnodeinstanceserver.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_QT5TESTNODEINSTANCESERVER_H -#define QMLDESIGNER_QT5TESTNODEINSTANCESERVER_H +#pragma once #include "qt5nodeinstanceserver.h" @@ -61,5 +60,3 @@ protected: }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_QT5TESTNODEINSTANCESERVER_H diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h index 8936927ab9..d655a9a103 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QuickITEMNODEINSTANCE_H -#define QuickITEMNODEINSTANCE_H +#pragma once #include <QtGlobal> @@ -134,6 +133,3 @@ private: //variables } // namespace Internal } // namespace QmlDesigner - -#endif // QuickITEMNODEINSTANCE_H - diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h index 424cd6dbac..c0c3f87608 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SERVERNODEINSTANCE_H -#define SERVERNODEINSTANCE_H +#pragma once #include <QSharedPointer> #include <QHash> @@ -214,5 +213,3 @@ QDebug operator <<(QDebug debug, const ServerNodeInstance &instance); } Q_DECLARE_METATYPE(QmlDesigner::ServerNodeInstance) - -#endif // SERVERNODEINSTANCE_H diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/designercustomobjectdata.h b/share/qtcreator/qml/qmlpuppet/qmlprivategate/designercustomobjectdata.h index e8601e42ef..c7030fe400 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/designercustomobjectdata.h +++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/designercustomobjectdata.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DESIGNERCUSTOMOBJECTDATA_H -#define DESIGNERCUSTOMOBJECTDATA_H +#pragma once #include "nodeinstanceglobal.h" @@ -81,5 +80,3 @@ private: } // namespace QmlPrivateGate } // namespace Internal } // namespace QmlDesigner - -#endif // DESIGNERCUSTOMOBJECTDATA_H diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.h b/share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.h index 800091c777..fc61657c07 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.h +++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/metaobject.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NODEINSTANCEMETAOBJECT_H -#define NODEINSTANCEMETAOBJECT_H +#pragma once #include <QQmlContext> #include <QScopedPointer> @@ -94,5 +93,3 @@ private: } // namespace QmlPrivateGate } // namespace Internal } // namespace QmlDesigner - -#endif // NODEINSTANCEMETAOBJECT_H diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h index 467659a2c2..bd17a68a1e 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h +++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPRIVATEGATE_H -#define QMLPRIVATEGATE_H +#pragma once #include "nodeinstanceglobal.h" @@ -131,5 +130,3 @@ public: } // namespace QmlPrivateGate } // namespace Internal } // namespace QmlDesigner - -#endif // QMLPRIVATEGATE_H diff --git a/share/qtcreator/qml/qmlpuppet/types/enumeration.h b/share/qtcreator/qml/qmlpuppet/types/enumeration.h index 537a391b9e..84028dd24a 100644 --- a/share/qtcreator/qml/qmlpuppet/types/enumeration.h +++ b/share/qtcreator/qml/qmlpuppet/types/enumeration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_ENUMERATION_H -#define QMLDESIGNER_ENUMERATION_H +#pragma once #include <QByteArray> #include <QDataStream> @@ -69,5 +68,3 @@ QDebug operator <<(QDebug debug, const Enumeration &enumeration); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::Enumeration) - -#endif // QMLDESIGNER_ENUMERATION_H diff --git a/share/qtcreator/templates/wizards/qtquick1-extension/plugin.h b/share/qtcreator/templates/wizards/qtquick1-extension/plugin.h index d487a8339d..bb4976b12e 100644 --- a/share/qtcreator/templates/wizards/qtquick1-extension/plugin.h +++ b/share/qtcreator/templates/wizards/qtquick1-extension/plugin.h @@ -1,5 +1,4 @@ -#ifndef %ProjectName:h%_PLUGIN_H -#define %ProjectName:h%_PLUGIN_H +#pragma once #include <QDeclarativeExtensionPlugin> @@ -13,5 +12,3 @@ class %ProjectName:s%Plugin : public QDeclarativeExtensionPlugin public: void registerTypes(const char *uri); }; - -#endif // %ProjectName:h%_PLUGIN_H diff --git a/share/qtcreator/templates/wizards/qtquick2-extension/plugin.h b/share/qtcreator/templates/wizards/qtquick2-extension/plugin.h index 3b0bc2a355..da01f59d04 100644 --- a/share/qtcreator/templates/wizards/qtquick2-extension/plugin.h +++ b/share/qtcreator/templates/wizards/qtquick2-extension/plugin.h @@ -1,5 +1,4 @@ -#ifndef %ProjectName:h%_PLUGIN_H -#define %ProjectName:h%_PLUGIN_H +#pragma once #include <QQmlExtensionPlugin> @@ -11,5 +10,3 @@ class %ProjectName:s%Plugin : public QQmlExtensionPlugin public: void registerTypes(const char *uri); }; - -#endif // %ProjectName:h%_PLUGIN_H diff --git a/src/app/app_version.h.in b/src/app/app_version.h.in index 9aed843da3..b48d6bee4c 100644 --- a/src/app/app_version.h.in +++ b/src/app/app_version.h.in @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef APP_VERSION_H -#define APP_VERSION_H +#pragma once namespace Core { namespace Constants { @@ -76,5 +75,3 @@ const char * const IDE_COPY_SETTINGS_FROM_VARIANT_STR = \"Nokia\"; } // Constants } // Core - -#endif //APP_VERSION_H diff --git a/src/libs/3rdparty/cplusplus/AST.h b/src/libs/3rdparty/cplusplus/AST.h index bcdf043362..fc6750320b 100644 --- a/src/libs/3rdparty/cplusplus/AST.h +++ b/src/libs/3rdparty/cplusplus/AST.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_AST_H -#define CPLUSPLUS_AST_H +#pragma once #include "CPlusPlusForwardDeclarations.h" #include "ASTfwd.h" @@ -4688,5 +4687,3 @@ protected: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_AST_H diff --git a/src/libs/3rdparty/cplusplus/ASTMatcher.h b/src/libs/3rdparty/cplusplus/ASTMatcher.h index ad622316da..f6f3eae8d9 100644 --- a/src/libs/3rdparty/cplusplus/ASTMatcher.h +++ b/src/libs/3rdparty/cplusplus/ASTMatcher.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef ASTMATCHER_H -#define ASTMATCHER_H +#pragma once #include "ASTfwd.h" @@ -184,5 +183,3 @@ public: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_ASTMATCHER_H diff --git a/src/libs/3rdparty/cplusplus/ASTVisitor.h b/src/libs/3rdparty/cplusplus/ASTVisitor.h index 699694e9f9..46bfde340b 100644 --- a/src/libs/3rdparty/cplusplus/ASTVisitor.h +++ b/src/libs/3rdparty/cplusplus/ASTVisitor.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_ASTVISITOR_H -#define CPLUSPLUS_ASTVISITOR_H +#pragma once #include "CPlusPlusForwardDeclarations.h" #include "ASTfwd.h" @@ -380,5 +379,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_ASTVISITOR_H diff --git a/src/libs/3rdparty/cplusplus/ASTfwd.h b/src/libs/3rdparty/cplusplus/ASTfwd.h index 0dd8d04037..2c55fd27d6 100644 --- a/src/libs/3rdparty/cplusplus/ASTfwd.h +++ b/src/libs/3rdparty/cplusplus/ASTfwd.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_ASTFWD_H -#define CPLUSPLUS_ASTFWD_H +#pragma once #include "CPlusPlusForwardDeclarations.h" @@ -225,6 +224,3 @@ typedef List<ObjCSynthesizedPropertyAST *> ObjCSynthesizedPropertyListAST; typedef List<DesignatorAST *> DesignatorListAST; } // namespace CPlusPlus - - -#endif // CPLUSPLUS_ASTFWD_H diff --git a/src/libs/3rdparty/cplusplus/Bind.h b/src/libs/3rdparty/cplusplus/Bind.h index 2eb58d8f2e..54e88e95a8 100644 --- a/src/libs/3rdparty/cplusplus/Bind.h +++ b/src/libs/3rdparty/cplusplus/Bind.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_BIND_H -#define CPLUSPLUS_BIND_H +#pragma once #include "ASTVisitor.h" #include "FullySpecifiedType.h" @@ -291,5 +290,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_BIND_H diff --git a/src/libs/3rdparty/cplusplus/CPlusPlus.h b/src/libs/3rdparty/cplusplus/CPlusPlus.h index 5fedc986a8..0dbf0f1ed3 100644 --- a/src/libs/3rdparty/cplusplus/CPlusPlus.h +++ b/src/libs/3rdparty/cplusplus/CPlusPlus.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_CPLUSPLUS_H -#define CPLUSPLUS_CPLUSPLUS_H +#pragma once #include "AST.h" #include "ASTMatcher.h" @@ -52,5 +51,3 @@ #include "Matcher.h" #include "TypeVisitor.h" #include "Templates.h" - -#endif // CPLUSPLUS_CPLUSPLUS_H diff --git a/src/libs/3rdparty/cplusplus/CPlusPlusForwardDeclarations.h b/src/libs/3rdparty/cplusplus/CPlusPlusForwardDeclarations.h index 9b1c5a30cf..bec7e77a5c 100644 --- a/src/libs/3rdparty/cplusplus/CPlusPlusForwardDeclarations.h +++ b/src/libs/3rdparty/cplusplus/CPlusPlusForwardDeclarations.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_CPLUSPLUSFORWARDDECLARATIONS_H -#define CPLUSPLUS_CPLUSPLUSFORWARDDECLARATIONS_H +#pragma once #include <cstdlib> #include <cstddef> @@ -136,5 +135,3 @@ class ObjCMethod; class ObjCPropertyDeclaration; } // namespace CPlusPlus - -#endif // CPLUSPLUS_CPLUSPLUSFORWARDDECLARATIONS_H diff --git a/src/libs/3rdparty/cplusplus/Control.h b/src/libs/3rdparty/cplusplus/Control.h index 85b8c3d3d7..97c1503833 100644 --- a/src/libs/3rdparty/cplusplus/Control.h +++ b/src/libs/3rdparty/cplusplus/Control.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_CONTROL_H -#define CPLUSPLUS_CONTROL_H +#pragma once #include "CPlusPlusForwardDeclarations.h" #include "ASTfwd.h" @@ -227,6 +226,3 @@ private: }; } // namespace CPlusPlus - - -#endif // CPLUSPLUS_CONTROL_H diff --git a/src/libs/3rdparty/cplusplus/CoreTypes.h b/src/libs/3rdparty/cplusplus/CoreTypes.h index 04eee89498..c0d799c4f2 100644 --- a/src/libs/3rdparty/cplusplus/CoreTypes.h +++ b/src/libs/3rdparty/cplusplus/CoreTypes.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_CORETYPES_H -#define CPLUSPLUS_CORETYPES_H +#pragma once #include "CPlusPlusForwardDeclarations.h" #include "Type.h" @@ -242,5 +241,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_CORETYPES_H diff --git a/src/libs/3rdparty/cplusplus/DiagnosticClient.h b/src/libs/3rdparty/cplusplus/DiagnosticClient.h index 98543de96b..108133b97e 100644 --- a/src/libs/3rdparty/cplusplus/DiagnosticClient.h +++ b/src/libs/3rdparty/cplusplus/DiagnosticClient.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_DIAGNOSTICCLIENT_H -#define CPLUSPLUS_DIAGNOSTICCLIENT_H +#pragma once #include "CPlusPlusForwardDeclarations.h" #include <cstdarg> @@ -48,6 +47,3 @@ public: }; } // namespace CPlusPlus - - -#endif // CPLUSPLUS_DIAGNOSTICCLIENT_H diff --git a/src/libs/3rdparty/cplusplus/FullySpecifiedType.h b/src/libs/3rdparty/cplusplus/FullySpecifiedType.h index 8f20018465..5a7e33a2db 100644 --- a/src/libs/3rdparty/cplusplus/FullySpecifiedType.h +++ b/src/libs/3rdparty/cplusplus/FullySpecifiedType.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_FULLYSPECIFIEDTYPE_H -#define CPLUSPLUS_FULLYSPECIFIEDTYPE_H +#pragma once #include "CPlusPlusForwardDeclarations.h" @@ -149,5 +148,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_FULLYSPECIFIEDTYPE_H diff --git a/src/libs/3rdparty/cplusplus/Lexer.h b/src/libs/3rdparty/cplusplus/Lexer.h index 8e862ea54c..1acfcf31b0 100644 --- a/src/libs/3rdparty/cplusplus/Lexer.h +++ b/src/libs/3rdparty/cplusplus/Lexer.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_LEXER_H -#define CPLUSPLUS_LEXER_H +#pragma once #include "CPlusPlusForwardDeclarations.h" #include "Token.h" @@ -158,5 +157,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_LEXER_H diff --git a/src/libs/3rdparty/cplusplus/LiteralTable.h b/src/libs/3rdparty/cplusplus/LiteralTable.h index 517e5d1539..5a3f1e9042 100644 --- a/src/libs/3rdparty/cplusplus/LiteralTable.h +++ b/src/libs/3rdparty/cplusplus/LiteralTable.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_LITERALTABLE_H -#define CPLUSPLUS_LITERALTABLE_H +#pragma once #include "CPlusPlusForwardDeclarations.h" #include <cstring> @@ -164,6 +163,3 @@ protected: }; } // namespace CPlusPlus - - -#endif // CPLUSPLUS_LITERALTABLE_H diff --git a/src/libs/3rdparty/cplusplus/Literals.h b/src/libs/3rdparty/cplusplus/Literals.h index 0dfb7a1c04..19255b619b 100644 --- a/src/libs/3rdparty/cplusplus/Literals.h +++ b/src/libs/3rdparty/cplusplus/Literals.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_LITERALS_H -#define CPLUSPLUS_LITERALS_H +#pragma once #include "CPlusPlusForwardDeclarations.h" #include "Token.h" @@ -124,6 +123,3 @@ protected: }; } // namespace CPlusPlus - - -#endif // CPLUSPLUS_LITERALS_H diff --git a/src/libs/3rdparty/cplusplus/Matcher.h b/src/libs/3rdparty/cplusplus/Matcher.h index f63ea7ef5b..6a8da9a7b7 100644 --- a/src/libs/3rdparty/cplusplus/Matcher.h +++ b/src/libs/3rdparty/cplusplus/Matcher.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TYPEMATCHER_H -#define TYPEMATCHER_H +#pragma once #include "CPlusPlusForwardDeclarations.h" @@ -75,5 +74,3 @@ public: }; } // namespace CPlusPlus - -#endif // TYPEMATCHER_H diff --git a/src/libs/3rdparty/cplusplus/MemoryPool.h b/src/libs/3rdparty/cplusplus/MemoryPool.h index ee56aaf9de..ec97d8fd03 100644 --- a/src/libs/3rdparty/cplusplus/MemoryPool.h +++ b/src/libs/3rdparty/cplusplus/MemoryPool.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_MEMORYPOOL_H -#define CPLUSPLUS_MEMORYPOOL_H +#pragma once #include "CPlusPlusForwardDeclarations.h" #include <new> @@ -82,5 +81,3 @@ public: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_MEMORYPOOL_H diff --git a/src/libs/3rdparty/cplusplus/Name.h b/src/libs/3rdparty/cplusplus/Name.h index 507195bead..200ccac75d 100644 --- a/src/libs/3rdparty/cplusplus/Name.h +++ b/src/libs/3rdparty/cplusplus/Name.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_NAME_H -#define CPLUSPLUS_NAME_H +#pragma once #include "CPlusPlusForwardDeclarations.h" #include "Matcher.h" @@ -73,6 +72,3 @@ protected: // for Matcher }; } // namespace CPlusPlus - - -#endif // CPLUSPLUS_NAME_H diff --git a/src/libs/3rdparty/cplusplus/NameVisitor.h b/src/libs/3rdparty/cplusplus/NameVisitor.h index c2a5f89da6..b0b737446d 100644 --- a/src/libs/3rdparty/cplusplus/NameVisitor.h +++ b/src/libs/3rdparty/cplusplus/NameVisitor.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_NAMEVISITOR_H -#define CPLUSPLUS_NAMEVISITOR_H +#pragma once #include "CPlusPlusForwardDeclarations.h" @@ -51,6 +50,3 @@ public: }; } // namespace CPlusPlus - - -#endif // CPLUSPLUS_NAMEVISITOR_H diff --git a/src/libs/3rdparty/cplusplus/Names.h b/src/libs/3rdparty/cplusplus/Names.h index 33f40d523d..eaf8e956d4 100644 --- a/src/libs/3rdparty/cplusplus/Names.h +++ b/src/libs/3rdparty/cplusplus/Names.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_NAMES_H -#define CPLUSPLUS_NAMES_H +#pragma once #include "CPlusPlusForwardDeclarations.h" #include "Name.h" @@ -273,5 +272,3 @@ private: } // namespace CPlusPlus - -#endif // CPLUSPLUS_NAMES_H diff --git a/src/libs/3rdparty/cplusplus/Parser.h b/src/libs/3rdparty/cplusplus/Parser.h index 1c69c21896..004d533109 100644 --- a/src/libs/3rdparty/cplusplus/Parser.h +++ b/src/libs/3rdparty/cplusplus/Parser.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_PARSER_H -#define CPLUSPLUS_PARSER_H +#pragma once #include "CPlusPlusForwardDeclarations.h" #include "ASTfwd.h" @@ -336,6 +335,3 @@ private: }; } // namespace CPlusPlus - - -#endif // CPLUSPLUS_PARSER_H diff --git a/src/libs/3rdparty/cplusplus/QtContextKeywords.h b/src/libs/3rdparty/cplusplus/QtContextKeywords.h index a7a1f1c3f8..edef73a7ee 100644 --- a/src/libs/3rdparty/cplusplus/QtContextKeywords.h +++ b/src/libs/3rdparty/cplusplus/QtContextKeywords.h @@ -1,6 +1,5 @@ -#ifndef QTCONTEXTKEYWORDS_H -#define QTCONTEXTKEYWORDS_H +#pragma once #include "CPlusPlusForwardDeclarations.h" @@ -24,5 +23,3 @@ enum { CPLUSPLUS_EXPORT int classifyQtContextKeyword(const char *s, int n); } // namespace CPlusPlus; - -#endif // QTCONTEXTKEYWORDS_H diff --git a/src/libs/3rdparty/cplusplus/Scope.h b/src/libs/3rdparty/cplusplus/Scope.h index 142138698e..01a5b7450d 100644 --- a/src/libs/3rdparty/cplusplus/Scope.h +++ b/src/libs/3rdparty/cplusplus/Scope.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_SCOPE_H -#define CPLUSPLUS_SCOPE_H +#pragma once #include "CPlusPlusForwardDeclarations.h" #include "Symbol.h" @@ -78,6 +77,3 @@ private: }; } // namespace CPlusPlus - - -#endif // CPLUSPLUS_SCOPE_H diff --git a/src/libs/3rdparty/cplusplus/Symbol.h b/src/libs/3rdparty/cplusplus/Symbol.h index 919268b14b..417217e469 100644 --- a/src/libs/3rdparty/cplusplus/Symbol.h +++ b/src/libs/3rdparty/cplusplus/Symbol.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_SYMBOL_H -#define CPLUSPLUS_SYMBOL_H +#pragma once #include "CPlusPlusForwardDeclarations.h" @@ -325,6 +324,3 @@ private: }; } // namespace CPlusPlus - - -#endif // CPLUSPLUS_SYMBOL_H diff --git a/src/libs/3rdparty/cplusplus/SymbolVisitor.h b/src/libs/3rdparty/cplusplus/SymbolVisitor.h index 4311672eca..4ed81c657c 100644 --- a/src/libs/3rdparty/cplusplus/SymbolVisitor.h +++ b/src/libs/3rdparty/cplusplus/SymbolVisitor.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef SYMBOLVISITOR_H -#define SYMBOLVISITOR_H +#pragma once #include "Symbol.h" @@ -71,6 +70,3 @@ public: }; } // namespace CPlusPlus - - -#endif // SYMBOLVISITOR_H diff --git a/src/libs/3rdparty/cplusplus/Symbols.h b/src/libs/3rdparty/cplusplus/Symbols.h index 257bdb8682..826c816b69 100644 --- a/src/libs/3rdparty/cplusplus/Symbols.h +++ b/src/libs/3rdparty/cplusplus/Symbols.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_SYMBOLS_H -#define CPLUSPLUS_SYMBOLS_H +#pragma once #include "CPlusPlusForwardDeclarations.h" #include "Symbol.h" @@ -911,6 +910,3 @@ private: }; } // namespace CPlusPlus - - -#endif // CPLUSPLUS_SYMBOLS_H diff --git a/src/libs/3rdparty/cplusplus/Templates.h b/src/libs/3rdparty/cplusplus/Templates.h index 9db69084f7..67b57a6296 100644 --- a/src/libs/3rdparty/cplusplus/Templates.h +++ b/src/libs/3rdparty/cplusplus/Templates.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_TEMPLATES_H -#define CPLUSPLUS_TEMPLATES_H +#pragma once #include "CPlusPlusForwardDeclarations.h" #include "TypeVisitor.h" @@ -207,5 +206,3 @@ private: }; } // end of namespace CPlusPlus - -#endif // CPLUSPLUS_TEMPLATES_H diff --git a/src/libs/3rdparty/cplusplus/Token.h b/src/libs/3rdparty/cplusplus/Token.h index afe732d493..358587366e 100644 --- a/src/libs/3rdparty/cplusplus/Token.h +++ b/src/libs/3rdparty/cplusplus/Token.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_TOKEN_H -#define CPLUSPLUS_TOKEN_H +#pragma once #include "CPlusPlusForwardDeclarations.h" @@ -422,5 +421,3 @@ struct LanguageFeatures }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_TOKEN_H diff --git a/src/libs/3rdparty/cplusplus/TranslationUnit.h b/src/libs/3rdparty/cplusplus/TranslationUnit.h index 94eb81666b..5b28cbd6e2 100644 --- a/src/libs/3rdparty/cplusplus/TranslationUnit.h +++ b/src/libs/3rdparty/cplusplus/TranslationUnit.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_TRANSLATIONUNIT_H -#define CPLUSPLUS_TRANSLATIONUNIT_H +#pragma once #include "CPlusPlusForwardDeclarations.h" #include "ASTfwd.h" @@ -213,6 +212,3 @@ private: }; } // namespace CPlusPlus - - -#endif // CPLUSPLUS_TRANSLATIONUNIT_H diff --git a/src/libs/3rdparty/cplusplus/Type.h b/src/libs/3rdparty/cplusplus/Type.h index 958ba15efd..25f260c2cd 100644 --- a/src/libs/3rdparty/cplusplus/Type.h +++ b/src/libs/3rdparty/cplusplus/Type.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_TYPE_H -#define CPLUSPLUS_TYPE_H +#pragma once #include "CPlusPlusForwardDeclarations.h" @@ -108,5 +107,3 @@ protected: // for Matcher }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_TYPE_H diff --git a/src/libs/3rdparty/cplusplus/TypeVisitor.h b/src/libs/3rdparty/cplusplus/TypeVisitor.h index b3a24b1572..bf69a8b8be 100644 --- a/src/libs/3rdparty/cplusplus/TypeVisitor.h +++ b/src/libs/3rdparty/cplusplus/TypeVisitor.h @@ -18,8 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -#ifndef CPLUSPLUS_TYPEVISITOR_H -#define CPLUSPLUS_TYPEVISITOR_H +#pragma once #include "CPlusPlusForwardDeclarations.h" @@ -62,6 +61,3 @@ public: }; } // namespace CPlusPlus - - -#endif // CPLUSPLUS_TYPEVISITOR_H diff --git a/src/libs/3rdparty/cplusplus/cppassert.h b/src/libs/3rdparty/cplusplus/cppassert.h index 7f8c225f30..828b5bc695 100644 --- a/src/libs/3rdparty/cplusplus/cppassert.h +++ b/src/libs/3rdparty/cplusplus/cppassert.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SOFT_ASSERT_H -#define SOFT_ASSERT_H +#pragma once #include <iostream> @@ -36,7 +35,3 @@ #define CPP_ASSERT(cond, action) if (cond) {} else { CPP_ASSERT_STRING(#cond); action; } do {} while (0) #define CPP_CHECK(cond) if (cond) {} else { CPP_ASSERT_STRING(#cond); } do {} while (0) - -#endif // SOFT_ASSERT_H - - diff --git a/src/libs/aggregation/aggregate.h b/src/libs/aggregation/aggregate.h index 47243846c4..8404e96d30 100644 --- a/src/libs/aggregation/aggregate.h +++ b/src/libs/aggregation/aggregate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef AGGREGATE_H -#define AGGREGATE_H +#pragma once #include "aggregation_global.h" @@ -126,5 +125,3 @@ template <typename T> QList<T *> query_all(QObject *obj) } } // namespace Aggregation - -#endif // AGGREGATE_H diff --git a/src/libs/aggregation/aggregation_global.h b/src/libs/aggregation/aggregation_global.h index 3b1d7140c6..e91129202a 100644 --- a/src/libs/aggregation/aggregation_global.h +++ b/src/libs/aggregation/aggregation_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef AGGREGATION_GLOBAL_H -#define AGGREGATION_GLOBAL_H +#pragma once #include <qglobal.h> @@ -33,5 +32,3 @@ #else # define AGGREGATION_EXPORT Q_DECL_IMPORT #endif - -#endif // AGGREGATION_GLOBAL_H diff --git a/src/libs/aggregation/examples/text/main.h b/src/libs/aggregation/examples/text/main.h index 53482ea894..76d0ec0191 100644 --- a/src/libs/aggregation/examples/text/main.h +++ b/src/libs/aggregation/examples/text/main.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MAIN_H -#define MAIN_H +#pragma once #include "myinterfaces.h" #include "ui_main.h" @@ -51,5 +50,3 @@ private: QList<IComboEntry *> m_entries; }; - -#endif // MAIN_H diff --git a/src/libs/aggregation/examples/text/myinterfaces.h b/src/libs/aggregation/examples/text/myinterfaces.h index 696c49bc9d..3dcdc6f0c3 100644 --- a/src/libs/aggregation/examples/text/myinterfaces.h +++ b/src/libs/aggregation/examples/text/myinterfaces.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MYINTERFACES_H -#define MYINTERFACES_H +#pragma once #include <aggregate.h> @@ -80,5 +79,3 @@ public: private: QString m_text; }; - -#endif // MYINTERFACES_H diff --git a/src/libs/clangbackendipc/clangbackendipc_global.h b/src/libs/clangbackendipc/clangbackendipc_global.h index 12a5804fdc..03b3493d70 100644 --- a/src/libs/clangbackendipc/clangbackendipc_global.h +++ b/src/libs/clangbackendipc/clangbackendipc_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKENDIPC_GLOBAL_H -#define CLANGBACKENDIPC_GLOBAL_H +#pragma once #include <utils/sizedarray.h> @@ -134,4 +133,3 @@ struct HighlightingTypes { }; } -#endif // CLANGBACKENDIPC_GLOBAL_H diff --git a/src/libs/clangbackendipc/clangbackendipcdebugutils.h b/src/libs/clangbackendipc/clangbackendipcdebugutils.h index 3a81b4ea0b..df2ff3194f 100644 --- a/src/libs/clangbackendipc/clangbackendipcdebugutils.h +++ b/src/libs/clangbackendipc/clangbackendipcdebugutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKENDIPCDEBUGUTILS_H -#define CLANGBACKENDIPCDEBUGUTILS_H +#pragma once #include "clangbackendipc_global.h" @@ -52,5 +51,3 @@ private: } // namespace ClangBackEnd #define TIME_SCOPE_DURATION(id) ClangBackEnd::VerboseScopeDurationTimer scopeDurationTimer(id) - -#endif // CLANGBACKENDIPCDEBUGUTILS_H diff --git a/src/libs/clangbackendipc/cmbalivemessage.h b/src/libs/clangbackendipc/cmbalivemessage.h index a28aa986d3..a198f44be3 100644 --- a/src/libs/clangbackendipc/cmbalivemessage.h +++ b/src/libs/clangbackendipc/cmbalivemessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMBALIVEMESSAGE_H -#define CMBALIVEMESSAGE_H +#pragma once #include "clangbackendipc_global.h" @@ -42,5 +41,3 @@ CMBIPC_EXPORT QDebug operator<<(QDebug debug, const AliveMessage &message); DECLARE_MESSAGE(AliveMessage) } - -#endif // CMBALIVEMESSAGE_H diff --git a/src/libs/clangbackendipc/cmbcodecompletedmessage.h b/src/libs/clangbackendipc/cmbcodecompletedmessage.h index e0e8109222..8fe9c5dbea 100644 --- a/src/libs/clangbackendipc/cmbcodecompletedmessage.h +++ b/src/libs/clangbackendipc/cmbcodecompletedmessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_CODECOMPLETEDMESSAGE_H -#define CLANGBACKEND_CODECOMPLETEDMESSAGE_H +#pragma once #include "codecompletion.h" @@ -68,5 +67,3 @@ void PrintTo(const CodeCompletedMessage &message, ::std::ostream* os); DECLARE_MESSAGE(CodeCompletedMessage) } // namespace ClangBackEnd - -#endif // CLANGBACKEND_CODECOMPLETEDMESSAGE_H diff --git a/src/libs/clangbackendipc/cmbcompletecodemessage.h b/src/libs/clangbackendipc/cmbcompletecodemessage.h index cd9aec2075..28356259ad 100644 --- a/src/libs/clangbackendipc/cmbcompletecodemessage.h +++ b/src/libs/clangbackendipc/cmbcompletecodemessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_COMPLETECODEMESSAGE_H -#define CLANGBACKEND_COMPLETECODEMESSAGE_H +#pragma once #include "clangbackendipc_global.h" @@ -72,6 +71,5 @@ CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CompleteCodeMessage &message void PrintTo(const CompleteCodeMessage &message, ::std::ostream* os); DECLARE_MESSAGE(CompleteCodeMessage); -} // namespace ClangBackEnd -#endif // CLANGBACKEND_COMPLETECODEMESSAGE_H +} // namespace ClangBackEnd diff --git a/src/libs/clangbackendipc/cmbechomessage.h b/src/libs/clangbackendipc/cmbechomessage.h index b1bc061d55..9cf29b4611 100644 --- a/src/libs/clangbackendipc/cmbechomessage.h +++ b/src/libs/clangbackendipc/cmbechomessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_ECHOMESSAGE_H -#define CLANGBACKEND_ECHOMESSAGE_H +#pragma once #include "clangbackendipc_global.h" @@ -55,5 +54,3 @@ void PrintTo(const EchoMessage &message, ::std::ostream* os); DECLARE_MESSAGE(EchoMessage) } // namespace ClangBackEnd - -#endif // CLANGBACKEND_ECHOMESSAGE_H diff --git a/src/libs/clangbackendipc/cmbendmessage.h b/src/libs/clangbackendipc/cmbendmessage.h index 91029d52b4..d5163a7be8 100644 --- a/src/libs/clangbackendipc/cmbendmessage.h +++ b/src/libs/clangbackendipc/cmbendmessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CMBENDMESSAGE_H -#define CMBENDMESSAGE_H +#pragma once #include "clangbackendipc_global.h" @@ -43,5 +42,3 @@ void PrintTo(const EndMessage &message, ::std::ostream* os); DECLARE_MESSAGE(EndMessage) } - -#endif // CMBENDMESSAGE_H diff --git a/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.h b/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.h index 253167e119..8701b01681 100644 --- a/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.h +++ b/src/libs/clangbackendipc/cmbregisterprojectsforeditormessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_REGISTERPROJECTSFOREDITORMESSAGE_H -#define CLANGBACKEND_REGISTERPROJECTSFOREDITORMESSAGE_H +#pragma once #include "projectpartcontainer.h" @@ -57,5 +56,3 @@ void PrintTo(const RegisterProjectPartsForEditorMessage &message, ::std::ostream DECLARE_MESSAGE(RegisterProjectPartsForEditorMessage); } // namespace ClangBackEnd - -#endif // CLANGBACKEND_REGISTERPROJECTSFOREDITORMESSAGE_H diff --git a/src/libs/clangbackendipc/cmbregistertranslationunitsforeditormessage.h b/src/libs/clangbackendipc/cmbregistertranslationunitsforeditormessage.h index 5295b130fb..c2956bcd1c 100644 --- a/src/libs/clangbackendipc/cmbregistertranslationunitsforeditormessage.h +++ b/src/libs/clangbackendipc/cmbregistertranslationunitsforeditormessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_REGISTERFILEFOREDITOR_H -#define CLANGBACKEND_REGISTERFILEFOREDITOR_H +#pragma once #include "filecontainer.h" @@ -63,5 +62,3 @@ void PrintTo(const RegisterTranslationUnitForEditorMessage &message, ::std::ostr DECLARE_MESSAGE(RegisterTranslationUnitForEditorMessage); } // namespace ClangBackEnd - -#endif // CLANGBACKEND_REGISTERFILEFORCODECOMPLITION_H diff --git a/src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.h b/src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.h index 142c914f8e..60ee689649 100644 --- a/src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.h +++ b/src/libs/clangbackendipc/cmbunregisterprojectsforeditormessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_UNREGISTERPROJECTSFOREDITOR_H -#define CLANGBACKEND_UNREGISTERPROJECTSFOREDITOR_H +#pragma once #include "clangbackendipc_global.h" @@ -58,5 +57,3 @@ void PrintTo(const UnregisterProjectPartsForEditorMessage &message, ::std::ostre DECLARE_MESSAGE(UnregisterProjectPartsForEditorMessage); } // namespace ClangBackEnd - -#endif // CLANGBACKEND_UNREGISTERPROJECTSFOREDITOR_H diff --git a/src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.h b/src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.h index a40bc33e74..c4bc778a6b 100644 --- a/src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.h +++ b/src/libs/clangbackendipc/cmbunregistertranslationunitsforeditormessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_UNRegisterTranslationUnitForEditorMessage_H -#define CLANGBACKEND_UNRegisterTranslationUnitForEditorMessage_H +#pragma once #include "clangbackendipc_global.h" @@ -62,5 +61,3 @@ void PrintTo(const UnregisterTranslationUnitsForEditorMessage &message, ::std::o DECLARE_MESSAGE(UnregisterTranslationUnitsForEditorMessage); } // namespace ClangBackEnd - -#endif // CLANGBACKEND_UNRegisterTranslationUnitForEditorMessage_H diff --git a/src/libs/clangbackendipc/codecompletion.h b/src/libs/clangbackendipc/codecompletion.h index 83d4babbb8..ec8984a89a 100644 --- a/src/libs/clangbackendipc/codecompletion.h +++ b/src/libs/clangbackendipc/codecompletion.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_CODECOMPLETION_H -#define CLANGBACKEND_CODECOMPLETION_H +#pragma once #include "clangbackendipc_global.h" #include "codecompletionchunk.h" @@ -129,5 +128,3 @@ void PrintTo(const CodeCompletion &message, ::std::ostream* os); void PrintTo(CodeCompletion::Kind kind, ::std::ostream *os); void PrintTo(CodeCompletion::Availability availability, ::std::ostream *os); } // namespace ClangBackEnd - -#endif // CLANGBACKEND_CODECOMPLETION_H diff --git a/src/libs/clangbackendipc/codecompletionchunk.h b/src/libs/clangbackendipc/codecompletionchunk.h index 74480c70e2..897e9f222a 100644 --- a/src/libs/clangbackendipc/codecompletionchunk.h +++ b/src/libs/clangbackendipc/codecompletionchunk.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_CODECOMPLETIONCHUNK_H -#define CLANGBACKEND_CODECOMPLETIONCHUNK_H +#pragma once #include "clangbackendipc_global.h" @@ -99,5 +98,3 @@ void PrintTo(const CodeCompletionChunk::Kind &kind, ::std::ostream* os); } // namespace ClangBackEnd Q_DECLARE_METATYPE(ClangBackEnd::CodeCompletionChunk) - -#endif // CLANGBACKEND_CODECOMPLETIONCHUNK_H diff --git a/src/libs/clangbackendipc/connectionclient.h b/src/libs/clangbackendipc/connectionclient.h index 001cbd2d3a..628a543019 100644 --- a/src/libs/clangbackendipc/connectionclient.h +++ b/src/libs/clangbackendipc/connectionclient.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_CONNECTIONCLIENT_H -#define CLANGBACKEND_CONNECTIONCLIENT_H +#pragma once #include "ipcserverproxy.h" #include "lineprefixer.h" @@ -111,5 +110,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_CONNECTIONCLIENT_H diff --git a/src/libs/clangbackendipc/connectionserver.h b/src/libs/clangbackendipc/connectionserver.h index ed0b7388c9..6eedf1b231 100644 --- a/src/libs/clangbackendipc/connectionserver.h +++ b/src/libs/clangbackendipc/connectionserver.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_CONNECTIONSERVER_H -#define CLANGBACKEND_CONNECTIONSERVER_H +#pragma once #include <ipcclientproxy.h> @@ -76,5 +75,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_CONNECTIONSERVER_H diff --git a/src/libs/clangbackendipc/diagnosticcontainer.h b/src/libs/clangbackendipc/diagnosticcontainer.h index d71bd4b87e..b1192f393b 100644 --- a/src/libs/clangbackendipc/diagnosticcontainer.h +++ b/src/libs/clangbackendipc/diagnosticcontainer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_DIAGNOSTICCONTAINER_H -#define CLANGBACKEND_DIAGNOSTICCONTAINER_H +#pragma once #include "sourcerangecontainer.h" #include "fixitcontainer.h" @@ -85,5 +84,3 @@ CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DiagnosticContainer &contain void PrintTo(const DiagnosticContainer &container, ::std::ostream* os); } // namespace ClangBackEnd - -#endif // CLANGBACKEND_DIAGNOSTICCONTAINER_H diff --git a/src/libs/clangbackendipc/diagnosticschangedmessage.h b/src/libs/clangbackendipc/diagnosticschangedmessage.h index 8654b3c32d..fe9a1e61c3 100644 --- a/src/libs/clangbackendipc/diagnosticschangedmessage.h +++ b/src/libs/clangbackendipc/diagnosticschangedmessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_DIAGNOSTICSCHANGEDMESSAGE_H -#define CLANGBACKEND_DIAGNOSTICSCHANGEDMESSAGE_H +#pragma once #include "clangbackendipc_global.h" #include "diagnosticcontainer.h" @@ -64,5 +63,3 @@ void PrintTo(const DiagnosticsChangedMessage &message, ::std::ostream* os); DECLARE_MESSAGE(DiagnosticsChangedMessage) } // namespace ClangBackEnd - -#endif // CLANGBACKEND_DIAGNOSTICSCHANGEDMESSAGE_H diff --git a/src/libs/clangbackendipc/filecontainer.h b/src/libs/clangbackendipc/filecontainer.h index 205b0803d6..ab1a0ac3f4 100644 --- a/src/libs/clangbackendipc/filecontainer.h +++ b/src/libs/clangbackendipc/filecontainer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_FILECONTAINER_H -#define CLANGBACKEND_FILECONTAINER_H +#pragma once #include <clangbackendipc_global.h> @@ -74,5 +73,3 @@ CMBIPC_EXPORT QDebug operator<<(QDebug debug, const FileContainer &container); void PrintTo(const FileContainer &container, ::std::ostream* os); } // namespace ClangBackEnd - -#endif // CLANGBACKEND_FILECONTAINER_H diff --git a/src/libs/clangbackendipc/fixitcontainer.h b/src/libs/clangbackendipc/fixitcontainer.h index 7e4d89890e..e67daa034e 100644 --- a/src/libs/clangbackendipc/fixitcontainer.h +++ b/src/libs/clangbackendipc/fixitcontainer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_FIXITCONTAINER_H -#define CLANGBACKEND_FIXITCONTAINER_H +#pragma once #include "sourcerangecontainer.h" @@ -58,5 +57,3 @@ void PrintTo(const FixItContainer &container, ::std::ostream* os); } // namespace ClangBackEnd Q_DECLARE_METATYPE(ClangBackEnd::FixItContainer) - -#endif // CLANGBACKEND_FIXITCONTAINER_H diff --git a/src/libs/clangbackendipc/highlightingchangedmessage.h b/src/libs/clangbackendipc/highlightingchangedmessage.h index b4ae93b001..b9909daa4f 100644 --- a/src/libs/clangbackendipc/highlightingchangedmessage.h +++ b/src/libs/clangbackendipc/highlightingchangedmessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_HIGHLIGHTINGCHANGEDMESSAGE_H -#define CLANGBACKEND_HIGHLIGHTINGCHANGEDMESSAGE_H +#pragma once #include "clangbackendipc_global.h" #include "filecontainer.h" @@ -68,5 +67,3 @@ void PrintTo(const HighlightingChangedMessage &message, ::std::ostream* os); DECLARE_MESSAGE(HighlightingChangedMessage) } // namespace ClangBackEnd - -#endif // CLANGBACKEND_HIGHLIGHTINGCHANGEDMESSAGE_H diff --git a/src/libs/clangbackendipc/ipcclientdispatcher.h b/src/libs/clangbackendipc/ipcclientdispatcher.h index 74b32c3019..dd6f683534 100644 --- a/src/libs/clangbackendipc/ipcclientdispatcher.h +++ b/src/libs/clangbackendipc/ipcclientdispatcher.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_IPCCLIENTDISPATCHER_H -#define CLANGBACKEND_IPCCLIENTDISPATCHER_H +#pragma once #include "ipcclientinterface.h" @@ -51,5 +50,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_IPCCLIENTDISPATCHER_H diff --git a/src/libs/clangbackendipc/ipcclientinterface.h b/src/libs/clangbackendipc/ipcclientinterface.h index def01ac5e1..3c4ac6eb82 100644 --- a/src/libs/clangbackendipc/ipcclientinterface.h +++ b/src/libs/clangbackendipc/ipcclientinterface.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_IPCCLIENTINTERFACE_H -#define CLANGBACKEND_IPCCLIENTINTERFACE_H +#pragma once #include "ipcinterface.h" @@ -64,5 +63,3 @@ public: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_IPCCLIENTINTERFACE_H diff --git a/src/libs/clangbackendipc/ipcclientproxy.h b/src/libs/clangbackendipc/ipcclientproxy.h index ffac833e7b..3142ae1913 100644 --- a/src/libs/clangbackendipc/ipcclientproxy.h +++ b/src/libs/clangbackendipc/ipcclientproxy.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CODELMODELBACKEND_IPCCLIENTPROXY_H -#define CODELMODELBACKEND_IPCCLIENTPROXY_H +#pragma once #include "clangbackendipc_global.h" #include "ipcclientinterface.h" @@ -72,5 +71,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CODELMODELBACKEND_IPCCLIENTPROXY_H diff --git a/src/libs/clangbackendipc/ipcinterface.h b/src/libs/clangbackendipc/ipcinterface.h index f868d6db3a..f58a7e2a5c 100644 --- a/src/libs/clangbackendipc/ipcinterface.h +++ b/src/libs/clangbackendipc/ipcinterface.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_IPCINTERFACE_H -#define CLANGBACKEND_IPCINTERFACE_H +#pragma once #include "clangbackendipc_global.h" @@ -42,5 +41,3 @@ public: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_IPCINTERFACE_H diff --git a/src/libs/clangbackendipc/ipcserverinterface.h b/src/libs/clangbackendipc/ipcserverinterface.h index dd9886d58c..5d702fbc72 100644 --- a/src/libs/clangbackendipc/ipcserverinterface.h +++ b/src/libs/clangbackendipc/ipcserverinterface.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_IPCSERVERINTERFACE_H -#define CLANGBACKEND_IPCSERVERINTERFACE_H +#pragma once #include "ipcinterface.h" @@ -62,5 +61,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_IPCSERVERINTERFACE_H diff --git a/src/libs/clangbackendipc/ipcserverproxy.h b/src/libs/clangbackendipc/ipcserverproxy.h index 5cecabeef3..c36db5d14c 100644 --- a/src/libs/clangbackendipc/ipcserverproxy.h +++ b/src/libs/clangbackendipc/ipcserverproxy.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_IPCSERVERPROXY_H -#define CLANGBACKEND_IPCSERVERPROXY_H +#pragma once #include "ipcserverinterface.h" #include "readmessageblock.h" #include "writemessageblock.h" @@ -74,5 +73,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_IPCSERVERPROXY_H diff --git a/src/libs/clangbackendipc/lineprefixer.h b/src/libs/clangbackendipc/lineprefixer.h index 99b1be3125..b2607720fe 100644 --- a/src/libs/clangbackendipc/lineprefixer.h +++ b/src/libs/clangbackendipc/lineprefixer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PRINTLINESWITHPREFIX_H -#define PRINTLINESWITHPREFIX_H +#pragma once #include <QString> #include <QTextStream> @@ -45,5 +44,3 @@ private: }; } // namespace ClangBackEnd - -#endif // PRINTLINESWITHPREFIX_H diff --git a/src/libs/clangbackendipc/messageenvelop.h b/src/libs/clangbackendipc/messageenvelop.h index 93dd2a0f24..008a4c0037 100644 --- a/src/libs/clangbackendipc/messageenvelop.h +++ b/src/libs/clangbackendipc/messageenvelop.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_MESSAGEENVELOP_H -#define CLANGBACKEND_MESSAGEENVELOP_H +#pragma once #include "clangbackendipc_global.h" @@ -108,5 +107,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_MESSAGEENVELOP_H diff --git a/src/libs/clangbackendipc/projectpartcontainer.h b/src/libs/clangbackendipc/projectpartcontainer.h index 75a6b5142a..8439949293 100644 --- a/src/libs/clangbackendipc/projectpartcontainer.h +++ b/src/libs/clangbackendipc/projectpartcontainer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_PROJECTCONTAINER_H -#define CLANGBACKEND_PROJECTCONTAINER_H +#pragma once #include <clangbackendipc_global.h> @@ -58,5 +57,3 @@ QDebug operator<<(QDebug debug, const ProjectPartContainer &container); void PrintTo(const ProjectPartContainer &container, ::std::ostream* os); } // namespace ClangBackEnd - -#endif // CLANGBACKEND_PROJECTCONTAINER_H diff --git a/src/libs/clangbackendipc/projectpartsdonotexistmessage.h b/src/libs/clangbackendipc/projectpartsdonotexistmessage.h index f79e658ff5..e896675ee5 100644 --- a/src/libs/clangbackendipc/projectpartsdonotexistmessage.h +++ b/src/libs/clangbackendipc/projectpartsdonotexistmessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_PROJECTPARTSDONOTEXISTMESSAGE_H -#define CLANGBACKEND_PROJECTPARTSDONOTEXISTMESSAGE_H +#pragma once #include "clangbackendipc_global.h" @@ -58,5 +57,3 @@ void PrintTo(const ProjectPartsDoNotExistMessage &message, ::std::ostream* os); DECLARE_MESSAGE(ProjectPartsDoNotExistMessage) } // namespace ClangBackEnd - -#endif // CLANGBACKEND_PROJECTPARTSDONOTEXISTMESSAGE_H diff --git a/src/libs/clangbackendipc/readmessageblock.h b/src/libs/clangbackendipc/readmessageblock.h index 1b5ddf2fb5..0dfd5d21d7 100644 --- a/src/libs/clangbackendipc/readmessageblock.h +++ b/src/libs/clangbackendipc/readmessageblock.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_READMESSAGEBLOCK_H -#define CLANGBACKEND_READMESSAGEBLOCK_H +#pragma once #include <QtGlobal> @@ -58,5 +57,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_READMESSAGEBLOCK_H diff --git a/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.h b/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.h index f5ff373004..0fd28da182 100644 --- a/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.h +++ b/src/libs/clangbackendipc/registerunsavedfilesforeditormessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_REGISTERUNSAVEDFILESFOREDITORMESSAGE_H -#define CLANGBACKEND_REGISTERUNSAVEDFILESFOREDITORMESSAGE_H +#pragma once #include "filecontainer.h" @@ -57,5 +56,3 @@ void PrintTo(const RegisterUnsavedFilesForEditorMessage &message, ::std::ostream DECLARE_MESSAGE(RegisterUnsavedFilesForEditorMessage); } // namespace ClangBackEnd - -#endif // CLANGBACKEND_REGISTERUNSAVEDFILESFOREDITORMESSAGE_H diff --git a/src/libs/clangbackendipc/requestdiagnosticsmessage.h b/src/libs/clangbackendipc/requestdiagnosticsmessage.h index 3f5fceebb6..a92cabf205 100644 --- a/src/libs/clangbackendipc/requestdiagnosticsmessage.h +++ b/src/libs/clangbackendipc/requestdiagnosticsmessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_REQUESTDIAGNOSTICSMESSAGE_H -#define CLANGBACKEND_REQUESTDIAGNOSTICSMESSAGE_H +#pragma once #include "filecontainer.h" @@ -57,5 +56,3 @@ void PrintTo(const RequestDiagnosticsMessage &message, ::std::ostream* os); DECLARE_MESSAGE(RequestDiagnosticsMessage); } // namespace ClangBackEnd - -#endif // CLANGBACKEND_REQUESTDIAGNOSTICSMESSAGE_H diff --git a/src/libs/clangbackendipc/requesthighlightingmessage.h b/src/libs/clangbackendipc/requesthighlightingmessage.h index f135f35bb8..9b5e0cb4ed 100644 --- a/src/libs/clangbackendipc/requesthighlightingmessage.h +++ b/src/libs/clangbackendipc/requesthighlightingmessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_REQUESTHIGHLIGHTING_H -#define CLANGBACKEND_REQUESTHIGHLIGHTING_H +#pragma once #include "filecontainer.h" @@ -57,5 +56,3 @@ void PrintTo(const RequestHighlightingMessage &message, ::std::ostream* os); DECLARE_MESSAGE(RequestHighlightingMessage) } // namespace ClangBackEnd - -#endif // CLANGBACKEND_REQUESTHIGHLIGHTING_H diff --git a/src/libs/clangbackendipc/sourcelocationcontainer.h b/src/libs/clangbackendipc/sourcelocationcontainer.h index 954c675384..e670cd3299 100644 --- a/src/libs/clangbackendipc/sourcelocationcontainer.h +++ b/src/libs/clangbackendipc/sourcelocationcontainer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_SOURCELOCATIONCONTAINER_H -#define CLANGBACKEND_SOURCELOCATIONCONTAINER_H +#pragma once #include <clangbackendipc_global.h> @@ -63,5 +62,3 @@ CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceLocationContainer &con void PrintTo(const SourceLocationContainer &container, ::std::ostream* os); } // namespace ClangBackEnd - -#endif // CLANGBACKEND_SOURCELOCATIONCONTAINER_H diff --git a/src/libs/clangbackendipc/sourcerangecontainer.h b/src/libs/clangbackendipc/sourcerangecontainer.h index 63dccbd2ad..b8198effd1 100644 --- a/src/libs/clangbackendipc/sourcerangecontainer.h +++ b/src/libs/clangbackendipc/sourcerangecontainer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_SOURCERANGECONTAINER_H -#define CLANGBACKEND_SOURCERANGECONTAINER_H +#pragma once #include "sourcelocationcontainer.h" @@ -57,5 +56,3 @@ CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceRangeContainer &contai void PrintTo(const SourceRangeContainer &container, ::std::ostream* os); } // namespace ClangBackEnd - -#endif // CLANGBACKEND_SOURCERANGECONTAINER_H diff --git a/src/libs/clangbackendipc/translationunitdoesnotexistmessage.h b/src/libs/clangbackendipc/translationunitdoesnotexistmessage.h index 08f2a54fc1..e4b7a547ab 100644 --- a/src/libs/clangbackendipc/translationunitdoesnotexistmessage.h +++ b/src/libs/clangbackendipc/translationunitdoesnotexistmessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_TRANSLATIONUNITDOESNOTEXISTSMESSAGE_H -#define CLANGBACKEND_TRANSLATIONUNITDOESNOTEXISTSMESSAGE_H +#pragma once #include "filecontainer.h" @@ -59,5 +58,3 @@ void PrintTo(const TranslationUnitDoesNotExistMessage &message, ::std::ostream* DECLARE_MESSAGE(TranslationUnitDoesNotExistMessage) } // namespace ClangBackEnd - -#endif // CLANGBACKEND_TRANSLATIONUNITDOESNOTEXISTSMESSAGE_H diff --git a/src/libs/clangbackendipc/unregisterunsavedfilesforeditormessage.h b/src/libs/clangbackendipc/unregisterunsavedfilesforeditormessage.h index a993c0a97d..4704e7e5b7 100644 --- a/src/libs/clangbackendipc/unregisterunsavedfilesforeditormessage.h +++ b/src/libs/clangbackendipc/unregisterunsavedfilesforeditormessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_UNREGISTERTRANSLATIONUNITSFOREDITORMESSAGE_H -#define CLANGBACKEND_UNREGISTERTRANSLATIONUNITSFOREDITORMESSAGE_H +#pragma once #include "filecontainer.h" @@ -57,5 +56,3 @@ void PrintTo(const UnregisterUnsavedFilesForEditorMessage &message, ::std::ostre DECLARE_MESSAGE(UnregisterUnsavedFilesForEditorMessage) } // namespace ClangBackEnd - -#endif // CLANGBACKEND_UNREGISTERTRANSLATIONUNITSFOREDITORMESSAGE_H diff --git a/src/libs/clangbackendipc/updatetranslationunitsforeditormessage.h b/src/libs/clangbackendipc/updatetranslationunitsforeditormessage.h index ea99fe43a2..dcd5701013 100644 --- a/src/libs/clangbackendipc/updatetranslationunitsforeditormessage.h +++ b/src/libs/clangbackendipc/updatetranslationunitsforeditormessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_UPDATEFILEFOREDITOR_H -#define CLANGBACKEND_UPDATEFILEFOREDITOR_H +#pragma once #include "filecontainer.h" @@ -57,5 +56,3 @@ void PrintTo(const UpdateTranslationUnitsForEditorMessage &message, ::std::ostre DECLARE_MESSAGE(UpdateTranslationUnitsForEditorMessage) } // namespace ClangBackEnd - -#endif // CLANGBACKEND_UPDATEFILEFOREDITOR_H diff --git a/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.h b/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.h index f43b905ec2..241455f310 100644 --- a/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.h +++ b/src/libs/clangbackendipc/updatevisibletranslationunitsmessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_UPDATEVISIBLETRANSLATIONUNITSMESSAGE_H -#define CLANGBACKEND_UPDATEVISIBLETRANSLATIONUNITSMESSAGE_H +#pragma once #include <clangbackendipc_global.h> @@ -59,5 +58,3 @@ void PrintTo(const UpdateVisibleTranslationUnitsMessage &message, ::std::ostream DECLARE_MESSAGE(UpdateVisibleTranslationUnitsMessage) } // namespace ClangBackEnd - -#endif // CLANGBACKEND_UPDATEVISIBLETRANSLATIONUNITSMESSAGE_H diff --git a/src/libs/clangbackendipc/writemessageblock.h b/src/libs/clangbackendipc/writemessageblock.h index 4b611a2475..0fa8d03dd3 100644 --- a/src/libs/clangbackendipc/writemessageblock.h +++ b/src/libs/clangbackendipc/writemessageblock.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_WRITEMESSAGEBLOCK_H -#define CLANGBACKEND_WRITEMESSAGEBLOCK_H +#pragma once #include <QtGlobal> @@ -55,5 +54,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_WRITEMESSAGEBLOCK_H diff --git a/src/libs/cplusplus/ASTParent.h b/src/libs/cplusplus/ASTParent.h index b208476818..8369265bc2 100644 --- a/src/libs/cplusplus/ASTParent.h +++ b/src/libs/cplusplus/ASTParent.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_ASTPARENT_H -#define CPLUSPLUS_ASTPARENT_H +#pragma once #include <cplusplus/ASTVisitor.h> @@ -56,5 +55,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_ASTPARENT_H diff --git a/src/libs/cplusplus/ASTPath.h b/src/libs/cplusplus/ASTPath.h index 8a34acbe58..e7dfab7fad 100644 --- a/src/libs/cplusplus/ASTPath.h +++ b/src/libs/cplusplus/ASTPath.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_ASTPATH_H -#define CPLUSPLUS_ASTPATH_H +#pragma once #include <cplusplus/ASTfwd.h> #include <cplusplus/ASTVisitor.h> @@ -71,5 +70,3 @@ private: }; } // namespace CppTools - -#endif // CPLUSPLUS_ASTPATH_H diff --git a/src/libs/cplusplus/AlreadyConsideredClassContainer.h b/src/libs/cplusplus/AlreadyConsideredClassContainer.h index 01c5588c17..fd35291c2a 100644 --- a/src/libs/cplusplus/AlreadyConsideredClassContainer.h +++ b/src/libs/cplusplus/AlreadyConsideredClassContainer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_ALREADYCONSIDEREDCLASSCONTAINER_H -#define CPLUSPLUS_ALREADYCONSIDEREDCLASSCONTAINER_H +#pragma once #include <cplusplus/SafeMatcher.h> @@ -69,5 +68,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_ALREADYCONSIDEREDCLASSCONTAINER_H diff --git a/src/libs/cplusplus/BackwardsScanner.h b/src/libs/cplusplus/BackwardsScanner.h index 039993ae23..2ac7a17a36 100644 --- a/src/libs/cplusplus/BackwardsScanner.h +++ b/src/libs/cplusplus/BackwardsScanner.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_BACKWARDSSCANNER_H -#define CPLUSPLUS_BACKWARDSSCANNER_H +#pragma once #include "SimpleLexer.h" @@ -85,5 +84,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_BACKWARDSSCANNER_H diff --git a/src/libs/cplusplus/CppDocument.h b/src/libs/cplusplus/CppDocument.h index 42a5275476..bac2fb2a47 100644 --- a/src/libs/cplusplus/CppDocument.h +++ b/src/libs/cplusplus/CppDocument.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_CPPDOCUMENT_H -#define CPLUSPLUS_CPPDOCUMENT_H +#pragma once #include "Macro.h" @@ -457,5 +456,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_CPPDOCUMENT_H diff --git a/src/libs/cplusplus/CppRewriter.h b/src/libs/cplusplus/CppRewriter.h index b507182b9a..66ff57344a 100644 --- a/src/libs/cplusplus/CppRewriter.h +++ b/src/libs/cplusplus/CppRewriter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPREWRITER_H -#define CPPREWRITER_H +#pragma once #include "CppDocument.h" #include "LookupContext.h" @@ -110,5 +109,3 @@ CPLUSPLUS_EXPORT const Name *rewriteName(const Name *name, Control *control); } // namespace CPlusPlus - -#endif // CPPREWRITER_H diff --git a/src/libs/cplusplus/DependencyTable.h b/src/libs/cplusplus/DependencyTable.h index b152f00f44..508ae297c5 100644 --- a/src/libs/cplusplus/DependencyTable.h +++ b/src/libs/cplusplus/DependencyTable.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_DEPENDENCYTABLE_H -#define CPLUSPLUS_DEPENDENCYTABLE_H +#pragma once #include <cplusplus/CPlusPlusForwardDeclarations.h> @@ -54,5 +53,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_DEPENDENCYTABLE_H diff --git a/src/libs/cplusplus/DeprecatedGenTemplateInstance.h b/src/libs/cplusplus/DeprecatedGenTemplateInstance.h index 37453c9d40..d612706a17 100644 --- a/src/libs/cplusplus/DeprecatedGenTemplateInstance.h +++ b/src/libs/cplusplus/DeprecatedGenTemplateInstance.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_DEPRECATEDGENTEMPLATEINSTANCE_H -#define CPLUSPLUS_DEPRECATEDGENTEMPLATEINSTANCE_H +#pragma once #include <cplusplus/TypeVisitor.h> #include <cplusplus/NameVisitor.h> @@ -54,5 +53,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_DEPRECATEDGENTEMPLATEINSTANCE_H diff --git a/src/libs/cplusplus/ExpressionUnderCursor.h b/src/libs/cplusplus/ExpressionUnderCursor.h index 79c0ed052d..230e196777 100644 --- a/src/libs/cplusplus/ExpressionUnderCursor.h +++ b/src/libs/cplusplus/ExpressionUnderCursor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_EXPRESSIONUNDERCURSOR_H -#define CPLUSPLUS_EXPRESSIONUNDERCURSOR_H +#pragma once #include <cplusplus/CPlusPlusForwardDeclarations.h> #include <cplusplus/Token.h> @@ -59,5 +58,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_EXPRESSIONUNDERCURSOR_H diff --git a/src/libs/cplusplus/FastPreprocessor.h b/src/libs/cplusplus/FastPreprocessor.h index 04d7320115..da63bdd59b 100644 --- a/src/libs/cplusplus/FastPreprocessor.h +++ b/src/libs/cplusplus/FastPreprocessor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_FASTPREPROCESSOR_H -#define CPLUSPLUS_FASTPREPROCESSOR_H +#pragma once #include "PreprocessorClient.h" #include "CppDocument.h" @@ -79,5 +78,3 @@ public: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_FASTPREPROCESSOR_H diff --git a/src/libs/cplusplus/FindUsages.h b/src/libs/cplusplus/FindUsages.h index 38d109062f..3d1e7a942e 100644 --- a/src/libs/cplusplus/FindUsages.h +++ b/src/libs/cplusplus/FindUsages.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_FINDUSAGES_H -#define CPLUSPLUS_FINDUSAGES_H +#pragma once #include "LookupContext.h" #include "CppDocument.h" @@ -304,6 +303,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_FINDUSAGES_H - diff --git a/src/libs/cplusplus/Icons.h b/src/libs/cplusplus/Icons.h index 35b62fb59d..51c550aae7 100644 --- a/src/libs/cplusplus/Icons.h +++ b/src/libs/cplusplus/Icons.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_ICONS_H -#define CPLUSPLUS_ICONS_H +#pragma once #include <cplusplus/CPlusPlusForwardDeclarations.h> @@ -101,5 +100,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_ICONS_H diff --git a/src/libs/cplusplus/LookupContext.h b/src/libs/cplusplus/LookupContext.h index 398571aea8..7273fe57d0 100644 --- a/src/libs/cplusplus/LookupContext.h +++ b/src/libs/cplusplus/LookupContext.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_LOOKUPCONTEXT_H -#define CPLUSPLUS_LOOKUPCONTEXT_H +#pragma once #include "CppDocument.h" #include "LookupItem.h" @@ -349,5 +348,3 @@ bool CPLUSPLUS_EXPORT compareFullyQualifiedName(const QList<const Name *> &path, } // namespace CPlusPlus - -#endif // CPLUSPLUS_LOOKUPCONTEXT_H diff --git a/src/libs/cplusplus/LookupItem.h b/src/libs/cplusplus/LookupItem.h index f61c50fa77..1007635f6a 100644 --- a/src/libs/cplusplus/LookupItem.h +++ b/src/libs/cplusplus/LookupItem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_LOOKUPITEM_H -#define CPLUSPLUS_LOOKUPITEM_H +#pragma once #include <cplusplus/FullySpecifiedType.h> @@ -80,5 +79,3 @@ uint qHash(const CPlusPlus::LookupItem &result); //it also a workaround for some compilers inline uint qHash(const CPlusPlus::LookupItem &item) { return CPlusPlus::qHash(item); } #endif - -#endif // CPLUSPLUS_LOOKUPITEM_H diff --git a/src/libs/cplusplus/Macro.h b/src/libs/cplusplus/Macro.h index a441578ffe..f54df57458 100644 --- a/src/libs/cplusplus/Macro.h +++ b/src/libs/cplusplus/Macro.h @@ -43,8 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef CPLUSPLUS_PP_MACRO_H -#define CPLUSPLUS_PP_MACRO_H +#pragma once #include "PPToken.h" @@ -179,5 +178,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_PP_MACRO_H diff --git a/src/libs/cplusplus/MatchingText.h b/src/libs/cplusplus/MatchingText.h index dfe111a337..f2d27c4ea8 100644 --- a/src/libs/cplusplus/MatchingText.h +++ b/src/libs/cplusplus/MatchingText.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_MATCHINGTEXT_H -#define CPLUSPLUS_MATCHINGTEXT_H +#pragma once #include <QtGlobal> #include <cplusplus/CPlusPlusForwardDeclarations.h> @@ -46,5 +45,3 @@ public: }; } // namespace CPlusPlus - -#endif // MATCHINGTEXT_H diff --git a/src/libs/cplusplus/NamePrettyPrinter.h b/src/libs/cplusplus/NamePrettyPrinter.h index 1f7816a133..13d378b25e 100644 --- a/src/libs/cplusplus/NamePrettyPrinter.h +++ b/src/libs/cplusplus/NamePrettyPrinter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_NAMEPRETTYPRINTER_H -#define CPLUSPLUS_NAMEPRETTYPRINTER_H +#pragma once #include <cplusplus/NameVisitor.h> @@ -61,5 +60,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_NAMEPRETTYPRINTER_H diff --git a/src/libs/cplusplus/Overview.h b/src/libs/cplusplus/Overview.h index b3fc0d0477..612ea79662 100644 --- a/src/libs/cplusplus/Overview.h +++ b/src/libs/cplusplus/Overview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_OVERVIEW_H -#define CPLUSPLUS_OVERVIEW_H +#pragma once #include <cplusplus/CPlusPlusForwardDeclarations.h> @@ -76,5 +75,3 @@ public: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_OVERVIEW_H diff --git a/src/libs/cplusplus/OverviewModel.h b/src/libs/cplusplus/OverviewModel.h index a8e3a01c0b..bd558b8244 100644 --- a/src/libs/cplusplus/OverviewModel.h +++ b/src/libs/cplusplus/OverviewModel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_OVERVIEWMODEL_H -#define CPLUSPLUS_OVERVIEWMODEL_H +#pragma once #include "CppDocument.h" #include "Overview.h" @@ -77,5 +76,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_OVERVIEWMODEL_H diff --git a/src/libs/cplusplus/PPToken.h b/src/libs/cplusplus/PPToken.h index 7fff4f2bfc..8eb8b26ab6 100644 --- a/src/libs/cplusplus/PPToken.h +++ b/src/libs/cplusplus/PPToken.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_INTERNAL_PPTOKEN_H -#define CPLUSPLUS_INTERNAL_PPTOKEN_H +#pragma once #include <cplusplus/CPlusPlus.h> #include <cplusplus/Token.h> @@ -136,5 +135,3 @@ private: } // namespace Internal } // namespace CPlusPlus - -#endif // CPLUSPLUS_INTERNAL_PPTOKEN_H diff --git a/src/libs/cplusplus/PreprocessorClient.h b/src/libs/cplusplus/PreprocessorClient.h index d9877a2199..accccdab1f 100644 --- a/src/libs/cplusplus/PreprocessorClient.h +++ b/src/libs/cplusplus/PreprocessorClient.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PREPROCESSORCLIENT_H -#define PREPROCESSORCLIENT_H +#pragma once #include <cplusplus/CPlusPlusForwardDeclarations.h> @@ -118,5 +117,3 @@ public: }; } // namespace CPlusPlus - -#endif // PREPROCESSORCLIENT_H diff --git a/src/libs/cplusplus/PreprocessorEnvironment.h b/src/libs/cplusplus/PreprocessorEnvironment.h index fe0a643606..a6db2d0c7f 100644 --- a/src/libs/cplusplus/PreprocessorEnvironment.h +++ b/src/libs/cplusplus/PreprocessorEnvironment.h @@ -43,8 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef PREPROCESSORENVIRONMENT_H -#define PREPROCESSORENVIRONMENT_H +#pragma once #include "PPToken.h" @@ -101,5 +100,3 @@ private: }; } // namespace CPlusPlus - -#endif // PREPROCESSORENVIRONMENT_H diff --git a/src/libs/cplusplus/ResolveExpression.h b/src/libs/cplusplus/ResolveExpression.h index d9043e720f..f53caf26aa 100644 --- a/src/libs/cplusplus/ResolveExpression.h +++ b/src/libs/cplusplus/ResolveExpression.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_RESOLVEEXPRESSION_H -#define CPLUSPLUS_RESOLVEEXPRESSION_H +#pragma once #include "LookupContext.h" @@ -134,5 +133,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_RESOLVEEXPRESSION_H diff --git a/src/libs/cplusplus/SimpleLexer.h b/src/libs/cplusplus/SimpleLexer.h index 1bb9a3d08d..2bd794933d 100644 --- a/src/libs/cplusplus/SimpleLexer.h +++ b/src/libs/cplusplus/SimpleLexer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_SIMPLELEXER_H -#define CPLUSPLUS_SIMPLELEXER_H +#pragma once #include <cplusplus/CPlusPlusForwardDeclarations.h> #include <cplusplus/Token.h> @@ -77,5 +76,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_SIMPLELEXER_H diff --git a/src/libs/cplusplus/SnapshotSymbolVisitor.h b/src/libs/cplusplus/SnapshotSymbolVisitor.h index 2fb78e352a..c0eab1bbbb 100644 --- a/src/libs/cplusplus/SnapshotSymbolVisitor.h +++ b/src/libs/cplusplus/SnapshotSymbolVisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_SNAPSHOTSYMBOLVISITOR_H -#define CPLUSPLUS_SNAPSHOTSYMBOLVISITOR_H +#pragma once #include "CppDocument.h" @@ -51,5 +50,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_SNAPSHOTSYMBOLVISITOR_H diff --git a/src/libs/cplusplus/SymbolNameVisitor.h b/src/libs/cplusplus/SymbolNameVisitor.h index 5123c717d1..0d48265db7 100644 --- a/src/libs/cplusplus/SymbolNameVisitor.h +++ b/src/libs/cplusplus/SymbolNameVisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_SYMBOLNAMEVISITOR_H -#define CPLUSPLUS_SYMBOLNAMEVISITOR_H +#pragma once #include <cplusplus/NameVisitor.h> @@ -44,5 +43,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_SYMBOLNAMEVISITOR_H diff --git a/src/libs/cplusplus/TypeOfExpression.h b/src/libs/cplusplus/TypeOfExpression.h index b200d78ead..1d13059b8c 100644 --- a/src/libs/cplusplus/TypeOfExpression.h +++ b/src/libs/cplusplus/TypeOfExpression.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_TYPEOFEXPRESSION_H -#define CPLUSPLUS_TYPEOFEXPRESSION_H +#pragma once #include "CppDocument.h" #include "LookupContext.h" @@ -159,5 +158,3 @@ ExpressionAST CPLUSPLUS_EXPORT *extractExpressionAST(Document::Ptr doc); Document::Ptr CPLUSPLUS_EXPORT documentForExpression(const QByteArray &utf8code); } // namespace CPlusPlus - -#endif // CPLUSPLUS_TYPEOFEXPRESSION_H diff --git a/src/libs/cplusplus/TypePrettyPrinter.h b/src/libs/cplusplus/TypePrettyPrinter.h index eef06b1503..15498784c3 100644 --- a/src/libs/cplusplus/TypePrettyPrinter.h +++ b/src/libs/cplusplus/TypePrettyPrinter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUS_TYPEPRETTYPRINTER_H -#define CPLUSPLUS_TYPEPRETTYPRINTER_H +#pragma once #include <cplusplus/TypeVisitor.h> #include <cplusplus/FullySpecifiedType.h> @@ -93,5 +92,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_TYPEPRETTYPRINTER_H diff --git a/src/libs/cplusplus/cppmodelmanagerbase.h b/src/libs/cplusplus/cppmodelmanagerbase.h index 3086d50cfd..680e7e2d06 100644 --- a/src/libs/cplusplus/cppmodelmanagerbase.h +++ b/src/libs/cplusplus/cppmodelmanagerbase.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPMODELMANAGERBASE_H -#define CPPMODELMANAGERBASE_H +#pragma once #include <cplusplus/CppDocument.h> @@ -54,5 +53,3 @@ public: }; } // namespace CPlusPlus - -#endif // CPPMODELMANAGERBASE_H diff --git a/src/libs/cplusplus/findcdbbreakpoint.h b/src/libs/cplusplus/findcdbbreakpoint.h index 57bf0f3dfc..6fb61030e7 100644 --- a/src/libs/cplusplus/findcdbbreakpoint.h +++ b/src/libs/cplusplus/findcdbbreakpoint.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FINDCDBBREAKPOINT_H -#define FINDCDBBREAKPOINT_H +#pragma once #include <cplusplus/CPlusPlusForwardDeclarations.h> #include <cplusplus/ASTVisitor.h> @@ -93,5 +92,3 @@ private: }; } // namespace CPlusPlus - -#endif // FINDCDBBREAKPOINT_H diff --git a/src/libs/cplusplus/pp-cctype.h b/src/libs/cplusplus/pp-cctype.h index 1376119151..91c39604f1 100644 --- a/src/libs/cplusplus/pp-cctype.h +++ b/src/libs/cplusplus/pp-cctype.h @@ -43,8 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef CPLUSPLUS_PP_CCTYPE_H -#define CPLUSPLUS_PP_CCTYPE_H +#pragma once #include <cplusplus/CPlusPlusForwardDeclarations.h> @@ -65,5 +64,3 @@ inline bool CPLUSPLUS_EXPORT pp_isspace (int ch) { return std::isspace ((unsigned char) ch) != 0; } } // namespace CPlusPlus - -#endif // CPLUSPLUS_PP_CCTYPE_H diff --git a/src/libs/cplusplus/pp-engine.h b/src/libs/cplusplus/pp-engine.h index 6b24fd8d9f..b265de6d46 100644 --- a/src/libs/cplusplus/pp-engine.h +++ b/src/libs/cplusplus/pp-engine.h @@ -43,8 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef CPLUSPLUS_PP_ENGINE_H -#define CPLUSPLUS_PP_ENGINE_H +#pragma once #include "PPToken.h" #include "PreprocessorClient.h" @@ -262,5 +261,3 @@ private: }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_PP_ENGINE_H diff --git a/src/libs/cplusplus/pp-scanner.h b/src/libs/cplusplus/pp-scanner.h index 13209ea6c3..1c493761b9 100644 --- a/src/libs/cplusplus/pp-scanner.h +++ b/src/libs/cplusplus/pp-scanner.h @@ -43,8 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef CPLUSPLUS_PP_SCANNER_H -#define CPLUSPLUS_PP_SCANNER_H +#pragma once namespace CPlusPlus { @@ -118,5 +117,3 @@ struct pp_skip_argument }; } // namespace CPlusPlus - -#endif // CPLUSPLUS_PP_SCANNER_H diff --git a/src/libs/cplusplus/pp.h b/src/libs/cplusplus/pp.h index e703f6c9a8..b4b75297e4 100644 --- a/src/libs/cplusplus/pp.h +++ b/src/libs/cplusplus/pp.h @@ -43,13 +43,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifndef CPLUSPLUS_PREPROCESSOR_H -#define CPLUSPLUS_PREPROCESSOR_H +#pragma once #include "Macro.h" #include "PreprocessorClient.h" #include "PreprocessorEnvironment.h" #include "pp-scanner.h" #include "pp-engine.h" - -#endif // CPLUSPLUS_PREPROCESSOR_H diff --git a/src/libs/extensionsystem/extensionsystem_global.h b/src/libs/extensionsystem/extensionsystem_global.h index 5239e814cb..2cc8add8c5 100644 --- a/src/libs/extensionsystem/extensionsystem_global.h +++ b/src/libs/extensionsystem/extensionsystem_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EXTENSIONSYSTEM_GLOBAL_H -#define EXTENSIONSYSTEM_GLOBAL_H +#pragma once #include <QLoggingCategory> #include <qglobal.h> @@ -36,5 +35,3 @@ #endif Q_DECLARE_LOGGING_CATEGORY(pluginLog) - -#endif // EXTENSIONSYSTEM_GLOBAL_H diff --git a/src/libs/extensionsystem/invoker.h b/src/libs/extensionsystem/invoker.h index 6574392a3b..1286e07aaa 100644 --- a/src/libs/extensionsystem/invoker.h +++ b/src/libs/extensionsystem/invoker.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EXTENSIONSYSTEM_INVOKER_H -#define EXTENSIONSYSTEM_INVOKER_H +#pragma once #include "extensionsystem_global.h" @@ -202,5 +201,3 @@ Result invoke(QObject *target, const char *slot, } } // namespace ExtensionSystem - -#endif // EXTENSIONSYSTEM_INVOKER_H diff --git a/src/libs/extensionsystem/iplugin.h b/src/libs/extensionsystem/iplugin.h index 1910f00c36..42b4a564c7 100644 --- a/src/libs/extensionsystem/iplugin.h +++ b/src/libs/extensionsystem/iplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IPLUGIN_H -#define IPLUGIN_H +#pragma once #include "extensionsystem_global.h" @@ -79,5 +78,3 @@ private: }; } // namespace ExtensionSystem - -#endif // IPLUGIN_H diff --git a/src/libs/extensionsystem/iplugin_p.h b/src/libs/extensionsystem/iplugin_p.h index 17e5a70aa1..0c3824dd39 100644 --- a/src/libs/extensionsystem/iplugin_p.h +++ b/src/libs/extensionsystem/iplugin_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IPLUGIN_P_H -#define IPLUGIN_P_H +#pragma once #include "iplugin.h" @@ -47,5 +46,3 @@ public: } // namespace Internal } // namespace ExtensionSystem - -#endif // IPLUGIN_P_H diff --git a/src/libs/extensionsystem/optionsparser.h b/src/libs/extensionsystem/optionsparser.h index 12095f062b..7b85d9e62a 100644 --- a/src/libs/extensionsystem/optionsparser.h +++ b/src/libs/extensionsystem/optionsparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OPTIONSPARSER_H -#define OPTIONSPARSER_H +#pragma once #include <QStringList> #include <QMap> @@ -81,5 +80,3 @@ private: } // namespace Internal } // namespace ExtensionSystem - -#endif // OPTIONSPARSER_H diff --git a/src/libs/extensionsystem/plugincollection.h b/src/libs/extensionsystem/plugincollection.h index 8415dd0afe..fd38bcedff 100644 --- a/src/libs/extensionsystem/plugincollection.h +++ b/src/libs/extensionsystem/plugincollection.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGINCOLLECTION_H -#define PLUGINCOLLECTION_H +#pragma once #include "extensionsystem_global.h" @@ -52,5 +51,3 @@ private: }; } // namespace ExtensionSystem - -#endif // PLUGINCOLLECTION_H diff --git a/src/libs/extensionsystem/plugindetailsview.h b/src/libs/extensionsystem/plugindetailsview.h index 38b5ba5f15..b6990e2960 100644 --- a/src/libs/extensionsystem/plugindetailsview.h +++ b/src/libs/extensionsystem/plugindetailsview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGINDETAILSVIEW_H_ -#define PLUGINDETAILSVIEW_H_ +#pragma once #include "extensionsystem_global.h" @@ -54,5 +53,3 @@ private: }; } // namespace ExtensionSystem - -#endif diff --git a/src/libs/extensionsystem/pluginerroroverview.h b/src/libs/extensionsystem/pluginerroroverview.h index dd2ac7352a..174efeee20 100644 --- a/src/libs/extensionsystem/pluginerroroverview.h +++ b/src/libs/extensionsystem/pluginerroroverview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGINERROROVERVIEW_H -#define PLUGINERROROVERVIEW_H +#pragma once #include "extensionsystem_global.h" @@ -56,5 +55,3 @@ private: }; } // ExtensionSystem - -#endif // PLUGINERROROVERVIEW_H diff --git a/src/libs/extensionsystem/pluginerrorview.h b/src/libs/extensionsystem/pluginerrorview.h index b35f83c59b..1655f4adcf 100644 --- a/src/libs/extensionsystem/pluginerrorview.h +++ b/src/libs/extensionsystem/pluginerrorview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGINERRORVIEW_H -#define PLUGINERRORVIEW_H +#pragma once #include "extensionsystem_global.h" @@ -52,5 +51,3 @@ private: }; } // namespace ExtensionSystem - -#endif // PLUGINERRORVIEW_H diff --git a/src/libs/extensionsystem/pluginmanager.h b/src/libs/extensionsystem/pluginmanager.h index 49ed9ae7ef..c2be55551f 100644 --- a/src/libs/extensionsystem/pluginmanager.h +++ b/src/libs/extensionsystem/pluginmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EXTENSIONSYSTEM_PLUGINMANAGER_H -#define EXTENSIONSYSTEM_PLUGINMANAGER_H +#pragma once #include "extensionsystem_global.h" #include <aggregation/aggregate.h> @@ -163,5 +162,3 @@ public slots: }; } // namespace ExtensionSystem - -#endif // EXTENSIONSYSTEM_PLUGINMANAGER_H diff --git a/src/libs/extensionsystem/pluginmanager_p.h b/src/libs/extensionsystem/pluginmanager_p.h index 968fa1d08e..e0342d401c 100644 --- a/src/libs/extensionsystem/pluginmanager_p.h +++ b/src/libs/extensionsystem/pluginmanager_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGINMANAGER_P_H -#define PLUGINMANAGER_P_H +#pragma once #include "pluginspec.h" @@ -154,5 +153,3 @@ private: } // namespace Internal } // namespace ExtensionSystem - -#endif // PLUGINMANAGER_P_H diff --git a/src/libs/extensionsystem/pluginspec.h b/src/libs/extensionsystem/pluginspec.h index bab1bd2371..7d41c91158 100644 --- a/src/libs/extensionsystem/pluginspec.h +++ b/src/libs/extensionsystem/pluginspec.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGINSPEC_H -#define PLUGINSPEC_H +#pragma once #include "extensionsystem_global.h" @@ -139,6 +138,3 @@ private: }; } // namespace ExtensionSystem - -#endif // PLUGINSPEC_H - diff --git a/src/libs/extensionsystem/pluginspec_p.h b/src/libs/extensionsystem/pluginspec_p.h index 62feba4496..bd172fef19 100644 --- a/src/libs/extensionsystem/pluginspec_p.h +++ b/src/libs/extensionsystem/pluginspec_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGINSPEC_P_H -#define PLUGINSPEC_P_H +#pragma once #include "pluginspec.h" #include "iplugin.h" @@ -115,5 +114,3 @@ private: } // namespace Internal } // namespace ExtensionSystem - -#endif // PLUGINSPEC_P_H diff --git a/src/libs/extensionsystem/pluginview.h b/src/libs/extensionsystem/pluginview.h index c65d8cc9f5..3b4da885fe 100644 --- a/src/libs/extensionsystem/pluginview.h +++ b/src/libs/extensionsystem/pluginview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGINVIEW_H -#define PLUGINVIEW_H +#pragma once #include "extensionsystem_global.h" @@ -82,5 +81,3 @@ private: }; } // namespae ExtensionSystem - -#endif // PLUGIN_VIEW_H diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h index f073e5c4ca..bc666c0cbc 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h +++ b/src/libs/extensionsystem/test/manual/pluginview/plugindialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGINDIALOG_H -#define PLUGINDIALOG_H +#pragma once #include <extensionsystem/pluginview.h> #include <extensionsystem/pluginmanager.h> @@ -51,5 +50,3 @@ private: QPushButton *m_detailsButton; QPushButton *m_errorDetailsButton; }; - -#endif // PLUGINDIALOG_H diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h index 02e85d090d..07c6c7d9bb 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin1/plugin1.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGIN1_H -#define PLUGIN1_H +#pragma once #include <extensionsystem/iplugin.h> @@ -48,5 +47,3 @@ private: }; } // namespace Plugin1 - -#endif // PLUGIN1_H diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h index 7f4b00bcbd..0b43ef0f2f 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin2/plugin2.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGIN2_H -#define PLUGIN2_H +#pragma once #include <extensionsystem/iplugin.h> @@ -48,5 +47,3 @@ private: }; } // namespace Plugin2 - -#endif // PLUGIN2_H diff --git a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h index ed8765f023..478d753053 100644 --- a/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h +++ b/src/libs/extensionsystem/test/manual/pluginview/plugins/plugin3/plugin3.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGIN3_H -#define PLUGIN3_H +#pragma once #include <extensionsystem/iplugin.h> @@ -48,5 +47,3 @@ private: }; } // namespace Plugin3 - -#endif // PLUGIN3_H diff --git a/src/libs/glsl/glsl.h b/src/libs/glsl/glsl.h index 868d3c9271..bc5515ab05 100644 --- a/src/libs/glsl/glsl.h +++ b/src/libs/glsl/glsl.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLSL_H -#define GLSL_H +#pragma once #include <qglobal.h> #include <cstdlib> @@ -75,5 +74,3 @@ class AST; class TranslationUnitAST; template <typename T> class List; } - -#endif // GLSL_H diff --git a/src/libs/glsl/glslast.h b/src/libs/glsl/glslast.h index 988e4b88a8..3711b30bdf 100644 --- a/src/libs/glsl/glslast.h +++ b/src/libs/glsl/glslast.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLSLAST_H -#define GLSLAST_H +#pragma once #include "glsl.h" #include "glslmemorypool.h" @@ -992,5 +991,3 @@ public: // attributes }; } // namespace GLSL - -#endif // GLSLAST_H diff --git a/src/libs/glsl/glslastdump.h b/src/libs/glsl/glslastdump.h index 086d158f0b..8213b913f1 100644 --- a/src/libs/glsl/glslastdump.h +++ b/src/libs/glsl/glslastdump.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLSLASTDUMP_H -#define GLSLASTDUMP_H +#pragma once #include "glslastvisitor.h" @@ -49,5 +48,3 @@ private: }; } // namespace GLSL - -#endif // GLSLASTDUMP_H diff --git a/src/libs/glsl/glslastvisitor.h b/src/libs/glsl/glslastvisitor.h index 65816d8703..4cd3530de8 100644 --- a/src/libs/glsl/glslastvisitor.h +++ b/src/libs/glsl/glslastvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLSLASTVISITOR_H -#define GLSLASTVISITOR_H +#pragma once #include "glslast.h" @@ -154,5 +153,3 @@ public: }; } // namespace GLSL - -#endif // GLSLASTVISITOR_H diff --git a/src/libs/glsl/glslengine.h b/src/libs/glsl/glslengine.h index eeb6697585..6b126111f6 100644 --- a/src/libs/glsl/glslengine.h +++ b/src/libs/glsl/glslengine.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLSLENGINE_H -#define GLSLENGINE_H +#pragma once #include "glsl.h" #include "glslmemorypool.h" @@ -142,5 +141,3 @@ private: }; } // namespace GLSL - -#endif // GLSLENGINE_H diff --git a/src/libs/glsl/glsllexer.h b/src/libs/glsl/glsllexer.h index 384688042d..2b0ad83fed 100644 --- a/src/libs/glsl/glsllexer.h +++ b/src/libs/glsl/glsllexer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLSLLEXER_H -#define GLSLLEXER_H +#pragma once #include "glsl.h" #include <qstring.h> @@ -129,5 +128,3 @@ private: }; } // namespace GLSL - -#endif // GLSLLEXER_H diff --git a/src/libs/glsl/glslmemorypool.h b/src/libs/glsl/glslmemorypool.h index fd55187c96..b33728b115 100644 --- a/src/libs/glsl/glslmemorypool.h +++ b/src/libs/glsl/glslmemorypool.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLSLMEMORYPOOL_H -#define GLSLMEMORYPOOL_H +#pragma once #include "glsl.h" #include <new> @@ -87,6 +86,3 @@ public: }; } // namespace GLSL - - -#endif // GLSLMEMORYPOOL_H diff --git a/src/libs/glsl/glslparsertable_p.h b/src/libs/glsl/glslparsertable_p.h index 667b85b836..b046b5df7a 100644 --- a/src/libs/glsl/glslparsertable_p.h +++ b/src/libs/glsl/glslparsertable_p.h @@ -35,8 +35,7 @@ // // This file was generated by qlalr - DO NOT EDIT! -#ifndef GLSLPARSERTABLE_P_H -#define GLSLPARSERTABLE_P_H +#pragma once #include <qglobal.h> @@ -264,5 +263,3 @@ public: QT_END_NAMESPACE -#endif // GLSLPARSERTABLE_P_H - diff --git a/src/libs/glsl/glslsemantic.h b/src/libs/glsl/glslsemantic.h index 8347604995..9c21a7a4be 100644 --- a/src/libs/glsl/glslsemantic.h +++ b/src/libs/glsl/glslsemantic.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLSLSEMANTIC_H -#define GLSLSEMANTIC_H +#pragma once #include "glslastvisitor.h" #include "glsltype.h" @@ -127,5 +126,3 @@ private: }; } // namespace GLSL - -#endif // GLSLSEMANTIC_H diff --git a/src/libs/glsl/glslsymbol.h b/src/libs/glsl/glslsymbol.h index cc91525646..db5c0dab9b 100644 --- a/src/libs/glsl/glslsymbol.h +++ b/src/libs/glsl/glslsymbol.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLSLSYMBOL_H -#define GLSLSYMBOL_H +#pragma once #include "glsl.h" #include <QString> @@ -77,5 +76,3 @@ public: }; } // namespace GLSL - -#endif // GLSLSYMBOL_H diff --git a/src/libs/glsl/glslsymbols.h b/src/libs/glsl/glslsymbols.h index 1a381c4495..32fde05bbb 100644 --- a/src/libs/glsl/glslsymbols.h +++ b/src/libs/glsl/glslsymbols.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLSLSYMBOLS_H -#define GLSLSYMBOLS_H +#pragma once #include "glsltype.h" #include "glslsymbol.h" @@ -103,5 +102,3 @@ private: }; } // namespace GLSL - -#endif // GLSLSYMBOLS_H diff --git a/src/libs/glsl/glsltype.h b/src/libs/glsl/glsltype.h index 265959c1aa..94aa422937 100644 --- a/src/libs/glsl/glsltype.h +++ b/src/libs/glsl/glsltype.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLSLTYPE_H -#define GLSLTYPE_H +#pragma once #include "glsl.h" @@ -60,5 +59,3 @@ public: }; } // namespace GLSL - -#endif // GLSLTYPE_H diff --git a/src/libs/glsl/glsltypes.h b/src/libs/glsl/glsltypes.h index 2b53ebfe37..5e89b0c3a4 100644 --- a/src/libs/glsl/glsltypes.h +++ b/src/libs/glsl/glsltypes.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLSLTYPES_H -#define GLSLTYPES_H +#pragma once #include "glsltype.h" #include "glslsymbol.h" @@ -290,5 +289,3 @@ private: }; } // namespace GLSL - -#endif // GLSLTYPES_H diff --git a/src/libs/languageutils/componentversion.h b/src/libs/languageutils/componentversion.h index 7bdbc26b5e..8e271bccab 100644 --- a/src/libs/languageutils/componentversion.h +++ b/src/libs/languageutils/componentversion.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMPONENTVERSION_H -#define COMPONENTVERSION_H +#pragma once #include "languageutils_global.h" @@ -66,5 +65,3 @@ bool LANGUAGEUTILS_EXPORT operator==(const ComponentVersion &lhs, const Componen bool LANGUAGEUTILS_EXPORT operator!=(const ComponentVersion &lhs, const ComponentVersion &rhs); } // namespace LanguageUtils - -#endif // COMPONENTVERSION_H diff --git a/src/libs/languageutils/fakemetaobject.h b/src/libs/languageutils/fakemetaobject.h index 8ea96eeb37..543d80b45c 100644 --- a/src/libs/languageutils/fakemetaobject.h +++ b/src/libs/languageutils/fakemetaobject.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FAKEMETAOBJECT_H -#define FAKEMETAOBJECT_H +#pragma once #include "languageutils_global.h" #include "componentversion.h" @@ -230,5 +229,3 @@ public: }; } // namespace LanguageUtils - -#endif // FAKEMETAOBJECT_H diff --git a/src/libs/languageutils/languageutils_global.h b/src/libs/languageutils/languageutils_global.h index a74345fc81..9de119ef98 100644 --- a/src/libs/languageutils/languageutils_global.h +++ b/src/libs/languageutils/languageutils_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LANGUAGEUTILS_GLOBAL_H -#define LANGUAGEUTILS_GLOBAL_H +#pragma once #include <qglobal.h> @@ -35,5 +34,3 @@ #else # define LANGUAGEUTILS_EXPORT Q_DECL_IMPORT #endif - -#endif // LANGUAGEUTILS_GLOBAL_H diff --git a/src/libs/modelinglib/qmt/config/configcontroller.h b/src/libs/modelinglib/qmt/config/configcontroller.h index 0fb6a8a3a7..34135bb4af 100644 --- a/src/libs/modelinglib/qmt/config/configcontroller.h +++ b/src/libs/modelinglib/qmt/config/configcontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_CONFIGCONTROLLER_H -#define QMT_CONFIGCONTROLLER_H +#pragma once #include <QObject> #include "qmt/infrastructure/qmt_global.h" @@ -56,5 +55,3 @@ private: }; } // namespace qmt - -#endif // QMT_CONFIGCONTROLLER_H diff --git a/src/libs/modelinglib/qmt/config/sourcepos.h b/src/libs/modelinglib/qmt/config/sourcepos.h index ee31261ca9..2d86eca92d 100644 --- a/src/libs/modelinglib/qmt/config/sourcepos.h +++ b/src/libs/modelinglib/qmt/config/sourcepos.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_SOURCEPOS_H -#define QMT_SOURCEPOS_H +#pragma once #include "qmt/infrastructure/qmt_global.h" @@ -49,5 +48,3 @@ private: }; } // namespace qmt - -#endif // QMT_SOURCEPOS_H diff --git a/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.h b/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.h index 465c3c5eb3..390ab4424e 100644 --- a/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.h +++ b/src/libs/modelinglib/qmt/config/stereotypedefinitionparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_STEREOTYPEDEFINITIONPARSER_H -#define QMT_STEREOTYPEDEFINITIONPARSER_H +#pragma once #include <QObject> #include "qmt/infrastructure/exceptions.h" @@ -119,5 +118,3 @@ private: }; } // namespace qmt - -#endif // QMT_STEREOTYPEDEFINITIONPARSER_H diff --git a/src/libs/modelinglib/qmt/config/stringtextsource.h b/src/libs/modelinglib/qmt/config/stringtextsource.h index 5fbd53e694..01301ca6cd 100644 --- a/src/libs/modelinglib/qmt/config/stringtextsource.h +++ b/src/libs/modelinglib/qmt/config/stringtextsource.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_STRINGTEXTSOURCE_H -#define QMT_STRINGTEXTSOURCE_H +#pragma once #include "textsource.h" @@ -54,5 +53,3 @@ private: }; } // namespace qmt - -#endif // QMT_STRINGTEXTSOURCE_H diff --git a/src/libs/modelinglib/qmt/config/textscanner.h b/src/libs/modelinglib/qmt/config/textscanner.h index bd46ba9339..de682a65c4 100644 --- a/src/libs/modelinglib/qmt/config/textscanner.h +++ b/src/libs/modelinglib/qmt/config/textscanner.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_TEXTSCANNER_H -#define QMT_TEXTSCANNER_H +#pragma once #include <QObject> @@ -82,5 +81,3 @@ private: }; } // namespace qmt - -#endif // QMT_TEXTSCANNER_H diff --git a/src/libs/modelinglib/qmt/config/textsource.h b/src/libs/modelinglib/qmt/config/textsource.h index 211f2f522d..dd9a7edc65 100644 --- a/src/libs/modelinglib/qmt/config/textsource.h +++ b/src/libs/modelinglib/qmt/config/textsource.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_TEXTSOURCE_H -#define QMT_TEXTSOURCE_H +#pragma once #include "sourcepos.h" @@ -55,5 +54,3 @@ public: }; } // namespace qmt - -#endif // QMT_TEXTSOURCE_H diff --git a/src/libs/modelinglib/qmt/config/token.h b/src/libs/modelinglib/qmt/config/token.h index 12381f8a16..8672c0ea1d 100644 --- a/src/libs/modelinglib/qmt/config/token.h +++ b/src/libs/modelinglib/qmt/config/token.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_TOKEN_H -#define QMT_TOKEN_H +#pragma once #include "sourcepos.h" @@ -70,5 +69,3 @@ private: }; } // namespace qmt - -#endif // QMT_TOKEN_H diff --git a/src/libs/modelinglib/qmt/controller/container.h b/src/libs/modelinglib/qmt/controller/container.h index fa2056e6da..5750cecb84 100644 --- a/src/libs/modelinglib/qmt/controller/container.h +++ b/src/libs/modelinglib/qmt/controller/container.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_CONTAINER_H -#define QMT_CONTAINER_H +#pragma once #include <QList> @@ -90,5 +89,3 @@ private: }; } // namespace qmt - -#endif // QMT_CONTAINER_H diff --git a/src/libs/modelinglib/qmt/controller/namecontroller.h b/src/libs/modelinglib/qmt/controller/namecontroller.h index 6326301177..ec77165695 100644 --- a/src/libs/modelinglib/qmt/controller/namecontroller.h +++ b/src/libs/modelinglib/qmt/controller/namecontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_NAMECONTROLLER_H -#define QMT_NAMECONTROLLER_H +#pragma once #include <QObject> #include "qmt/infrastructure/qmt_global.h" @@ -53,5 +52,3 @@ public: }; } // namespace qmt - -#endif // QMT_NAMECONTROLLER_H diff --git a/src/libs/modelinglib/qmt/controller/references.h b/src/libs/modelinglib/qmt/controller/references.h index f9711c0159..c6fbbd3849 100644 --- a/src/libs/modelinglib/qmt/controller/references.h +++ b/src/libs/modelinglib/qmt/controller/references.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_REFERENCES_H -#define QMT_REFERENCES_H +#pragma once #include <QList> @@ -51,5 +50,3 @@ private: }; } // namespace qmt - -#endif // QMT_REFERENCES_H diff --git a/src/libs/modelinglib/qmt/controller/selection.h b/src/libs/modelinglib/qmt/controller/selection.h index 4a8cb2969a..bca36c802b 100644 --- a/src/libs/modelinglib/qmt/controller/selection.h +++ b/src/libs/modelinglib/qmt/controller/selection.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_SELECTION_H -#define QMT_SELECTION_H +#pragma once #include "qmt/infrastructure/uid.h" @@ -71,5 +70,3 @@ private: }; } // namespace qmt - -#endif // QMT_SELECTION_H diff --git a/src/libs/modelinglib/qmt/controller/undocommand.h b/src/libs/modelinglib/qmt/controller/undocommand.h index 56d4b6aee2..52cd00b707 100644 --- a/src/libs/modelinglib/qmt/controller/undocommand.h +++ b/src/libs/modelinglib/qmt/controller/undocommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_UNDOCOMMAND_H -#define QMT_UNDOCOMMAND_H +#pragma once #include <QUndoCommand> #include "qmt/infrastructure/qmt_global.h" @@ -53,5 +52,3 @@ private: }; } // namespace qmt - -#endif // QMT_UNDOCOMMAND_H diff --git a/src/libs/modelinglib/qmt/controller/undocontroller.h b/src/libs/modelinglib/qmt/controller/undocontroller.h index a18b00894c..7a3e162d1b 100644 --- a/src/libs/modelinglib/qmt/controller/undocontroller.h +++ b/src/libs/modelinglib/qmt/controller/undocontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_UNDOCONTROLLER_H -#define QMT_UNDOCONTROLLER_H +#pragma once #include <QObject> #include "qmt/infrastructure/qmt_global.h" @@ -60,5 +59,3 @@ private: }; } // namespace qmt - -#endif // QMT_UNDOCONTROLLER_H diff --git a/src/libs/modelinglib/qmt/diagram/dannotation.h b/src/libs/modelinglib/qmt/diagram/dannotation.h index a6ec215147..fe1e57d37d 100644 --- a/src/libs/modelinglib/qmt/diagram/dannotation.h +++ b/src/libs/modelinglib/qmt/diagram/dannotation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DANNOTATION_H -#define QMT_DANNOTATION_H +#pragma once #include "delement.h" @@ -75,5 +74,3 @@ private: }; } // namespace qmt - -#endif // QMT_DANNOTATION_H diff --git a/src/libs/modelinglib/qmt/diagram/dassociation.h b/src/libs/modelinglib/qmt/diagram/dassociation.h index 65b48bed77..1da72c36b5 100644 --- a/src/libs/modelinglib/qmt/diagram/dassociation.h +++ b/src/libs/modelinglib/qmt/diagram/dassociation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DASSOCIATION_H -#define QMT_DASSOCIATION_H +#pragma once #include "drelation.h" @@ -81,5 +80,3 @@ private: }; } // namespace qmt - -#endif // QMT_DASSOCIATION_H diff --git a/src/libs/modelinglib/qmt/diagram/dboundary.h b/src/libs/modelinglib/qmt/diagram/dboundary.h index f475eb654f..cb617f7c6c 100644 --- a/src/libs/modelinglib/qmt/diagram/dboundary.h +++ b/src/libs/modelinglib/qmt/diagram/dboundary.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DBOUNDARY_H -#define QMT_DBOUNDARY_H +#pragma once #include "delement.h" @@ -60,5 +59,3 @@ private: }; } // namespace qmt - -#endif // QMT_DBOUNDARY_H diff --git a/src/libs/modelinglib/qmt/diagram/dclass.h b/src/libs/modelinglib/qmt/diagram/dclass.h index 3a56f6ad98..c86d8b335c 100644 --- a/src/libs/modelinglib/qmt/diagram/dclass.h +++ b/src/libs/modelinglib/qmt/diagram/dclass.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DCLASS_H -#define QMT_DCLASS_H +#pragma once #include "dobject.h" #include "qmt/model/mclassmember.h" @@ -71,5 +70,3 @@ private: }; } // namespace qmt - -#endif // QMT_DCLASS_H diff --git a/src/libs/modelinglib/qmt/diagram/dcomponent.h b/src/libs/modelinglib/qmt/diagram/dcomponent.h index 448b4f1585..03ef43ecdb 100644 --- a/src/libs/modelinglib/qmt/diagram/dcomponent.h +++ b/src/libs/modelinglib/qmt/diagram/dcomponent.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DCOMPONENT_H -#define QMT_DCOMPONENT_H +#pragma once #include "dobject.h" @@ -47,5 +46,3 @@ private: }; } // namespace qmt - -#endif // QMT_DCOMPONENT_H diff --git a/src/libs/modelinglib/qmt/diagram/dconstvisitor.h b/src/libs/modelinglib/qmt/diagram/dconstvisitor.h index 9b3a1b2e45..23bdb91d58 100644 --- a/src/libs/modelinglib/qmt/diagram/dconstvisitor.h +++ b/src/libs/modelinglib/qmt/diagram/dconstvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DCONSTVISITOR_H -#define QMT_DCONSTVISITOR_H +#pragma once namespace qmt { @@ -63,5 +62,3 @@ public: }; } // namespace qmt - -#endif // QMT_DCONSTVISITOR_H diff --git a/src/libs/modelinglib/qmt/diagram/ddependency.h b/src/libs/modelinglib/qmt/diagram/ddependency.h index ad8ec69620..7c3c712452 100644 --- a/src/libs/modelinglib/qmt/diagram/ddependency.h +++ b/src/libs/modelinglib/qmt/diagram/ddependency.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DDEPENDENCY_H -#define QMT_DDEPENDENCY_H +#pragma once #include "drelation.h" @@ -55,5 +54,3 @@ private: }; } // namespace qmt - -#endif // QMT_DDEPENDENCY_H diff --git a/src/libs/modelinglib/qmt/diagram/ddiagram.h b/src/libs/modelinglib/qmt/diagram/ddiagram.h index 50378dde17..59dfd88f83 100644 --- a/src/libs/modelinglib/qmt/diagram/ddiagram.h +++ b/src/libs/modelinglib/qmt/diagram/ddiagram.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DDIAGRAM_H -#define QMT_DDIAGRAM_H +#pragma once #include "dobject.h" @@ -41,5 +40,3 @@ public: }; } // namespace qmt - -#endif // QMT_DDIAGRAM_H diff --git a/src/libs/modelinglib/qmt/diagram/delement.h b/src/libs/modelinglib/qmt/diagram/delement.h index 5d33b6cac8..bd454408cb 100644 --- a/src/libs/modelinglib/qmt/diagram/delement.h +++ b/src/libs/modelinglib/qmt/diagram/delement.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DELEMENT_H -#define QMT_DELEMENT_H +#pragma once #include "qmt/infrastructure/uid.h" @@ -54,5 +53,3 @@ private: }; } // namespace qmt - -#endif // QMT_DELEMENT_H diff --git a/src/libs/modelinglib/qmt/diagram/dinheritance.h b/src/libs/modelinglib/qmt/diagram/dinheritance.h index 5869f0fc73..82d6785377 100644 --- a/src/libs/modelinglib/qmt/diagram/dinheritance.h +++ b/src/libs/modelinglib/qmt/diagram/dinheritance.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DINHERITANCE_H -#define QMT_DINHERITANCE_H +#pragma once #include "drelation.h" @@ -48,5 +47,3 @@ public: }; } // namespace qmt - -#endif // QMT_DINHERITANCE_H diff --git a/src/libs/modelinglib/qmt/diagram/ditem.h b/src/libs/modelinglib/qmt/diagram/ditem.h index 8539f784f4..7782e9497d 100644 --- a/src/libs/modelinglib/qmt/diagram/ditem.h +++ b/src/libs/modelinglib/qmt/diagram/ditem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DITEM_H -#define QMT_DITEM_H +#pragma once #include "dobject.h" @@ -53,5 +52,3 @@ private: }; } // namespace qmt - -#endif // QMT_DITEM_H diff --git a/src/libs/modelinglib/qmt/diagram/dobject.h b/src/libs/modelinglib/qmt/diagram/dobject.h index b31ce24392..6e5f85358a 100644 --- a/src/libs/modelinglib/qmt/diagram/dobject.h +++ b/src/libs/modelinglib/qmt/diagram/dobject.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DOBJECT_H -#define QMT_DOBJECT_H +#pragma once #include "delement.h" @@ -120,5 +119,3 @@ private: }; } // namespace qmt - -#endif // QMT_DOBJECT_H diff --git a/src/libs/modelinglib/qmt/diagram/dpackage.h b/src/libs/modelinglib/qmt/diagram/dpackage.h index bcb2f68aec..c1ca291c7b 100644 --- a/src/libs/modelinglib/qmt/diagram/dpackage.h +++ b/src/libs/modelinglib/qmt/diagram/dpackage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DPACKAGE_H -#define QMT_DPACKAGE_H +#pragma once #include "dobject.h" @@ -41,5 +40,3 @@ public: }; } // namespace qmt - -#endif // QMT_DPACKAGE_H diff --git a/src/libs/modelinglib/qmt/diagram/drelation.h b/src/libs/modelinglib/qmt/diagram/drelation.h index 59c426b41e..18aaed94a4 100644 --- a/src/libs/modelinglib/qmt/diagram/drelation.h +++ b/src/libs/modelinglib/qmt/diagram/drelation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DRELATION_H -#define QMT_DRELATION_H +#pragma once #include "delement.h" @@ -86,5 +85,3 @@ inline bool operator!=(const DRelation::IntermediatePoint &lhs, } } // namespace qmt - -#endif // QMT_DRELATION_H diff --git a/src/libs/modelinglib/qmt/diagram/dvisitor.h b/src/libs/modelinglib/qmt/diagram/dvisitor.h index 00a0ffee25..bb9e7873ee 100644 --- a/src/libs/modelinglib/qmt/diagram/dvisitor.h +++ b/src/libs/modelinglib/qmt/diagram/dvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DVISITOR_H -#define QMT_DVISITOR_H +#pragma once namespace qmt { @@ -63,5 +62,3 @@ public: }; } // namespace qmt - -#endif // QMT_DVISITOR_H diff --git a/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.h b/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.h index 01c83628c3..c69534b542 100644 --- a/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.h +++ b/src/libs/modelinglib/qmt/diagram_controller/dclonevisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DCLONEVISITOR_H -#define QMT_DCLONEVISITOR_H +#pragma once #include "qmt/diagram/dconstvisitor.h" #include "qmt/infrastructure/qmt_global.h" @@ -82,5 +81,3 @@ private: }; } // namespace qmt - -#endif // QMT_DCLONEVISITOR_H diff --git a/src/libs/modelinglib/qmt/diagram_controller/dcontainer.h b/src/libs/modelinglib/qmt/diagram_controller/dcontainer.h index 59684efc5d..b6ccd86756 100644 --- a/src/libs/modelinglib/qmt/diagram_controller/dcontainer.h +++ b/src/libs/modelinglib/qmt/diagram_controller/dcontainer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DCONTAINER_H -#define QMT_DCONTAINER_H +#pragma once #include "qmt/controller/container.h" #include "qmt/diagram/delement.h" @@ -36,5 +35,3 @@ class QMT_EXPORT DContainer : public Container<DElement> }; } // namespace qmt - -#endif // QMT_DCONTAINER_H diff --git a/src/libs/modelinglib/qmt/diagram_controller/dfactory.h b/src/libs/modelinglib/qmt/diagram_controller/dfactory.h index 46b91599c4..5d5e48ded8 100644 --- a/src/libs/modelinglib/qmt/diagram_controller/dfactory.h +++ b/src/libs/modelinglib/qmt/diagram_controller/dfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DFACTORY_H -#define QMT_DFACTORY_H +#pragma once #include "qmt/model/mconstvisitor.h" #include "qmt/infrastructure/qmt_global.h" @@ -58,5 +57,3 @@ private: }; } // namespace qmt - -#endif // QMT_DFACTORY_H diff --git a/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.h b/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.h index 59a30dc4bb..8c2537ab05 100644 --- a/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.h +++ b/src/libs/modelinglib/qmt/diagram_controller/dflatassignmentvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DFLATASSIGNMENTVISITOR_H -#define QMT_DFLATASSIGNMENTVISITOR_H +#pragma once #include "qmt/diagram/dconstvisitor.h" #include "qmt/infrastructure/qmt_global.h" @@ -55,5 +54,3 @@ private: }; } // namespace qmt - -#endif // QMT_DFLATASSIGNMENTVISITOR_H diff --git a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h index 074f0f7d0a..4199208e53 100644 --- a/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h +++ b/src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DIAGRAMCONTROLLER_H -#define QMT_DIAGRAMCONTROLLER_H +#pragma once #include "qmt/infrastructure/uid.h" @@ -170,5 +169,3 @@ private: }; } // namespace qmt - -#endif // DIAGRAMCONTROLLER_H diff --git a/src/libs/modelinglib/qmt/diagram_controller/dreferences.h b/src/libs/modelinglib/qmt/diagram_controller/dreferences.h index 13a492783f..325cbef306 100644 --- a/src/libs/modelinglib/qmt/diagram_controller/dreferences.h +++ b/src/libs/modelinglib/qmt/diagram_controller/dreferences.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DREFERENCES_H -#define QMT_DREFERENCES_H +#pragma once #include "qmt/controller/references.h" #include "qmt/infrastructure/qmt_global.h" @@ -38,5 +37,3 @@ class QMT_EXPORT DReferences : public References<DElement> }; } // namespace qmt - -#endif // QMT_DREFERENCES_H diff --git a/src/libs/modelinglib/qmt/diagram_controller/dselection.h b/src/libs/modelinglib/qmt/diagram_controller/dselection.h index f653777d69..030c19dfa5 100644 --- a/src/libs/modelinglib/qmt/diagram_controller/dselection.h +++ b/src/libs/modelinglib/qmt/diagram_controller/dselection.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DSELECTION_H -#define QMT_DSELECTION_H +#pragma once #include "qmt/controller/selection.h" #include "qmt/infrastructure/qmt_global.h" @@ -36,5 +35,3 @@ class QMT_EXPORT DSelection : public Selection }; } // namespace qmt - -#endif // QMT_DSELECTION_H diff --git a/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.h b/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.h index ade9391b01..e88e9eed4b 100644 --- a/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.h +++ b/src/libs/modelinglib/qmt/diagram_controller/dupdatevisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DUPDATEVISITOR_H -#define QMT_DUPDATEVISITOR_H +#pragma once #include "qmt/model/mconstvisitor.h" #include "qmt/infrastructure/qmt_global.h" @@ -64,5 +63,3 @@ private: }; } // namespace qmt - -#endif // QMT_DUPDATEVISITOR_H diff --git a/src/libs/modelinglib/qmt/diagram_controller/dvoidvisitor.h b/src/libs/modelinglib/qmt/diagram_controller/dvoidvisitor.h index 4f4328694e..4519c1a943 100644 --- a/src/libs/modelinglib/qmt/diagram_controller/dvoidvisitor.h +++ b/src/libs/modelinglib/qmt/diagram_controller/dvoidvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DVOIDVISITOR_H -#define QMT_DVOIDVISITOR_H +#pragma once #include "qmt/diagram/dvisitor.h" #include "qmt/diagram/dconstvisitor.h" @@ -73,5 +72,3 @@ public: }; } // namespace qmt - -#endif // DVOIDVISITOR_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/capabilities/alignable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/alignable.h index e78755e305..2b569ecce8 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/capabilities/alignable.h +++ b/src/libs/modelinglib/qmt/diagram_scene/capabilities/alignable.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_ALIGNABLE_H -#define QMT_ALIGNABLE_H +#pragma once #include <QString> @@ -51,5 +50,3 @@ public: }; } // namespace qmt - -#endif // QMT_ALIGNABLE_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/capabilities/editable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/editable.h index eab027ab56..de0e70edd5 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/capabilities/editable.h +++ b/src/libs/modelinglib/qmt/diagram_scene/capabilities/editable.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_EDITABLE_H -#define QMT_EDITABLE_H +#pragma once namespace qmt { @@ -39,5 +38,3 @@ public: }; } // namespace qmt - -#endif // QMT_EDITABLE_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/capabilities/intersectionable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/intersectionable.h index 4e697d19e0..bb7b0ec81c 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/capabilities/intersectionable.h +++ b/src/libs/modelinglib/qmt/diagram_scene/capabilities/intersectionable.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_INTERSECTIONABLE_H -#define QMT_INTERSECTIONABLE_H +#pragma once #include <QtGlobal> @@ -45,5 +44,3 @@ public: }; } // namespace qmt - -#endif // QMT_INTERSECTIONABLE_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/capabilities/latchable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/latchable.h index fb9c0ae324..3f720cdec2 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/capabilities/latchable.h +++ b/src/libs/modelinglib/qmt/diagram_scene/capabilities/latchable.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_LATCHABLE_H -#define QMT_LATCHABLE_H +#pragma once #include <QList> @@ -82,5 +81,3 @@ public: }; } // namespace qmt - -#endif // QMT_LATCHABLE_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/capabilities/moveable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/moveable.h index a5e25b5534..0588fad2bc 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/capabilities/moveable.h +++ b/src/libs/modelinglib/qmt/diagram_scene/capabilities/moveable.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MOVEABLE_H -#define QMT_MOVEABLE_H +#pragma once #include <QtGlobal> @@ -44,5 +43,3 @@ public: }; } // namespace qmt - -#endif // QMT_MOVEABLE_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/capabilities/relationable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/relationable.h index ac4bd952ac..793bb3f796 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/capabilities/relationable.h +++ b/src/libs/modelinglib/qmt/diagram_scene/capabilities/relationable.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_RELATIONABLE_H -#define QMT_RELATIONABLE_H +#pragma once #include <QList> @@ -46,5 +45,3 @@ public: }; } // namespace qmt - -#endif // QMT_RELATIONABLE_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/capabilities/resizable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/resizable.h index 0bcf587c34..5fbda477e7 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/capabilities/resizable.h +++ b/src/libs/modelinglib/qmt/diagram_scene/capabilities/resizable.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_RESIZABLE_H -#define QMT_RESIZABLE_H +#pragma once #include <QtGlobal> @@ -58,5 +57,3 @@ public: }; } // namespace qmt - -#endif // QMT_RESIZABLE_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/capabilities/selectable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/selectable.h index c600d986de..5afcf64efd 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/capabilities/selectable.h +++ b/src/libs/modelinglib/qmt/diagram_scene/capabilities/selectable.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_SELECTABLE_H -#define QMT_SELECTABLE_H +#pragma once namespace qmt { @@ -40,5 +39,3 @@ public: }; } // namespace qmt - -#endif // QMT_SELECTABLE_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/capabilities/windable.h b/src/libs/modelinglib/qmt/diagram_scene/capabilities/windable.h index 16228de48b..8d7afa63c0 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/capabilities/windable.h +++ b/src/libs/modelinglib/qmt/diagram_scene/capabilities/windable.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_WINDABLE_H -#define QMT_WINDABLE_H +#pragma once #include <QtGlobal> @@ -47,5 +46,3 @@ public: }; } // namespace qmt - -#endif // QMT_WINDABLE_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramgraphicsscene.h b/src/libs/modelinglib/qmt/diagram_scene/diagramgraphicsscene.h index cadc04aa29..3be43fa397 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/diagramgraphicsscene.h +++ b/src/libs/modelinglib/qmt/diagram_scene/diagramgraphicsscene.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DIAGRAMGRAPHICSSCENE_H -#define QMT_DIAGRAMGRAPHICSSCENE_H +#pragma once #include <QGraphicsScene> #include "qmt/infrastructure/qmt_global.h" @@ -69,5 +68,3 @@ private: }; } // namespace qmt - -#endif // QMT_DIAGRAMGRAPHICSSCENE_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramsceneconstants.h b/src/libs/modelinglib/qmt/diagram_scene/diagramsceneconstants.h index 01d6256110..6f7d0a89e2 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/diagramsceneconstants.h +++ b/src/libs/modelinglib/qmt/diagram_scene/diagramsceneconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DIAGRAMSCENECONSTANTS_H -#define QMT_DIAGRAMSCENECONSTANTS_H +#pragma once namespace qmt { @@ -45,5 +44,3 @@ const double CUSTOM_ICON_MINIMUM_AUTO_WIDTH = 40.0; // must be n * 2 * RASTER_WI const double CUSTOM_ICON_MINIMUM_AUTO_HEIGHT = 40.0; // must be n * 2 * RASTER_HEIGHT } // namespace qmt - -#endif // QMT_DIAGRAMSCENECONSTANTS_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h index 16b6ecdda9..1b616710cf 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h +++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DIAGRAMSCENEMODEL_H -#define QMT_DIAGRAMSCENEMODEL_H +#pragma once #include <QObject> #include "qmt/infrastructure/qmt_global.h" @@ -184,5 +183,3 @@ private: }; } // namespace qmt - -#endif // QMT_DIAGRAMSCENEMODEL_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.h b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.h index 40c460e447..138f087481 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.h +++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodelitemvisitors.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DIAGRAMSCENEMODELITEMVISITORS_H -#define QMT_DIAGRAMSCENEMODELITEMVISITORS_H +#pragma once #include "diagramscenemodel.h" @@ -85,5 +84,3 @@ private: }; } // namespace qmt - -#endif // QMT_DIAGRAMSCENEMODELITEMVISITORS_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.h index 12bff51a35..29e16224ec 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.h +++ b/src/libs/modelinglib/qmt/diagram_scene/items/annotationitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_ANNOTATIONITEM_H -#define QMT_ANNOTATIONITEM_H +#pragma once #include <QGraphicsItem> @@ -111,5 +110,3 @@ private: }; } // namespace qmt - -#endif // QMT_ANNOTATIONITEM_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.h index 9b2966d74f..ad076eee59 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.h +++ b/src/libs/modelinglib/qmt/diagram_scene/items/associationitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_GRAPHICSASSOCIATIONITEM_H -#define QMT_GRAPHICSASSOCIATIONITEM_H +#pragma once #include "relationitem.h" @@ -63,5 +62,3 @@ private: }; } // namespace qmt - -#endif // QMT_GRAPHICSASSOCIATIONITEM_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.h index f00ddfba9b..b6b3380beb 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.h +++ b/src/libs/modelinglib/qmt/diagram_scene/items/boundaryitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_BOUNDARYITEM_H -#define QMT_BOUNDARYITEM_H +#pragma once #include <QGraphicsItem> @@ -110,5 +109,3 @@ private: }; } // namespace qmt - -#endif // QMT_BOUNDARYITEM_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h index 1e0df2a451..c4312a313c 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h +++ b/src/libs/modelinglib/qmt/diagram_scene/items/classitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_GRAPHICSCLASSITEM_H -#define QMT_GRAPHICSCLASSITEM_H +#pragma once #include "objectitem.h" @@ -93,5 +92,3 @@ private: }; } // namespace qmt - -#endif // QMT_GRAPHICSCLASSITEM_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.h index d0b294ba3b..1b524247f3 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.h +++ b/src/libs/modelinglib/qmt/diagram_scene/items/componentitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_GRAPHICSCOMPONENTITEM_H -#define QMT_GRAPHICSCOMPONENTITEM_H +#pragma once #include "objectitem.h" @@ -79,5 +78,3 @@ private: }; } // namespace qmt - -#endif // QMT_GRAPHICSCOMPONENTITEM_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.h index 0d3596b9ef..33919920a6 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.h +++ b/src/libs/modelinglib/qmt/diagram_scene/items/diagramitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_GRAPHICSDIAGRAMITEM_H -#define QMT_GRAPHICSDIAGRAMITEM_H +#pragma once #include "objectitem.h" @@ -58,5 +57,3 @@ private: }; } // namespace qmt - -#endif // QMT_GRAPHICSDIAGRAMITEM_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.h index 0c64c1d333..49a3c2fc58 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.h +++ b/src/libs/modelinglib/qmt/diagram_scene/items/itemitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_ITEMITEM_H -#define QMT_ITEMITEM_H +#pragma once #include "objectitem.h" @@ -75,5 +74,3 @@ private: }; } // namespace qmt - -#endif // QMT_ITEMITEM_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h index 6d8901b4c8..4560a6fbbb 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h +++ b/src/libs/modelinglib/qmt/diagram_scene/items/objectitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_OBJECTITEM_H -#define QMT_OBJECTITEM_H +#pragma once #include <QGraphicsItem> @@ -175,5 +174,3 @@ private: }; } // namespace qmt - -#endif // QMT_OBJECTITEM_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.h index 99f6587cba..c08add8368 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.h +++ b/src/libs/modelinglib/qmt/diagram_scene/items/packageitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_GRAPHICSPACKAGEITEM_H -#define QMT_GRAPHICSPACKAGEITEM_H +#pragma once #include "objectitem.h" @@ -76,5 +75,3 @@ private: }; } // namespace qmt - -#endif // QMT_GRAPHICSPACKAGEITEM_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h index d81470a759..983d480fbc 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h +++ b/src/libs/modelinglib/qmt/diagram_scene/items/relationitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_GRAPHICSRELATIONITEM_H -#define QMT_GRAPHICSRELATIONITEM_H +#pragma once #include <QGraphicsItem> #include "qmt/diagram_scene/capabilities/moveable.h" @@ -109,5 +108,3 @@ protected: }; } // namespace qmt - -#endif // QMT_GRAPHICSRELATIONITEM_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.h b/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.h index 4d01efddfe..cac65534d2 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.h +++ b/src/libs/modelinglib/qmt/diagram_scene/items/stereotypedisplayvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_STEREOTYPEDISPLAYVISITOR_H -#define QMT_STEREOTYPEDISPLAYVISITOR_H +#pragma once #include "qmt/diagram_controller/dvoidvisitor.h" @@ -67,5 +66,3 @@ private: }; } // namespace qmt - -#endif // QMT_STEREOTYPEDISPLAYVISITOR_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.h b/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.h index c478ce0faa..fc91764d2f 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.h +++ b/src/libs/modelinglib/qmt/diagram_scene/latchcontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_LATCHCONTROLLER_H -#define QMT_LATCHCONTROLLER_H +#pragma once #include <QObject> #include "qmt/infrastructure/qmt_global.h" @@ -80,5 +79,3 @@ private: }; } // namespace qmt - -#endif // QMT_LATCHCONTROLLER_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.h index 14144170b0..96a48f3d8a 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.h +++ b/src/libs/modelinglib/qmt/diagram_scene/parts/alignbuttonsitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_ALIGNBUTTONSITEM_H -#define QMT_ALIGNBUTTONSITEM_H +#pragma once #include "qmt/diagram_scene/capabilities/alignable.h" @@ -64,5 +63,3 @@ private: }; } // namespace qmt - -#endif // QMT_ALIGNBUTTONSITEM_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/alignlineitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/alignlineitem.h index 1d8c240ea3..a630efc2b7 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/alignlineitem.h +++ b/src/libs/modelinglib/qmt/diagram_scene/parts/alignlineitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_ALIGNLINEITEM_H -#define QMT_ALIGNLINEITEM_H +#pragma once #include <QGraphicsItem> @@ -54,5 +53,3 @@ public: }; } // namespace qmt - -#endif // QMT_ALIGNLINEITEM_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.h index c10b2817a3..1db2c532cd 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.h +++ b/src/libs/modelinglib/qmt/diagram_scene/parts/arrowitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_GRAPHICSARROWITEM_H -#define QMT_GRAPHICSARROWITEM_H +#pragma once #include <QGraphicsItem> @@ -101,5 +100,3 @@ private: }; } // namespace qmt - -#endif // QMT_GRAPHICSARROWITEM_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/contextlabelitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/contextlabelitem.h index 3f85103642..3bbce88073 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/contextlabelitem.h +++ b/src/libs/modelinglib/qmt/diagram_scene/parts/contextlabelitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_CONTEXTLABELITEM_H -#define QMT_CONTEXTLABELITEM_H +#pragma once #include <QGraphicsSimpleTextItem> @@ -49,5 +48,3 @@ private: }; } // namespace qmt - -#endif // QMT_CONTEXTLABELITEM_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.h index ebdbbaea97..a1280f45e6 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.h +++ b/src/libs/modelinglib/qmt/diagram_scene/parts/customiconitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_CUSTOMICONITEM_H -#define QMT_CUSTOMICONITEM_H +#pragma once #include <QGraphicsItem> @@ -67,5 +66,3 @@ private: }; } // namespace qmt - -#endif // QMT_CUSTOMICONITEM_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.h index 488058e9f1..b3e93ecd1b 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.h +++ b/src/libs/modelinglib/qmt/diagram_scene/parts/editabletextitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_EDITABLETEXTITEM_H -#define QMT_EDITABLETEXTITEM_H +#pragma once #include <QGraphicsTextItem> @@ -63,5 +62,3 @@ private: }; } // namespace qmt - -#endif // QMT_EDITABLETEXTITEM_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h index 04e112949d..b38688e2a0 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h +++ b/src/libs/modelinglib/qmt/diagram_scene/parts/pathselectionitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_GRAPHICSPATHSELECTIONITEM_H -#define QMT_GRAPHICSPATHSELECTIONITEM_H +#pragma once #include <QGraphicsItem> @@ -82,5 +81,3 @@ private: }; } // namespace qmt - -#endif // QMT_GRAPHICSPATHSELECTIONITEM_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.h index b07e886de8..bb82cc4460 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.h +++ b/src/libs/modelinglib/qmt/diagram_scene/parts/rectangularselectionitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_RECTENGULARSELECTIONITEM_H -#define QMT_RECTENGULARSELECTIONITEM_H +#pragma once #include <QGraphicsItem> #include <QVector> @@ -114,5 +113,3 @@ private: }; } // namespace qmt - -#endif // QMT_RECTENGULARSELECTIONITEM_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.h b/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.h index d345108b1d..cbf69e9244 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.h +++ b/src/libs/modelinglib/qmt/diagram_scene/parts/relationstarter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_GRAPHICSRELATIONSTARTER_H -#define QMT_GRAPHICSRELATIONSTARTER_H +#pragma once #include <QGraphicsRectItem> @@ -71,5 +70,3 @@ private: }; } // namespace qmt - -#endif // QMT_GRAPHICSRELATIONSTARTER_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/stereotypesitem.h b/src/libs/modelinglib/qmt/diagram_scene/parts/stereotypesitem.h index 2e4868024f..bfb5808261 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/stereotypesitem.h +++ b/src/libs/modelinglib/qmt/diagram_scene/parts/stereotypesitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_GRAPHICSSTEREOTYPESITEM_H -#define QMT_GRAPHICSSTEREOTYPESITEM_H +#pragma once #include <QGraphicsSimpleTextItem> #include <QList> @@ -43,5 +42,3 @@ public: }; } // namespace qmt - -#endif // QMT_GRAPHICSSTEREOTYPESITEM_H diff --git a/src/libs/modelinglib/qmt/diagram_scene/parts/templateparameterbox.h b/src/libs/modelinglib/qmt/diagram_scene/parts/templateparameterbox.h index b22009193c..63349f8ab8 100644 --- a/src/libs/modelinglib/qmt/diagram_scene/parts/templateparameterbox.h +++ b/src/libs/modelinglib/qmt/diagram_scene/parts/templateparameterbox.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_TEMPLATEPARAMETERBOX_H -#define QMT_TEMPLATEPARAMETERBOX_H +#pragma once #include <QGraphicsRectItem> @@ -51,5 +50,3 @@ private: }; } // namespace qmt - -#endif // QMT_TEMPLATEPARAMETERBOX_H diff --git a/src/libs/modelinglib/qmt/diagram_ui/diagram_mime_types.h b/src/libs/modelinglib/qmt/diagram_ui/diagram_mime_types.h index b8df13c86d..5926f07ba1 100644 --- a/src/libs/modelinglib/qmt/diagram_ui/diagram_mime_types.h +++ b/src/libs/modelinglib/qmt/diagram_ui/diagram_mime_types.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DIAGRAM_MIME_TYPES_H -#define QMT_DIAGRAM_MIME_TYPES_H +#pragma once namespace qmt { @@ -41,5 +40,3 @@ static const char ELEMENT_TYPE_ANNOTATION[] = "annotation"; static const char ELEMENT_TYPE_BOUNDARY[] = "boundary"; } // namespace qmt - -#endif // QMT_DIAGRAM_MIME_TYPES_H diff --git a/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.h b/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.h index df7a57fbd9..f9af7636a0 100644 --- a/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.h +++ b/src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DIAGRAMSMANAGER_H -#define QMT_DIAGRAMSMANAGER_H +#pragma once #include <QObject> @@ -94,5 +93,3 @@ private: }; } // namespace qmt - -#endif // QMT_DIAGRAMSMANAGER_H diff --git a/src/libs/modelinglib/qmt/diagram_ui/diagramsviewinterface.h b/src/libs/modelinglib/qmt/diagram_ui/diagramsviewinterface.h index afa95b5d8f..9aacb765d5 100644 --- a/src/libs/modelinglib/qmt/diagram_ui/diagramsviewinterface.h +++ b/src/libs/modelinglib/qmt/diagram_ui/diagramsviewinterface.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DIAGRAMSVIEWINTERFACE_H -#define QMT_DIAGRAMSVIEWINTERFACE_H +#pragma once namespace qmt { @@ -43,5 +42,3 @@ public: }; } // namespace qmt - -#endif // QMT_DIAGRAMSVIEWINTERFACE_H diff --git a/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.h b/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.h index f42969b5a0..9cd964a6d9 100644 --- a/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.h +++ b/src/libs/modelinglib/qmt/diagram_ui/sceneinspector.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_SCENEINSPECTOR_H -#define QMT_SCENEINSPECTOR_H +#pragma once #include <QObject> #include "qmt/tasks/isceneinspector.h" @@ -52,5 +51,3 @@ private: }; } // namespace qmt - -#endif // QMT_SCENEINSPECTOR_H diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.h b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.h index e797150dcc..6913957b66 100644 --- a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.h +++ b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DIAGRAMSVIEW_H -#define QMT_DIAGRAMSVIEW_H +#pragma once #include <QTabWidget> @@ -75,5 +74,3 @@ private: }; } // namespace qmt - -#endif // DIAGRAMSVIEW_H diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.h b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.h index ee0eb2dfc1..3ddc1951b1 100644 --- a/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.h +++ b/src/libs/modelinglib/qmt/diagram_widgets_ui/diagramview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DIAGRAMVIEW_H -#define QMT_DIAGRAMVIEW_H +#pragma once #include <QGraphicsView> #include "qmt/infrastructure/qmt_global.h" @@ -56,5 +55,3 @@ private: }; } // namespace qmt - -#endif // QMT_DIAGRAMVIEW_H diff --git a/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.h b/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.h index 2b66884f08..d4b9eb1b3f 100644 --- a/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.h +++ b/src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_STACKEDDIAGRAMSVIEW_H -#define QMT_STACKEDDIAGRAMSVIEW_H +#pragma once #include <QStackedWidget> @@ -73,5 +72,3 @@ private: }; } // namespace qmt - -#endif // QMT_STACKEDDIAGRAMSVIEW_H diff --git a/src/libs/modelinglib/qmt/document_controller/documentcontroller.h b/src/libs/modelinglib/qmt/document_controller/documentcontroller.h index 2c04e1ae50..d9a253773f 100644 --- a/src/libs/modelinglib/qmt/document_controller/documentcontroller.h +++ b/src/libs/modelinglib/qmt/document_controller/documentcontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DOCUMENTCONTROLLER_H -#define QMT_DOCUMENTCONTROLLER_H +#pragma once #include <QObject> #include "qmt/infrastructure/qmt_global.h" @@ -124,5 +123,3 @@ private: }; } // namespace qmt - -#endif // QMT_DOCUMENTCONTROLLER_H diff --git a/src/libs/modelinglib/qmt/infrastructure/contextmenuaction.h b/src/libs/modelinglib/qmt/infrastructure/contextmenuaction.h index de056f8b30..ea6f2cd504 100644 --- a/src/libs/modelinglib/qmt/infrastructure/contextmenuaction.h +++ b/src/libs/modelinglib/qmt/infrastructure/contextmenuaction.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_CONTEXTMENUACTION_H -#define QMT_CONTEXTMENUACTION_H +#pragma once #include <QAction> @@ -45,5 +44,3 @@ private: }; } // namespace qmt - -#endif // QMT_CONTEXTMENUACTION_H diff --git a/src/libs/modelinglib/qmt/infrastructure/exceptions.h b/src/libs/modelinglib/qmt/infrastructure/exceptions.h index 16824f10de..cbf4b86856 100644 --- a/src/libs/modelinglib/qmt/infrastructure/exceptions.h +++ b/src/libs/modelinglib/qmt/infrastructure/exceptions.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_EXCEPTIONS_H -#define QMT_EXCEPTIONS_H +#pragma once #include "qmt_global.h" @@ -55,5 +54,3 @@ public: }; } // namespace qmt - -#endif // QMT_EXCEPTIONS_H diff --git a/src/libs/modelinglib/qmt/infrastructure/geometryutilities.h b/src/libs/modelinglib/qmt/infrastructure/geometryutilities.h index 003556a791..c0062aa297 100644 --- a/src/libs/modelinglib/qmt/infrastructure/geometryutilities.h +++ b/src/libs/modelinglib/qmt/infrastructure/geometryutilities.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_GEOMETRYUTILITIES_H -#define QMT_GEOMETRYUTILITIES_H +#pragma once #include <QtGlobal> @@ -69,5 +68,3 @@ public: }; } // namespace qmt - -#endif // QMT_GEOMETRYUTILITIES_H diff --git a/src/libs/modelinglib/qmt/infrastructure/handle.h b/src/libs/modelinglib/qmt/infrastructure/handle.h index d94fa160af..261f8c7460 100644 --- a/src/libs/modelinglib/qmt/infrastructure/handle.h +++ b/src/libs/modelinglib/qmt/infrastructure/handle.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_HANDLE_H -#define QMT_HANDLE_H +#pragma once #include "uid.h" #include "qmtassert.h" @@ -99,5 +98,3 @@ Handle<T> handle_dynamic_cast(const Handle<U> &handle) } } // namespace qmt - -#endif // QMT_HANDLE_H diff --git a/src/libs/modelinglib/qmt/infrastructure/handles.h b/src/libs/modelinglib/qmt/infrastructure/handles.h index b7dd70f25c..d0e4c83ea5 100644 --- a/src/libs/modelinglib/qmt/infrastructure/handles.h +++ b/src/libs/modelinglib/qmt/infrastructure/handles.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_HANDLES_H -#define QMT_HANDLES_H +#pragma once #include "handle.h" #include "qmt/infrastructure/qmtassert.h" @@ -240,5 +239,3 @@ template<typename T> bool operator!=(const Handles<T> &lhs, const Handles<T> &rhs) { return !(lhs == rhs); } } // namespace qmt - -#endif // QMT_HANDLES_H diff --git a/src/libs/modelinglib/qmt/infrastructure/ioexceptions.h b/src/libs/modelinglib/qmt/infrastructure/ioexceptions.h index 2a5d56e5e9..cba138b056 100644 --- a/src/libs/modelinglib/qmt/infrastructure/ioexceptions.h +++ b/src/libs/modelinglib/qmt/infrastructure/ioexceptions.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_IOEXCEPTIONS_H -#define QMT_IOEXCEPTIONS_H +#pragma once #include "exceptions.h" @@ -87,5 +86,3 @@ public: }; } // namespace qmt - -#endif // QMT_IOEXCEPTIONS_H diff --git a/src/libs/modelinglib/qmt/infrastructure/qcompressedfile.h b/src/libs/modelinglib/qmt/infrastructure/qcompressedfile.h index 94007e7a5c..dad4f9a596 100644 --- a/src/libs/modelinglib/qmt/infrastructure/qcompressedfile.h +++ b/src/libs/modelinglib/qmt/infrastructure/qcompressedfile.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QCOMPRESSEDDEVICE_H -#define QCOMPRESSEDDEVICE_H +#pragma once #include <QIODevice> #include <QByteArray> @@ -60,5 +59,3 @@ private: }; } // namespace qmt - -#endif // QCOMPRESSEDDEVICE_H diff --git a/src/libs/modelinglib/qmt/infrastructure/qmt_global.h b/src/libs/modelinglib/qmt/infrastructure/qmt_global.h index 3899eed807..d96df8d624 100644 --- a/src/libs/modelinglib/qmt/infrastructure/qmt_global.h +++ b/src/libs/modelinglib/qmt/infrastructure/qmt_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_GLOBAL_H -#define QMT_GLOBAL_H +#pragma once #include <QtCore/QtGlobal> @@ -33,6 +32,3 @@ #else # define QMT_EXPORT Q_DECL_IMPORT #endif - -#endif // QMT_GLOBAL_H - diff --git a/src/libs/modelinglib/qmt/infrastructure/qmtassert.h b/src/libs/modelinglib/qmt/infrastructure/qmtassert.h index 7580a044fb..c87076be25 100644 --- a/src/libs/modelinglib/qmt/infrastructure/qmtassert.h +++ b/src/libs/modelinglib/qmt/infrastructure/qmtassert.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_QMTASSERT_H -#define QMT_QMTASSERT_H +#pragma once #include "utils/qtcassert.h" @@ -32,5 +31,3 @@ #define QMT_CHECK(condition) QTC_CHECK(condition) // TODO implement logging of where and what #define QMT_CHECK_X(condition, where, what) QTC_CHECK(condition) - -#endif // QMT_QMTASSERT_H diff --git a/src/libs/modelinglib/qmt/infrastructure/uid.h b/src/libs/modelinglib/qmt/infrastructure/uid.h index 30b99a83a2..757f5c11b0 100644 --- a/src/libs/modelinglib/qmt/infrastructure/uid.h +++ b/src/libs/modelinglib/qmt/infrastructure/uid.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_UID_H -#define QMT_UID_H +#pragma once #include "qmt_global.h" @@ -87,5 +86,3 @@ inline QDataStream &operator>>(QDataStream &stream, Uid &uid) } // namespace qmt Q_DECLARE_METATYPE(qmt::Uid) - -#endif // QMT_UID_H diff --git a/src/libs/modelinglib/qmt/model/massociation.h b/src/libs/modelinglib/qmt/model/massociation.h index 1d4ebc8a21..82f6bdf0c6 100644 --- a/src/libs/modelinglib/qmt/model/massociation.h +++ b/src/libs/modelinglib/qmt/model/massociation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MASSOCIATION_H -#define QMT_MASSOCIATION_H +#pragma once #include "mrelation.h" #include "qmt/infrastructure/handle.h" @@ -95,5 +94,3 @@ private: }; } // namespace qmt - -#endif // QMT_MASSOCIATION_H diff --git a/src/libs/modelinglib/qmt/model/mcanvasdiagram.h b/src/libs/modelinglib/qmt/model/mcanvasdiagram.h index 7f54c9d2c8..303be48144 100644 --- a/src/libs/modelinglib/qmt/model/mcanvasdiagram.h +++ b/src/libs/modelinglib/qmt/model/mcanvasdiagram.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MCANVASDIAGRAM_H -#define QMT_MCANVASDIAGRAM_H +#pragma once #include "mdiagram.h" @@ -41,5 +40,3 @@ public: }; } // namespace qmt - -#endif // QMT_MCANVASDIAGRAM_H diff --git a/src/libs/modelinglib/qmt/model/mclass.h b/src/libs/modelinglib/qmt/model/mclass.h index a37b30b516..d026172685 100644 --- a/src/libs/modelinglib/qmt/model/mclass.h +++ b/src/libs/modelinglib/qmt/model/mclass.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MCLASS_H -#define QMT_MCLASS_H +#pragma once #include "mobject.h" #include "mclassmember.h" @@ -64,5 +63,3 @@ private: }; } // namespace qmt - -#endif // QMT_MCLASS_H diff --git a/src/libs/modelinglib/qmt/model/mclassmember.h b/src/libs/modelinglib/qmt/model/mclassmember.h index cdba8f5a5a..99acb8d2ae 100644 --- a/src/libs/modelinglib/qmt/model/mclassmember.h +++ b/src/libs/modelinglib/qmt/model/mclassmember.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MCLASSMEMBER_H -#define QMT_MCLASSMEMBER_H +#pragma once #include "qmt/infrastructure/uid.h" @@ -104,5 +103,3 @@ private: bool operator==(const MClassMember &lhs, const MClassMember &rhs); } // namespace qmt - -#endif // QMT_MCLASSMEMBER_H diff --git a/src/libs/modelinglib/qmt/model/mcomponent.h b/src/libs/modelinglib/qmt/model/mcomponent.h index 4fde25a218..b0580dde70 100644 --- a/src/libs/modelinglib/qmt/model/mcomponent.h +++ b/src/libs/modelinglib/qmt/model/mcomponent.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MCOMPONENT_H -#define QMT_MCOMPONENT_H +#pragma once #include "mobject.h" @@ -41,5 +40,3 @@ public: }; } // namespace qmt - -#endif // QMT_MCOMPONENT_H diff --git a/src/libs/modelinglib/qmt/model/mconstvisitor.h b/src/libs/modelinglib/qmt/model/mconstvisitor.h index 8bfd9c39fb..fcfa9665fc 100644 --- a/src/libs/modelinglib/qmt/model/mconstvisitor.h +++ b/src/libs/modelinglib/qmt/model/mconstvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MCONSTVISITOR_H -#define QMT_MCONSTVISITOR_H +#pragma once namespace qmt { @@ -63,5 +62,3 @@ public: }; } // namespace qmt - -#endif // QMT_MCONSTVISITOR_H diff --git a/src/libs/modelinglib/qmt/model/mdependency.h b/src/libs/modelinglib/qmt/model/mdependency.h index 27acfe696d..f2754c4f9c 100644 --- a/src/libs/modelinglib/qmt/model/mdependency.h +++ b/src/libs/modelinglib/qmt/model/mdependency.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MDEPENDENCY_H -#define QMT_MDEPENDENCY_H +#pragma once #include "mrelation.h" @@ -62,5 +61,3 @@ private: }; } // namespace qmt - -#endif // QMT_MDEPENDENCY_H diff --git a/src/libs/modelinglib/qmt/model/mdiagram.h b/src/libs/modelinglib/qmt/model/mdiagram.h index 47ea04abf9..41f54cfec2 100644 --- a/src/libs/modelinglib/qmt/model/mdiagram.h +++ b/src/libs/modelinglib/qmt/model/mdiagram.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MDIAGRAM_H -#define QMT_MDIAGRAM_H +#pragma once #include "mobject.h" @@ -69,5 +68,3 @@ private: }; } // namespace qmt - -#endif // QMT_MDIAGRAM_H diff --git a/src/libs/modelinglib/qmt/model/melement.h b/src/libs/modelinglib/qmt/model/melement.h index 864bf3464e..b83b5bd980 100644 --- a/src/libs/modelinglib/qmt/model/melement.h +++ b/src/libs/modelinglib/qmt/model/melement.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MELEMENT_H -#define QMT_MELEMENT_H +#pragma once #include "qmt/infrastructure/uid.h" @@ -91,5 +90,3 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(MElement::Flags) } // namespace qmt - -#endif // QMT_MELEMENT_H diff --git a/src/libs/modelinglib/qmt/model/minheritance.h b/src/libs/modelinglib/qmt/model/minheritance.h index e1be05e557..2154d4f4de 100644 --- a/src/libs/modelinglib/qmt/model/minheritance.h +++ b/src/libs/modelinglib/qmt/model/minheritance.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MINHERITANCE_H -#define QMT_MINHERITANCE_H +#pragma once #include "mrelation.h" #include "qmt/infrastructure/handle.h" @@ -50,5 +49,3 @@ public: }; } // namespace qmt - -#endif // QMT_MINHERITANCE_H diff --git a/src/libs/modelinglib/qmt/model/mitem.h b/src/libs/modelinglib/qmt/model/mitem.h index 940c4fadfb..ebedea5efe 100644 --- a/src/libs/modelinglib/qmt/model/mitem.h +++ b/src/libs/modelinglib/qmt/model/mitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MITEM_H -#define QMT_MITEM_H +#pragma once #include "mobject.h" @@ -53,5 +52,3 @@ private: }; } // namespace qmt - -#endif // QMT_MITEM_H diff --git a/src/libs/modelinglib/qmt/model/mobject.h b/src/libs/modelinglib/qmt/model/mobject.h index e3478b9e7b..62e3d8b569 100644 --- a/src/libs/modelinglib/qmt/model/mobject.h +++ b/src/libs/modelinglib/qmt/model/mobject.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MOBJECT_H -#define QMT_MOBJECT_H +#pragma once #include "melement.h" #include "qmt/infrastructure/handles.h" @@ -76,5 +75,3 @@ private: }; } // namespace qmt - -#endif // QMT_MOBJECT_H diff --git a/src/libs/modelinglib/qmt/model/mpackage.h b/src/libs/modelinglib/qmt/model/mpackage.h index 721231a6de..78bf459936 100644 --- a/src/libs/modelinglib/qmt/model/mpackage.h +++ b/src/libs/modelinglib/qmt/model/mpackage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MPACKAGE_H -#define QMT_MPACKAGE_H +#pragma once #include "mobject.h" #include "qmt/infrastructure/handles.h" @@ -42,5 +41,3 @@ public: }; } // namespace qmt - -#endif // QMT_MPACKAGE_H diff --git a/src/libs/modelinglib/qmt/model/mrelation.h b/src/libs/modelinglib/qmt/model/mrelation.h index 3d7fc504ee..85f6cee6df 100644 --- a/src/libs/modelinglib/qmt/model/mrelation.h +++ b/src/libs/modelinglib/qmt/model/mrelation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MRELATION_H -#define QMT_MRELATION_H +#pragma once #include "melement.h" @@ -60,5 +59,3 @@ private: }; } // namespace qmt - -#endif // QMT_MRELATION_H diff --git a/src/libs/modelinglib/qmt/model/msourceexpansion.h b/src/libs/modelinglib/qmt/model/msourceexpansion.h index 049da96ef7..eb7c1bc3a5 100644 --- a/src/libs/modelinglib/qmt/model/msourceexpansion.h +++ b/src/libs/modelinglib/qmt/model/msourceexpansion.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MSOURCEEXPANSION_H -#define QMT_MSOURCEEXPANSION_H +#pragma once #include "melement.h" @@ -52,5 +51,3 @@ private: }; } // namespace qmt - -#endif // QMT_MSOURCEEXPANSION_H diff --git a/src/libs/modelinglib/qmt/model/mvisitor.h b/src/libs/modelinglib/qmt/model/mvisitor.h index 4b034bef38..bce52be8d0 100644 --- a/src/libs/modelinglib/qmt/model/mvisitor.h +++ b/src/libs/modelinglib/qmt/model/mvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MVISITOR_H -#define QMT_MVISITOR_H +#pragma once namespace qmt { @@ -63,5 +62,3 @@ public: }; } // namespace qmt - -#endif // QMT_MVISITOR_H diff --git a/src/libs/modelinglib/qmt/model_controller/mchildrenvisitor.h b/src/libs/modelinglib/qmt/model_controller/mchildrenvisitor.h index 79430540fa..406febde8e 100644 --- a/src/libs/modelinglib/qmt/model_controller/mchildrenvisitor.h +++ b/src/libs/modelinglib/qmt/model_controller/mchildrenvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MCHILDRENVISITOR_H -#define QMT_MCHILDRENVISITOR_H +#pragma once #include "qmt/model/mvisitor.h" #include "qmt/infrastructure/qmt_global.h" @@ -49,5 +48,3 @@ public: }; } // namespace qmt - -#endif // QMT_MCHILDRENVISITOR_H diff --git a/src/libs/modelinglib/qmt/model_controller/mclonevisitor.h b/src/libs/modelinglib/qmt/model_controller/mclonevisitor.h index 20b916f5a7..4d97acdd4f 100644 --- a/src/libs/modelinglib/qmt/model_controller/mclonevisitor.h +++ b/src/libs/modelinglib/qmt/model_controller/mclonevisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_CLONEVISITOR_H -#define QMT_CLONEVISITOR_H +#pragma once #include "qmt/model/mconstvisitor.h" #include "qmt/infrastructure/qmt_global.h" @@ -82,5 +81,3 @@ private: }; } // namespace qmt - -#endif // QMT_CLONEVISITOR_H diff --git a/src/libs/modelinglib/qmt/model_controller/mcontainer.h b/src/libs/modelinglib/qmt/model_controller/mcontainer.h index 1d70ba9980..22131f84d4 100644 --- a/src/libs/modelinglib/qmt/model_controller/mcontainer.h +++ b/src/libs/modelinglib/qmt/model_controller/mcontainer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MCONTAINER_H -#define QMT_MCONTAINER_H +#pragma once #include "qmt/controller/container.h" #include "qmt/model/melement.h" @@ -36,5 +35,3 @@ class QMT_EXPORT MContainer : public Container<MElement> }; } // namespace qmt - -#endif // QMT_MCONTAINER_H diff --git a/src/libs/modelinglib/qmt/model_controller/mflatassignmentvisitor.h b/src/libs/modelinglib/qmt/model_controller/mflatassignmentvisitor.h index 660d7cdd7f..49d696fd92 100644 --- a/src/libs/modelinglib/qmt/model_controller/mflatassignmentvisitor.h +++ b/src/libs/modelinglib/qmt/model_controller/mflatassignmentvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MFLATASSIGNMENTVISITOR_H -#define QMT_MFLATASSIGNMENTVISITOR_H +#pragma once #include "qmt/model/mconstvisitor.h" #include "qmt/infrastructure/qmt_global.h" @@ -56,5 +55,3 @@ private: }; } // namespace qmt - -#endif // QMT_MFLATASSIGNMENTVISITOR_H diff --git a/src/libs/modelinglib/qmt/model_controller/modelcontroller.h b/src/libs/modelinglib/qmt/model_controller/modelcontroller.h index 8b9f0fdf86..ccc53078a5 100644 --- a/src/libs/modelinglib/qmt/model_controller/modelcontroller.h +++ b/src/libs/modelinglib/qmt/model_controller/modelcontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MODELCONTROLLER_H -#define QMT_MODELCONTROLLER_H +#pragma once #include "qmt/infrastructure/uid.h" @@ -162,5 +161,3 @@ private: }; } // namespace qmt - -#endif // QMT_MODELCONTROLLER_H diff --git a/src/libs/modelinglib/qmt/model_controller/mreferences.h b/src/libs/modelinglib/qmt/model_controller/mreferences.h index 9a3e8e4986..ad61d1e181 100644 --- a/src/libs/modelinglib/qmt/model_controller/mreferences.h +++ b/src/libs/modelinglib/qmt/model_controller/mreferences.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MREFERENCES_H -#define QMT_MREFERENCES_H +#pragma once #include "qmt/controller/references.h" #include "qmt/infrastructure/qmt_global.h" @@ -38,5 +37,3 @@ class QMT_EXPORT MReferences : public References<MElement> }; } // namespace qmt - -#endif // QMT_MREFERENCES_H diff --git a/src/libs/modelinglib/qmt/model_controller/mselection.h b/src/libs/modelinglib/qmt/model_controller/mselection.h index f827023d10..3d0ea069f2 100644 --- a/src/libs/modelinglib/qmt/model_controller/mselection.h +++ b/src/libs/modelinglib/qmt/model_controller/mselection.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MSELECTION_H -#define QMT_MSELECTION_H +#pragma once #include "qmt/controller/selection.h" @@ -35,5 +34,3 @@ class QMT_EXPORT MSelection : public Selection }; } // namespace qmt - -#endif // QMT_MSELECTION_H diff --git a/src/libs/modelinglib/qmt/model_controller/mvoidvisitor.h b/src/libs/modelinglib/qmt/model_controller/mvoidvisitor.h index a7e75d5329..34404adbb2 100644 --- a/src/libs/modelinglib/qmt/model_controller/mvoidvisitor.h +++ b/src/libs/modelinglib/qmt/model_controller/mvoidvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MVOIDVISITOR_H -#define QMT_MVOIDVISITOR_H +#pragma once #include "qmt/model/mvisitor.h" #include "qmt/model/mconstvisitor.h" @@ -67,5 +66,3 @@ public: }; } // namespace qmt - -#endif // QMT_MVOIDVISITOR_H diff --git a/src/libs/modelinglib/qmt/model_ui/modeltreeviewinterface.h b/src/libs/modelinglib/qmt/model_ui/modeltreeviewinterface.h index 9bbf44d8dd..8e781f64db 100644 --- a/src/libs/modelinglib/qmt/model_ui/modeltreeviewinterface.h +++ b/src/libs/modelinglib/qmt/model_ui/modeltreeviewinterface.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MODELTREEVIEWINTERFACE_H -#define QMT_MODELTREEVIEWINTERFACE_H +#pragma once #include <QList> @@ -44,5 +43,3 @@ public: }; } // namespace qmt - -#endif // QMT_MODELTREEVIEWINTERFACE_H diff --git a/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h b/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h index ddef6d11e2..fed3721768 100644 --- a/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h +++ b/src/libs/modelinglib/qmt/model_ui/sortedtreemodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_SORTEDTREEMODEL_H -#define QMT_SORTEDTREEMODEL_H +#pragma once #include <QSortFilterProxyModel> #include "qmt/infrastructure/qmt_global.h" @@ -61,5 +60,3 @@ private: }; } // namespace qmt - -#endif // QMT_SORTEDTREEMODEL_H diff --git a/src/libs/modelinglib/qmt/model_ui/stereotypescontroller.h b/src/libs/modelinglib/qmt/model_ui/stereotypescontroller.h index 51e47ee7bc..e7034640df 100644 --- a/src/libs/modelinglib/qmt/model_ui/stereotypescontroller.h +++ b/src/libs/modelinglib/qmt/model_ui/stereotypescontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_STEREOTYPESCONTROLLER_H -#define QMT_STEREOTYPESCONTROLLER_H +#pragma once #include <QObject> #include "qmt/infrastructure/qmt_global.h" @@ -51,5 +50,3 @@ public: }; } // namespace qmt - -#endif // QMT_STEREOTYPESCONTROLLER_H diff --git a/src/libs/modelinglib/qmt/model_ui/treemodel.h b/src/libs/modelinglib/qmt/model_ui/treemodel.h index 0c987424e1..877a4a0fd5 100644 --- a/src/libs/modelinglib/qmt/model_ui/treemodel.h +++ b/src/libs/modelinglib/qmt/model_ui/treemodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_TREEMODEL_H -#define QMT_TREEMODEL_H +#pragma once #include <QStandardItemModel> #include "qmt/infrastructure/qmt_global.h" @@ -145,5 +144,3 @@ private: }; } // namespace qmt - -#endif // QMT_TREEMODEL_H diff --git a/src/libs/modelinglib/qmt/model_ui/treemodelmanager.h b/src/libs/modelinglib/qmt/model_ui/treemodelmanager.h index aefa738366..dfb604cd98 100644 --- a/src/libs/modelinglib/qmt/model_ui/treemodelmanager.h +++ b/src/libs/modelinglib/qmt/model_ui/treemodelmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_TREEMODELMANAGER_H -#define QMT_TREEMODELMANAGER_H +#pragma once #include <QObject> #include "qmt/infrastructure/qmt_global.h" @@ -61,5 +60,3 @@ private: }; } // namespace qmt - -#endif // QMT_TREEMODELMANAGER_H diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.h b/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.h index 2fe340e72f..ca23702742 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.h +++ b/src/libs/modelinglib/qmt/model_widgets_ui/classmembersedit.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_CLASSMEMBERSEDIT_H -#define QMT_CLASSMEMBERSEDIT_H +#pragma once #include <QPlainTextEdit> #include "qmt/infrastructure/qmt_global.h" @@ -63,5 +62,3 @@ private: }; } // namespace qmt - -#endif // QMT_CLASSMEMBERSEDIT_H diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h index 094b6a1118..bb910bd635 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h +++ b/src/libs/modelinglib/qmt/model_widgets_ui/modeltreeview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MODELTREEVIEW_H -#define QMT_MODELTREEVIEW_H +#pragma once #include <QTreeView> #include "qmt/infrastructure/qmt_global.h" @@ -75,5 +74,3 @@ private: }; } // namespace qmt - -#endif // QMT_MODELTREEVIEW_H diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/palettebox.h b/src/libs/modelinglib/qmt/model_widgets_ui/palettebox.h index b0fe0ed8a0..501b7ea758 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/palettebox.h +++ b/src/libs/modelinglib/qmt/model_widgets_ui/palettebox.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_PALETTEBOX_H -#define QMT_PALETTEBOX_H +#pragma once #include <QWidget> #include "qmt/infrastructure/qmt_global.h" @@ -67,5 +66,3 @@ private: }; } // namespace qmt - -#endif // QMT_PALETTEBOX_H diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.h b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.h index a4ea9b4d07..39c1f817a1 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.h +++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_PROPERTIESVIEW_H -#define QMT_PROPERTIESVIEW_H +#pragma once #include <QObject> @@ -130,5 +129,3 @@ private: }; } // namespace qmt - -#endif // QMT_PROPERTIESVIEW_H diff --git a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h index b5daf798de..a3fa23fb0d 100644 --- a/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h +++ b/src/libs/modelinglib/qmt/model_widgets_ui/propertiesviewmview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_PROPERTIESVIEWMVIEW_H -#define QMT_PROPERTIESVIEWMVIEW_H +#pragma once #include <QObject> @@ -248,5 +247,3 @@ protected: }; } // namespace qmt - -#endif // QMT_PROPERTIESVIEWMVIEW_H diff --git a/src/libs/modelinglib/qmt/project/project.h b/src/libs/modelinglib/qmt/project/project.h index 70dd4f6c4a..b135769d87 100644 --- a/src/libs/modelinglib/qmt/project/project.h +++ b/src/libs/modelinglib/qmt/project/project.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_PROJECT_H -#define QMT_PROJECT_H +#pragma once #include "qmt/infrastructure/uid.h" @@ -58,5 +57,3 @@ private: }; } // namespace qmt - -#endif // QMT_PROJECT_H diff --git a/src/libs/modelinglib/qmt/project_controller/projectcontroller.h b/src/libs/modelinglib/qmt/project_controller/projectcontroller.h index 26db1db74f..73daf2a2ac 100644 --- a/src/libs/modelinglib/qmt/project_controller/projectcontroller.h +++ b/src/libs/modelinglib/qmt/project_controller/projectcontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_PROJECTCONTROLLER_H -#define QMT_PROJECTCONTROLLER_H +#pragma once #include "qmt/infrastructure/exceptions.h" #include "qmt/infrastructure/qmt_global.h" @@ -78,5 +77,3 @@ private: }; } // namespace qmt - -#endif // PROJECTCONTROLLER_H diff --git a/src/libs/modelinglib/qmt/serializer/diagramserializer.h b/src/libs/modelinglib/qmt/serializer/diagramserializer.h index 60ac5619a6..85deb24ea2 100644 --- a/src/libs/modelinglib/qmt/serializer/diagramserializer.h +++ b/src/libs/modelinglib/qmt/serializer/diagramserializer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DIAGRAMSERIALIZER_H -#define QMT_DIAGRAMSERIALIZER_H +#pragma once #include "qmt/diagram/dannotation.h" #include "qmt/diagram/dobject.h" @@ -41,5 +40,3 @@ QARK_SERIALIZE_ENUM(qmt::DClass::TemplateDisplay) QARK_SERIALIZE_ENUM(qmt::DAnnotation::VisualRole) } // namespace qark - -#endif // QMT_DIAGRAMSERIALIZER_H diff --git a/src/libs/modelinglib/qmt/serializer/infrastructureserializer.h b/src/libs/modelinglib/qmt/serializer/infrastructureserializer.h index ff20644f26..1814fb6a9d 100644 --- a/src/libs/modelinglib/qmt/serializer/infrastructureserializer.h +++ b/src/libs/modelinglib/qmt/serializer/infrastructureserializer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_INFRASTRUCTURESERIALIZER_H -#define QMT_INFRASTRUCTURESERIALIZER_H +#pragma once #include "qmt/infrastructure/handle.h" #include "qmt/infrastructure/handles.h" @@ -75,5 +74,3 @@ inline void serialize(Archive &archive, qmt::Handles<T> &handles) } } // namespace qark - -#endif // QMT_INFRASTRUCTURESERIALIZER_H diff --git a/src/libs/modelinglib/qmt/serializer/modelserializer.h b/src/libs/modelinglib/qmt/serializer/modelserializer.h index 8d7d9524c4..58e96768a9 100644 --- a/src/libs/modelinglib/qmt/serializer/modelserializer.h +++ b/src/libs/modelinglib/qmt/serializer/modelserializer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_MODELSERIALIZER_H -#define QMT_MODELSERIALIZER_H +#pragma once #include "qmt/model/melement.h" #include "qmt/model/mclassmember.h" @@ -42,5 +41,3 @@ QARK_SERIALIZE_ENUM(qmt::MDependency::Direction) QARK_SERIALIZE_ENUM(qmt::MAssociationEnd::Kind) } // namespace qark - -#endif // QMT_MODELSERIALIZER_H diff --git a/src/libs/modelinglib/qmt/serializer/projectserializer.h b/src/libs/modelinglib/qmt/serializer/projectserializer.h index b20180af98..4229b776bf 100644 --- a/src/libs/modelinglib/qmt/serializer/projectserializer.h +++ b/src/libs/modelinglib/qmt/serializer/projectserializer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_PROJECTSERIALIZER_H -#define QMT_PROJECTSERIALIZER_H +#pragma once #include "qmt/infrastructure/qmt_global.h" @@ -54,5 +53,3 @@ private: }; } // namespace qmt - -#endif // QMT_PROJECTSERIALIZER_H diff --git a/src/libs/modelinglib/qmt/stereotype/iconshape.h b/src/libs/modelinglib/qmt/stereotype/iconshape.h index 49b7a27bba..0efea797ff 100644 --- a/src/libs/modelinglib/qmt/stereotype/iconshape.h +++ b/src/libs/modelinglib/qmt/stereotype/iconshape.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_ICONSHAPE_H -#define QMT_ICONSHAPE_H +#pragma once #include "qmt/infrastructure/qmt_global.h" #include <QSizeF> @@ -72,5 +71,3 @@ private: }; } // namespace qmt - -#endif // QMT_ICONSHAPE_H diff --git a/src/libs/modelinglib/qmt/stereotype/shape.h b/src/libs/modelinglib/qmt/stereotype/shape.h index 9cca553a33..467266b961 100644 --- a/src/libs/modelinglib/qmt/stereotype/shape.h +++ b/src/libs/modelinglib/qmt/stereotype/shape.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_SHAPE_H -#define QMT_SHAPE_H +#pragma once namespace qmt { @@ -42,5 +41,3 @@ public: }; } // namespace qmt - -#endif // QMT_SHAPE_H diff --git a/src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.h b/src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.h index 18552d85ae..67a90ee6ac 100644 --- a/src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.h +++ b/src/libs/modelinglib/qmt/stereotype/shapepaintvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_SHAPEPAINTVISITOR_H -#define QMT_SHAPEPAINTVISITOR_H +#pragma once #include "shapevisitor.h" #include "qmt/infrastructure/qmt_global.h" @@ -82,5 +81,3 @@ private: }; } // namespace qmt - -#endif // QMT_SHAPEPAINTVISITOR_H diff --git a/src/libs/modelinglib/qmt/stereotype/shapes.h b/src/libs/modelinglib/qmt/stereotype/shapes.h index c35bf95b27..88f4c6e392 100644 --- a/src/libs/modelinglib/qmt/stereotype/shapes.h +++ b/src/libs/modelinglib/qmt/stereotype/shapes.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_SHAPES_H -#define QMT_SHAPES_H +#pragma once #include "shape.h" #include "qmt/infrastructure/qmt_global.h" @@ -231,5 +230,3 @@ private: }; } // namespace qmt - -#endif // QMT_SHAPES_H diff --git a/src/libs/modelinglib/qmt/stereotype/shapevalue.h b/src/libs/modelinglib/qmt/stereotype/shapevalue.h index cb3f283a7c..4b2f09a1dc 100644 --- a/src/libs/modelinglib/qmt/stereotype/shapevalue.h +++ b/src/libs/modelinglib/qmt/stereotype/shapevalue.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_SHAPEVALUE_H -#define QMT_SHAPEVALUE_H +#pragma once #include "qmt/infrastructure/qmt_global.h" @@ -141,5 +140,3 @@ private: }; } // namespace qmt - -#endif // QMT_SHAPEVALUE_H diff --git a/src/libs/modelinglib/qmt/stereotype/shapevisitor.h b/src/libs/modelinglib/qmt/stereotype/shapevisitor.h index f068ddeb5b..6adbba12ba 100644 --- a/src/libs/modelinglib/qmt/stereotype/shapevisitor.h +++ b/src/libs/modelinglib/qmt/stereotype/shapevisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_SHAPEVISITOR_H -#define QMT_SHAPEVISITOR_H +#pragma once namespace qmt { @@ -65,5 +64,3 @@ public: }; } // namespace qmt - -#endif // QMT_SHAPEVISITOR_H diff --git a/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h b/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h index f833499e2b..990c2ae8b4 100644 --- a/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h +++ b/src/libs/modelinglib/qmt/stereotype/stereotypecontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_STEREOTYPECONTROLLER_H -#define QMT_STEREOTYPECONTROLLER_H +#pragma once #include <QObject> @@ -67,5 +66,3 @@ private: }; } // namespace qmt - -#endif // QMT_STEREOTYPECONTROLLER_H diff --git a/src/libs/modelinglib/qmt/stereotype/stereotypeicon.h b/src/libs/modelinglib/qmt/stereotype/stereotypeicon.h index 4b0eb0d0e1..354bd6f9ce 100644 --- a/src/libs/modelinglib/qmt/stereotype/stereotypeicon.h +++ b/src/libs/modelinglib/qmt/stereotype/stereotypeicon.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_STEREOTYPEICON_H -#define QMT_STEREOTYPEICON_H +#pragma once #include "iconshape.h" @@ -117,5 +116,3 @@ private: }; } // namespace qmt - -#endif // QMT_STEREOTYPEICON_H diff --git a/src/libs/modelinglib/qmt/stereotype/toolbar.h b/src/libs/modelinglib/qmt/stereotype/toolbar.h index f5af53b31b..b7422f408d 100644 --- a/src/libs/modelinglib/qmt/stereotype/toolbar.h +++ b/src/libs/modelinglib/qmt/stereotype/toolbar.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_TOOLBAR_H -#define QMT_TOOLBAR_H +#pragma once #include "qmt/infrastructure/qmt_global.h" @@ -80,5 +79,3 @@ private: }; } // namespace qmt - -#endif // QMT_TOOLBAR_H diff --git a/src/libs/modelinglib/qmt/style/defaultstyle.h b/src/libs/modelinglib/qmt/style/defaultstyle.h index 851a0c4191..89ec15fdaf 100644 --- a/src/libs/modelinglib/qmt/style/defaultstyle.h +++ b/src/libs/modelinglib/qmt/style/defaultstyle.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DEFAULTSTYLE_H -#define QMT_DEFAULTSTYLE_H +#pragma once #include "style.h" @@ -38,5 +37,3 @@ public: }; } // namespace qmt - -#endif // QMT_DEFAULTSTYLE_H diff --git a/src/libs/modelinglib/qmt/style/defaultstyleengine.h b/src/libs/modelinglib/qmt/style/defaultstyleengine.h index 3fe0933edc..792b9247a0 100644 --- a/src/libs/modelinglib/qmt/style/defaultstyleengine.h +++ b/src/libs/modelinglib/qmt/style/defaultstyleengine.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DEFAULTSTYLEENGINE_H -#define QMT_DEFAULTSTYLEENGINE_H +#pragma once #include "styleengine.h" @@ -91,5 +90,3 @@ private: }; } // namespace qmt - -#endif // QMT_DEFAULTSTYLEENGINE_H diff --git a/src/libs/modelinglib/qmt/style/objectvisuals.h b/src/libs/modelinglib/qmt/style/objectvisuals.h index b53e570675..715252befc 100644 --- a/src/libs/modelinglib/qmt/style/objectvisuals.h +++ b/src/libs/modelinglib/qmt/style/objectvisuals.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_OBJECTVISUALS_H -#define QMT_OBJECTVISUALS_H +#pragma once #include "qmt/diagram/dobject.h" @@ -64,5 +63,3 @@ bool operator==(const ObjectVisuals &lhs, const ObjectVisuals &rhs); uint qHash(const ObjectVisuals &objectVisuals); } // namespace qmt - -#endif // QMT_OBJECTVISUALS_H diff --git a/src/libs/modelinglib/qmt/style/relationstarterstyle.h b/src/libs/modelinglib/qmt/style/relationstarterstyle.h index fb39eda285..ed745c5776 100644 --- a/src/libs/modelinglib/qmt/style/relationstarterstyle.h +++ b/src/libs/modelinglib/qmt/style/relationstarterstyle.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_RELATIONSTARTERSTYLE_H -#define QMT_RELATIONSTARTERSTYLE_H +#pragma once #include "style.h" @@ -38,5 +37,3 @@ public: }; } // namespace qmt - -#endif // QMT_RELATIONSTARTERSTYLE_H diff --git a/src/libs/modelinglib/qmt/style/style.h b/src/libs/modelinglib/qmt/style/style.h index 8d67d8751e..9add43d26e 100644 --- a/src/libs/modelinglib/qmt/style/style.h +++ b/src/libs/modelinglib/qmt/style/style.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_STYLE_H -#define QMT_STYLE_H +#pragma once #include "qmt/infrastructure/qmt_global.h" @@ -83,5 +82,3 @@ private: }; } // namespace qmt - -#endif // QMT_STYLE_H diff --git a/src/libs/modelinglib/qmt/style/stylecontroller.h b/src/libs/modelinglib/qmt/style/stylecontroller.h index d8525374e8..344409e941 100644 --- a/src/libs/modelinglib/qmt/style/stylecontroller.h +++ b/src/libs/modelinglib/qmt/style/stylecontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_STYLECONTROLLER_H -#define QMT_STYLECONTROLLER_H +#pragma once #include <QObject> @@ -71,5 +70,3 @@ private: }; } // namespace qmt - -#endif // QMT_STYLECONTROLLER_H diff --git a/src/libs/modelinglib/qmt/style/styledobject.h b/src/libs/modelinglib/qmt/style/styledobject.h index 510729a3a3..26687065b7 100644 --- a/src/libs/modelinglib/qmt/style/styledobject.h +++ b/src/libs/modelinglib/qmt/style/styledobject.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_STYLEDOBJECT_H -#define QMT_STYLEDOBJECT_H +#pragma once #include "objectvisuals.h" @@ -52,5 +51,3 @@ private: }; } // namespace qmt - -#endif // QMT_ STYLEDOBJECT_H diff --git a/src/libs/modelinglib/qmt/style/styledrelation.h b/src/libs/modelinglib/qmt/style/styledrelation.h index 53a28d98ab..6811f3e3da 100644 --- a/src/libs/modelinglib/qmt/style/styledrelation.h +++ b/src/libs/modelinglib/qmt/style/styledrelation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_STYLEDRELATION_H -#define QMT_STYLEDRELATION_H +#pragma once #include "qmt/infrastructure/qmt_global.h" @@ -50,5 +49,3 @@ private: }; } // namespace qmt - -#endif // QMT_STYLEDRELATION_H diff --git a/src/libs/modelinglib/qmt/style/styleengine.h b/src/libs/modelinglib/qmt/style/styleengine.h index cbd70f14d6..2da52b429a 100644 --- a/src/libs/modelinglib/qmt/style/styleengine.h +++ b/src/libs/modelinglib/qmt/style/styleengine.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_STYLEENGINE_H -#define QMT_STYLEENGINE_H +#pragma once #include "qmt/infrastructure/qmt_global.h" @@ -81,5 +80,3 @@ public: }; } // namespace qmt - -#endif // QMT_STYLEENGINE_H diff --git a/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.h b/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.h index b7e760e2f0..994cab48c3 100644 --- a/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.h +++ b/src/libs/modelinglib/qmt/tasks/alignonrastervisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_ALIGNONRASTERVISITOR_H -#define QMT_ALIGNONRASTERVISITOR_H +#pragma once #include "qmt/diagram/dvisitor.h" #include "qmt/infrastructure/qmt_global.h" @@ -66,5 +65,3 @@ private: }; } // namespace qmt - -#endif // QMT_ALIGNONRASTERVISITOR_H diff --git a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h index cc678738a2..967e02f51c 100644 --- a/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h +++ b/src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_DIAGRAMSCENECONTROLLER_H -#define QMT_DIAGRAMSCENECONTROLLER_H +#pragma once #include <QObject> #include "qmt/infrastructure/qmt_global.h" @@ -133,5 +132,3 @@ private: }; } // namespace qmt - -#endif // QMT_DIAGRAMSCENECONTROLLER_H diff --git a/src/libs/modelinglib/qmt/tasks/finddiagramvisitor.h b/src/libs/modelinglib/qmt/tasks/finddiagramvisitor.h index 1b14b29015..bd664629f1 100644 --- a/src/libs/modelinglib/qmt/tasks/finddiagramvisitor.h +++ b/src/libs/modelinglib/qmt/tasks/finddiagramvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_FINDDIAGRAMVISITOR_H -#define QMT_FINDDIAGRAMVISITOR_H +#pragma once #include "qmt/model_controller/mvoidvisitor.h" @@ -46,5 +45,3 @@ private: }; } // namespace qmt - -#endif // QMT_FINDDIAGRAMVISITOR_H diff --git a/src/libs/modelinglib/qmt/tasks/findrootdiagramvisitor.h b/src/libs/modelinglib/qmt/tasks/findrootdiagramvisitor.h index 422376d27f..a520ef6e34 100644 --- a/src/libs/modelinglib/qmt/tasks/findrootdiagramvisitor.h +++ b/src/libs/modelinglib/qmt/tasks/findrootdiagramvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_FINDROOTDIAGRAMVISITOR_H -#define QMT_FINDROOTDIAGRAMVISITOR_H +#pragma once #include "qmt/model_controller/mvoidvisitor.h" @@ -47,5 +46,3 @@ private: }; } // namespace qmt - -#endif // QMT_FINDROOTDIAGRAMVISITOR_H diff --git a/src/libs/modelinglib/qmt/tasks/ielementtasks.h b/src/libs/modelinglib/qmt/tasks/ielementtasks.h index f7837b7df8..3120474ea6 100644 --- a/src/libs/modelinglib/qmt/tasks/ielementtasks.h +++ b/src/libs/modelinglib/qmt/tasks/ielementtasks.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_IELEMENTTASKS_H -#define QMT_IELEMENTTASKS_H +#pragma once namespace qmt { @@ -77,5 +76,3 @@ public: }; } // namespace qmt - -#endif // QMT_IELEMENTTASKS_H diff --git a/src/libs/modelinglib/qmt/tasks/isceneinspector.h b/src/libs/modelinglib/qmt/tasks/isceneinspector.h index d830f1ee7e..626bf06f66 100644 --- a/src/libs/modelinglib/qmt/tasks/isceneinspector.h +++ b/src/libs/modelinglib/qmt/tasks/isceneinspector.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_ISCENEINSPECTOR_H -#define QMT_ISCENEINSPECTOR_H +#pragma once #include <QtGlobal> @@ -51,5 +50,3 @@ public: }; } // namespace qmt - -#endif // QMT_ISCENEINSPECTOR_H diff --git a/src/libs/modelinglib/qmt/tasks/voidelementtasks.h b/src/libs/modelinglib/qmt/tasks/voidelementtasks.h index 92a576edec..4ed1dd19b6 100644 --- a/src/libs/modelinglib/qmt/tasks/voidelementtasks.h +++ b/src/libs/modelinglib/qmt/tasks/voidelementtasks.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMT_VOIDELEMENTTASKS_H -#define QMT_VOIDELEMENTTASKS_H +#pragma once #include "ielementtasks.h" #include "qmt/infrastructure/qmt_global.h" @@ -76,5 +75,3 @@ public: }; } // namespace qmt - -#endif // QMT_VOIDELEMENTTASKS_H diff --git a/src/libs/modelinglib/qstringparser/qstringparser.h b/src/libs/modelinglib/qstringparser/qstringparser.h index 43dae740ec..8735e9b60b 100644 --- a/src/libs/modelinglib/qstringparser/qstringparser.h +++ b/src/libs/modelinglib/qstringparser/qstringparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QSTRINGPARSER_H -#define QSTRINGPARSER_H +#pragma once #include <QString> #include <QList> @@ -138,5 +137,3 @@ public: private: const QString m_source; }; - -#endif // QSTRINGPARSER_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/access.h b/src/libs/modelinglib/qtserialization/inc/qark/access.h index bc12e32af8..276e6a275e 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/access.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/access.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_ACCESS_H -#define QARK_ACCESS_H +#pragma once namespace qark { @@ -106,5 +105,3 @@ void serializeHelper(Archive &archive, T &t) #define QARK_ACCESS_SPECIALIZE(INARCHIVE, OUTARCHIVE, TYPE) \ template class Access<INARCHIVE, TYPE>; \ template class Access<OUTARCHIVE, TYPE>; - -#endif // QARK_ACCESS_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/archivebasics.h b/src/libs/modelinglib/qtserialization/inc/qark/archivebasics.h index 4f9ad079d9..591954d20f 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/archivebasics.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/archivebasics.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_ARCHIVEBASICS_H -#define QARK_ARCHIVEBASICS_H +#pragma once #include "flag.h" @@ -84,5 +83,3 @@ private: }; } // namespace qark - -#endif // QARK_ARCHIVEBASICS_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/attribute.h b/src/libs/modelinglib/qtserialization/inc/qark/attribute.h index da1203ad53..7070964d6f 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/attribute.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/attribute.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_ATTRIBUTE_H -#define QARK_ATTRIBUTE_H +#pragma once #include "parameters.h" @@ -368,5 +367,3 @@ GetSetFuncAttr<U, T, V> attr(const QString &qualifiedName, U &u, T (*func)(const } } // namespace qark - -#endif // QARK_ATTRIBUTE_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/baseclass.h b/src/libs/modelinglib/qtserialization/inc/qark/baseclass.h index 99776515a3..4fae0f2e7a 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/baseclass.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/baseclass.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_BASECLASS_H -#define QARK_BASECLASS_H +#pragma once #include "typeregistry.h" #include "parameters.h" @@ -99,5 +98,3 @@ Base<BASE, DERIVED> base(DERIVED &obj, const Parameters ¶meters) } } // namespace qark - -#endif // QARK_BASECLASS_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/flag.h b/src/libs/modelinglib/qtserialization/inc/qark/flag.h index 932c6b4083..e1ac63c484 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/flag.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/flag.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_FLAG_H -#define QARK_FLAG_H +#pragma once namespace qark { @@ -43,5 +42,3 @@ private: }; } // namespace qark - -#endif // QARK_FLAG_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/friend_access.h b/src/libs/modelinglib/qtserialization/inc/qark/friend_access.h index 5c39a37aba..37b5fd35d0 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/friend_access.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/friend_access.h @@ -23,11 +23,8 @@ ** ****************************************************************************/ -#ifndef QARK_FRIEND_ACCESS_H -#define QARK_FRIEND_ACCESS_H +#pragma once #define QARK_FRIEND_ACCESS \ template<class Archive, class T> \ friend class qark::Access; - -#endif // QMT_FRIEND_ACCESS_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/impl/loadingrefmap.h b/src/libs/modelinglib/qtserialization/inc/qark/impl/loadingrefmap.h index 1e44d169cf..6e290bd927 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/impl/loadingrefmap.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/impl/loadingrefmap.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_LOADINGREFMAP_H -#define QARK_LOADINGREFMAP_H +#pragma once #include "objectid.h" @@ -63,5 +62,3 @@ private: } // namespace impl } // namespace qark - -#endif // QARK_LOADINGREFMAP_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/impl/objectid.h b/src/libs/modelinglib/qtserialization/inc/qark/impl/objectid.h index 142f2975b2..98c9b71343 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/impl/objectid.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/impl/objectid.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_OBJECTID_H -#define QARK_OBJECTID_H +#pragma once namespace qark { namespace impl { @@ -51,5 +50,3 @@ inline bool operator<(const ObjectId &lhs, const ObjectId &rhs) } // namespace impl } // namespace qark - -#endif // QARK_OBJECTID_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/impl/savingrefmap.h b/src/libs/modelinglib/qtserialization/inc/qark/impl/savingrefmap.h index f80f432ff5..b87fa6c3ed 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/impl/savingrefmap.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/impl/savingrefmap.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_SAVINGREFMAP_H -#define QARK_SAVINGREFMAP_H +#pragma once #include "objectid.h" @@ -73,5 +72,3 @@ private: } // namespace impl } // namespace qark - -#endif // QARK_SAVINGREFMAP_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/parameters.h b/src/libs/modelinglib/qtserialization/inc/qark/parameters.h index 37f38aa74f..c583ff183b 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/parameters.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/parameters.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_PARAMETER_H -#define QARK_PARAMETER_H +#pragma once #include "flag.h" @@ -56,5 +55,3 @@ private: }; } // namespace qark - -#endif // QARK_PARAMETER_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h b/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h index b6f1ef077e..b11a4db04b 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/qxmlinarchive.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_QXMLINARCHIVE_H -#define QARK_QXMLINARCHIVE_H +#pragma once #include "archivebasics.h" #include "tag.h" @@ -925,5 +924,3 @@ void QXmlInArchive::skipUntilEndOfTag(const XmlTag &xmlTag) } } // namespace qark - -#endif // QARK_XMLINARCHIVE_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/qxmloutarchive.h b/src/libs/modelinglib/qtserialization/inc/qark/qxmloutarchive.h index 651d7458e2..91525173cb 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/qxmloutarchive.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/qxmloutarchive.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_QXMLOUTARCHIVE_H -#define QARK_QXMLOUTARCHIVE_H +#pragma once #include "archivebasics.h" #include "tag.h" @@ -327,5 +326,3 @@ private: }; } // namespace qark - -#endif // QARK_QXMLOUTARCHIVE_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/reference.h b/src/libs/modelinglib/qtserialization/inc/qark/reference.h index cd2f8ac93b..c00c6b6664 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/reference.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/reference.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_REFERENCE_H -#define QARK_REFERENCE_H +#pragma once #include "parameters.h" @@ -422,5 +421,3 @@ GetSetFuncRef<U, T *, V * const &> ref(const QString &qualifiedName, U &u, T *(* } } // namespace qark - -#endif // QARK_REFERENCE_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/serialize.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize.h index bff84bbc62..57a3a19e08 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/serialize.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/serialize.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_SERIALIZE_H -#define QARK_SERIALIZE_H +#pragma once #include "tag.h" #include "baseclass.h" @@ -494,5 +493,3 @@ typename std::enable_if<Archive::inArchive, Archive &>::type operator||( } } // namespace qark - -#endif // QARK_SERIALIZE_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/serialize_basic.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize_basic.h index 06e69d143c..695c53031d 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/serialize_basic.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/serialize_basic.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_SERIALIZE_BASIC_H -#define QARK_SERIALIZE_BASIC_H +#pragma once #include "parameters.h" #include "qstringparser/qstringparser.h" @@ -126,5 +125,3 @@ inline void load(Archive &archive, QDateTime &dateTime, const Parameters &) } } // namespace qark - -#endif // QARK_SERIALIZE_BASIC_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h index 85865398b2..a9d8e2a922 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/serialize_container.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_SERIALIZE_CONTAINER_H -#define QARK_SERIALIZE_CONTAINER_H +#pragma once #include "parameters.h" @@ -201,5 +200,3 @@ inline void load(Archive &archive, QHash<KEY, VALUE> &hash, const Parameters &) } } // namespace qark - -#endif // QARK_SERIALIZE_CONTAINER_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/serialize_enum.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize_enum.h index c4dcf219c6..f8c20f2896 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/serialize_enum.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/serialize_enum.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_SERIALIZE_ENUM_H -#define QARK_SERIALIZE_ENUM_H +#pragma once #include "parameters.h" @@ -81,5 +80,3 @@ inline void load(Archive &archive, QFlags<T> &flags, const Parameters &) } } // namespace qark - -#endif // QARK_SERIALIZE_ENUM_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/serialize_pointer.h b/src/libs/modelinglib/qtserialization/inc/qark/serialize_pointer.h index 2338676b24..876609643d 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/serialize_pointer.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/serialize_pointer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_SERIALIZE_POINTER_H -#define QARK_SERIALIZE_POINTER_H +#pragma once #include "typeregistry.h" @@ -86,6 +85,3 @@ void load(Archive &archive, T *&p, const Parameters &) } } // namespace qark - -#endif // QARK_SERIALIZE_POINTER_H - diff --git a/src/libs/modelinglib/qtserialization/inc/qark/tag.h b/src/libs/modelinglib/qtserialization/inc/qark/tag.h index 5f6615bd36..24f81e5d92 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/tag.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/tag.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_TAG_H -#define QARK_TAG_H +#pragma once #include "typeregistry.h" #include "parameters.h" @@ -150,5 +149,3 @@ inline End end(const Parameters ¶meters) } } // namespace qark - -#endif // QARK_TAG_H diff --git a/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h b/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h index 50090e1826..aa0750cfdb 100644 --- a/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h +++ b/src/libs/modelinglib/qtserialization/inc/qark/typeregistry.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QARK_TYPEREGISTRY_H -#define QARK_TYPEREGISTRY_H +#pragma once #include "parameters.h" @@ -308,5 +307,3 @@ typename registry::TypeRegistry<Archive,T>::TypeInfo typeInfo(const QString &uid int qark::registry::DerivedTypeRegistry<OUTARCHIVE, typename std::add_const<BASE>::type, typename std::add_const<DERIVED>::type>::staticInit = \ qark::registry::DerivedTypeRegistry<OUTARCHIVE, typename std::add_const<BASE>::type, typename std::add_const<DERIVED>::type>:: \ init(qark::registry::savePointer<OUTARCHIVE, typename std::add_const<BASE>::type, typename std::add_const<DERIVED>::type>, 0); - -#endif // QARK_TYPEREGISTRY_H diff --git a/src/libs/qmldebug/baseenginedebugclient.h b/src/libs/qmldebug/baseenginedebugclient.h index d490d05b24..b74397cf9d 100644 --- a/src/libs/qmldebug/baseenginedebugclient.h +++ b/src/libs/qmldebug/baseenginedebugclient.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BASEENGINEDEBUGCLIENT_H -#define BASEENGINEDEBUGCLIENT_H +#pragma once #include "qmldebug_global.h" #include "qmldebugclient.h" @@ -259,5 +258,3 @@ inline QDebug operator<<(QDebug dbg, const QmlDebug::ObjectReference &ref) { return dbg.space(); } QT_END_NAMESPACE - -#endif // BASEENGINEDEBUGCLIENT_H diff --git a/src/libs/qmldebug/basetoolsclient.h b/src/libs/qmldebug/basetoolsclient.h index 7f2da7b167..d84e02066e 100644 --- a/src/libs/qmldebug/basetoolsclient.h +++ b/src/libs/qmldebug/basetoolsclient.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BASETOOLSCLIENT_H -#define BASETOOLSCLIENT_H +#pragma once #include "qmldebugclient.h" #include "baseenginedebugclient.h" @@ -72,5 +71,3 @@ protected: }; } // namespace QmlDebug - -#endif // BASETOOLSCLIENT_H diff --git a/src/libs/qmldebug/declarativeenginedebugclient.h b/src/libs/qmldebug/declarativeenginedebugclient.h index 5ef02c9395..793347e9c7 100644 --- a/src/libs/qmldebug/declarativeenginedebugclient.h +++ b/src/libs/qmldebug/declarativeenginedebugclient.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DECLARATIVEENGINEDEBUGCLIENT_H -#define DECLARATIVEENGINEDEBUGCLIENT_H +#pragma once #include "baseenginedebugclient.h" @@ -51,5 +50,3 @@ protected: }; } // namespace QmlDebug - -#endif // DECLARATIVEENGINEDEBUGCLIENT_H diff --git a/src/libs/qmldebug/declarativeenginedebugclientv2.h b/src/libs/qmldebug/declarativeenginedebugclientv2.h index 286d95460b..00af9d5424 100644 --- a/src/libs/qmldebug/declarativeenginedebugclientv2.h +++ b/src/libs/qmldebug/declarativeenginedebugclientv2.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DECLARATIVEENGINEDEBUGCLIENTV2_H -#define DECLARATIVEENGINEDEBUGCLIENTV2_H +#pragma once #include "baseenginedebugclient.h" @@ -43,5 +42,3 @@ public: }; } // namespace QmlDebug - -#endif // DECLARATIVEENGINEDEBUGCLIENTV2_H diff --git a/src/libs/qmldebug/declarativetoolsclient.h b/src/libs/qmldebug/declarativetoolsclient.h index 6e8d6e5378..83698b4037 100644 --- a/src/libs/qmldebug/declarativetoolsclient.h +++ b/src/libs/qmldebug/declarativetoolsclient.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DECLARATIVETOOLSCLIENT_H -#define DECLARATIVETOOLSCLIENT_H +#pragma once #include "basetoolsclient.h" @@ -58,5 +57,3 @@ private: }; } // namespace QmlDebug - -#endif // DECLARATIVETOOLSCLIENT_H diff --git a/src/libs/qmldebug/qdebugmessageclient.h b/src/libs/qmldebug/qdebugmessageclient.h index c185e3ddfb..5a4e45bbac 100644 --- a/src/libs/qmldebug/qdebugmessageclient.h +++ b/src/libs/qmldebug/qdebugmessageclient.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QDEBUGMESSAGECLIENT_H -#define QDEBUGMESSAGECLIENT_H +#pragma once #include "qmldebugclient.h" #include "qmldebug_global.h" @@ -64,5 +63,3 @@ private: }; } // namespace QmlDebug - -#endif // QDEBUGMESSAGECLIENT_H diff --git a/src/libs/qmldebug/qmldebug_global.h b/src/libs/qmldebug/qmldebug_global.h index b765adc477..3f6bc8ee30 100644 --- a/src/libs/qmldebug/qmldebug_global.h +++ b/src/libs/qmldebug/qmldebug_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDEBUG_GLOBAL_H -#define QMLDEBUG_GLOBAL_H +#pragma once #if defined(QMLDEBUG_LIB) # define QMLDEBUG_EXPORT Q_DECL_EXPORT @@ -33,5 +32,3 @@ #else # define QMLDEBUG_EXPORT Q_DECL_IMPORT #endif - -#endif // QMLDEBUG_GLOBAL_H diff --git a/src/libs/qmldebug/qmldebugclient.h b/src/libs/qmldebug/qmldebugclient.h index 95853f92a7..3ea50acae5 100644 --- a/src/libs/qmldebug/qmldebugclient.h +++ b/src/libs/qmldebug/qmldebugclient.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDEBUGCLIENT_H -#define QMLDEBUGCLIENT_H +#pragma once #include "qmldebug_global.h" #include <qtcpsocket.h> @@ -111,5 +110,3 @@ private: }; } // namespace QmlDebug - -#endif // QMLDEBUGCLIENT_H diff --git a/src/libs/qmldebug/qmldebugcommandlinearguments.h b/src/libs/qmldebug/qmldebugcommandlinearguments.h index 3c060ea4db..4be2cbf386 100644 --- a/src/libs/qmldebug/qmldebugcommandlinearguments.h +++ b/src/libs/qmldebug/qmldebugcommandlinearguments.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDEBUGCOMMANDLINEARGUMENTS_H -#define QMLDEBUGCOMMANDLINEARGUMENTS_H +#pragma once #include <QString> @@ -83,6 +82,3 @@ static inline QString qmlDebugLocalArguments(QmlDebugServicesPreset services, co } } // namespace QmlDebug - -#endif // QMLDEBUGCOMMANDLINEARGUMENTS_H - diff --git a/src/libs/qmldebug/qmldebugconstants.h b/src/libs/qmldebug/qmldebugconstants.h index 9b3d9ae431..74299b393f 100644 --- a/src/libs/qmldebug/qmldebugconstants.h +++ b/src/libs/qmldebug/qmldebugconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDEBUGCONSTANTS_H -#define QMLDEBUGCONSTANTS_H +#pragma once namespace QmlDebug { namespace Constants { @@ -40,5 +39,3 @@ const char QDECLARATIVE_ENGINE[] = "QDeclarativeEngine"; } // namespace Constants } // namespace QmlDebug - -#endif // QMLDEBUGCONSTANTS_H diff --git a/src/libs/qmldebug/qmlenginecontrolclient.h b/src/libs/qmldebug/qmlenginecontrolclient.h index 5c57220bc2..c5da7a7130 100644 --- a/src/libs/qmldebug/qmlenginecontrolclient.h +++ b/src/libs/qmldebug/qmlenginecontrolclient.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLENGINECONTROLCLIENT_H -#define QMLENGINECONTROLCLIENT_H +#pragma once #include "qmldebugclient.h" @@ -73,5 +72,3 @@ protected: }; } - -#endif // QMLENGINECONTROLCLIENT_H diff --git a/src/libs/qmldebug/qmlenginedebugclient.h b/src/libs/qmldebug/qmlenginedebugclient.h index fd7f7a30bc..706cbabe6b 100644 --- a/src/libs/qmldebug/qmlenginedebugclient.h +++ b/src/libs/qmldebug/qmlenginedebugclient.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLENGINEDEBUGCLIENT_H -#define QMLENGINEDEBUGCLIENT_H +#pragma once #include "baseenginedebugclient.h" @@ -43,5 +42,3 @@ public: }; } // namespace QmlDebug - -#endif // QMLENGINEDEBUGCLIENT_H diff --git a/src/libs/qmldebug/qmloutputparser.h b/src/libs/qmldebug/qmloutputparser.h index bcfe5a9120..a9e08f08e6 100644 --- a/src/libs/qmldebug/qmloutputparser.h +++ b/src/libs/qmldebug/qmloutputparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLOUTPUTPARSER_H -#define QMLOUTPUTPARSER_H +#pragma once #include "qmldebug_global.h" @@ -55,5 +54,3 @@ private: }; } // namespace QmlDebug - -#endif // QMLOUTPUTPARSER_H diff --git a/src/libs/qmldebug/qmlprofilereventlocation.h b/src/libs/qmldebug/qmlprofilereventlocation.h index 725463698a..21de6d9305 100644 --- a/src/libs/qmldebug/qmlprofilereventlocation.h +++ b/src/libs/qmldebug/qmlprofilereventlocation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILEREVENTLOCATION_H -#define QMLPROFILEREVENTLOCATION_H +#pragma once #include "qmldebug_global.h" @@ -42,5 +41,3 @@ struct QMLDEBUG_EXPORT QmlEventLocation }; } - -#endif // QMLPROFILEREVENTLOCATION_H diff --git a/src/libs/qmldebug/qmlprofilereventtypes.h b/src/libs/qmldebug/qmlprofilereventtypes.h index 82dd1a4357..7a9eefe179 100644 --- a/src/libs/qmldebug/qmlprofilereventtypes.h +++ b/src/libs/qmldebug/qmlprofilereventtypes.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILEREVENTTYPES_H -#define QMLPROFILEREVENTTYPES_H +#pragma once #include <QtGlobal> @@ -181,5 +180,3 @@ const quint64 QML_JS_RANGE_FEATURES = (1 << ProfileCompiling) | } } // namespace QmlDebug - -#endif //QMLPROFILEREVENTTYPES_H diff --git a/src/libs/qmldebug/qmlprofilertraceclient.h b/src/libs/qmldebug/qmlprofilertraceclient.h index 4c7bfcdfa1..adaf93971c 100644 --- a/src/libs/qmldebug/qmlprofilertraceclient.h +++ b/src/libs/qmldebug/qmlprofilertraceclient.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERTRACECLIENT_H -#define QMLPROFILERTRACECLIENT_H +#pragma once #include "qmldebugclient.h" #include "qmlprofilereventtypes.h" @@ -86,5 +85,3 @@ private: }; } // namespace QmlDebug - -#endif // QMLPROFILERTRACECLIENT_H diff --git a/src/libs/qmldebug/qmltoolsclient.h b/src/libs/qmldebug/qmltoolsclient.h index ea4a0b7189..51dc6730af 100644 --- a/src/libs/qmldebug/qmltoolsclient.h +++ b/src/libs/qmldebug/qmltoolsclient.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLTOOLSCLIENT_H -#define QMLTOOLSCLIENT_H +#pragma once #include "basetoolsclient.h" @@ -59,5 +58,3 @@ private: }; } // namespace QmlDebug - -#endif // QMLTOOLSCLIENT_H diff --git a/src/libs/qmldebug/qpacketprotocol.h b/src/libs/qmldebug/qpacketprotocol.h index d3ad42ff15..33d1ecdbf6 100644 --- a/src/libs/qmldebug/qpacketprotocol.h +++ b/src/libs/qmldebug/qpacketprotocol.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QPACKETPROTOCOL_H -#define QPACKETPROTOCOL_H +#pragma once #include "qmldebug_global.h" @@ -72,5 +71,3 @@ private: }; } // QmlDebug - -#endif diff --git a/src/libs/qmleditorwidgets/colorbox.h b/src/libs/qmleditorwidgets/colorbox.h index 91b5451fd8..dd576f61f2 100644 --- a/src/libs/qmleditorwidgets/colorbox.h +++ b/src/libs/qmleditorwidgets/colorbox.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COLORBOX_H -#define COLORBOX_H +#pragma once #include "qmleditorwidgets_global.h" #include <QWidget> @@ -86,5 +85,3 @@ private: }; } //QmlEditorWidgets - -#endif //COLORBOX_H diff --git a/src/libs/qmleditorwidgets/colorbutton.h b/src/libs/qmleditorwidgets/colorbutton.h index 65f35c934d..c70fd2b309 100644 --- a/src/libs/qmleditorwidgets/colorbutton.h +++ b/src/libs/qmleditorwidgets/colorbutton.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COLORBUTTON_H -#define COLORBUTTON_H +#pragma once #include "qmleditorwidgets_global.h" #include <QToolButton> @@ -68,5 +67,3 @@ private: }; } //QmlEditorWidgets - -#endif //COLORBUTTON_H diff --git a/src/libs/qmleditorwidgets/contextpanetextwidget.h b/src/libs/qmleditorwidgets/contextpanetextwidget.h index 02a6103965..4a15d85838 100644 --- a/src/libs/qmleditorwidgets/contextpanetextwidget.h +++ b/src/libs/qmleditorwidgets/contextpanetextwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CONTEXTPANETEXTWIDGET_H -#define CONTEXTPANETEXTWIDGET_H +#pragma once #include "qmleditorwidgets_global.h" #include <QWidget> @@ -84,5 +83,3 @@ private: }; } //QmlDesigner - -#endif // CONTEXTPANETEXTWIDGET_H diff --git a/src/libs/qmleditorwidgets/contextpanewidget.h b/src/libs/qmleditorwidgets/contextpanewidget.h index 63794a8f98..f7cd9684ad 100644 --- a/src/libs/qmleditorwidgets/contextpanewidget.h +++ b/src/libs/qmleditorwidgets/contextpanewidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CONTEXTPANEWIDGET_H -#define CONTEXTPANEWIDGET_H +#pragma once #include "qmleditorwidgets_global.h" #include <QFrame> @@ -141,5 +140,3 @@ private: }; } //QmlDesigner - -#endif // CONTEXTPANEWIDGET_H diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.h b/src/libs/qmleditorwidgets/contextpanewidgetimage.h index 4990a93c09..50788b8562 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetimage.h +++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CONTEXTPANEWIDGETIMAGE_H -#define CONTEXTPANEWIDGETIMAGE_H +#pragma once #include "qmleditorwidgets_global.h" #include "contextpanewidget.h" @@ -186,5 +185,3 @@ protected: } //QmlDesigner - -#endif // CONTEXTPANEWIDGETIMAGE_H diff --git a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h index 8c57bd59f1..95221276d9 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h +++ b/src/libs/qmleditorwidgets/contextpanewidgetrectangle.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CONTEXTPANEWIDGETRECTANGLE_H -#define CONTEXTPANEWIDGETRECTANGLE_H +#pragma once #include "qmleditorwidgets_global.h" #include <QWidget> @@ -82,5 +81,3 @@ private: }; } //QmlDesigner - -#endif // CONTEXTPANEWIDGETRECTANGLE_H diff --git a/src/libs/qmleditorwidgets/customcolordialog.h b/src/libs/qmleditorwidgets/customcolordialog.h index 0431b695c0..a3753edc31 100644 --- a/src/libs/qmleditorwidgets/customcolordialog.h +++ b/src/libs/qmleditorwidgets/customcolordialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CUSTOMCOLORDIALOG_H -#define CUSTOMCOLORDIALOG_H +#pragma once #include "qmleditorwidgets_global.h" #include <QFrame> @@ -103,5 +102,3 @@ private: }; } //QmlEditorWidgets - -#endif //CUSTOMCOLORDIALOG_H diff --git a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h index 243bde11f5..8609f843b8 100644 --- a/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h +++ b/src/libs/qmleditorwidgets/easingpane/easingcontextpane.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EASINGCONTEXTPANE_H -#define EASINGCONTEXTPANE_H +#pragma once #include "easinggraph.h" @@ -86,4 +85,3 @@ private slots: }; } -#endif // EASINGCONTEXTPANE_H diff --git a/src/libs/qmleditorwidgets/easingpane/easinggraph.h b/src/libs/qmleditorwidgets/easingpane/easinggraph.h index 03d72dca1b..37236caded 100644 --- a/src/libs/qmleditorwidgets/easingpane/easinggraph.h +++ b/src/libs/qmleditorwidgets/easingpane/easinggraph.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EASINGGRAPH_H -#define EASINGGRAPH_H +#pragma once #include <QWidget> #include <QEasingCurve> @@ -105,5 +104,3 @@ private: QT_END_NAMESPACE //QML_DECLARE_TYPE(EasingGraph) - -#endif // EASINGGRAPH_H diff --git a/src/libs/qmleditorwidgets/filewidget.h b/src/libs/qmleditorwidgets/filewidget.h index c130d53b18..ef445b0668 100644 --- a/src/libs/qmleditorwidgets/filewidget.h +++ b/src/libs/qmleditorwidgets/filewidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FILEWIDGET_H -#define FILEWIDGET_H +#pragma once #include "qmleditorwidgets_global.h" @@ -117,6 +116,3 @@ private: }; } //QmlEditorWidgets - -#endif - diff --git a/src/libs/qmleditorwidgets/fontsizespinbox.h b/src/libs/qmleditorwidgets/fontsizespinbox.h index c288a984c4..2f86000fef 100644 --- a/src/libs/qmleditorwidgets/fontsizespinbox.h +++ b/src/libs/qmleditorwidgets/fontsizespinbox.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FONTSIZESPINBOX_H -#define FONTSIZESPINBOX_H +#pragma once #include "qmleditorwidgets_global.h" #include <QAbstractSpinBox> @@ -92,5 +91,3 @@ private: }; } //QmlDesigner - -#endif // FONTSIZESPINBOX_H diff --git a/src/libs/qmleditorwidgets/gradientline.h b/src/libs/qmleditorwidgets/gradientline.h index 493a59684f..99c101f2a4 100644 --- a/src/libs/qmleditorwidgets/gradientline.h +++ b/src/libs/qmleditorwidgets/gradientline.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GRADIENTLINE_H -#define GRADIENTLINE_H +#pragma once #include "qmleditorwidgets_global.h" #include <QWidget> @@ -90,5 +89,3 @@ private: }; } //QmlEditorWidgets - -#endif //GRADIENTLINE_H diff --git a/src/libs/qmleditorwidgets/huecontrol.h b/src/libs/qmleditorwidgets/huecontrol.h index ee88836441..f9db8790ed 100644 --- a/src/libs/qmleditorwidgets/huecontrol.h +++ b/src/libs/qmleditorwidgets/huecontrol.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HUECONTROL_H -#define HUECONTROL_H +#pragma once #include "qmleditorwidgets_global.h" #include <QWidget> @@ -63,5 +62,3 @@ private: }; } //QmlEditorWidgets - -#endif //HUECONTROL_H diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets_global.h b/src/libs/qmleditorwidgets/qmleditorwidgets_global.h index 1c46500395..1b611c894a 100644 --- a/src/libs/qmleditorwidgets/qmleditorwidgets_global.h +++ b/src/libs/qmleditorwidgets/qmleditorwidgets_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLEDITORWIDGETS_GLOBAL_H -#define QMLEDITORWIDGETS_GLOBAL_H +#pragma once #include <qglobal.h> @@ -35,5 +34,3 @@ # else # define QMLEDITORWIDGETS_EXPORT Q_DECL_IMPORT #endif - -#endif // QMLEDITORWIDGETS_GLOBAL_H diff --git a/src/libs/qmljs/jsoncheck.h b/src/libs/qmljs/jsoncheck.h index 6558c13d08..53246045ff 100644 --- a/src/libs/qmljs/jsoncheck.h +++ b/src/libs/qmljs/jsoncheck.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JSONCHECK_H -#define JSONCHECK_H +#pragma once #include "qmljs_global.h" @@ -83,5 +82,3 @@ private: }; } // QmlJs - -#endif // JSONCHECK_H diff --git a/src/libs/qmljs/parser/qmldirparser_p.h b/src/libs/qmljs/parser/qmldirparser_p.h index be9e126f75..72a2cf9922 100644 --- a/src/libs/qmljs/parser/qmldirparser_p.h +++ b/src/libs/qmljs/parser/qmldirparser_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QQMLDIRPARSER_P_H -#define QQMLDIRPARSER_P_H +#pragma once // // W A R N I N G @@ -146,5 +145,3 @@ QDebug &operator<< (QDebug &, const QmlDirParser::Component &); QDebug &operator<< (QDebug &, const QmlDirParser::Script &); QT_END_NAMESPACE - -#endif // QQMLDIRPARSER_P_H diff --git a/src/libs/qmljs/parser/qmlerror.h b/src/libs/qmljs/parser/qmlerror.h index 3d4ebde73d..6219a7c8b5 100644 --- a/src/libs/qmljs/parser/qmlerror.h +++ b/src/libs/qmljs/parser/qmlerror.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QQMLERROR_H -#define QQMLERROR_H +#pragma once @@ -66,5 +65,3 @@ QDebug operator<<(QDebug debug, const QmlError &error); Q_DECLARE_TYPEINFO(QmlError, Q_MOVABLE_TYPE); QT_END_NAMESPACE - -#endif // QQMLERROR_H diff --git a/src/libs/qmljs/parser/qmljs.g b/src/libs/qmljs/parser/qmljs.g index 0a20e9e367..f0c1722dc6 100644 --- a/src/libs/qmljs/parser/qmljs.g +++ b/src/libs/qmljs/parser/qmljs.g @@ -201,8 +201,7 @@ // qlalr --no-debug --no-lines --qt qmljs.g // -#ifndef QMLJSPARSER_P_H -#define QMLJSPARSER_P_H +#prama once #include "qmljsglobal_p.h" #include "qmljsgrammar_p.h" @@ -3114,6 +3113,4 @@ QT_QML_END_NAMESPACE QT_QML_END_NAMESPACE - -#endif // QMLJSPARSER_P_H :/ diff --git a/src/libs/qmljs/parser/qmljsast_p.h b/src/libs/qmljs/parser/qmljsast_p.h index 80f36c96b8..42c0046d4c 100644 --- a/src/libs/qmljs/parser/qmljsast_p.h +++ b/src/libs/qmljs/parser/qmljsast_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSAST_P_H -#define QMLJSAST_P_H +#pragma once // // W A R N I N G @@ -2759,5 +2758,3 @@ public: QT_QML_END_NAMESPACE - -#endif diff --git a/src/libs/qmljs/parser/qmljsastfwd_p.h b/src/libs/qmljs/parser/qmljsastfwd_p.h index e9ea732acd..4a818602bb 100644 --- a/src/libs/qmljs/parser/qmljsastfwd_p.h +++ b/src/libs/qmljs/parser/qmljsastfwd_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSAST_FWD_P_H -#define QMLJSAST_FWD_P_H +#pragma once #include "qmljsglobal_p.h" @@ -171,5 +170,3 @@ class UiHeaderItemList; } } // namespace AST QT_QML_END_NAMESPACE - -#endif diff --git a/src/libs/qmljs/parser/qmljsastvisitor_p.h b/src/libs/qmljs/parser/qmljsastvisitor_p.h index 036e34b4ba..769cb644a4 100644 --- a/src/libs/qmljs/parser/qmljsastvisitor_p.h +++ b/src/libs/qmljs/parser/qmljsastvisitor_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSASTVISITOR_P_H -#define QMLJSASTVISITOR_P_H +#pragma once // // W A R N I N G @@ -321,5 +320,3 @@ public: } } // namespace AST QT_QML_END_NAMESPACE - -#endif // QMLJSASTVISITOR_P_H diff --git a/src/libs/qmljs/parser/qmljsengine_p.h b/src/libs/qmljs/parser/qmljsengine_p.h index e9a72f6269..7078f3c6b4 100644 --- a/src/libs/qmljs/parser/qmljsengine_p.h +++ b/src/libs/qmljs/parser/qmljsengine_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSENGINE_P_H -#define QMLJSENGINE_P_H +#pragma once // // W A R N I N G @@ -111,5 +110,3 @@ double integerFromString(const char *buf, int size, int radix); } // end of namespace QmlJS QT_QML_END_NAMESPACE - -#endif // QMLJSENGINE_P_H diff --git a/src/libs/qmljs/parser/qmljsglobal_p.h b/src/libs/qmljs/parser/qmljsglobal_p.h index 8cdf617f66..f7810e6a43 100644 --- a/src/libs/qmljs/parser/qmljsglobal_p.h +++ b/src/libs/qmljs/parser/qmljsglobal_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSGLOBAL_P_H -#define QMLJSGLOBAL_P_H +#pragma once #include <QtCore/qglobal.h> @@ -52,5 +51,3 @@ # define QML_PARSER_EXPORT # endif #endif // QT_CREATOR - -#endif // QMLJSGLOBAL_P_H diff --git a/src/libs/qmljs/parser/qmljsgrammar_p.h b/src/libs/qmljs/parser/qmljsgrammar_p.h index 9a84aa86f6..b36219f474 100644 --- a/src/libs/qmljs/parser/qmljsgrammar_p.h +++ b/src/libs/qmljs/parser/qmljsgrammar_p.h @@ -35,8 +35,7 @@ // // This file was generated by qlalr - DO NOT EDIT! -#ifndef QMLJSGRAMMAR_P_H -#define QMLJSGRAMMAR_P_H +#pragma once #include "qmljsglobal_p.h" #include <QtCore/qglobal.h> @@ -196,5 +195,3 @@ public: QT_END_NAMESPACE -#endif // QMLJSGRAMMAR_P_H - diff --git a/src/libs/qmljs/parser/qmljskeywords_p.h b/src/libs/qmljs/parser/qmljskeywords_p.h index 36e04a732f..df0030d6dd 100644 --- a/src/libs/qmljs/parser/qmljskeywords_p.h +++ b/src/libs/qmljs/parser/qmljskeywords_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSKEYWORDS_P_H -#define QMLJSKEYWORDS_P_H +#pragma once // // W A R N I N G @@ -875,5 +874,3 @@ int Lexer::classify(const QChar *s, int n, bool qmlMode) { } // namespace QmlJS QT_QML_END_NAMESPACE - -#endif // QMLJSKEYWORDS_P_H diff --git a/src/libs/qmljs/parser/qmljslexer_p.h b/src/libs/qmljs/parser/qmljslexer_p.h index 463c551ee6..067161fb3f 100644 --- a/src/libs/qmljs/parser/qmljslexer_p.h +++ b/src/libs/qmljs/parser/qmljslexer_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSLEXER_P_H -#define QMLJSLEXER_P_H +#pragma once // // W A R N I N G @@ -233,5 +232,3 @@ private: } // end of namespace QmlJS QT_QML_END_NAMESPACE - -#endif // LEXER_H diff --git a/src/libs/qmljs/parser/qmljsmemorypool_p.h b/src/libs/qmljs/parser/qmljsmemorypool_p.h index bfa7ad6f9e..199f9dbbbd 100644 --- a/src/libs/qmljs/parser/qmljsmemorypool_p.h +++ b/src/libs/qmljs/parser/qmljsmemorypool_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSMEMORYPOOL_P_H -#define QMLJSMEMORYPOOL_P_H +#pragma once // // W A R N I N G @@ -153,5 +152,3 @@ public: } // namespace QmlJS QT_QML_END_NAMESPACE - -#endif diff --git a/src/libs/qmljs/parser/qmljsparser_p.h b/src/libs/qmljs/parser/qmljsparser_p.h index 0f00561d94..281c7bc6a3 100644 --- a/src/libs/qmljs/parser/qmljsparser_p.h +++ b/src/libs/qmljs/parser/qmljsparser_p.h @@ -46,8 +46,7 @@ // qlalr --no-debug --no-lines --qt qmljs.g // -#ifndef QMLJSPARSER_P_H -#define QMLJSPARSER_P_H +#pragma once #include "qmljsglobal_p.h" #include "qmljsgrammar_p.h" @@ -236,7 +235,3 @@ protected: #define J_SCRIPT_REGEXPLITERAL_RULE2 88 QT_QML_END_NAMESPACE - - - -#endif // QMLJSPARSER_P_H diff --git a/src/libs/qmljs/persistenttrie.h b/src/libs/qmljs/persistenttrie.h index 65639bc4a3..35ab652967 100644 --- a/src/libs/qmljs/persistenttrie.h +++ b/src/libs/qmljs/persistenttrie.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PERSISTENTTRIE_H -#define PERSISTENTTRIE_H +#pragma once #include <qmljs/qmljs_global.h> @@ -128,5 +127,3 @@ QMLJS_EXPORT QDebug &operator<<(QDebug &dbg, const Trie &trie); } // end namespace PersistentTrie } // end namespace QmlJS - -#endif // PERSISTENTTRIE_H diff --git a/src/libs/qmljs/qmljs_global.h b/src/libs/qmljs/qmljs_global.h index 3c9c4cc266..e34d6e5220 100644 --- a/src/libs/qmljs/qmljs_global.h +++ b/src/libs/qmljs/qmljs_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJS_GLOBAL_H -#define QMLJS_GLOBAL_H +#pragma once #include <qglobal.h> @@ -35,5 +34,3 @@ #else # define QMLJS_EXPORT Q_DECL_IMPORT #endif - -#endif // QMLJS_GLOBAL_H diff --git a/src/libs/qmljs/qmljsbind.h b/src/libs/qmljs/qmljsbind.h index 15e23303e8..81da23b6fa 100644 --- a/src/libs/qmljs/qmljsbind.h +++ b/src/libs/qmljs/qmljsbind.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSBIND_H -#define QMLJSBIND_H +#pragma once #include <qmljs/parser/qmljsastvisitor_p.h> #include <qmljs/qmljsvalueowner.h> @@ -104,5 +103,3 @@ private: }; } // namespace Qml - -#endif // QMLJSBIND_H diff --git a/src/libs/qmljs/qmljsbundle.h b/src/libs/qmljs/qmljsbundle.h index 8138b7315f..0bf00ab755 100644 --- a/src/libs/qmljs/qmljsbundle.h +++ b/src/libs/qmljs/qmljsbundle.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSBUNDLE_H -#define QMLJSBUNDLE_H +#pragma once #include <qmljs/qmljs_global.h> #include <qmljs/persistenttrie.h> @@ -104,5 +103,3 @@ private: QHash<Dialect,QmlBundle> m_bundles; }; } // namespace QmlJS - -#endif // QMLJSBUNDLE_H diff --git a/src/libs/qmljs/qmljscheck.h b/src/libs/qmljs/qmljscheck.h index f449e331b3..810bdb8d26 100644 --- a/src/libs/qmljs/qmljscheck.h +++ b/src/libs/qmljs/qmljscheck.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSCHECK_H -#define QMLJSCHECK_H +#pragma once #include <qmljs/qmljsscopebuilder.h> #include <qmljs/qmljsscopechain.h> @@ -155,5 +154,3 @@ private: }; } // namespace QmlJS - -#endif // QMLJSCHECK_H diff --git a/src/libs/qmljs/qmljscodeformatter.h b/src/libs/qmljs/qmljscodeformatter.h index 86540ece9a..990ec080ce 100644 --- a/src/libs/qmljs/qmljscodeformatter.h +++ b/src/libs/qmljs/qmljscodeformatter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSCODEFORMATTER_H -#define QMLJSCODEFORMATTER_H +#pragma once #include "qmljs_global.h" @@ -328,5 +327,3 @@ private: }; } // namespace QmlJS - -#endif // QMLJSCODEFORMATTER_H diff --git a/src/libs/qmljs/qmljscompletioncontextfinder.h b/src/libs/qmljs/qmljscompletioncontextfinder.h index e3770bd1bc..34632807e7 100644 --- a/src/libs/qmljs/qmljscompletioncontextfinder.h +++ b/src/libs/qmljs/qmljscompletioncontextfinder.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSCOMPLETIONCONTEXTFINDER_H -#define QMLJSCOMPLETIONCONTEXTFINDER_H +#pragma once #include "qmljs_global.h" #include <qmljs/qmljslineinfo.h> @@ -70,5 +69,3 @@ private: }; } // namespace QmlJS - -#endif // QMLJSCOMPLETIONCONTEXTFINDER_H diff --git a/src/libs/qmljs/qmljsconstants.h b/src/libs/qmljs/qmljsconstants.h index 5d34c8f286..532b74697d 100644 --- a/src/libs/qmljs/qmljsconstants.h +++ b/src/libs/qmljs/qmljsconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSCONSTANTS_H -#define QMLJSCONSTANTS_H +#pragma once #include "qmljs_global.h" @@ -91,4 +90,3 @@ const char TASK_IMPORT_SCAN[] = "QmlJSEditor.TaskImportScan"; QMLJS_EXPORT Q_DECLARE_LOGGING_CATEGORY(qmljsLog) } // namespace QmlJS -#endif // QMLJSCONSTANTS_H diff --git a/src/libs/qmljs/qmljscontext.h b/src/libs/qmljs/qmljscontext.h index 7aeb4500ac..fd7f0569eb 100644 --- a/src/libs/qmljs/qmljscontext.h +++ b/src/libs/qmljs/qmljscontext.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJS_CONTEXT_H -#define QMLJS_CONTEXT_H +#pragma once #include "qmljs_global.h" #include "qmljsdocument.h" @@ -97,5 +96,3 @@ private: }; } // namespace QmlJS - -#endif // QMLJS_CONTEXT_H diff --git a/src/libs/qmljs/qmljsdescribevalue.h b/src/libs/qmljs/qmljsdescribevalue.h index d378c02434..3c27c320e5 100644 --- a/src/libs/qmljs/qmljsdescribevalue.h +++ b/src/libs/qmljs/qmljsdescribevalue.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSDESCRIBEVALUE_H -#define QMLJSDESCRIBEVALUE_H +#pragma once #include "qmljs_global.h" #include "qmljsinterpreter.h" @@ -73,4 +72,3 @@ private: }; } // namespace QmlJS -#endif // QMLJSDESCRIBEVALUE_H diff --git a/src/libs/qmljs/qmljsdialect.h b/src/libs/qmljs/qmljsdialect.h index 7f2e87466f..5f63b51066 100644 --- a/src/libs/qmljs/qmljsdialect.h +++ b/src/libs/qmljs/qmljsdialect.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSDIALECT_H -#define QMLJSDIALECT_H +#pragma once #include "qmljs_global.h" @@ -168,4 +167,3 @@ private: }; } // namespace QmlJS -#endif // QMLJSDIALECT_H diff --git a/src/libs/qmljs/qmljsdocument.h b/src/libs/qmljs/qmljsdocument.h index ab04375f8e..0c39b52c02 100644 --- a/src/libs/qmljs/qmljsdocument.h +++ b/src/libs/qmljs/qmljsdocument.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSDOCUMENT_H -#define QMLJSDOCUMENT_H +#pragma once #include <QList> #include <QSharedPointer> @@ -246,5 +245,3 @@ public: }; } // namespace QmlJS - -#endif // QMLJSDOCUMENT_H diff --git a/src/libs/qmljs/qmljsevaluate.h b/src/libs/qmljs/qmljsevaluate.h index 24b00967f2..0246bc453a 100644 --- a/src/libs/qmljs/qmljsevaluate.h +++ b/src/libs/qmljs/qmljsevaluate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSEVALUATE_H -#define QMLJSEVALUATE_H +#pragma once #include "parser/qmljsastvisitor_p.h" #include "qmljsdocument.h" @@ -164,5 +163,3 @@ private: }; } // namespace Qml - -#endif // QMLJSEVALUATE_H diff --git a/src/libs/qmljs/qmljsfindexportedcpptypes.h b/src/libs/qmljs/qmljsfindexportedcpptypes.h index 03d2b42840..fbc9126880 100644 --- a/src/libs/qmljs/qmljsfindexportedcpptypes.h +++ b/src/libs/qmljs/qmljsfindexportedcpptypes.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJS_QMLJSFINDEXPORTEDCPPTYPES_H -#define QMLJS_QMLJSFINDEXPORTEDCPPTYPES_H +#pragma once #include "qmljs_global.h" #include <cplusplus/CppDocument.h> @@ -56,5 +55,3 @@ private: }; } // namespace QmlJS - -#endif // QMLJS_QMLJSFINDEXPORTEDCPPTYPES_H diff --git a/src/libs/qmljs/qmljsicons.h b/src/libs/qmljs/qmljsicons.h index 7772234535..989e088ad1 100644 --- a/src/libs/qmljs/qmljsicons.h +++ b/src/libs/qmljs/qmljsicons.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSICONS_H -#define QMLJSICONS_H +#pragma once #include <qmljs/qmljs_global.h> #include <qmljs/parser/qmljsast_p.h> @@ -59,5 +58,3 @@ private: }; } // namespace QmlJS - -#endif // QMLJSICONS_H diff --git a/src/libs/qmljs/qmljsicontextpane.h b/src/libs/qmljs/qmljsicontextpane.h index 6578b49868..3a36a104ef 100644 --- a/src/libs/qmljs/qmljsicontextpane.h +++ b/src/libs/qmljs/qmljsicontextpane.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSICONTEXTPANE_H -#define QMLJSICONTEXTPANE_H +#pragma once #include <QObject> @@ -55,5 +54,3 @@ signals: }; } // namespace QmlJS - -#endif // QMLJSICONTEXTPANE_H diff --git a/src/libs/qmljs/qmljsimportdependencies.h b/src/libs/qmljs/qmljsimportdependencies.h index c2885e27b0..f529629465 100644 --- a/src/libs/qmljs/qmljsimportdependencies.h +++ b/src/libs/qmljs/qmljsimportdependencies.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSIMPORTCACHE_H -#define QMLJSIMPORTCACHE_H +#pragma once #include "qmljsconstants.h" #include "qmljsdialect.h" @@ -232,5 +231,3 @@ private: }; } // namespace QmlJS - -#endif // QMLJSIMPORTCACHE_H diff --git a/src/libs/qmljs/qmljsindenter.h b/src/libs/qmljs/qmljsindenter.h index a140326406..97cf1eb6ab 100644 --- a/src/libs/qmljs/qmljsindenter.h +++ b/src/libs/qmljs/qmljsindenter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSINDENTER_H -#define QMLJSINDENTER_H +#pragma once #include <qmljs/qmljs_global.h> #include <qmljs/qmljslineinfo.h> @@ -72,6 +71,3 @@ private: }; } // namespace QmlJS - -#endif // QMLJSINDENTER_H - diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h index 4ceece5e3d..3d86a5795e 100644 --- a/src/libs/qmljs/qmljsinterpreter.h +++ b/src/libs/qmljs/qmljsinterpreter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJS_INTERPRETER_H -#define QMLJS_INTERPRETER_H +#pragma once #include <qmljs/qmljs_global.h> #include <qmljs/qmljsconstants.h> @@ -1129,5 +1128,3 @@ public: }; } // namespace QmlJS - -#endif // QMLJS_INTERPRETER_H diff --git a/src/libs/qmljs/qmljslineinfo.h b/src/libs/qmljs/qmljslineinfo.h index eac9eeba51..d687a1e18b 100644 --- a/src/libs/qmljs/qmljslineinfo.h +++ b/src/libs/qmljs/qmljslineinfo.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSLINEINFO_H -#define QMLJSLINEINFO_H +#pragma once #include <qmljs/qmljs_global.h> @@ -117,6 +116,3 @@ protected: }; } // namespace QmlJS - -#endif // QMLJSLINEINFO_H - diff --git a/src/libs/qmljs/qmljslink.h b/src/libs/qmljs/qmljslink.h index 0735f62bf9..59e5e3f85a 100644 --- a/src/libs/qmljs/qmljslink.h +++ b/src/libs/qmljs/qmljslink.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSLINK_H -#define QMLJSLINK_H +#pragma once #include <qmljs/qmljscontext.h> @@ -61,5 +60,3 @@ private: }; } // namespace QmlJS - -#endif // QMLJSLINK_H diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.h b/src/libs/qmljs/qmljsmodelmanagerinterface.h index 690b178ec8..421a06b7b0 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.h +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSMODELMANAGERINTERFACE_H -#define QMLJSMODELMANAGERINTERFACE_H +#pragma once #include "qmljs_global.h" #include "qmljsbundle.h" @@ -284,5 +283,3 @@ private: }; } // namespace QmlJS - -#endif // QMLJSMODELMANAGERINTERFACE_H diff --git a/src/libs/qmljs/qmljsplugindumper.h b/src/libs/qmljs/qmljsplugindumper.h index 7a93631751..f0a716df9c 100644 --- a/src/libs/qmljs/qmljsplugindumper.h +++ b/src/libs/qmljs/qmljsplugindumper.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSPLUGINDUMPER_H -#define QMLJSPLUGINDUMPER_H +#pragma once #include <qmljs/qmljsmodelmanagerinterface.h> @@ -97,5 +96,3 @@ private: }; } // namespace QmlJS - -#endif // QMLJSPLUGINDUMPER_H diff --git a/src/libs/qmljs/qmljspropertyreader.h b/src/libs/qmljs/qmljspropertyreader.h index 79721f54be..650b3d075d 100644 --- a/src/libs/qmljs/qmljspropertyreader.h +++ b/src/libs/qmljs/qmljspropertyreader.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSPROPERTYREADER_H -#define QMLJSPROPERTYREADER_H +#pragma once #include <qmljs/qmljsdocument.h> @@ -71,5 +70,3 @@ private: }; } //QmlJS - -#endif // QMLJSPROPERTYREADER_H diff --git a/src/libs/qmljs/qmljsqrcparser.h b/src/libs/qmljs/qmljsqrcparser.h index 19bd4d0f78..b52f874e79 100644 --- a/src/libs/qmljs/qmljsqrcparser.h +++ b/src/libs/qmljs/qmljsqrcparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSQRCPARSER_H -#define QMLJSQRCPARSER_H +#pragma once #include "qmljs_global.h" #include <QMap> @@ -80,4 +79,3 @@ private: Internal::QrcCachePrivate *d; }; } -#endif // QMLJSQRCPARSER_H diff --git a/src/libs/qmljs/qmljsreformatter.h b/src/libs/qmljs/qmljsreformatter.h index 4d210463c0..18d5c6fd85 100644 --- a/src/libs/qmljs/qmljsreformatter.h +++ b/src/libs/qmljs/qmljsreformatter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSREFORMATTER_H -#define QMLJSREFORMATTER_H +#pragma once #include "qmljs_global.h" @@ -33,5 +32,3 @@ namespace QmlJS { QMLJS_EXPORT QString reformat(const Document::Ptr &doc); } - -#endif // QMLJSREFORMATTER_H diff --git a/src/libs/qmljs/qmljsrewriter.h b/src/libs/qmljs/qmljsrewriter.h index d8dea16541..1bb68a01c1 100644 --- a/src/libs/qmljs/qmljsrewriter.h +++ b/src/libs/qmljs/qmljsrewriter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSREWRITER_H -#define QMLJSREWRITER_H +#pragma once #include <qmljs/qmljs_global.h> #include <qmljs/parser/qmljsastfwd_p.h> @@ -112,5 +111,3 @@ private: }; } // namespace QmlJS - -#endif // QMLJSREWRITER_H diff --git a/src/libs/qmljs/qmljsscanner.h b/src/libs/qmljs/qmljsscanner.h index 9f038daf82..0cd8c69d7d 100644 --- a/src/libs/qmljs/qmljsscanner.h +++ b/src/libs/qmljs/qmljsscanner.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSSCANNER_H -#define QMLJSSCANNER_H +#pragma once #include <qmljs/qmljs_global.h> @@ -100,5 +99,3 @@ private: }; } // namespace QmlJS - -#endif // QMLJSSCANNER_H diff --git a/src/libs/qmljs/qmljsscopeastpath.h b/src/libs/qmljs/qmljsscopeastpath.h index d298e15e00..f06db11c5c 100644 --- a/src/libs/qmljs/qmljsscopeastpath.h +++ b/src/libs/qmljs/qmljsscopeastpath.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSSCOPEASTPATH_H -#define QMLJSSCOPEASTPATH_H +#pragma once #include "qmljs_global.h" #include "parser/qmljsastvisitor_p.h" @@ -61,5 +60,3 @@ private: }; } // namespace QmlJS - -#endif // QMLJSSCOPEASTPATH_H diff --git a/src/libs/qmljs/qmljsscopebuilder.h b/src/libs/qmljs/qmljsscopebuilder.h index 19b33b5a33..472a409105 100644 --- a/src/libs/qmljs/qmljsscopebuilder.h +++ b/src/libs/qmljs/qmljsscopebuilder.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSSCOPEBUILDER_H -#define QMLJSSCOPEBUILDER_H +#pragma once #include <qmljs/qmljsdocument.h> @@ -64,5 +63,3 @@ private: }; } // namespace QmlJS - -#endif // QMLJSSCOPEBUILDER_H diff --git a/src/libs/qmljs/qmljsscopechain.h b/src/libs/qmljs/qmljsscopechain.h index f8e2913e9c..a08d686248 100644 --- a/src/libs/qmljs/qmljsscopechain.h +++ b/src/libs/qmljs/qmljsscopechain.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJS_SCOPECHAIN_H -#define QMLJS_SCOPECHAIN_H +#pragma once #include "qmljs_global.h" #include "qmljsdocument.h" @@ -123,5 +122,3 @@ private: }; } // namespace QmlJS - -#endif // QMLJS_SCOPECHAIN_H diff --git a/src/libs/qmljs/qmljssimplereader.h b/src/libs/qmljs/qmljssimplereader.h index dc55042c96..a0ff03f455 100644 --- a/src/libs/qmljs/qmljssimplereader.h +++ b/src/libs/qmljs/qmljssimplereader.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJS_SIMPLEREADER_H -#define QMLJS_SIMPLEREADER_H +#pragma once #include <qmljs/qmljs_global.h> #include <qmljs/parser/qmljsastfwd_p.h> @@ -127,5 +126,3 @@ private: }; } // namespace QmlJS - -#endif // QMLJS_SIMPLEREADER_H diff --git a/src/libs/qmljs/qmljsstaticanalysismessage.h b/src/libs/qmljs/qmljsstaticanalysismessage.h index e479b9adbb..e5b8f8d882 100644 --- a/src/libs/qmljs/qmljsstaticanalysismessage.h +++ b/src/libs/qmljs/qmljsstaticanalysismessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJS_STATICANALYSIS_QMLJSSTATICANALYSISMESSAGE_H -#define QMLJS_STATICANALYSIS_QMLJSSTATICANALYSISMESSAGE_H +#pragma once #include "qmljs_global.h" #include "qmljsconstants.h" @@ -166,5 +165,3 @@ public: } // namespace StaticAnalysis } // namespace QmlJS - -#endif // QMLJS_STATICANALYSIS_QMLJSSTATICANALYSISMESSAGE_H diff --git a/src/libs/qmljs/qmljstypedescriptionreader.h b/src/libs/qmljs/qmljstypedescriptionreader.h index 826aa7dec0..85829d04ee 100644 --- a/src/libs/qmljs/qmljstypedescriptionreader.h +++ b/src/libs/qmljs/qmljstypedescriptionreader.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSTYPEDESCRIPTIONREADER_H -#define QMLJSTYPEDESCRIPTIONREADER_H +#pragma once #include "qmljs_global.h" #include <qmljs/parser/qmljsastfwd_p.h> @@ -94,5 +93,3 @@ private: }; } // namespace QmlJS - -#endif // QMLJSTYPEDESCRIPTIONREADER_H diff --git a/src/libs/qmljs/qmljsutils.h b/src/libs/qmljs/qmljsutils.h index 41d89a9352..dbbfbd3995 100644 --- a/src/libs/qmljs/qmljsutils.h +++ b/src/libs/qmljs/qmljsutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJS_QMLJSUTILS_H -#define QMLJS_QMLJSUTILS_H +#pragma once #include "qmljs_global.h" #include "qmljsconstants.h" @@ -70,5 +69,3 @@ DiagnosticMessage errorMessage(const T *node, const QString &message) } } // namespace QmlJS - -#endif // QMLJS_QMLJSUTILS_H diff --git a/src/libs/qmljs/qmljsvalueowner.h b/src/libs/qmljs/qmljsvalueowner.h index 88d58fe5cc..9fad48a235 100644 --- a/src/libs/qmljs/qmljsvalueowner.h +++ b/src/libs/qmljs/qmljsvalueowner.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJS_VALUEOWNER_H -#define QMLJS_VALUEOWNER_H +#pragma once #include "qmljs_global.h" #include "qmljsinterpreter.h" @@ -155,5 +154,3 @@ protected: }; } // namespace QmlJS - -#endif // QMLJS_VALUEOWNER_H diff --git a/src/libs/qmljs/qmljsviewercontext.h b/src/libs/qmljs/qmljsviewercontext.h index 9d2db50807..7724d872d0 100644 --- a/src/libs/qmljs/qmljsviewercontext.h +++ b/src/libs/qmljs/qmljsviewercontext.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef VIEWERCONTEXT_H -#define VIEWERCONTEXT_H +#pragma once #include "qmljs_global.h" #include "qmljsdialect.h" @@ -59,4 +58,3 @@ public: }; } // namespace QmlJS -#endif // VIEWERCONTEXT_H diff --git a/src/libs/qtcreatorcdbext/common.h b/src/libs/qtcreatorcdbext/common.h index a33ec01ebb..e41a71df12 100644 --- a/src/libs/qtcreatorcdbext/common.h +++ b/src/libs/qtcreatorcdbext/common.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMMON_H -#define COMMON_H +#pragma once // Define KDEXT_64BIT to make all wdbgexts APIs recognize 64 bit addresses // It is recommended for extensions to use 64 bit headers from wdbgexts so @@ -76,5 +75,3 @@ std::string sourceFileNameByOffset(CIDebugSymbols *symbols, ULONG64 offset, PULO # define QTC_TRACE_IN # define QTC_TRACE_OUT #endif - -#endif // COMMON_H diff --git a/src/libs/qtcreatorcdbext/containers.h b/src/libs/qtcreatorcdbext/containers.h index 9113a56fd9..ee991df439 100644 --- a/src/libs/qtcreatorcdbext/containers.h +++ b/src/libs/qtcreatorcdbext/containers.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CONTAINERS_H -#define CONTAINERS_H +#pragma once struct SymbolGroupValueContext; class AbstractSymbolGroupNode; @@ -45,5 +44,3 @@ std::vector<AbstractSymbolGroupNode *> containerChildren(SymbolGroupNode *node, int type, unsigned size, const SymbolGroupValueContext &ctx); - -#endif // CONTAINERS_H diff --git a/src/libs/qtcreatorcdbext/eventcallback.h b/src/libs/qtcreatorcdbext/eventcallback.h index 07e124ecd1..d92f3e97f5 100644 --- a/src/libs/qtcreatorcdbext/eventcallback.h +++ b/src/libs/qtcreatorcdbext/eventcallback.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EVENTCALLBACK_H -#define EVENTCALLBACK_H +#pragma once #include "common.h" #include "extensioncontext.h" @@ -148,4 +147,3 @@ public: private: IDebugEventCallbacks *m_wrapped; }; -#endif // EVENTCALLBACK_H diff --git a/src/libs/qtcreatorcdbext/extensioncontext.h b/src/libs/qtcreatorcdbext/extensioncontext.h index 02066d69dd..428a5275f6 100644 --- a/src/libs/qtcreatorcdbext/extensioncontext.h +++ b/src/libs/qtcreatorcdbext/extensioncontext.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EXTENSIONCONTEXT_H -#define EXTENSIONCONTEXT_H +#pragma once #include "common.h" #include "iinterfacepointer.h" @@ -187,5 +186,3 @@ private: IInterfacePointer<CIDebugRegisters> m_registers; IInterfacePointer<CIDebugDataSpaces> m_dataSpaces; }; - -#endif // EXTENSIONCONTEXT_H diff --git a/src/libs/qtcreatorcdbext/gdbmihelpers.h b/src/libs/qtcreatorcdbext/gdbmihelpers.h index 6821e79596..4bf113d329 100644 --- a/src/libs/qtcreatorcdbext/gdbmihelpers.h +++ b/src/libs/qtcreatorcdbext/gdbmihelpers.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GDBMIHELPERS_H -#define GDBMIHELPERS_H +#pragma once #include "common.h" #include <vector> @@ -177,5 +176,3 @@ bool evaluateExpression(CIDebugControl *control, const std::string expression, bool evaluateInt64Expression(CIDebugControl *control, const std::string expression, LONG64 *, std::string *errorMessage); - -#endif // GDBMIHELPERS_H diff --git a/src/libs/qtcreatorcdbext/iinterfacepointer.h b/src/libs/qtcreatorcdbext/iinterfacepointer.h index bd0b457ec7..64e7e56448 100644 --- a/src/libs/qtcreatorcdbext/iinterfacepointer.h +++ b/src/libs/qtcreatorcdbext/iinterfacepointer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IINTERFACEPOINTER_H -#define IINTERFACEPOINTER_H +#pragma once #include "common.h" @@ -80,5 +79,3 @@ private: IInterface *m_instance; HRESULT m_hr; }; - -#endif // IINTERFACEPOINTER_H diff --git a/src/libs/qtcreatorcdbext/knowntype.h b/src/libs/qtcreatorcdbext/knowntype.h index 6ce6c94e73..6e4d9bf799 100644 --- a/src/libs/qtcreatorcdbext/knowntype.h +++ b/src/libs/qtcreatorcdbext/knowntype.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef KNOWNTYPE_H -#define KNOWNTYPE_H +#pragma once // Enumeration describing a type. enum KnownType @@ -178,5 +177,3 @@ enum KnownType KT_StdMultiMap = KT_STL_Type + KT_ContainerType + KT_HasSimpleDumper + 7, KT_StdArray = KT_STL_Type + KT_ContainerType + KT_HasSimpleDumper + 8 }; - -#endif // KNOWNTYPE_H diff --git a/src/libs/qtcreatorcdbext/outputcallback.h b/src/libs/qtcreatorcdbext/outputcallback.h index 2a5cd1f807..846e4a74c1 100644 --- a/src/libs/qtcreatorcdbext/outputcallback.h +++ b/src/libs/qtcreatorcdbext/outputcallback.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OUTPUTCALLBACK_H -#define OUTPUTCALLBACK_H +#pragma once #include "common.h" @@ -63,5 +62,3 @@ private: bool m_recording; std::wstring m_recorded; }; - -#endif // OUTPUTCALLBACK_H diff --git a/src/libs/qtcreatorcdbext/stringutils.h b/src/libs/qtcreatorcdbext/stringutils.h index 5e8f422ad1..89316d7e9a 100644 --- a/src/libs/qtcreatorcdbext/stringutils.h +++ b/src/libs/qtcreatorcdbext/stringutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef STRINGUTILS_H -#define STRINGUTILS_H +#pragma once #include <string> #include <sstream> @@ -222,5 +221,3 @@ void formatGdbmiHash(std::ostream &os, const std::map<std::string, std::string> // Hex encoding helpers void hexEncode(std::ostream &str, const unsigned char *source, size_t sourcelen); - -#endif // STRINGUTILS_H diff --git a/src/libs/qtcreatorcdbext/symbolgroup.h b/src/libs/qtcreatorcdbext/symbolgroup.h index 5da31d52df..20281a500b 100644 --- a/src/libs/qtcreatorcdbext/symbolgroup.h +++ b/src/libs/qtcreatorcdbext/symbolgroup.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SYMBOLGROUP_H -#define SYMBOLGROUP_H +#pragma once #include "common.h" #include "symbolgroupnode.h" @@ -170,5 +169,3 @@ private: static inline std::string fixWatchExpressionI(CIDebugSymbols *s, const std::string &ex); bool collapsePointerItems(std::string *errorMessage); }; - -#endif // SYMBOLGROUP_H diff --git a/src/libs/qtcreatorcdbext/symbolgroupnode.h b/src/libs/qtcreatorcdbext/symbolgroupnode.h index c46a491528..cf4994fb11 100644 --- a/src/libs/qtcreatorcdbext/symbolgroupnode.h +++ b/src/libs/qtcreatorcdbext/symbolgroupnode.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SYMBOLGROUPNODE_H -#define SYMBOLGROUPNODE_H +#pragma once #include "common.h" @@ -432,5 +431,3 @@ private: const DumpParameters &m_parameters; unsigned m_lastDepth; }; - -#endif // SYMBOLGROUPNODE_H diff --git a/src/libs/qtcreatorcdbext/symbolgroupvalue.h b/src/libs/qtcreatorcdbext/symbolgroupvalue.h index 7a8edf8d42..ad19aff641 100644 --- a/src/libs/qtcreatorcdbext/symbolgroupvalue.h +++ b/src/libs/qtcreatorcdbext/symbolgroupvalue.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SYMBOLGROUPVALUE_H -#define SYMBOLGROUPVALUE_H +#pragma once #include "common.h" #include "knowntype.h" @@ -274,5 +273,3 @@ bool assignType(SymbolGroupNode *n, int valueEncoding, const std::string &value std::vector<AbstractSymbolGroupNode *> dumpComplexType(SymbolGroupNode *node, int type, void *specialInfo, const SymbolGroupValueContext &ctx); - -#endif // SYMBOLGROUPVALUE_H diff --git a/src/libs/sqlite/columndefinition.h b/src/libs/sqlite/columndefinition.h index cf1715a33f..91f64cb24c 100644 --- a/src/libs/sqlite/columndefinition.h +++ b/src/libs/sqlite/columndefinition.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COLUMNDEFINITION_H -#define COLUMNDEFINITION_H +#pragma once #include "sqliteglobal.h" #include "utf8string.h" @@ -51,5 +50,3 @@ private: }; } - -#endif // COLUMNDEFINITION_H diff --git a/src/libs/sqlite/createtablecommand.h b/src/libs/sqlite/createtablecommand.h index 70b2146394..b4387e7ab7 100644 --- a/src/libs/sqlite/createtablecommand.h +++ b/src/libs/sqlite/createtablecommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INTERNAL_CREATETABLECOMMAND_H -#define INTERNAL_CREATETABLECOMMAND_H +#pragma once #include "columndefinition.h" #include "utf8string.h" @@ -48,5 +47,3 @@ public: } // namespace Internal Q_DECLARE_METATYPE(Internal::CreateTableCommand) - -#endif // INTERNAL_CREATETABLECOMMAND_H diff --git a/src/libs/sqlite/createtablesqlstatementbuilder.h b/src/libs/sqlite/createtablesqlstatementbuilder.h index 25caf3ccda..3445d4946f 100644 --- a/src/libs/sqlite/createtablesqlstatementbuilder.h +++ b/src/libs/sqlite/createtablesqlstatementbuilder.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CREATETABLESQLSTATEMENTBUILDER_H -#define CREATETABLESQLSTATEMENTBUILDER_H +#pragma once #include "columndefinition.h" #include "sqlstatementbuilder.h" @@ -62,5 +61,3 @@ private: }; } - -#endif // CREATETABLESQLSTATEMENTBUILDER_H diff --git a/src/libs/sqlite/sqlitecolumn.h b/src/libs/sqlite/sqlitecolumn.h index c16ec3f212..136691e36d 100644 --- a/src/libs/sqlite/sqlitecolumn.h +++ b/src/libs/sqlite/sqlitecolumn.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITECOLUMN_H -#define SQLITECOLUMN_H +#pragma once #include "columndefinition.h" #include "utf8string.h" @@ -55,5 +54,3 @@ private: ColumnType type_; bool isPrimaryKey_; }; - -#endif // SQLITECOLUMN_H diff --git a/src/libs/sqlite/sqlitedatabase.h b/src/libs/sqlite/sqlitedatabase.h index ec77d78f84..91454329ee 100644 --- a/src/libs/sqlite/sqlitedatabase.h +++ b/src/libs/sqlite/sqlitedatabase.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITEDATABASE_H -#define SQLITEDATABASE_H +#pragma once #include "sqlitedatabaseconnectionproxy.h" #include "sqliteglobal.h" @@ -78,5 +77,3 @@ private: QString databaseFilePath_; JournalMode journalMode_; }; - -#endif // SQLITEDATABASE_H diff --git a/src/libs/sqlite/sqlitedatabasebackend.h b/src/libs/sqlite/sqlitedatabasebackend.h index 674e0324d7..7d86519922 100644 --- a/src/libs/sqlite/sqlitedatabasebackend.h +++ b/src/libs/sqlite/sqlitedatabasebackend.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITEDATABASEBACKEND_H -#define SQLITEDATABASEBACKEND_H +#pragma once #include "sqliteglobal.h" @@ -107,5 +106,3 @@ private: TextEncoding cachedTextEncoding; }; - -#endif // SQLITEDATABASEBACKEND_H diff --git a/src/libs/sqlite/sqlitedatabaseconnection.h b/src/libs/sqlite/sqlitedatabaseconnection.h index 154cf250d9..bbf813ffe6 100644 --- a/src/libs/sqlite/sqlitedatabaseconnection.h +++ b/src/libs/sqlite/sqlitedatabaseconnection.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITEDATABASECONNECTIONCONTROLLER_H -#define SQLITEDATABASECONNECTIONCONTROLLER_H +#pragma once #include "sqlitedatabasebackend.h" @@ -56,5 +55,3 @@ signals: private: SqliteDatabaseBackend databaseBackend; }; - -#endif // SQLITEDATABASECONNECTIONCONTROLLER_H diff --git a/src/libs/sqlite/sqlitedatabaseconnectionproxy.h b/src/libs/sqlite/sqlitedatabaseconnectionproxy.h index 2e3f1e7e96..ddc25f18b9 100644 --- a/src/libs/sqlite/sqlitedatabaseconnectionproxy.h +++ b/src/libs/sqlite/sqlitedatabaseconnectionproxy.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITEDATABASECONNECTION_H -#define SQLITEDATABASECONNECTION_H +#pragma once #include <sqliteglobal.h> @@ -62,5 +61,3 @@ private: QPointer<SqliteWorkerThread> databaseConnectionThread; bool databaseConnectionIsOpen; }; - -#endif // SQLITEDATABASECONNECTION_H diff --git a/src/libs/sqlite/sqliteexception.h b/src/libs/sqlite/sqliteexception.h index 54d9084584..b778d39b58 100644 --- a/src/libs/sqlite/sqliteexception.h +++ b/src/libs/sqlite/sqliteexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITEEXCEPTION_H -#define SQLITEEXCEPTION_H +#pragma once #include "sqliteglobal.h" @@ -41,5 +40,3 @@ private: const char *whatErrorHasHappen; QByteArray sqliteErrorMessage_; }; - -#endif // SQLITEEXCEPTION_H diff --git a/src/libs/sqlite/sqliteglobal.h b/src/libs/sqlite/sqliteglobal.h index 5d75871b86..9349230fab 100644 --- a/src/libs/sqlite/sqliteglobal.h +++ b/src/libs/sqlite/sqliteglobal.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITEGLOBAL_H -#define SQLITEGLOBAL_H +#pragma once #include <QtGlobal> @@ -86,6 +85,3 @@ class Utf8StringVector; typedef QMap<Utf8String, QVariant> RowDictionary; typedef QVector<RowDictionary> RowDictionaries; - - -#endif // SQLITEGLOBAL_H diff --git a/src/libs/sqlite/sqlitereadstatement.h b/src/libs/sqlite/sqlitereadstatement.h index 932c36af31..4f27c8657b 100644 --- a/src/libs/sqlite/sqlitereadstatement.h +++ b/src/libs/sqlite/sqlitereadstatement.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITEREADSTATEMENT_H -#define SQLITEREADSTATEMENT_H +#pragma once #include "sqlitestatement.h" @@ -50,5 +49,3 @@ public: protected: void checkIsReadOnlyStatement(); }; - -#endif // SQLITEREADSTATEMENT_H diff --git a/src/libs/sqlite/sqlitereadwritestatement.h b/src/libs/sqlite/sqlitereadwritestatement.h index 1b7e4e8431..cb3c0707d4 100644 --- a/src/libs/sqlite/sqlitereadwritestatement.h +++ b/src/libs/sqlite/sqlitereadwritestatement.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITEREADWRITESTATEMENT_H -#define SQLITEREADWRITESTATEMENT_H +#pragma once #include "sqlitestatement.h" @@ -49,5 +48,3 @@ public: using SqliteStatement::toValue; using SqliteStatement::execute; }; - -#endif // SQLITEREADWRITESTATEMENT_H diff --git a/src/libs/sqlite/sqlitestatement.h b/src/libs/sqlite/sqlitestatement.h index 76762ef284..4cdf5ac262 100644 --- a/src/libs/sqlite/sqlitestatement.h +++ b/src/libs/sqlite/sqlitestatement.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITESTATEMENT_H -#define SQLITESTATEMENT_H +#pragma once #include "sqliteglobal.h" @@ -127,5 +126,3 @@ private: int columnCount_; mutable bool isReadyToFetchValues; }; - -#endif // SQLITESTATEMENT_H diff --git a/src/libs/sqlite/sqlitetable.h b/src/libs/sqlite/sqlitetable.h index c945b96781..16a0661909 100644 --- a/src/libs/sqlite/sqlitetable.h +++ b/src/libs/sqlite/sqlitetable.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITETABLE_H -#define SQLITETABLE_H +#pragma once #include "sqliteglobal.h" #include "tablewriteworkerproxy.h" @@ -75,5 +74,3 @@ private: SqliteDatabase *sqliteDatabase; bool withoutRowId; }; - -#endif // SQLITETABLE_H diff --git a/src/libs/sqlite/sqlitetransaction.h b/src/libs/sqlite/sqlitetransaction.h index 90f83360ea..3ff6c8c739 100644 --- a/src/libs/sqlite/sqlitetransaction.h +++ b/src/libs/sqlite/sqlitetransaction.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITETRANSACTION_H -#define SQLITETRANSACTION_H +#pragma once #include "sqliteglobal.h" @@ -60,6 +59,3 @@ public: SqliteExclusiveTransaction(); }; - - -#endif // SQLITETRANSACTION_H diff --git a/src/libs/sqlite/sqliteworkerthread.h b/src/libs/sqlite/sqliteworkerthread.h index 9f0d640483..b76852434a 100644 --- a/src/libs/sqlite/sqliteworkerthread.h +++ b/src/libs/sqlite/sqliteworkerthread.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITEWORKERTHREAD_H -#define SQLITEWORKERTHREAD_H +#pragma once #include <QMutex> #include <QPointer> @@ -48,5 +47,3 @@ private: mutable QWaitCondition connectionChanged; QPointer<SqliteDatabaseConnection> connection; }; - -#endif // SQLITEWORKERTHREAD_H diff --git a/src/libs/sqlite/sqlitewritestatement.h b/src/libs/sqlite/sqlitewritestatement.h index cf623afb76..abfb27d741 100644 --- a/src/libs/sqlite/sqlitewritestatement.h +++ b/src/libs/sqlite/sqlitewritestatement.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLITEWRITESTATEMENT_H -#define SQLITEWRITESTATEMENT_H +#pragma once #include "sqlitestatement.h" @@ -47,5 +46,3 @@ public: protected: void checkIsWritableStatement(); }; - -#endif // SQLITEWRITESTATEMENT_H diff --git a/src/libs/sqlite/sqlstatementbuilder.h b/src/libs/sqlite/sqlstatementbuilder.h index 674089d19b..6bc092900e 100644 --- a/src/libs/sqlite/sqlstatementbuilder.h +++ b/src/libs/sqlite/sqlstatementbuilder.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLSTATEMENTBUILDER_H -#define SQLSTATEMENTBUILDER_H +#pragma once #include "utf8string.h" @@ -77,5 +76,3 @@ private: mutable Utf8String sqlStatement_; mutable std::vector<BindingPair> bindings; }; - -#endif // SQLSTATEMENTBUILDER_H diff --git a/src/libs/sqlite/sqlstatementbuilderexception.h b/src/libs/sqlite/sqlstatementbuilderexception.h index 104e12d3e5..17e215ad4f 100644 --- a/src/libs/sqlite/sqlstatementbuilderexception.h +++ b/src/libs/sqlite/sqlstatementbuilderexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SQLSTATEMENTBUILDEREXCEPTION_H -#define SQLSTATEMENTBUILDEREXCEPTION_H +#pragma once #include "sqliteexception.h" @@ -33,5 +32,3 @@ class SQLITE_EXPORT SqlStatementBuilderException : public SqliteException public: SqlStatementBuilderException(const char *whatErrorHasHappen, const char *errorMessage = 0); }; - -#endif // SQLSTATEMENTBUILDEREXCEPTION_H diff --git a/src/libs/sqlite/tablewriteworker.h b/src/libs/sqlite/tablewriteworker.h index 26f541a987..8ae95c44c3 100644 --- a/src/libs/sqlite/tablewriteworker.h +++ b/src/libs/sqlite/tablewriteworker.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INTERNAL_TABLEWRITEWORKER_H -#define INTERNAL_TABLEWRITEWORKER_H +#pragma once #include "createtablecommand.h" @@ -47,5 +46,3 @@ signals: }; } // namespace Internal - -#endif // INTERNAL_TABLEWRITEWORKER_H diff --git a/src/libs/sqlite/tablewriteworkerproxy.h b/src/libs/sqlite/tablewriteworkerproxy.h index cff996b70e..0bf481e69d 100644 --- a/src/libs/sqlite/tablewriteworkerproxy.h +++ b/src/libs/sqlite/tablewriteworkerproxy.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INTERNAL_TABLEWRITEWORKERPROXY_H -#define INTERNAL_TABLEWRITEWORKERPROXY_H +#pragma once #include "createtablecommand.h" @@ -62,5 +61,3 @@ private: }; } // namespace Internal - -#endif // INTERNAL_TABLEWRITEWORKERPROXY_H diff --git a/src/libs/sqlite/utf8string.h b/src/libs/sqlite/utf8string.h index 15129c255c..26bf354e24 100644 --- a/src/libs/sqlite/utf8string.h +++ b/src/libs/sqlite/utf8string.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UTF8STRING_H -#define UTF8STRING_H +#pragma once #include "sqliteglobal.h" @@ -127,5 +126,3 @@ SQLITE_EXPORT uint qHash(const Utf8String &utf8String); #define Utf8StringLiteral(str) Utf8String::fromByteArray(QByteArrayLiteral(str)) Q_DECLARE_METATYPE(Utf8String) - -#endif // UTF8STRING_H diff --git a/src/libs/sqlite/utf8stringvector.h b/src/libs/sqlite/utf8stringvector.h index d68f68b811..7d77e283d0 100644 --- a/src/libs/sqlite/utf8stringvector.h +++ b/src/libs/sqlite/utf8stringvector.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UTF8STRINGVECTOR_H -#define UTF8STRINGVECTOR_H +#pragma once #include "sqliteglobal.h" #include "utf8string.h" @@ -69,5 +68,3 @@ SQLITE_EXPORT QDebug operator<<(QDebug debug, const Utf8StringVector &textVector SQLITE_EXPORT void PrintTo(const Utf8StringVector &textVector, ::std::ostream* os); Q_DECLARE_METATYPE(Utf8StringVector) - -#endif // UTF8STRINGVECTOR_H diff --git a/src/libs/ssh/sftpchannel.h b/src/libs/ssh/sftpchannel.h index 0cc5579f0d..78857459ee 100644 --- a/src/libs/ssh/sftpchannel.h +++ b/src/libs/ssh/sftpchannel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SFTPCHANNEL_H -#define SFTPCHANNEL_H +#pragma once #include "sftpdefs.h" #include "sftpincomingpacket_p.h" @@ -102,5 +101,3 @@ private: }; } // namespace QSsh - -#endif // SFTPCHANNEL_H diff --git a/src/libs/ssh/sftpchannel_p.h b/src/libs/ssh/sftpchannel_p.h index a5769abba0..6ab1c3a2db 100644 --- a/src/libs/ssh/sftpchannel_p.h +++ b/src/libs/ssh/sftpchannel_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SFTPCHANNEL_P_H -#define SFTPCHANNEL_P_H +#pragma once #include "sftpdefs.h" #include "sftpincomingpacket_p.h" @@ -123,5 +122,3 @@ private: } // namespace Internal } // namespace QSsh - -#endif // SFTPCHANNEL_P_H diff --git a/src/libs/ssh/sftpdefs.h b/src/libs/ssh/sftpdefs.h index 08813fa750..71d2d6dd30 100644 --- a/src/libs/ssh/sftpdefs.h +++ b/src/libs/ssh/sftpdefs.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SFTPDEFS_H -#define SFTPDEFS_H +#pragma once #include "ssh_global.h" @@ -58,5 +57,3 @@ public: }; } // namespace QSsh - -#endif // SFTPDEFS_H diff --git a/src/libs/ssh/sftpfilesystemmodel.h b/src/libs/ssh/sftpfilesystemmodel.h index 344a4b0989..0dc1401fe6 100644 --- a/src/libs/ssh/sftpfilesystemmodel.h +++ b/src/libs/ssh/sftpfilesystemmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SFTPFILESYSTEMMODEL_H -#define SFTPFILESYSTEMMODEL_H +#pragma once #include "sftpdefs.h" @@ -100,5 +99,3 @@ private: }; } // namespace QSsh; - -#endif // SFTPFILESYSTEMMODEL_H diff --git a/src/libs/ssh/sftpincomingpacket_p.h b/src/libs/ssh/sftpincomingpacket_p.h index da56f5ffd9..fe372e30fb 100644 --- a/src/libs/ssh/sftpincomingpacket_p.h +++ b/src/libs/ssh/sftpincomingpacket_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SFTPINCOMINGPACKET_P_H -#define SFTPINCOMINGPACKET_P_H +#pragma once #include "sftppacket_p.h" @@ -103,5 +102,3 @@ private: } // namespace Internal } // namespace QSsh - -#endif // SFTPINCOMINGPACKET_P_H diff --git a/src/libs/ssh/sftpoperation_p.h b/src/libs/ssh/sftpoperation_p.h index bf3831e111..3ee703f666 100644 --- a/src/libs/ssh/sftpoperation_p.h +++ b/src/libs/ssh/sftpoperation_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SFTPOPERATION_P_H -#define SFTPOPERATION_P_H +#pragma once #include "sftpdefs.h" @@ -243,5 +242,3 @@ struct SftpUploadDir } // namespace Internal } // namespace QSsh - -#endif // SFTPOPERATION_P_H diff --git a/src/libs/ssh/sftpoutgoingpacket_p.h b/src/libs/ssh/sftpoutgoingpacket_p.h index fb0e1a145e..0fcc67c151 100644 --- a/src/libs/ssh/sftpoutgoingpacket_p.h +++ b/src/libs/ssh/sftpoutgoingpacket_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SFTPOUTGOINGPACKET_P_H -#define SFTPOUTGOINGPACKET_P_H +#pragma once #include "sftppacket_p.h" #include "sftpdefs.h" @@ -83,5 +82,3 @@ private: } // namespace Internal } // namespace QSsh - -#endif // SFTPOUTGOINGPACKET_P_H diff --git a/src/libs/ssh/sftppacket_p.h b/src/libs/ssh/sftppacket_p.h index 63e26a279e..b99f7b36d6 100644 --- a/src/libs/ssh/sftppacket_p.h +++ b/src/libs/ssh/sftppacket_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SFTPPACKET_P_H -#define SFTPPACKET_P_H +#pragma once #include <QByteArray> #include <QList> @@ -108,5 +107,3 @@ protected: } // namespace Internal } // namespace QSsh - -#endif // SFTPPACKET_P_H diff --git a/src/libs/ssh/ssh_global.h b/src/libs/ssh/ssh_global.h index 4ac4fedaa3..63cfeeaf8c 100644 --- a/src/libs/ssh/ssh_global.h +++ b/src/libs/ssh/ssh_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSH_GLOBAL_H -#define SSH_GLOBAL_H +#pragma once #include <QtGlobal> @@ -38,5 +37,3 @@ #define QSSH_ASSERT(cond) do { if (!(cond)) { QSSH_PRINT_WARNING; } } while (false) #define QSSH_ASSERT_AND_RETURN(cond) do { if (!(cond)) { QSSH_PRINT_WARNING; return; } } while (false) #define QSSH_ASSERT_AND_RETURN_VALUE(cond, value) do { if (!(cond)) { QSSH_PRINT_WARNING; return value; } } while (false) - -#endif // SSH_GLOBAL_H diff --git a/src/libs/ssh/sshbotanconversions_p.h b/src/libs/ssh/sshbotanconversions_p.h index 6213c19881..30849ad25c 100644 --- a/src/libs/ssh/sshbotanconversions_p.h +++ b/src/libs/ssh/sshbotanconversions_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHBOTANCONVERSIONS_P_H -#define SSHBOTANCONVERSIONS_P_H +#pragma once #include "sshcapabilities_p.h" #include "sshexception_p.h" @@ -131,5 +130,3 @@ inline quint32 botanHMacKeyLen(const QByteArray &rfcAlgoName) } // namespace Internal } // namespace QSsh - -#endif // SSHBOTANCONVERSIONS_P_H diff --git a/src/libs/ssh/sshcapabilities_p.h b/src/libs/ssh/sshcapabilities_p.h index 60e043e3ee..46341681b1 100644 --- a/src/libs/ssh/sshcapabilities_p.h +++ b/src/libs/ssh/sshcapabilities_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CAPABILITIES_P_H -#define CAPABILITIES_P_H +#pragma once #include <QByteArray> #include <QList> @@ -82,5 +81,3 @@ public: } // namespace Internal } // namespace QSsh - -#endif // CAPABILITIES_P_H diff --git a/src/libs/ssh/sshchannel_p.h b/src/libs/ssh/sshchannel_p.h index d1b92dc83e..a55567708f 100644 --- a/src/libs/ssh/sshchannel_p.h +++ b/src/libs/ssh/sshchannel_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHCHANNEL_P_H -#define SSHCHANNEL_P_H +#pragma once #include <QByteArray> #include <QObject> @@ -116,5 +115,3 @@ private: } // namespace Internal } // namespace QSsh - -#endif // SSHCHANNEL_P_H diff --git a/src/libs/ssh/sshchannelmanager_p.h b/src/libs/ssh/sshchannelmanager_p.h index f36b3a7cf1..9f2865e4f3 100644 --- a/src/libs/ssh/sshchannelmanager_p.h +++ b/src/libs/ssh/sshchannelmanager_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHCHANNELMANAGER_P_H -#define SSHCHANNELMANAGER_P_H +#pragma once #include <QHash> #include <QObject> @@ -91,5 +90,3 @@ private: } // namespace Internal } // namespace QSsh - -#endif // SSHCHANNELMANAGER_P_H diff --git a/src/libs/ssh/sshconnection.h b/src/libs/ssh/sshconnection.h index 6b72c524ef..136c91c199 100644 --- a/src/libs/ssh/sshconnection.h +++ b/src/libs/ssh/sshconnection.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHCONNECTION_H -#define SSHCONNECTION_H +#pragma once #include "ssherrors.h" #include "sshhostkeydatabase.h" @@ -141,5 +140,3 @@ private: }; } // namespace QSsh - -#endif // SSHCONNECTION_H diff --git a/src/libs/ssh/sshconnection_p.h b/src/libs/ssh/sshconnection_p.h index a137276092..06eb959294 100644 --- a/src/libs/ssh/sshconnection_p.h +++ b/src/libs/ssh/sshconnection_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHCONNECTION_P_H -#define SSHCONNECTION_P_H +#pragma once #include "sshconnection.h" #include "sshexception_p.h" @@ -172,5 +171,3 @@ private: } // namespace Internal } // namespace QSsh - -#endif // SSHCONNECTION_P_H diff --git a/src/libs/ssh/sshconnectionmanager.h b/src/libs/ssh/sshconnectionmanager.h index e3e0c93451..87d6c50145 100644 --- a/src/libs/ssh/sshconnectionmanager.h +++ b/src/libs/ssh/sshconnectionmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHCONNECTIONMANAGER_H -#define SSHCONNECTIONMANAGER_H +#pragma once #include "ssh_global.h" @@ -40,5 +39,3 @@ QSSH_EXPORT void releaseConnection(SshConnection *connection); QSSH_EXPORT void forceNewConnection(const SshConnectionParameters &sshParams); } // namespace QSsh - -#endif // SSHCONNECTIONMANAGER_H diff --git a/src/libs/ssh/sshcryptofacility_p.h b/src/libs/ssh/sshcryptofacility_p.h index ac5e85d3fb..db008207d1 100644 --- a/src/libs/ssh/sshcryptofacility_p.h +++ b/src/libs/ssh/sshcryptofacility_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHCRYPTOFACILITY_P_H -#define SSHCRYPTOFACILITY_P_H +#pragma once #include <botan/botan.h> @@ -137,5 +136,3 @@ private: } // namespace Internal } // namespace QSsh - -#endif // SSHCRYPTOFACILITY_P_H diff --git a/src/libs/ssh/sshdirecttcpiptunnel.h b/src/libs/ssh/sshdirecttcpiptunnel.h index 9f831ee26a..e242629d6c 100644 --- a/src/libs/ssh/sshdirecttcpiptunnel.h +++ b/src/libs/ssh/sshdirecttcpiptunnel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHDIRECTTCPIPTUNNEL_H -#define SSHDIRECTTCPIPTUNNEL_H +#pragma once #include "ssh_global.h" @@ -79,5 +78,3 @@ private: }; } // namespace QSsh - -#endif // SSHDIRECTTCPIPTUNNEL_H diff --git a/src/libs/ssh/sshdirecttcpiptunnel_p.h b/src/libs/ssh/sshdirecttcpiptunnel_p.h index 438eb71ed0..3d665c0711 100644 --- a/src/libs/ssh/sshdirecttcpiptunnel_p.h +++ b/src/libs/ssh/sshdirecttcpiptunnel_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHDIRECTTCPIPTUNNEL_P_H -#define SSHDIRECTTCPIPTUNNEL_P_H +#pragma once #include "sshchannel_p.h" @@ -75,5 +74,3 @@ private: } // namespace Internal } // namespace QSsh - -#endif // SSHDIRECTTCPIPTUNNEL_P_H diff --git a/src/libs/ssh/ssherrors.h b/src/libs/ssh/ssherrors.h index a178f92ea8..4c85e071cf 100644 --- a/src/libs/ssh/ssherrors.h +++ b/src/libs/ssh/ssherrors.h @@ -23,7 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHERRORS_P_H +#pragma once #define SSHERRORS_P_H namespace QSsh { @@ -35,5 +35,3 @@ enum SshError { }; } // namespace QSsh - -#endif // SSHERRORS_P_H diff --git a/src/libs/ssh/sshexception_p.h b/src/libs/ssh/sshexception_p.h index 9becda115c..b51ce4b04c 100644 --- a/src/libs/ssh/sshexception_p.h +++ b/src/libs/ssh/sshexception_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHEXCEPTION_P_H -#define SSHEXCEPTION_P_H +#pragma once #include "ssherrors.h" @@ -81,5 +80,3 @@ struct SshClientException } // namespace Internal } // namespace QSsh - -#endif // SSHEXCEPTION_P_H diff --git a/src/libs/ssh/sshhostkeydatabase.h b/src/libs/ssh/sshhostkeydatabase.h index 258087f39f..bd58ab86b5 100644 --- a/src/libs/ssh/sshhostkeydatabase.h +++ b/src/libs/ssh/sshhostkeydatabase.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHHOSTKEYDATABASE_H -#define SSHHOSTKEYDATABASE_H +#pragma once #include "ssh_global.h" @@ -65,5 +64,3 @@ private: }; } // namespace QSsh - -#endif // Include guard. diff --git a/src/libs/ssh/sshincomingpacket_p.h b/src/libs/ssh/sshincomingpacket_p.h index 1bea9369f6..5729108fea 100644 --- a/src/libs/ssh/sshincomingpacket_p.h +++ b/src/libs/ssh/sshincomingpacket_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHINCOMINGPACKET_P_H -#define SSHINCOMINGPACKET_P_H +#pragma once #include "sshpacket_p.h" @@ -196,5 +195,3 @@ private: } // namespace Internal } // namespace QSsh - -#endif // SSHINCOMINGPACKET_P_H diff --git a/src/libs/ssh/sshkeycreationdialog.h b/src/libs/ssh/sshkeycreationdialog.h index 5d5957ef9f..adeaae0396 100644 --- a/src/libs/ssh/sshkeycreationdialog.h +++ b/src/libs/ssh/sshkeycreationdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHKEYCREATIONDIALOG_H -#define SSHKEYCREATIONDIALOG_H +#pragma once #include "ssh_global.h" @@ -61,5 +60,3 @@ private: }; } // namespace QSsh - -#endif // SSHKEYCREATIONDIALOG_H diff --git a/src/libs/ssh/sshkeyexchange_p.h b/src/libs/ssh/sshkeyexchange_p.h index e4fca79cfa..b56597b6df 100644 --- a/src/libs/ssh/sshkeyexchange_p.h +++ b/src/libs/ssh/sshkeyexchange_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHKEYEXCHANGE_P_H -#define SSHKEYEXCHANGE_P_H +#pragma once #include "sshconnection.h" @@ -92,5 +91,3 @@ private: } // namespace Internal } // namespace QSsh - -#endif // SSHKEYEXCHANGE_P_H diff --git a/src/libs/ssh/sshkeygenerator.h b/src/libs/ssh/sshkeygenerator.h index c82b2401f8..483614429e 100644 --- a/src/libs/ssh/sshkeygenerator.h +++ b/src/libs/ssh/sshkeygenerator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHKEYGENERATOR_H -#define SSHKEYGENERATOR_H +#pragma once #include "ssh_global.h" @@ -74,5 +73,3 @@ private: }; } // namespace QSsh - -#endif // SSHKEYGENERATOR_H diff --git a/src/libs/ssh/sshkeypasswordretriever_p.h b/src/libs/ssh/sshkeypasswordretriever_p.h index 084e62594b..15301feb67 100644 --- a/src/libs/ssh/sshkeypasswordretriever_p.h +++ b/src/libs/ssh/sshkeypasswordretriever_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef KEYPASSWORDRETRIEVER_H -#define KEYPASSWORDRETRIEVER_H +#pragma once #include <botan/botan.h> @@ -42,5 +41,3 @@ public: } // namespace Internal } // namespace QSsh - -#endif // KEYPASSWORDRETRIEVER_H diff --git a/src/libs/ssh/sshlogging_p.h b/src/libs/ssh/sshlogging_p.h index 7955efe982..07815313e5 100644 --- a/src/libs/ssh/sshlogging_p.h +++ b/src/libs/ssh/sshlogging_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHLOGGING_P_H -#define SSHLOGGING_P_H +#pragma once #include <QLoggingCategory> @@ -33,5 +32,3 @@ namespace Internal { Q_DECLARE_LOGGING_CATEGORY(sshLog) } // namespace Internal } // namespace QSsh - -#endif // Include guard diff --git a/src/libs/ssh/sshoutgoingpacket_p.h b/src/libs/ssh/sshoutgoingpacket_p.h index 8b892038c3..e68b213260 100644 --- a/src/libs/ssh/sshoutgoingpacket_p.h +++ b/src/libs/ssh/sshoutgoingpacket_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHOUTGOINGPACKET_P_H -#define SSHOUTGOINGPACKET_P_H +#pragma once #include "sshpacket_p.h" @@ -106,5 +105,3 @@ private: } // namespace Internal } // namespace QSsh - -#endif // SSHOUTGOINGPACKET_P_H diff --git a/src/libs/ssh/sshpacket_p.h b/src/libs/ssh/sshpacket_p.h index 6171a12618..64fb65f7ab 100644 --- a/src/libs/ssh/sshpacket_p.h +++ b/src/libs/ssh/sshpacket_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHPACKET_P_H -#define SSHPACKET_P_H +#pragma once #include "sshexception_p.h" @@ -139,5 +138,3 @@ protected: } // namespace Internal } // namespace QSsh - -#endif // SSHPACKET_P_H diff --git a/src/libs/ssh/sshpacketparser_p.h b/src/libs/ssh/sshpacketparser_p.h index 2e41418aec..8dd70511d2 100644 --- a/src/libs/ssh/sshpacketparser_p.h +++ b/src/libs/ssh/sshpacketparser_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHPACKETPARSER_P_H -#define SSHPACKETPARSER_P_H +#pragma once #include <botan/botan.h> @@ -73,5 +72,3 @@ public: } // namespace Internal } // namespace QSsh - -#endif // SSHPACKETPARSER_P_H diff --git a/src/libs/ssh/sshpseudoterminal.h b/src/libs/ssh/sshpseudoterminal.h index 3838e53f91..827d6449e2 100644 --- a/src/libs/ssh/sshpseudoterminal.h +++ b/src/libs/ssh/sshpseudoterminal.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHPSEUDOTERMINAL_H -#define SSHPSEUDOTERMINAL_H +#pragma once #include "ssh_global.h" @@ -109,5 +108,3 @@ class QSSH_EXPORT SshPseudoTerminal }; } // namespace QSsh - -#endif // SSHPSEUDOTERMINAL_H diff --git a/src/libs/ssh/sshremoteprocess.h b/src/libs/ssh/sshremoteprocess.h index b65338bbd8..cd54a03ede 100644 --- a/src/libs/ssh/sshremoteprocess.h +++ b/src/libs/ssh/sshremoteprocess.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHREMOTEPROCESS_H -#define SSHREMOTEPROCESS_H +#pragma once #include "ssh_global.h" @@ -120,5 +119,3 @@ private: }; } // namespace QSsh - -#endif // SSHREMOTEPROCESS_H diff --git a/src/libs/ssh/sshremoteprocess_p.h b/src/libs/ssh/sshremoteprocess_p.h index e4eacea415..edf0648329 100644 --- a/src/libs/ssh/sshremoteprocess_p.h +++ b/src/libs/ssh/sshremoteprocess_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHREMOTEPROCESS_P_H -#define SSHREMOTEPROCESS_P_H +#pragma once #include "sshpseudoterminal.h" @@ -102,5 +101,3 @@ private: } // namespace Internal } // namespace QSsh - -#endif // SSHREMOTEPROCESS_P_H diff --git a/src/libs/ssh/sshremoteprocessrunner.h b/src/libs/ssh/sshremoteprocessrunner.h index 1d6075560c..a217d0c94c 100644 --- a/src/libs/ssh/sshremoteprocessrunner.h +++ b/src/libs/ssh/sshremoteprocessrunner.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHREMOTEPROCESSRUNNER_H -#define SSHREMOTEPROCESSRUNNER_H +#pragma once #include "sshconnection.h" #include "sshremoteprocess.h" @@ -83,5 +82,3 @@ private: }; } // namespace QSsh - -#endif // SSHREMOTEPROCESSRUNNER_H diff --git a/src/libs/ssh/sshsendfacility_p.h b/src/libs/ssh/sshsendfacility_p.h index 4921efb380..ba67464476 100644 --- a/src/libs/ssh/sshsendfacility_p.h +++ b/src/libs/ssh/sshsendfacility_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHSENDFACILITY_P_H -#define SSHSENDFACILITY_P_H +#pragma once #include "sshcryptofacility_p.h" #include "sshoutgoingpacket_p.h" @@ -99,5 +98,3 @@ private: } // namespace Internal } // namespace QSsh - -#endif // SSHSENDFACILITY_P_H diff --git a/src/libs/timeline/timeline_global.h b/src/libs/timeline/timeline_global.h index 82ac552d92..1b2a560fb4 100644 --- a/src/libs/timeline/timeline_global.h +++ b/src/libs/timeline/timeline_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TIMELINE_GLOBAL_H -#define TIMELINE_GLOBAL_H +#pragma once #include <QtGlobal> @@ -33,6 +32,3 @@ #else # define TIMELINE_EXPORT Q_DECL_IMPORT #endif - -#endif // TIMELINE_GLOBAL_H - diff --git a/src/libs/timeline/timelineabstractrenderer.h b/src/libs/timeline/timelineabstractrenderer.h index 41df720c42..8ba388e116 100644 --- a/src/libs/timeline/timelineabstractrenderer.h +++ b/src/libs/timeline/timelineabstractrenderer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TIMELINEABSTRACTRENDERER_H -#define TIMELINEABSTRACTRENDERER_H +#pragma once #include "timelinezoomcontrol.h" #include "timelinemodel.h" @@ -93,6 +92,3 @@ protected: }; } // namespace Timeline - - -#endif // TIMELINEABSTRACTRENDERER_H diff --git a/src/libs/timeline/timelineabstractrenderer_p.h b/src/libs/timeline/timelineabstractrenderer_p.h index 7beaa7262b..d2c3917e9d 100644 --- a/src/libs/timeline/timelineabstractrenderer_p.h +++ b/src/libs/timeline/timelineabstractrenderer_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TIMELINEABSTRACTRENDERER_P_H -#define TIMELINEABSTRACTRENDERER_P_H +#pragma once #include "timelineabstractrenderer.h" @@ -49,6 +48,3 @@ public: }; } - -#endif // TIMELINEABSTRACTRENDERER_P_H - diff --git a/src/libs/timeline/timelineitemsrenderpass.h b/src/libs/timeline/timelineitemsrenderpass.h index 7d4044850f..720f1cd9d5 100644 --- a/src/libs/timeline/timelineitemsrenderpass.h +++ b/src/libs/timeline/timelineitemsrenderpass.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TIMELINEITEMSRENDERPASS_H -#define TIMELINEITEMSRENDERPASS_H +#pragma once #include "timelineabstractrenderer.h" #include "timelinerenderpass.h" @@ -81,5 +80,3 @@ protected: }; } // namespace Timeline - -#endif // TIMELINEITEMSRENDERPASS_H diff --git a/src/libs/timeline/timelinemodel.h b/src/libs/timeline/timelinemodel.h index 83ad4012cc..dd9b6701a7 100644 --- a/src/libs/timeline/timelinemodel.h +++ b/src/libs/timeline/timelinemodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TIMELINEMODEL_H -#define TIMELINEMODEL_H +#pragma once #include "timeline_global.h" #include "timelinerenderpass.h" @@ -149,5 +148,3 @@ private: }; } // namespace Timeline - -#endif // TIMELINEMODEL_H diff --git a/src/libs/timeline/timelinemodel_p.h b/src/libs/timeline/timelinemodel_p.h index 0d775e9eda..dce63be8ed 100644 --- a/src/libs/timeline/timelinemodel_p.h +++ b/src/libs/timeline/timelinemodel_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TIMELINEMODEL_P_H -#define TIMELINEMODEL_P_H +#pragma once #include "timelinemodel.h" @@ -146,5 +145,3 @@ private: }; } // namespace Timeline - -#endif // TIMELINEMODEL_P_H diff --git a/src/libs/timeline/timelinemodelaggregator.h b/src/libs/timeline/timelinemodelaggregator.h index 6e27dfde60..17e5d78f1a 100644 --- a/src/libs/timeline/timelinemodelaggregator.h +++ b/src/libs/timeline/timelinemodelaggregator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TIMELINEMODELAGGREGATOR_H -#define TIMELINEMODELAGGREGATOR_H +#pragma once #include "timelinemodel.h" #include "timelinenotesmodel.h" @@ -68,5 +67,3 @@ private: }; } // namespace Timeline - -#endif // TIMELINEMODELAGGREGATOR_H diff --git a/src/libs/timeline/timelinenotesmodel.h b/src/libs/timeline/timelinenotesmodel.h index 9f4039df58..2a83136704 100644 --- a/src/libs/timeline/timelinenotesmodel.h +++ b/src/libs/timeline/timelinenotesmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TIMELINENOTESMODEL_H -#define TIMELINENOTESMODEL_H +#pragma once #include "timelinemodel.h" @@ -78,5 +77,3 @@ private: }; } // namespace Timeline - -#endif // TIMELINENOTESMODEL_H diff --git a/src/libs/timeline/timelinenotesmodel_p.h b/src/libs/timeline/timelinenotesmodel_p.h index ec02a19be1..455ee8af69 100644 --- a/src/libs/timeline/timelinenotesmodel_p.h +++ b/src/libs/timeline/timelinenotesmodel_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TIMELINENOTESMODEL_P_H -#define TIMELINENOTESMODEL_P_H +#pragma once #include "timelinenotesmodel.h" @@ -55,6 +54,3 @@ private: }; } // namespace Timeline - -#endif // TIMELINENOTESMODEL_P_H - diff --git a/src/libs/timeline/timelinenotesrenderpass.h b/src/libs/timeline/timelinenotesrenderpass.h index 75f40ddc4f..4eaa341863 100644 --- a/src/libs/timeline/timelinenotesrenderpass.h +++ b/src/libs/timeline/timelinenotesrenderpass.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TIMELINENOTESRENDERPASS_H -#define TIMELINENOTESRENDERPASS_H +#pragma once #include "timelineabstractrenderer.h" #include <QSGMaterial> @@ -45,6 +44,3 @@ private: }; } // namespace Timeline - -#endif // TIMELINENOTESRENDERPASS_H - diff --git a/src/libs/timeline/timelineoverviewrenderer.h b/src/libs/timeline/timelineoverviewrenderer.h index 54548db0eb..d5c946dde7 100644 --- a/src/libs/timeline/timelineoverviewrenderer.h +++ b/src/libs/timeline/timelineoverviewrenderer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TIMELINEOVERVIEWRENDERER_H -#define TIMELINEOVERVIEWRENDERER_H +#pragma once #include "timelineabstractrenderer.h" @@ -45,5 +44,3 @@ protected: } // namespace Timeline QML_DECLARE_TYPE(Timeline::TimelineOverviewRenderer) - -#endif // TIMELINEOVERVIEWRENDERER_H diff --git a/src/libs/timeline/timelineoverviewrenderer_p.h b/src/libs/timeline/timelineoverviewrenderer_p.h index bbc79e336e..d45d4d716b 100644 --- a/src/libs/timeline/timelineoverviewrenderer_p.h +++ b/src/libs/timeline/timelineoverviewrenderer_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TIMELINEOVERVIEWRENDERER_P_H -#define TIMELINEOVERVIEWRENDERER_P_H +#pragma once #include "timelineoverviewrenderer.h" #include "timelineabstractrenderer_p.h" @@ -42,6 +41,3 @@ public: }; } // namespace Timeline - -#endif // TIMELINEOVERVIEWRENDERER_P_H - diff --git a/src/libs/timeline/timelinerenderer.h b/src/libs/timeline/timelinerenderer.h index 0c6d877329..bd23b30321 100644 --- a/src/libs/timeline/timelinerenderer.h +++ b/src/libs/timeline/timelinerenderer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TIMELINERENDERER_H -#define TIMELINERENDERER_H +#pragma once #include "timelinezoomcontrol.h" #include "timelinemodel.h" @@ -71,5 +70,3 @@ private: } // namespace Timeline QML_DECLARE_TYPE(Timeline::TimelineRenderer) - -#endif // TIMELINERENDERER_H diff --git a/src/libs/timeline/timelinerenderer_p.h b/src/libs/timeline/timelinerenderer_p.h index 7ba5dcc685..eccab59f4d 100644 --- a/src/libs/timeline/timelinerenderer_p.h +++ b/src/libs/timeline/timelinerenderer_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TIMELINERENDERER_P_H -#define TIMELINERENDERER_P_H +#pragma once #include "timelinerenderer.h" #include "timelineabstractrenderer_p.h" @@ -66,6 +65,3 @@ private: }; } // namespace Timeline - -#endif // TIMELINERENDERER_P_H - diff --git a/src/libs/timeline/timelinerenderpass.h b/src/libs/timeline/timelinerenderpass.h index 60a77744e4..54dbe34388 100644 --- a/src/libs/timeline/timelinerenderpass.h +++ b/src/libs/timeline/timelinerenderpass.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TIMELINERENDERPASS_H -#define TIMELINERENDERPASS_H +#pragma once #include "timeline_global.h" #include <QVector> @@ -54,5 +53,3 @@ public: }; } // namespace Timeline - -#endif // TIMELINERENDERPASS_H diff --git a/src/libs/timeline/timelinerenderstate.h b/src/libs/timeline/timelinerenderstate.h index 7cc0a2313c..c4e44da018 100644 --- a/src/libs/timeline/timelinerenderstate.h +++ b/src/libs/timeline/timelinerenderstate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TIMELINERENDERSTATE_H -#define TIMELINERENDERSTATE_H +#pragma once #include <QSGNode> #include "timelinerenderpass.h" @@ -68,5 +67,3 @@ private: }; } // namespace Timeline - -#endif // TIMELINERENDERSTATE_H diff --git a/src/libs/timeline/timelinerenderstate_p.h b/src/libs/timeline/timelinerenderstate_p.h index e7967a9ac1..d76dd6b3de 100644 --- a/src/libs/timeline/timelinerenderstate_p.h +++ b/src/libs/timeline/timelinerenderstate_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TIMELINERENDERSTATE_P_H -#define TIMELINERENDERSTATE_P_H +#pragma once #include "timelinerenderstate.h" @@ -46,6 +45,3 @@ public: }; } // namespace Timeline - -#endif // TIMELINERENDERSTATE_P_H - diff --git a/src/libs/timeline/timelineselectionrenderpass.h b/src/libs/timeline/timelineselectionrenderpass.h index 15f43f3284..b66328259b 100644 --- a/src/libs/timeline/timelineselectionrenderpass.h +++ b/src/libs/timeline/timelineselectionrenderpass.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TIMELINESELECTIONRENDERPASS_H -#define TIMELINESELECTIONRENDERPASS_H +#pragma once #include "timelineabstractrenderer.h" #include "timelinerenderpass.h" @@ -46,6 +45,3 @@ protected: }; } // namespace Timeline - -#endif // TIMELINESELECTIONRENDERPASS_H - diff --git a/src/libs/timeline/timelinezoomcontrol.h b/src/libs/timeline/timelinezoomcontrol.h index 57ef9ae511..2236e754f3 100644 --- a/src/libs/timeline/timelinezoomcontrol.h +++ b/src/libs/timeline/timelinezoomcontrol.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TIMELINEZOOMCONTROL_H -#define TIMELINEZOOMCONTROL_H +#pragma once #include "timeline_global.h" #include <QTimer> @@ -117,5 +116,3 @@ protected: }; } // namespace Timeline - -#endif // TIMELINEZOOMCONTROL_H diff --git a/src/libs/utils/algorithm.h b/src/libs/utils/algorithm.h index fbb9eda5be..61a0a5d10f 100644 --- a/src/libs/utils/algorithm.h +++ b/src/libs/utils/algorithm.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ALGORITHM_H -#define ALGORITHM_H +#pragma once #include <qcompilerdetection.h> // for Q_REQUIRED_RESULT @@ -430,5 +429,3 @@ inline void sort(Container &c, Predicate p) } } - -#endif // ALGORITHM_H diff --git a/src/libs/utils/annotateditemdelegate.h b/src/libs/utils/annotateditemdelegate.h index 4e054fe25d..c14b1d49d4 100644 --- a/src/libs/utils/annotateditemdelegate.h +++ b/src/libs/utils/annotateditemdelegate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANNOTATEDITEMDELEGATE_H -#define ANNOTATEDITEMDELEGATE_H +#pragma once #include "utils_global.h" @@ -56,5 +55,3 @@ private: }; } // Utils - -#endif // ANNOTATEDITEMDELEGATE_H diff --git a/src/libs/utils/ansiescapecodehandler.h b/src/libs/utils/ansiescapecodehandler.h index 50e3e341bb..0451297621 100644 --- a/src/libs/utils/ansiescapecodehandler.h +++ b/src/libs/utils/ansiescapecodehandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UTILS_ANSIESCAPECODEHANDLER_H -#define UTILS_ANSIESCAPECODEHANDLER_H +#pragma once #include "utils_global.h" @@ -60,5 +59,3 @@ private: }; } // namespace Utils - -#endif // UTILS_ANSIESCAPECODEHANDLER_H diff --git a/src/libs/utils/appmainwindow.h b/src/libs/utils/appmainwindow.h index 51e1b72e3c..c93695550d 100644 --- a/src/libs/utils/appmainwindow.h +++ b/src/libs/utils/appmainwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef APPMAINWINDOW_H -#define APPMAINWINDOW_H +#pragma once #include "utils_global.h" #include <QMainWindow> @@ -54,5 +53,3 @@ private: }; } // Utils - -#endif // APPMAINWINDOW_H diff --git a/src/libs/utils/basetreeview.h b/src/libs/utils/basetreeview.h index ec696ba2d8..390fdba321 100644 --- a/src/libs/utils/basetreeview.h +++ b/src/libs/utils/basetreeview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BASETREEVIEW_H -#define BASETREEVIEW_H +#pragma once #include "utils_global.h" @@ -72,5 +71,3 @@ private: }; } // namespace Utils - -#endif // BASETREEVIEW_H diff --git a/src/libs/utils/bracematcher.h b/src/libs/utils/bracematcher.h index 910c3549ff..e2fa0928d3 100644 --- a/src/libs/utils/bracematcher.h +++ b/src/libs/utils/bracematcher.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BRACEMATCHER_H -#define BRACEMATCHER_H +#pragma once #include "utils_global.h" @@ -65,5 +64,3 @@ private: }; } // namespace Utils - -#endif // BRACEMATCHER_H diff --git a/src/libs/utils/buildablehelperlibrary.h b/src/libs/utils/buildablehelperlibrary.h index ab5c99bcdf..c818749f2b 100644 --- a/src/libs/utils/buildablehelperlibrary.h +++ b/src/libs/utils/buildablehelperlibrary.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BUILDABLEHELPERLIBRARY_H -#define BUILDABLEHELPERLIBRARY_H +#pragma once #include "environment.h" #include "fileutils.h" @@ -79,5 +78,3 @@ public: }; } - -#endif // BUILDABLEHELPERLIBRARY_H diff --git a/src/libs/utils/categorysortfiltermodel.h b/src/libs/utils/categorysortfiltermodel.h index 9956f69149..a0ae25ff69 100644 --- a/src/libs/utils/categorysortfiltermodel.h +++ b/src/libs/utils/categorysortfiltermodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CATEGORYSORTFILTERMODEL_H -#define CATEGORYSORTFILTERMODEL_H +#pragma once #include "utils_global.h" @@ -42,5 +41,3 @@ protected: }; } // Utils - -#endif // CATEGORYSORTFILTERMODEL_H diff --git a/src/libs/utils/changeset.h b/src/libs/utils/changeset.h index ef2cc559f5..d445237b44 100644 --- a/src/libs/utils/changeset.h +++ b/src/libs/utils/changeset.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CHANGESET_H -#define CHANGESET_H +#pragma once #include "utils_global.h" @@ -124,5 +123,3 @@ private: }; } // namespace Utils - -#endif // CHANGESET_H diff --git a/src/libs/utils/checkablemessagebox.h b/src/libs/utils/checkablemessagebox.h index 7975da1864..c120098e00 100644 --- a/src/libs/utils/checkablemessagebox.h +++ b/src/libs/utils/checkablemessagebox.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CHECKABLEMESSAGEBOX_H -#define CHECKABLEMESSAGEBOX_H +#pragma once #include "utils_global.h" @@ -130,5 +129,3 @@ private: }; } // namespace Utils - -#endif // CHECKABLEMESSAGEBOX_H diff --git a/src/libs/utils/classnamevalidatinglineedit.h b/src/libs/utils/classnamevalidatinglineedit.h index f707008a71..f3ba7acc0c 100644 --- a/src/libs/utils/classnamevalidatinglineedit.h +++ b/src/libs/utils/classnamevalidatinglineedit.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLASSNAMEVALIDATINGLINEEDIT_H -#define CLASSNAMEVALIDATINGLINEEDIT_H +#pragma once #include "fancylineedit.h" @@ -74,5 +73,3 @@ private: }; } // namespace Utils - -#endif // CLASSNAMEVALIDATINGLINEEDIT_H diff --git a/src/libs/utils/codegeneration.h b/src/libs/utils/codegeneration.h index 41dadf350c..2738d7b27a 100644 --- a/src/libs/utils/codegeneration.h +++ b/src/libs/utils/codegeneration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CODEGENERATION_H -#define CODEGENERATION_H +#pragma once #include "utils_global.h" @@ -69,5 +68,3 @@ void writeClosingNameSpaces(const QStringList &namespaces, QTextStream &str); } // namespace Utils - -#endif // CODEGENERATION_H diff --git a/src/libs/utils/completinglineedit.h b/src/libs/utils/completinglineedit.h index 875262f393..abcced4de3 100644 --- a/src/libs/utils/completinglineedit.h +++ b/src/libs/utils/completinglineedit.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMPLETINGLINEEDIT_H -#define COMPLETINGLINEEDIT_H +#pragma once #include "utils_global.h" #include <QLineEdit> @@ -44,5 +43,3 @@ protected: }; } // namespace Utils - -#endif // COMPLETINGLINEEDIT_H diff --git a/src/libs/utils/completingtextedit.h b/src/libs/utils/completingtextedit.h index 6d5e937ccf..666e2f21dd 100644 --- a/src/libs/utils/completingtextedit.h +++ b/src/libs/utils/completingtextedit.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMPLETINGTEXTEDIT_H -#define COMPLETINGTEXTEDIT_H +#pragma once #include "utils_global.h" @@ -63,5 +62,3 @@ private: }; } // namespace Utils - -#endif // COMPLETINGTEXTEDIT_H diff --git a/src/libs/utils/consoleprocess.h b/src/libs/utils/consoleprocess.h index d81cdbecff..59a51d98cf 100644 --- a/src/libs/utils/consoleprocess.h +++ b/src/libs/utils/consoleprocess.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CONSOLEPROCESS_H -#define CONSOLEPROCESS_H +#pragma once #include "utils_global.h" @@ -135,5 +134,3 @@ private: }; } //namespace Utils - -#endif diff --git a/src/libs/utils/consoleprocess_p.h b/src/libs/utils/consoleprocess_p.h index 8b4e76c850..8fa610a709 100644 --- a/src/libs/utils/consoleprocess_p.h +++ b/src/libs/utils/consoleprocess_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CONSOLEPROCESS_P_H -#define CONSOLEPROCESS_P_H +#pragma once #include "consoleprocess.h" #include "environment.h" @@ -79,5 +78,3 @@ struct ConsoleProcessPrivate { }; } //namespace Utils - -#endif diff --git a/src/libs/utils/crumblepath.h b/src/libs/utils/crumblepath.h index 4bc43e2597..d3d1962535 100644 --- a/src/libs/utils/crumblepath.h +++ b/src/libs/utils/crumblepath.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CRUMBLEPATH_H -#define CRUMBLEPATH_H +#pragma once #include "utils_global.h" @@ -73,5 +72,3 @@ private: }; } // namespace Utils - -#endif // CRUMBLEPATH_H diff --git a/src/libs/utils/declarationmacros.h b/src/libs/utils/declarationmacros.h index 24baaee135..4b7b894544 100644 --- a/src/libs/utils/declarationmacros.h +++ b/src/libs/utils/declarationmacros.h @@ -30,4 +30,3 @@ Class &operator=(const Class&) = delete; \ Class(Class&&) = delete; \ Class &operator=(Class&&) = delete; - diff --git a/src/libs/utils/detailsbutton.h b/src/libs/utils/detailsbutton.h index f5754f5d28..3540d8d116 100644 --- a/src/libs/utils/detailsbutton.h +++ b/src/libs/utils/detailsbutton.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DETAILSBUTTON_H -#define DETAILSBUTTON_H +#pragma once #include "utils_global.h" @@ -80,4 +79,3 @@ private: float m_fader; }; } // namespace Utils -#endif // DETAILSBUTTON_H diff --git a/src/libs/utils/detailswidget.h b/src/libs/utils/detailswidget.h index 7170324d7a..5ce8c04f5d 100644 --- a/src/libs/utils/detailswidget.h +++ b/src/libs/utils/detailswidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DETAILSWIDGET_H -#define DETAILSWIDGET_H +#pragma once #include "utils_global.h" @@ -101,5 +100,3 @@ private: }; } // namespace Utils - -#endif // DETAILSWIDGET_H diff --git a/src/libs/utils/dropsupport.h b/src/libs/utils/dropsupport.h index 77ec885450..c91f2c5c8a 100644 --- a/src/libs/utils/dropsupport.h +++ b/src/libs/utils/dropsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UTILS_DROPSUPPORT_H -#define UTILS_DROPSUPPORT_H +#pragma once #include "utils_global.h" @@ -105,5 +104,3 @@ private: }; } // namespace Utils - -#endif // UTILS_DROPSUPPORT_H diff --git a/src/libs/utils/elfreader.h b/src/libs/utils/elfreader.h index 3df707c920..fe965a0fc8 100644 --- a/src/libs/utils/elfreader.h +++ b/src/libs/utils/elfreader.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UTILS_ELFREADER_H -#define UTILS_ELFREADER_H +#pragma once #include "utils_global.h" @@ -189,5 +188,3 @@ public: }; } // namespace Utils - -#endif // UTILS_ELFREADER_H diff --git a/src/libs/utils/elidinglabel.h b/src/libs/utils/elidinglabel.h index 8d7daf5546..fa7bab29d2 100644 --- a/src/libs/utils/elidinglabel.h +++ b/src/libs/utils/elidinglabel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ELIDINGLABEL_H -#define ELIDINGLABEL_H +#pragma once #include "utils_global.h" #include <QLabel> @@ -51,5 +50,3 @@ private: }; } // namespace Utils - -#endif // ELIDINGLABEL_H diff --git a/src/libs/utils/environment.h b/src/libs/utils/environment.h index 7e01a877a2..c7773179e5 100644 --- a/src/libs/utils/environment.h +++ b/src/libs/utils/environment.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UTILS_ENVIRONMENT_H -#define UTILS_ENVIRONMENT_H +#pragma once #include "fileutils.h" #include "hostosinfo.h" @@ -115,5 +114,3 @@ private: }; } // namespace Utils - -#endif // UTILS_ENVIRONMENT_H diff --git a/src/libs/utils/environmentmodel.h b/src/libs/utils/environmentmodel.h index 0e658e4f02..171c19b8f2 100644 --- a/src/libs/utils/environmentmodel.h +++ b/src/libs/utils/environmentmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UTILS_ENVIRONMENTMODEL_H -#define UTILS_ENVIRONMENTMODEL_H +#pragma once #include "utils_global.h" @@ -76,5 +75,3 @@ private: }; } // namespace Utils - -#endif // UTILS_ENVIRONMENTMODEL_H diff --git a/src/libs/utils/execmenu.h b/src/libs/utils/execmenu.h index 7d5b34bd19..90c3c35673 100644 --- a/src/libs/utils/execmenu.h +++ b/src/libs/utils/execmenu.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EXECMENU_H -#define EXECMENU_H +#pragma once #include "utils_global.h" @@ -39,5 +38,3 @@ namespace Utils { QTCREATOR_UTILS_EXPORT QAction *execMenuAtWidget(QMenu *menu, QWidget *widget); } // namespace Utils - -#endif // EXECMENU_H diff --git a/src/libs/utils/executeondestruction.h b/src/libs/utils/executeondestruction.h index 71b69c1aa5..1e95af297d 100644 --- a/src/libs/utils/executeondestruction.h +++ b/src/libs/utils/executeondestruction.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EXECUTEONDESTRUCTION_H -#define EXECUTEONDESTRUCTION_H +#pragma once #include <functional> @@ -41,5 +40,3 @@ private: }; } // Utils - -#endif // EXECUTEONDESTRUCTION_H diff --git a/src/libs/utils/fadingindicator.h b/src/libs/utils/fadingindicator.h index 31e52ad920..5f4e96436c 100644 --- a/src/libs/utils/fadingindicator.h +++ b/src/libs/utils/fadingindicator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FADINGINDICATOR_H -#define FADINGINDICATOR_H +#pragma once #include "utils_global.h" @@ -45,6 +44,3 @@ QTCREATOR_UTILS_EXPORT void showPixmap(QWidget *parent, const QString &pixmap); } // FadingIndicator } // Utils - -#endif // FADINGINDICATOR_H - diff --git a/src/libs/utils/faketooltip.h b/src/libs/utils/faketooltip.h index ff9cfc3541..3cb5cbeb47 100644 --- a/src/libs/utils/faketooltip.h +++ b/src/libs/utils/faketooltip.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FAKETOOLTIP_H -#define FAKETOOLTIP_H +#pragma once #include "utils_global.h" @@ -45,5 +44,3 @@ protected: }; } // namespace Utils - -#endif // FAKETOOLTIP_H diff --git a/src/libs/utils/fancylineedit.h b/src/libs/utils/fancylineedit.h index fdc85b273a..9df78961bb 100644 --- a/src/libs/utils/fancylineedit.h +++ b/src/libs/utils/fancylineedit.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FANCYLINEEDIT_H -#define FANCYLINEEDIT_H +#pragma once #include "utils_global.h" #include "completinglineedit.h" @@ -182,5 +181,3 @@ private: }; } // namespace Utils - -#endif // FANCYLINEEDIT_H diff --git a/src/libs/utils/fancymainwindow.h b/src/libs/utils/fancymainwindow.h index 1b1cbde4a1..1960bea384 100644 --- a/src/libs/utils/fancymainwindow.h +++ b/src/libs/utils/fancymainwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FANCYMAINWINDOW_H -#define FANCYMAINWINDOW_H +#pragma once #include "utils_global.h" @@ -90,5 +89,3 @@ private: }; } // namespace Utils - -#endif // FANCYMAINWINDOW_H diff --git a/src/libs/utils/fileinprojectfinder.h b/src/libs/utils/fileinprojectfinder.h index d47261939f..4fc3af8ece 100644 --- a/src/libs/utils/fileinprojectfinder.h +++ b/src/libs/utils/fileinprojectfinder.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FILEINPROJECTFINDER_H -#define FILEINPROJECTFINDER_H +#pragma once #include <utils/utils_global.h> @@ -66,5 +65,3 @@ private: }; } // namespace Utils - -#endif // FILEINPROJECTFINDER_H diff --git a/src/libs/utils/filenamevalidatinglineedit.h b/src/libs/utils/filenamevalidatinglineedit.h index 4fc63a1620..1185723fdf 100644 --- a/src/libs/utils/filenamevalidatinglineedit.h +++ b/src/libs/utils/filenamevalidatinglineedit.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FILENAMEVALIDATINGLINEEDIT_H -#define FILENAMEVALIDATINGLINEEDIT_H +#pragma once #include "fancylineedit.h" @@ -79,5 +78,3 @@ private: }; } // namespace Utils - -#endif // FILENAMEVALIDATINGLINEEDIT_H diff --git a/src/libs/utils/filesearch.h b/src/libs/utils/filesearch.h index 39a8fa0661..05cadc261d 100644 --- a/src/libs/utils/filesearch.h +++ b/src/libs/utils/filesearch.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FILESEARCH_H -#define FILESEARCH_H +#pragma once #include "utils_global.h" @@ -178,5 +177,3 @@ QTCREATOR_UTILS_EXPORT QString expandRegExpReplacement(const QString &replaceTex QTCREATOR_UTILS_EXPORT QString matchCaseReplacement(const QString &originalText, const QString &replaceText); } // namespace Utils - -#endif // FILESEARCH_H diff --git a/src/libs/utils/filesystemwatcher.h b/src/libs/utils/filesystemwatcher.h index 71c5ab64ce..59f5938204 100644 --- a/src/libs/utils/filesystemwatcher.h +++ b/src/libs/utils/filesystemwatcher.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FILESYSTEMWATCHER_H -#define FILESYSTEMWATCHER_H +#pragma once #include "utils_global.h" @@ -82,5 +81,3 @@ private: }; } // namespace Utils - -#endif // FILESYSTEMWATCHER_H diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h index 286ffd02f7..79f5b9ddac 100644 --- a/src/libs/utils/fileutils.h +++ b/src/libs/utils/fileutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FILEUTILS_H -#define FILEUTILS_H +#pragma once #include "utils_global.h" @@ -207,5 +206,3 @@ QTCREATOR_UTILS_EXPORT uint qHash(const Utils::FileName &a); QT_END_NAMESPACE Q_DECLARE_METATYPE(Utils::FileName) - -#endif // FILEUTILS_H diff --git a/src/libs/utils/fileutils_mac.h b/src/libs/utils/fileutils_mac.h index 640a8f8a3f..5b66130274 100644 --- a/src/libs/utils/fileutils_mac.h +++ b/src/libs/utils/fileutils_mac.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FILEUTILS_MAC_H -#define FILEUTILS_MAC_H +#pragma once #include <QUrl> @@ -36,6 +35,3 @@ QString normalizePathName(const QString &filePath); } // Internal } // Utils - -#endif // FILEUTILS_MAC_H - diff --git a/src/libs/utils/filewizardpage.h b/src/libs/utils/filewizardpage.h index ffcc7dad7e..e0f19d03db 100644 --- a/src/libs/utils/filewizardpage.h +++ b/src/libs/utils/filewizardpage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FILEWIZARDPAGE_H -#define FILEWIZARDPAGE_H +#pragma once #include "utils_global.h" @@ -75,5 +74,3 @@ private: }; } // namespace Utils - -#endif // FILEWIZARDPAGE_H diff --git a/src/libs/utils/flowlayout.h b/src/libs/utils/flowlayout.h index fe727107a9..c76472fafb 100644 --- a/src/libs/utils/flowlayout.h +++ b/src/libs/utils/flowlayout.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FLOWLAYOUT_H -#define FLOWLAYOUT_H +#pragma once #include "utils_global.h" @@ -63,5 +62,3 @@ private: }; } // namespace Utils - -#endif // FLOWLAYOUT_H diff --git a/src/libs/utils/headerviewstretcher.h b/src/libs/utils/headerviewstretcher.h index 2e9190ddeb..e360ff58b1 100644 --- a/src/libs/utils/headerviewstretcher.h +++ b/src/libs/utils/headerviewstretcher.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HEADERVIEWSTRETCHER_H -#define HEADERVIEWSTRETCHER_H +#pragma once #include "utils_global.h" #include <QObject> @@ -46,5 +45,3 @@ public: }; } // namespace Utils - -#endif // HEADERVIEWSTRETCHER_H diff --git a/src/libs/utils/historycompleter.h b/src/libs/utils/historycompleter.h index eaaca115a1..4ab08f8700 100644 --- a/src/libs/utils/historycompleter.h +++ b/src/libs/utils/historycompleter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HISTORYCOMPLETER_H -#define HISTORYCOMPLETER_H +#pragma once #include "utils_global.h" @@ -64,5 +63,3 @@ private: }; } // namespace Utils - -#endif // HISTORYCOMPLETER_H diff --git a/src/libs/utils/hostosinfo.h b/src/libs/utils/hostosinfo.h index 9991c6605b..72327a5c40 100644 --- a/src/libs/utils/hostosinfo.h +++ b/src/libs/utils/hostosinfo.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HOSTOSINFO_H -#define HOSTOSINFO_H +#pragma once #include "utils_global.h" @@ -114,5 +113,3 @@ bool HostOsInfo::isAnyUnixHost() } } // namespace Utils - -#endif // HOSTOSINFO_H diff --git a/src/libs/utils/htmldocextractor.h b/src/libs/utils/htmldocextractor.h index 5b975666d3..f7c82f54a1 100644 --- a/src/libs/utils/htmldocextractor.h +++ b/src/libs/utils/htmldocextractor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HTMLDOCEXTRACTOR_H -#define HTMLDOCEXTRACTOR_H +#pragma once #include "utils_global.h" @@ -87,5 +86,3 @@ private: }; } // namespace Utils - -#endif // HTMLDOCEXTRACTOR_H diff --git a/src/libs/utils/icon.h b/src/libs/utils/icon.h index be012d3fea..8041b838e6 100644 --- a/src/libs/utils/icon.h +++ b/src/libs/utils/icon.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef THEMEHELPER_H -#define THEMEHELPER_H +#pragma once #include "utils_global.h" #include "theme/theme.h" @@ -86,5 +85,3 @@ private: } // namespace Utils Q_DECLARE_OPERATORS_FOR_FLAGS(Utils::Icon::IconStyleOptions) - -#endif // THEMEHELPER_H diff --git a/src/libs/utils/itemviews.h b/src/libs/utils/itemviews.h index 7604bc59bd..5708c6dc4d 100644 --- a/src/libs/utils/itemviews.h +++ b/src/libs/utils/itemviews.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TREEVIEW_H -#define TREEVIEW_H +#pragma once #include "utils_global.h" @@ -122,7 +121,4 @@ public: {} }; - -} - -#endif // TREEVIEW_H +} // Utils diff --git a/src/libs/utils/json.h b/src/libs/utils/json.h index fe4918230f..09b74d8950 100644 --- a/src/libs/utils/json.h +++ b/src/libs/utils/json.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JSON_H -#define JSON_H +#pragma once #include "utils_global.h" @@ -417,5 +416,3 @@ private: }; } // namespace Utils - -#endif // JSON_H diff --git a/src/libs/utils/linecolumnlabel.h b/src/libs/utils/linecolumnlabel.h index 1ae57ad292..4eeb55f257 100644 --- a/src/libs/utils/linecolumnlabel.h +++ b/src/libs/utils/linecolumnlabel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LINECOLUMNLABEL_H -#define LINECOLUMNLABEL_H +#pragma once #include "utils_global.h" #include <QLabel> @@ -58,5 +57,3 @@ private: }; } // namespace Utils - -#endif // LINECOLUMNLABEL_H diff --git a/src/libs/utils/listutils.h b/src/libs/utils/listutils.h index 2b32073547..a116801176 100644 --- a/src/libs/utils/listutils.h +++ b/src/libs/utils/listutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LISTUTILS_H -#define LISTUTILS_H +#pragma once #include <QList> @@ -41,5 +40,3 @@ QList<T1> qwConvertList(const QList<T2> &list) } } // namespace Utils - -#endif // LISTUTILS_H diff --git a/src/libs/utils/macroexpander.h b/src/libs/utils/macroexpander.h index eebb315549..a8fd1afdab 100644 --- a/src/libs/utils/macroexpander.h +++ b/src/libs/utils/macroexpander.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UTILS_MACROEXPANDER_H -#define UTILS_MACROEXPANDER_H +#pragma once #include "utils_global.h" @@ -103,5 +102,3 @@ private: QTCREATOR_UTILS_EXPORT MacroExpander *globalMacroExpander(); } // namespace Utils - -#endif // UTILS_MACROEXPANDER_H diff --git a/src/libs/utils/mimetypes/mimedatabase.h b/src/libs/utils/mimetypes/mimedatabase.h index 884d5a7552..7d69cde501 100644 --- a/src/libs/utils/mimetypes/mimedatabase.h +++ b/src/libs/utils/mimetypes/mimedatabase.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef XMIMEDATABASE_H -#define XMIMEDATABASE_H +#pragma once #include "mimetype.h" #include "mimemagicrule_p.h" @@ -103,5 +102,3 @@ private: }; } // Utils - -#endif // MIMEDATABASE_H diff --git a/src/libs/utils/mimetypes/mimedatabase_p.h b/src/libs/utils/mimetypes/mimedatabase_p.h index a1cc7c3769..b576cada8f 100644 --- a/src/libs/utils/mimetypes/mimedatabase_p.h +++ b/src/libs/utils/mimetypes/mimedatabase_p.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef MIMEDATABASE_P_H -#define MIMEDATABASE_P_H +#pragma once // // W A R N I N G @@ -101,5 +100,3 @@ public: } // Internal } // Utils - -#endif // MIMEDATABASE_P_H diff --git a/src/libs/utils/mimetypes/mimeglobpattern_p.h b/src/libs/utils/mimetypes/mimeglobpattern_p.h index 5816a634e6..863c432653 100644 --- a/src/libs/utils/mimetypes/mimeglobpattern_p.h +++ b/src/libs/utils/mimetypes/mimeglobpattern_p.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef MIMEGLOBPATTERN_P_H -#define MIMEGLOBPATTERN_P_H +#pragma once // // W A R N I N G @@ -153,5 +152,3 @@ public: } // Internal } // Utils - -#endif // MIMEGLOBPATTERN_P_H diff --git a/src/libs/utils/mimetypes/mimemagicrule_p.h b/src/libs/utils/mimetypes/mimemagicrule_p.h index 2d55619e46..e1c8017903 100644 --- a/src/libs/utils/mimetypes/mimemagicrule_p.h +++ b/src/libs/utils/mimetypes/mimemagicrule_p.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef MIMEMAGICRULE_P_H -#define MIMEMAGICRULE_P_H +#pragma once // // W A R N I N G @@ -107,5 +106,3 @@ private: QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(Utils::Internal::MimeMagicRule, Q_MOVABLE_TYPE); QT_END_NAMESPACE - -#endif // MIMEMAGICRULE_H diff --git a/src/libs/utils/mimetypes/mimemagicrulematcher_p.h b/src/libs/utils/mimetypes/mimemagicrulematcher_p.h index f57cfd5a62..dd54f515d9 100644 --- a/src/libs/utils/mimetypes/mimemagicrulematcher_p.h +++ b/src/libs/utils/mimetypes/mimemagicrulematcher_p.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef MIMEMAGICRULEMATCHER_P_H -#define MIMEMAGICRULEMATCHER_P_H +#pragma once // // W A R N I N G @@ -86,5 +85,3 @@ private: } // Internal } // Utils - -#endif // MIMEMAGICRULEMATCHER_P_H diff --git a/src/libs/utils/mimetypes/mimeprovider_p.h b/src/libs/utils/mimetypes/mimeprovider_p.h index 44a7bbdd52..267a54fbaf 100644 --- a/src/libs/utils/mimetypes/mimeprovider_p.h +++ b/src/libs/utils/mimetypes/mimeprovider_p.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef MIMEPROVIDER_P_H -#define MIMEPROVIDER_P_H +#pragma once // // W A R N I N G @@ -191,5 +190,3 @@ private: } // Internal } // Utils - -#endif // MIMEPROVIDER_P_H diff --git a/src/libs/utils/mimetypes/mimetype.h b/src/libs/utils/mimetypes/mimetype.h index 39ce6a7753..8b47696d7d 100644 --- a/src/libs/utils/mimetypes/mimetype.h +++ b/src/libs/utils/mimetypes/mimetype.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef MIMETYPE_H -#define MIMETYPE_H +#pragma once #include <utils/utils_global.h> @@ -132,5 +131,3 @@ class QDebug; QTCREATOR_UTILS_EXPORT QDebug operator<<(QDebug debug, const Utils::MimeType &mime); QT_END_NAMESPACE #endif - -#endif // MIMETYPE_H diff --git a/src/libs/utils/mimetypes/mimetype_p.h b/src/libs/utils/mimetypes/mimetype_p.h index 5e2260a7f4..c143a0d01b 100644 --- a/src/libs/utils/mimetypes/mimetype_p.h +++ b/src/libs/utils/mimetypes/mimetype_p.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef MIMETYPE_P_H -#define MIMETYPE_P_H +#pragma once // // W A R N I N G @@ -119,5 +118,3 @@ public: } \ QT_END_NAMESPACE #endif - -#endif // MIMETYPE_P_H diff --git a/src/libs/utils/mimetypes/mimetypeparser_p.h b/src/libs/utils/mimetypes/mimetypeparser_p.h index 1cae1fc9d9..2cc47fd30c 100644 --- a/src/libs/utils/mimetypes/mimetypeparser_p.h +++ b/src/libs/utils/mimetypes/mimetypeparser_p.h @@ -37,8 +37,7 @@ ** ****************************************************************************/ -#ifndef MIMETYPEPARSER_P_H -#define MIMETYPEPARSER_P_H +#pragma once // // W A R N I N G @@ -130,5 +129,3 @@ private: } // Internal } // Utils - -#endif // MIMETYPEPARSER_P_H diff --git a/src/libs/utils/navigationtreeview.h b/src/libs/utils/navigationtreeview.h index 6222dd7bed..4718a96b3e 100644 --- a/src/libs/utils/navigationtreeview.h +++ b/src/libs/utils/navigationtreeview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NAVIGATIONTREEVIEW_H -#define NAVIGATIONTREEVIEW_H +#pragma once #include "utils_global.h" @@ -45,5 +44,3 @@ protected: }; } // Utils - -#endif // NAVIGATIONTREEVIEW_H diff --git a/src/libs/utils/networkaccessmanager.h b/src/libs/utils/networkaccessmanager.h index a258e1c4e8..d1f92379c5 100644 --- a/src/libs/utils/networkaccessmanager.h +++ b/src/libs/utils/networkaccessmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NETWORKACCESSMANAGER_H -#define NETWORKACCESSMANAGER_H +#pragma once #include "utils_global.h" @@ -48,5 +47,3 @@ protected: } // namespace utils - -#endif // NETWORKACCESSMANAGER_H diff --git a/src/libs/utils/newclasswidget.h b/src/libs/utils/newclasswidget.h index cbda607b5e..18a5029f5b 100644 --- a/src/libs/utils/newclasswidget.h +++ b/src/libs/utils/newclasswidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NEWCLASSWIDGET_H -#define NEWCLASSWIDGET_H +#pragma once #include "utils_global.h" @@ -166,5 +165,3 @@ private: }; } // namespace Utils - -#endif // NEWCLASSWIDGET_H diff --git a/src/libs/utils/osspecificaspects.h b/src/libs/utils/osspecificaspects.h index 04fba72223..15609794c9 100644 --- a/src/libs/utils/osspecificaspects.h +++ b/src/libs/utils/osspecificaspects.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTC_OSSPECIFICASPECTS_H -#define QTC_OSSPECIFICASPECTS_H +#pragma once #include "utils_global.h" @@ -66,5 +65,3 @@ private: }; } // namespace Utils - -#endif // Include guard. diff --git a/src/libs/utils/outputformat.h b/src/libs/utils/outputformat.h index a3ce484323..6a5f495de0 100644 --- a/src/libs/utils/outputformat.h +++ b/src/libs/utils/outputformat.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OUTPUTFORMAT_H -#define OUTPUTFORMAT_H +#pragma once namespace Utils { @@ -41,5 +40,3 @@ enum OutputFormat }; } // namespace Utils - -#endif // OUTPUTFORMATR_H diff --git a/src/libs/utils/outputformatter.h b/src/libs/utils/outputformatter.h index ecb6ba9580..def0172f42 100644 --- a/src/libs/utils/outputformatter.h +++ b/src/libs/utils/outputformatter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OUTPUTFORMATTER_H -#define OUTPUTFORMATTER_H +#pragma once #include "utils_global.h" #include "outputformat.h" @@ -73,5 +72,3 @@ private: }; } // namespace Utils - -#endif // OUTPUTFORMATTER_H diff --git a/src/libs/utils/overridecursor.h b/src/libs/utils/overridecursor.h index b29350a9c4..5ca2bb5800 100644 --- a/src/libs/utils/overridecursor.h +++ b/src/libs/utils/overridecursor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OVERRIDECURSOR_H -#define OVERRIDECURSOR_H +#pragma once #include "utils_global.h" @@ -45,5 +44,3 @@ private: }; } - -#endif // OVERRIDECURSOR_H diff --git a/src/libs/utils/parameteraction.h b/src/libs/utils/parameteraction.h index f5743b383c..a402844987 100644 --- a/src/libs/utils/parameteraction.h +++ b/src/libs/utils/parameteraction.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PARAMETERACTION_H -#define PARAMETERACTION_H +#pragma once #include "utils_global.h" @@ -66,5 +65,3 @@ private: }; } // namespace Utils - -#endif // PARAMETERACTION_H diff --git a/src/libs/utils/pathchooser.h b/src/libs/utils/pathchooser.h index 1e9ab523ce..17b572310d 100644 --- a/src/libs/utils/pathchooser.h +++ b/src/libs/utils/pathchooser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PATHCHOOSER_H -#define PATHCHOOSER_H +#pragma once #include "fancylineedit.h" #include "fileutils.h" @@ -178,6 +177,3 @@ private: }; } // namespace Utils - - -#endif // PATHCHOOSER_H diff --git a/src/libs/utils/pathlisteditor.h b/src/libs/utils/pathlisteditor.h index e95fc1e4f9..8636450406 100644 --- a/src/libs/utils/pathlisteditor.h +++ b/src/libs/utils/pathlisteditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PATHLISTEDITOR_H -#define PATHLISTEDITOR_H +#pragma once #include "utils_global.h" @@ -78,5 +77,3 @@ private: }; } // namespace Utils - -#endif // PATHLISTEDITOR_H diff --git a/src/libs/utils/persistentsettings.h b/src/libs/utils/persistentsettings.h index 6e5fd5c598..e424a5fbc1 100644 --- a/src/libs/utils/persistentsettings.h +++ b/src/libs/utils/persistentsettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PERSISTENTSETTINGS_H -#define PERSISTENTSETTINGS_H +#pragma once #include "fileutils.h" @@ -67,5 +66,3 @@ private: }; } // namespace Utils - -#endif // PERSISTENTSETTINGS_H diff --git a/src/libs/utils/port.h b/src/libs/utils/port.h index 1fe429aa11..779d5b7524 100644 --- a/src/libs/utils/port.h +++ b/src/libs/utils/port.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UTILS_PORT_H -#define UTILS_PORT_H +#pragma once #include "utils_global.h" @@ -44,5 +43,3 @@ private: }; } // Utils - -#endif // UTILS_PORT_H diff --git a/src/libs/utils/portlist.h b/src/libs/utils/portlist.h index 289a280ca7..21e05a43e5 100644 --- a/src/libs/utils/portlist.h +++ b/src/libs/utils/portlist.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PORTLIST_H -#define PORTLIST_H +#pragma once #include "utils_global.h" @@ -57,5 +56,3 @@ private: }; } // namespace Utils - -#endif // PORTLIST_H diff --git a/src/libs/utils/progressindicator.h b/src/libs/utils/progressindicator.h index 98c63fde8c..4fee8b1956 100644 --- a/src/libs/utils/progressindicator.h +++ b/src/libs/utils/progressindicator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROGRESSINDICATOR_H -#define PROGRESSINDICATOR_H +#pragma once #include "utils_global.h" @@ -72,5 +71,3 @@ private: }; } // Utils - -#endif // PROGRESSINDICATOR_H diff --git a/src/libs/utils/projectintropage.h b/src/libs/utils/projectintropage.h index 4a6798f624..eb26a839c2 100644 --- a/src/libs/utils/projectintropage.h +++ b/src/libs/utils/projectintropage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTINTROPAGE_H -#define PROJECTINTROPAGE_H +#pragma once #include "utils_global.h" #include "wizardpage.h" @@ -89,5 +88,3 @@ private: }; } // namespace Utils - -#endif // PROJECTINTROPAGE_H diff --git a/src/libs/utils/proxyaction.h b/src/libs/utils/proxyaction.h index e2eea9908d..d6187d047e 100644 --- a/src/libs/utils/proxyaction.h +++ b/src/libs/utils/proxyaction.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROXYACTION_H -#define PROXYACTION_H +#pragma once #include "utils_global.h" @@ -80,5 +79,3 @@ private: } // namespace Utils Q_DECLARE_OPERATORS_FOR_FLAGS(Utils::ProxyAction::Attributes) - -#endif // PROXYACTION_H diff --git a/src/libs/utils/proxycredentialsdialog.h b/src/libs/utils/proxycredentialsdialog.h index 76b11ce5b4..d18af5b2d5 100644 --- a/src/libs/utils/proxycredentialsdialog.h +++ b/src/libs/utils/proxycredentialsdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROXYCREDENTIALSDIALOG_H -#define PROXYCREDENTIALSDIALOG_H +#pragma once #include "utils_global.h" #include <QDialog> @@ -55,5 +54,3 @@ private: }; } // namespace Utils - -#endif // PROXYCREDENTIALSDIALOG_H diff --git a/src/libs/utils/qtcassert.h b/src/libs/utils/qtcassert.h index 004c4e0439..544221ee8c 100644 --- a/src/libs/utils/qtcassert.h +++ b/src/libs/utils/qtcassert.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTC_ASSERT_H -#define QTC_ASSERT_H +#pragma once #include "utils_global.h" @@ -40,6 +39,3 @@ namespace Utils { QTCREATOR_UTILS_EXPORT void writeAssertLocation(const char *ms #define QTC_ASSERT(cond, action) if (cond) {} else { QTC_ASSERT_STRING(#cond); action; } do {} while (0) #define QTC_CHECK(cond) if (cond) {} else { QTC_ASSERT_STRING(#cond); } do {} while (0) - -#endif // QTC_ASSERT_H - diff --git a/src/libs/utils/qtcolorbutton.h b/src/libs/utils/qtcolorbutton.h index d22421497e..07b3c63a22 100644 --- a/src/libs/utils/qtcolorbutton.h +++ b/src/libs/utils/qtcolorbutton.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTCOLORBUTTON_H -#define QTCOLORBUTTON_H +#pragma once #include "utils_global.h" @@ -70,5 +69,3 @@ private: }; } // namespace Utils - -#endif // QTCOLORBUTTON_H diff --git a/src/libs/utils/qtcprocess.h b/src/libs/utils/qtcprocess.h index 3a3ba788e9..fed5ad484d 100644 --- a/src/libs/utils/qtcprocess.h +++ b/src/libs/utils/qtcprocess.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTCPROCESS_H -#define QTCPROCESS_H +#pragma once #include "environment.h" @@ -153,5 +152,3 @@ private: }; } // namespace Utils - -#endif // QTCPROCESS_H diff --git a/src/libs/utils/reloadpromptutils.h b/src/libs/utils/reloadpromptutils.h index a5105bc6cb..b01bd25b53 100644 --- a/src/libs/utils/reloadpromptutils.h +++ b/src/libs/utils/reloadpromptutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RELOADPROMPTUTILS_H -#define RELOADPROMPTUTILS_H +#pragma once #include "utils_global.h" @@ -63,5 +62,3 @@ QTCREATOR_UTILS_EXPORT FileDeletedPromptAnswer fileDeletedPrompt(const QString & QWidget *parent); } // namespace Utils - -#endif // RELOADPROMPTUTILS_H diff --git a/src/libs/utils/runextensions.h b/src/libs/utils/runextensions.h index bd20b862c4..1fc9005bbb 100644 --- a/src/libs/utils/runextensions.h +++ b/src/libs/utils/runextensions.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RUNEXTENSIONS_H -#define RUNEXTENSIONS_H +#pragma once #include "functiontraits.h" #include "utils_global.h" @@ -509,5 +508,3 @@ runAsync(QThreadPool *pool, Function &&function, Args&&... args) } } // Utils - -#endif // RUNEXTENSIONS_H diff --git a/src/libs/utils/savedaction.h b/src/libs/utils/savedaction.h index f03150d637..4fb98496b4 100644 --- a/src/libs/utils/savedaction.h +++ b/src/libs/utils/savedaction.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SAVED_ACTION_H -#define SAVED_ACTION_H +#pragma once #include "utils_global.h" @@ -103,5 +102,3 @@ private: }; } // namespace Utils - -#endif // SAVED_ACTION_H diff --git a/src/libs/utils/savefile.h b/src/libs/utils/savefile.h index 4584d56b05..0be71967fd 100644 --- a/src/libs/utils/savefile.h +++ b/src/libs/utils/savefile.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SAVEFILE_H -#define SAVEFILE_H +#pragma once #include "utils_global.h" @@ -55,5 +54,3 @@ private: }; } // namespace Utils - -#endif // SAVEFILE_H diff --git a/src/libs/utils/scopedswap.h b/src/libs/utils/scopedswap.h index 0af542a126..6e996c11f2 100644 --- a/src/libs/utils/scopedswap.h +++ b/src/libs/utils/scopedswap.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SCOPEDSWAP_H -#define SCOPEDSWAP_H +#pragma once #if !(__cplusplus > 199711L || __GXX_EXPERIMENTAL_CXX0X__ || _MSC_VER >= 1600 || defined( _LIBCPP_VERSION )) || \ (defined(__GNUC_LIBSTD__) && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)) @@ -59,5 +58,3 @@ public: typedef ScopedSwap<bool> ScopedBoolSwap; } // Utils namespace - -#endif // SCOPEDSWAP_H diff --git a/src/libs/utils/settingsselector.h b/src/libs/utils/settingsselector.h index 06ca19b924..6df875a6e4 100644 --- a/src/libs/utils/settingsselector.h +++ b/src/libs/utils/settingsselector.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SETTINGSSELECTORWIDGET_H -#define SETTINGSSELECTORWIDGET_H +#pragma once #include "utils_global.h" @@ -82,5 +81,3 @@ private: }; } // namespace Utils - -#endif // SETTINGSSELECTORWIDGET_H diff --git a/src/libs/utils/settingsutils.h b/src/libs/utils/settingsutils.h index 965293dee8..c693dc7442 100644 --- a/src/libs/utils/settingsutils.h +++ b/src/libs/utils/settingsutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SETTINGSUTILS_H -#define SETTINGSUTILS_H +#pragma once #include <QSettings> #include <QString> @@ -70,5 +69,3 @@ void toSettings(const QString &postFix, } } // Utils - -#endif // SETTINGSUTILS_H diff --git a/src/libs/utils/shellcommand.h b/src/libs/utils/shellcommand.h index d139842d0f..f6024fb4b3 100644 --- a/src/libs/utils/shellcommand.h +++ b/src/libs/utils/shellcommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UTILS_SHELLCOMMAND_H -#define UTILS_SHELLCOMMAND_H +#pragma once #include "utils_global.h" @@ -179,5 +178,3 @@ private: }; } // namespace Utils - -#endif // UTILS_SHELLCOMMAND_H diff --git a/src/libs/utils/shellcommandpage.h b/src/libs/utils/shellcommandpage.h index f716ab913b..63cb3aed78 100644 --- a/src/libs/utils/shellcommandpage.h +++ b/src/libs/utils/shellcommandpage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SHELLCOMMANDPAGE_H -#define SHELLCOMMANDPAGE_H +#pragma once #include "utils_global.h" @@ -77,5 +76,3 @@ private: }; } // namespace Utils - -#endif // SHELLCOMMANDPAGE_H diff --git a/src/libs/utils/sleep.h b/src/libs/utils/sleep.h index 4f2c43f6e1..c7df10f8f7 100644 --- a/src/libs/utils/sleep.h +++ b/src/libs/utils/sleep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SLEEP_H -#define SLEEP_H +#pragma once #include "utils_global.h" @@ -33,5 +32,3 @@ namespace Utils { void QTCREATOR_UTILS_EXPORT sleep(int msec); } - -#endif // SLEEP_H diff --git a/src/libs/utils/smallstringliteral.h b/src/libs/utils/smallstringliteral.h index 5b5a03a265..0f631d03e6 100644 --- a/src/libs/utils/smallstringliteral.h +++ b/src/libs/utils/smallstringliteral.h @@ -134,4 +134,3 @@ private: #pragma pop_macro("noexcept") #pragma pop_macro("constexpr") - diff --git a/src/libs/utils/statuslabel.h b/src/libs/utils/statuslabel.h index 53395adee0..8531a66d1b 100644 --- a/src/libs/utils/statuslabel.h +++ b/src/libs/utils/statuslabel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UTILS_STATUSLABEL_H -#define UTILS_STATUSLABEL_H +#pragma once #include "utils_global.h" @@ -55,5 +54,3 @@ private: }; } // namespace Utils - -#endif // UTILS_STATUSLABEL_H diff --git a/src/libs/utils/stringutils.h b/src/libs/utils/stringutils.h index 94e1e28d50..8e0c78f028 100644 --- a/src/libs/utils/stringutils.h +++ b/src/libs/utils/stringutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef STRINGUTILS_H -#define STRINGUTILS_H +#pragma once #include "utils_global.h" @@ -75,5 +74,3 @@ QTCREATOR_UTILS_EXPORT void expandMacros(QString *str, AbstractMacroExpander *mx QTCREATOR_UTILS_EXPORT QString expandMacros(const QString &str, AbstractMacroExpander *mx); } // namespace Utils - -#endif // STRINGUTILS_H diff --git a/src/libs/utils/styledbar.h b/src/libs/utils/styledbar.h index 39c3e02761..4b76c13e30 100644 --- a/src/libs/utils/styledbar.h +++ b/src/libs/utils/styledbar.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef STYLEDBAR_H -#define STYLEDBAR_H +#pragma once #include "utils_global.h" @@ -57,5 +56,3 @@ protected: }; } // Utils - -#endif // STYLEDBAR_H diff --git a/src/libs/utils/stylehelper.h b/src/libs/utils/stylehelper.h index 7e483c43f1..e6a1da0302 100644 --- a/src/libs/utils/stylehelper.h +++ b/src/libs/utils/stylehelper.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef STYLEHELPER_H -#define STYLEHELPER_H +#pragma once #include "utils_global.h" @@ -100,4 +99,3 @@ private: }; } // namespace Utils -#endif // STYLEHELPER_H diff --git a/src/libs/utils/synchronousprocess.h b/src/libs/utils/synchronousprocess.h index cb19aeea3d..c8891122cf 100644 --- a/src/libs/utils/synchronousprocess.h +++ b/src/libs/utils/synchronousprocess.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SYNCHRONOUSPROCESS_H -#define SYNCHRONOUSPROCESS_H +#pragma once #include "utils_global.h" @@ -171,5 +170,3 @@ private: }; } // namespace Utils - -#endif diff --git a/src/libs/utils/tcpportsgatherer.h b/src/libs/utils/tcpportsgatherer.h index 712cc5a885..dc56f75281 100644 --- a/src/libs/utils/tcpportsgatherer.h +++ b/src/libs/utils/tcpportsgatherer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TCPPORTSGATHERER_H -#define TCPPORTSGATHERER_H +#pragma once #include "portlist.h" @@ -49,5 +48,3 @@ private: }; } // namespace Utils - -#endif // TCPPORTSGATHERER_H diff --git a/src/libs/utils/templateengine.h b/src/libs/utils/templateengine.h index c3e3d354e8..5073992347 100644 --- a/src/libs/utils/templateengine.h +++ b/src/libs/utils/templateengine.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEMPLATEENGINE_H -#define TEMPLATEENGINE_H +#pragma once #include "utils_global.h" @@ -48,5 +47,3 @@ public: }; } // namespace Utils - -#endif // TEMPLATEENGINE_H diff --git a/src/libs/utils/textfieldcheckbox.h b/src/libs/utils/textfieldcheckbox.h index 3d37c0bc8c..456e156370 100644 --- a/src/libs/utils/textfieldcheckbox.h +++ b/src/libs/utils/textfieldcheckbox.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTFIELDCHECKBOX_H -#define TEXTFIELDCHECKBOX_H +#pragma once #include "utils_global.h" @@ -61,5 +60,3 @@ private: }; } // namespace Utils - -#endif // TEXTFIELDCHECKBOX_H diff --git a/src/libs/utils/textfieldcombobox.h b/src/libs/utils/textfieldcombobox.h index a3fca807e1..943e7a677c 100644 --- a/src/libs/utils/textfieldcombobox.h +++ b/src/libs/utils/textfieldcombobox.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTFIELDCOMBOBOX_H -#define TEXTFIELDCOMBOBOX_H +#pragma once #include "utils_global.h" @@ -55,5 +54,3 @@ private: }; } // namespace Utils - -#endif // TEXTFIELDCOMBOBOX_H diff --git a/src/libs/utils/textfileformat.h b/src/libs/utils/textfileformat.h index 07398fb09d..6cb6c7ede8 100644 --- a/src/libs/utils/textfileformat.h +++ b/src/libs/utils/textfileformat.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTFILEFORMAT_H -#define TEXTFILEFORMAT_H +#pragma once #include "utils_global.h" @@ -85,5 +84,3 @@ public: }; } // namespace Utils - -#endif // TEXTFILEFORMAT_H diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h index 884b76104f..e9727bb999 100644 --- a/src/libs/utils/theme/theme.h +++ b/src/libs/utils/theme/theme.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef THEME_H -#define THEME_H +#pragma once #include "../utils_global.h" @@ -293,5 +292,3 @@ private: QTCREATOR_UTILS_EXPORT Theme *creatorTheme(); } // namespace Utils - -#endif // THEME_H diff --git a/src/libs/utils/theme/theme_p.h b/src/libs/utils/theme/theme_p.h index 7382905a6a..8dafe9db57 100644 --- a/src/libs/utils/theme/theme_p.h +++ b/src/libs/utils/theme/theme_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef THEME_P_H -#define THEME_P_H +#pragma once #include "theme.h" #include "../utils_global.h" @@ -55,5 +54,3 @@ public: QTCREATOR_UTILS_EXPORT void setCreatorTheme(Theme *theme); } // namespace Utils - -#endif // THEME_P_H diff --git a/src/libs/utils/tooltip/effects.h b/src/libs/utils/tooltip/effects.h index 02afec45a8..9e6b571e89 100644 --- a/src/libs/utils/tooltip/effects.h +++ b/src/libs/utils/tooltip/effects.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EFFECTS_H -#define EFFECTS_H +#pragma once #include <QtGlobal> @@ -50,5 +49,3 @@ extern void Q_GUI_EXPORT qScrollEffect(QWidget*, QEffects::DirFlags dir = QEffec extern void Q_GUI_EXPORT qFadeEffect(QWidget*, int time = -1); QT_END_NAMESPACE - -#endif // EFFECTS_H diff --git a/src/libs/utils/tooltip/reuse.h b/src/libs/utils/tooltip/reuse.h index 8f8519b37a..ee2fca72de 100644 --- a/src/libs/utils/tooltip/reuse.h +++ b/src/libs/utils/tooltip/reuse.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TOOLTIPREUSE_H -#define TOOLTIPREUSE_H +#pragma once #include <utils/hostosinfo.h> @@ -54,5 +53,3 @@ inline QRect screenGeometry(const QPoint &pos, QWidget *w) } // namespace Internal } // namespace Utils - -#endif // TOOLTIPREUSE_H diff --git a/src/libs/utils/tooltip/tips.h b/src/libs/utils/tooltip/tips.h index f0389e404c..e2d467f6db 100644 --- a/src/libs/utils/tooltip/tips.h +++ b/src/libs/utils/tooltip/tips.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TIPS_H -#define TIPS_H +#pragma once #include "../utils_global.h" @@ -117,5 +116,3 @@ private: } // namespace Internal } // namespace Utils #endif - -#endif // TIPS_H diff --git a/src/libs/utils/tooltip/tooltip.h b/src/libs/utils/tooltip/tooltip.h index d6ad642ece..2d6d197528 100644 --- a/src/libs/utils/tooltip/tooltip.h +++ b/src/libs/utils/tooltip/tooltip.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TOOLTIP_H -#define TOOLTIP_H +#pragma once #include "../utils_global.h" @@ -116,5 +115,3 @@ private: }; } // namespace Utils - -#endif // TOOLTIP_H diff --git a/src/libs/utils/treemodel.h b/src/libs/utils/treemodel.h index 62a17ecda7..0fcabcf85c 100644 --- a/src/libs/utils/treemodel.h +++ b/src/libs/utils/treemodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UTILS_TREEMODEL_H -#define UTILS_TREEMODEL_H +#pragma once #include "utils_global.h" @@ -300,5 +299,3 @@ private: }; } // namespace Utils - -#endif // UTILS_TREEMODEL_H diff --git a/src/libs/utils/treeviewcombobox.h b/src/libs/utils/treeviewcombobox.h index b904a641e3..e32d64d4ae 100644 --- a/src/libs/utils/treeviewcombobox.h +++ b/src/libs/utils/treeviewcombobox.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TREEVIEWCOMBOBOX_H -#define TREEVIEWCOMBOBOX_H +#pragma once #include "utils_global.h" @@ -65,5 +64,3 @@ private: bool m_skipNextHide; }; } - -#endif // TREEVIEWCOMBOBOX_H diff --git a/src/libs/utils/uncommentselection.h b/src/libs/utils/uncommentselection.h index bba6798c9a..46efe8da97 100644 --- a/src/libs/utils/uncommentselection.h +++ b/src/libs/utils/uncommentselection.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UNCOMMENTSELECTION_H -#define UNCOMMENTSELECTION_H +#pragma once #include "utils_global.h" @@ -60,5 +59,3 @@ void unCommentSelection(QPlainTextEdit *edit, const CommentDefinition &definiton = CommentDefinition()); } // namespace Utils - -#endif // UNCOMMENTSELECTION_H diff --git a/src/libs/utils/unixutils.h b/src/libs/utils/unixutils.h index 5e6bbeecaf..b43cb09142 100644 --- a/src/libs/utils/unixutils.h +++ b/src/libs/utils/unixutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UNIXUTILS_H -#define UNIXUTILS_H +#pragma once #include "utils_global.h" @@ -46,5 +45,3 @@ public: }; } - -#endif // UNIXUTILS_H diff --git a/src/libs/utils/utils_global.h b/src/libs/utils/utils_global.h index 2313d16b2c..76ed9c6445 100644 --- a/src/libs/utils/utils_global.h +++ b/src/libs/utils/utils_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UTILS_GLOBAL_H -#define UTILS_GLOBAL_H +#pragma once #include <qglobal.h> @@ -35,5 +34,3 @@ #else # define QTCREATOR_UTILS_EXPORT Q_DECL_IMPORT #endif - -#endif // UTILS_GLOBAL_H diff --git a/src/libs/utils/utilsicons.h b/src/libs/utils/utilsicons.h index 51da2999c4..bf481e9b4f 100644 --- a/src/libs/utils/utilsicons.h +++ b/src/libs/utils/utilsicons.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UTILSICONS_H -#define UTILSICONS_H +#pragma once #include "icon.h" @@ -36,5 +35,3 @@ const Utils::Icon EDIT_CLEAR({ } // namespace Icons } // namespace Utils - -#endif // UTILSICONS_H diff --git a/src/libs/utils/winutils.h b/src/libs/utils/winutils.h index 28a1b5c113..6bb75f97d6 100644 --- a/src/libs/utils/winutils.h +++ b/src/libs/utils/winutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINUTILS_H -#define WINUTILS_H +#pragma once #include "utils_global.h" @@ -63,5 +62,3 @@ private: }; } // namespace Utils - -#endif // WINUTILS_H diff --git a/src/libs/utils/wizard.h b/src/libs/utils/wizard.h index 587ac48356..070b6ff4a2 100644 --- a/src/libs/utils/wizard.h +++ b/src/libs/utils/wizard.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WIZARD_H -#define WIZARD_H +#pragma once #include "utils_global.h" @@ -170,5 +169,3 @@ private: }; } // namespace Utils - -#endif // WIZARD_H diff --git a/src/libs/utils/wizardpage.h b/src/libs/utils/wizardpage.h index 2570da5d75..c9f9a462ec 100644 --- a/src/libs/utils/wizardpage.h +++ b/src/libs/utils/wizardpage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WIZARDPAGE_H -#define WIZARDPAGE_H +#pragma once #include "utils_global.h" @@ -59,5 +58,3 @@ private: }; } // namespace Utils - -#endif // WIZARDPAGE_H diff --git a/src/plugins/android/android_global.h b/src/plugins/android/android_global.h index 3be55983cd..1f79d86ebc 100644 --- a/src/plugins/android/android_global.h +++ b/src/plugins/android/android_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROID_GLOBAL_H -#define ANDROID_GLOBAL_H +#pragma once #include <qglobal.h> @@ -33,5 +32,3 @@ #else # define ANDROID_EXPORT Q_DECL_IMPORT #endif - -#endif // ANDROID_GLOBAL_H diff --git a/src/plugins/android/androidanalyzesupport.h b/src/plugins/android/androidanalyzesupport.h index e272688a27..54460cdb1d 100644 --- a/src/plugins/android/androidanalyzesupport.h +++ b/src/plugins/android/androidanalyzesupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDANALYZESUPPORT_H -#define ANDROIDANALYZESUPPORT_H +#pragma once #include "androidrunconfiguration.h" #include <qmldebug/qmloutputparser.h> @@ -55,5 +54,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDANALYZESUPPORT_H diff --git a/src/plugins/android/androidbuildapkstep.h b/src/plugins/android/androidbuildapkstep.h index 42d446bd7c..302a5c714d 100644 --- a/src/plugins/android/androidbuildapkstep.h +++ b/src/plugins/android/androidbuildapkstep.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDBUILDAPKSTEP_H -#define ANDROIDBUILDAPKSTEP_H +#pragma once #include "android_global.h" #include <projectexplorer/abstractprocessstep.h> @@ -114,5 +113,3 @@ protected: }; } // namespace Android - -#endif // ANDROIDBUILDAPKSTEP_H diff --git a/src/plugins/android/androidbuildapkwidget.h b/src/plugins/android/androidbuildapkwidget.h index 52d765275e..42e3dc3c79 100644 --- a/src/plugins/android/androidbuildapkwidget.h +++ b/src/plugins/android/androidbuildapkwidget.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDBUILDAPKWIDGET_H -#define ANDROIDBUILDAPKWIDGET_H +#pragma once #include "android_global.h" @@ -76,5 +75,3 @@ private: }; } - -#endif // ANDROIDBUILDAPKWIDGET_H diff --git a/src/plugins/android/androidconfigurations.h b/src/plugins/android/androidconfigurations.h index 740dafc9bd..85a1e15f8d 100644 --- a/src/plugins/android/androidconfigurations.h +++ b/src/plugins/android/androidconfigurations.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDCONFIGURATIONS_H -#define ANDROIDCONFIGURATIONS_H +#pragma once #include "android_global.h" @@ -248,5 +247,3 @@ private: }; } // namespace Android - -#endif // ANDROIDCONFIGURATIONS_H diff --git a/src/plugins/android/androidconstants.h b/src/plugins/android/androidconstants.h index e9002b5e88..d51c40b13f 100644 --- a/src/plugins/android/androidconstants.h +++ b/src/plugins/android/androidconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDCONSTANTS_H -#define ANDROIDCONSTANTS_H +#pragma once #include <QtGlobal> @@ -71,5 +70,3 @@ const char ANDROID_EXTRA_LIBS[] = "AndroidExtraLibs"; } // namespace Constants; } // namespace Android - -#endif // ANDROIDCONSTANTS_H diff --git a/src/plugins/android/androidcreatekeystorecertificate.h b/src/plugins/android/androidcreatekeystorecertificate.h index eba9b73ea9..22030d2c24 100644 --- a/src/plugins/android/androidcreatekeystorecertificate.h +++ b/src/plugins/android/androidcreatekeystorecertificate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDCREATEKEYSTORECERTIFICATE_H -#define ANDROIDCREATEKEYSTORECERTIFICATE_H +#pragma once #include <utils/fileutils.h> @@ -73,5 +72,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDCREATEKEYSTORECERTIFICATE_H diff --git a/src/plugins/android/androiddebugsupport.h b/src/plugins/android/androiddebugsupport.h index cf46aa8069..368b66c11c 100644 --- a/src/plugins/android/androiddebugsupport.h +++ b/src/plugins/android/androiddebugsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDDEBUGSUPPORT_H -#define ANDROIDDEBUGSUPPORT_H +#pragma once #include "androidrunconfiguration.h" @@ -58,5 +57,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDDEBUGSUPPORT_H diff --git a/src/plugins/android/androiddeployconfiguration.h b/src/plugins/android/androiddeployconfiguration.h index d1cd85b054..8ce9191e6d 100644 --- a/src/plugins/android/androiddeployconfiguration.h +++ b/src/plugins/android/androiddeployconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDDEPLOYCONFIGURATION_H -#define ANDROIDDEPLOYCONFIGURATION_H +#pragma once #include <projectexplorer/deployconfiguration.h> @@ -65,5 +64,3 @@ public: } // namespace Internal } // namespace Android - -#endif // ANDROIDDEPLOYCONFIGURATION_H diff --git a/src/plugins/android/androiddeployqtstep.h b/src/plugins/android/androiddeployqtstep.h index acd0b9aa96..470b8a4115 100644 --- a/src/plugins/android/androiddeployqtstep.h +++ b/src/plugins/android/androiddeployqtstep.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDDEPLOYQTSTEP_H -#define ANDROIDDEPLOYQTSTEP_H +#pragma once #include "androidbuildapkstep.h" #include "androidconfigurations.h" @@ -143,5 +142,3 @@ private: } } // namespace Android - -#endif // ANDROIDDEPLOYQTSTEP_H diff --git a/src/plugins/android/androiddeployqtwidget.h b/src/plugins/android/androiddeployqtwidget.h index b8cc586e0b..81ae354676 100644 --- a/src/plugins/android/androiddeployqtwidget.h +++ b/src/plugins/android/androiddeployqtwidget.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDDEPLOYQTWIDGET_H -#define ANDROIDDEPLOYQTWIDGET_H +#pragma once #include <projectexplorer/buildstep.h> @@ -62,4 +61,3 @@ private: } } -#endif // ANDROIDDEPLOYQTWIDGET_H diff --git a/src/plugins/android/androiddevice.h b/src/plugins/android/androiddevice.h index 5ed6fb5804..364628d8b2 100644 --- a/src/plugins/android/androiddevice.h +++ b/src/plugins/android/androiddevice.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDDEVICE_H -#define ANDROIDDEVICE_H +#pragma once #include <projectexplorer/devicesupport/idevice.h> @@ -58,5 +57,3 @@ protected: } // namespace Internal } // namespace Android - -#endif // ANDROIDDEVICE_H diff --git a/src/plugins/android/androiddevicedialog.h b/src/plugins/android/androiddevicedialog.h index fa17aa5d56..39b9abcc7d 100644 --- a/src/plugins/android/androiddevicedialog.h +++ b/src/plugins/android/androiddevicedialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDDEVICEDIALOG_H -#define ANDROIDDEVICEDIALOG_H +#pragma once #include "androidconfigurations.h" @@ -83,5 +82,3 @@ private: } } - -#endif // ANDROIDDEVICEDIALOG_H diff --git a/src/plugins/android/androiddevicefactory.h b/src/plugins/android/androiddevicefactory.h index d57109615e..8d6dc109b8 100644 --- a/src/plugins/android/androiddevicefactory.h +++ b/src/plugins/android/androiddevicefactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDDEVICEFACTORY_H -#define ANDROIDDEVICEFACTORY_H +#pragma once #include <projectexplorer/devicesupport/idevicefactory.h> @@ -48,5 +47,3 @@ public: } // namespace Internal } // namespace Android - -#endif // ANDROIDDEVICEFACTORY_H diff --git a/src/plugins/android/androiderrormessage.h b/src/plugins/android/androiderrormessage.h index 133cc562bf..add3807b88 100644 --- a/src/plugins/android/androiderrormessage.h +++ b/src/plugins/android/androiderrormessage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDERRORMESSAGE_H -#define ANDROIDERRORMESSAGE_H +#pragma once #include <QVariantList> #include <QCoreApplication> @@ -53,5 +52,3 @@ public: } // namespace Internal } // namespace Android - -#endif // ANDROIDERRORMESSAGE_H diff --git a/src/plugins/android/androidgdbserverkitinformation.h b/src/plugins/android/androidgdbserverkitinformation.h index 5a0122e8de..1aaadd4e3b 100644 --- a/src/plugins/android/androidgdbserverkitinformation.h +++ b/src/plugins/android/androidgdbserverkitinformation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDGDBSERVERKITINFORMATION_H -#define ANDROIDGDBSERVERKITINFORMATION_H +#pragma once #include <projectexplorer/kitinformation.h> #include <projectexplorer/kitconfigwidget.h> @@ -85,5 +84,3 @@ public: } // namespace Internal } // namespace Android - -#endif // ANDROIDGDBSERVERKITINFORMATION_H diff --git a/src/plugins/android/androidglobal.h b/src/plugins/android/androidglobal.h index c2de68148a..66c942c8f9 100644 --- a/src/plugins/android/androidglobal.h +++ b/src/plugins/android/androidglobal.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDGLOBAL_H -#define ANDROIDGLOBAL_H +#pragma once #include <utils/environment.h> @@ -74,5 +73,3 @@ public: }; } // namespace Android - -#endif // ANDROIDGLOBAL_H diff --git a/src/plugins/android/androidmanager.h b/src/plugins/android/androidmanager.h index d2f03531c8..344a4330de 100644 --- a/src/plugins/android/androidmanager.h +++ b/src/plugins/android/androidmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDMANAGER_H -#define ANDROIDMANAGER_H +#pragma once #include "android_global.h" @@ -90,5 +89,3 @@ public: }; } // namespace Android - -#endif // ANDROIDMANAGER_H diff --git a/src/plugins/android/androidmanifestdocument.h b/src/plugins/android/androidmanifestdocument.h index aad62b8f9a..169047f051 100644 --- a/src/plugins/android/androidmanifestdocument.h +++ b/src/plugins/android/androidmanifestdocument.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDMANIFESTDOCUMENT_H -#define ANDROIDMANIFESTDOCUMENT_H +#pragma once #include <texteditor/textdocument.h> @@ -49,5 +48,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDMANIFESTDOCUMENT_H diff --git a/src/plugins/android/androidmanifesteditor.h b/src/plugins/android/androidmanifesteditor.h index a2c2956e32..32ed8476f0 100644 --- a/src/plugins/android/androidmanifesteditor.h +++ b/src/plugins/android/androidmanifesteditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDMANIFESTEDITOR_H -#define ANDROIDMANIFESTEDITOR_H +#pragma once #include "androidmanifestdocument.h" #include "androidmanifesteditorwidget.h" @@ -69,5 +68,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDMANIFESTEDITOR_H diff --git a/src/plugins/android/androidmanifesteditorfactory.h b/src/plugins/android/androidmanifesteditorfactory.h index 6ab7289877..a25e02cef5 100644 --- a/src/plugins/android/androidmanifesteditorfactory.h +++ b/src/plugins/android/androidmanifesteditorfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDMANIFESTEDITORFACTORY_H -#define ANDROIDMANIFESTEDITORFACTORY_H +#pragma once #include <coreplugin/editormanager/ieditorfactory.h> @@ -43,5 +42,3 @@ public: } // namespace Internal } // namespace Android - -#endif // ANDROIDMANIFESTEDITORFACTORY_H diff --git a/src/plugins/android/androidmanifesteditorwidget.h b/src/plugins/android/androidmanifesteditorwidget.h index 7581ca0939..8a0afa166f 100644 --- a/src/plugins/android/androidmanifesteditorwidget.h +++ b/src/plugins/android/androidmanifesteditorwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDMANIFESTEDITORWIDGET_H -#define ANDROIDMANIFESTEDITORWIDGET_H +#pragma once #include <texteditor/texteditor.h> @@ -191,6 +190,3 @@ private: }; } // namespace Internal } // namespace Android - - -#endif // ANDROIDMANIFESTEDITORWIDGET_H diff --git a/src/plugins/android/androidplugin.h b/src/plugins/android/androidplugin.h index afde90ccc9..6f2bbd7544 100644 --- a/src/plugins/android/androidplugin.h +++ b/src/plugins/android/androidplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDPLUGIN_H -#define ANDROIDPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -47,5 +46,3 @@ private slots: }; } // namespace Android - -#endif // ANDROIDPLUGIN_H diff --git a/src/plugins/android/androidpotentialkit.h b/src/plugins/android/androidpotentialkit.h index dbffe2c782..fe10550f4d 100644 --- a/src/plugins/android/androidpotentialkit.h +++ b/src/plugins/android/androidpotentialkit.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDPOTENTIALKIT_H -#define ANDROIDPOTENTIALKIT_H +#pragma once #include <projectexplorer/ipotentialkit.h> #include <utils/detailswidget.h> @@ -56,5 +55,3 @@ private slots: } } - -#endif // ANDROIDPOTENTIALKIT_H diff --git a/src/plugins/android/androidqtsupport.h b/src/plugins/android/androidqtsupport.h index b4c1e9d7d7..021e5d7cff 100644 --- a/src/plugins/android/androidqtsupport.h +++ b/src/plugins/android/androidqtsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDSUPPORT_H -#define ANDROIDSUPPORT_H +#pragma once #include "android_global.h" @@ -66,6 +65,3 @@ public: }; } // namespace Android - - -#endif // ANDROIDSUPPORT_H diff --git a/src/plugins/android/androidqtversion.h b/src/plugins/android/androidqtversion.h index 05df491ed2..865c31e65c 100644 --- a/src/plugins/android/androidqtversion.h +++ b/src/plugins/android/androidqtversion.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDQTVERSION_H -#define ANDROIDQTVERSION_H +#pragma once #include <qtsupport/baseqtversion.h> @@ -64,5 +63,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDQTVERSION_H diff --git a/src/plugins/android/androidqtversionfactory.h b/src/plugins/android/androidqtversionfactory.h index e75fa9b580..8f551b9b86 100644 --- a/src/plugins/android/androidqtversionfactory.h +++ b/src/plugins/android/androidqtversionfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDQTVERSIONFACTORY_H -#define ANDROIDQTVERSIONFACTORY_H +#pragma once #include <qtsupport/qtversionfactory.h> @@ -46,5 +45,3 @@ public: } // namespace Internal } // namespace Android - -#endif // ANDROIDQTVERSIONFACTORY_H diff --git a/src/plugins/android/androidrunconfiguration.h b/src/plugins/android/androidrunconfiguration.h index ca895e2c0b..cfa54312d9 100644 --- a/src/plugins/android/androidrunconfiguration.h +++ b/src/plugins/android/androidrunconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDRUNCONFIGURATION_H -#define ANDROIDRUNCONFIGURATION_H +#pragma once #include "android_global.h" @@ -47,5 +46,3 @@ protected: }; } // namespace Android - -#endif // ANDROIDRUNCONFIGURATION_H diff --git a/src/plugins/android/androidruncontrol.h b/src/plugins/android/androidruncontrol.h index 2ee21c3bcb..343164de49 100644 --- a/src/plugins/android/androidruncontrol.h +++ b/src/plugins/android/androidruncontrol.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDRUNCONTROL_H -#define ANDROIDRUNCONTROL_H +#pragma once #include <projectexplorer/runconfiguration.h> @@ -59,5 +58,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDRUNCONTROL_H diff --git a/src/plugins/android/androidrunfactories.h b/src/plugins/android/androidrunfactories.h index 58362cf8c8..5556b44f48 100644 --- a/src/plugins/android/androidrunfactories.h +++ b/src/plugins/android/androidrunfactories.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDRUNFACTORIES_H -#define ANDROIDRUNFACTORIES_H +#pragma once #include "android_global.h" #include <projectexplorer/runconfiguration.h> @@ -55,5 +54,3 @@ public: } // namespace Internal } // namespace Android - -#endif // ANDROIDRUNFACTORIES_H diff --git a/src/plugins/android/androidrunnable.h b/src/plugins/android/androidrunnable.h index 453807c359..5f09a50355 100644 --- a/src/plugins/android/androidrunnable.h +++ b/src/plugins/android/androidrunnable.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDRUNNABLE_H -#define ANDROIDRUNNABLE_H +#pragma once #include "android_global.h" #include <projectexplorer/runnables.h> @@ -54,5 +53,3 @@ inline bool operator==(const AndroidRunnable &r1, const AndroidRunnable &r2) } } // namespace Android - -#endif // ANDROIDRUNNABLE_H diff --git a/src/plugins/android/androidrunner.h b/src/plugins/android/androidrunner.h index 32f7418ad9..d32018c869 100644 --- a/src/plugins/android/androidrunner.h +++ b/src/plugins/android/androidrunner.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDRUNNER_H -#define ANDROIDRUNNER_H +#pragma once #include "androidconfigurations.h" #include "androidrunnable.h" @@ -120,5 +119,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDRUNNER_H diff --git a/src/plugins/android/androidsettingspage.h b/src/plugins/android/androidsettingspage.h index 2f45863c71..1330721dbf 100644 --- a/src/plugins/android/androidsettingspage.h +++ b/src/plugins/android/androidsettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDSETTINGSPAGE_H -#define ANDROIDSETTINGSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> @@ -52,5 +51,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDSETTINGSPAGE_H diff --git a/src/plugins/android/androidsettingswidget.h b/src/plugins/android/androidsettingswidget.h index 4e68c596ff..f39c7eaf52 100644 --- a/src/plugins/android/androidsettingswidget.h +++ b/src/plugins/android/androidsettingswidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDSETTINGSWIDGET_H -#define ANDROIDSETTINGSWIDGET_H +#pragma once #include "androidconfigurations.h" @@ -124,5 +123,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDSETTINGSWIDGET_H diff --git a/src/plugins/android/androidsignaloperation.h b/src/plugins/android/androidsignaloperation.h index ae35d6cc6e..f31972e3fa 100644 --- a/src/plugins/android/androidsignaloperation.h +++ b/src/plugins/android/androidsignaloperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDSIGNALOPERATION_H -#define ANDROIDSIGNALOPERATION_H +#pragma once #include <projectexplorer/devicesupport/idevice.h> @@ -74,5 +73,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDSIGNALOPERATION_H diff --git a/src/plugins/android/androidtoolchain.h b/src/plugins/android/androidtoolchain.h index c1ecc9fde2..0f15f2db61 100644 --- a/src/plugins/android/androidtoolchain.h +++ b/src/plugins/android/androidtoolchain.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDTOOLCHAIN_H -#define ANDROIDTOOLCHAIN_H +#pragma once #include <projectexplorer/gcctoolchain.h> #include <projectexplorer/toolchainconfigwidget.h> @@ -124,5 +123,3 @@ private: } // namespace Internal } // namespace Android - -#endif // ANDROIDTOOLCHAIN_H diff --git a/src/plugins/android/avddialog.h b/src/plugins/android/avddialog.h index d4e6c355ac..6d98aa0124 100644 --- a/src/plugins/android/avddialog.h +++ b/src/plugins/android/avddialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef AVDDIALOG_H -#define AVDDIALOG_H +#pragma once #include "ui_addnewavddialog.h" @@ -62,5 +61,3 @@ private: }; } } - -#endif // AVDDIALOG_H diff --git a/src/plugins/android/certificatesmodel.h b/src/plugins/android/certificatesmodel.h index e77bc06c8d..57c0a6ab43 100644 --- a/src/plugins/android/certificatesmodel.h +++ b/src/plugins/android/certificatesmodel.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef CERTIFICATESMODEL_H -#define CERTIFICATESMODEL_H +#pragma once #include <QAbstractListModel> #include <QVector> @@ -50,5 +49,3 @@ private: } } - -#endif // CERTIFICATESMODEL_H diff --git a/src/plugins/android/javaautocompleter.h b/src/plugins/android/javaautocompleter.h index 6372d15695..ed088c033d 100644 --- a/src/plugins/android/javaautocompleter.h +++ b/src/plugins/android/javaautocompleter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JAVAAUTOCOMPLETER_H -#define JAVAAUTOCOMPLETER_H +#pragma once #include <texteditor/autocompleter.h> @@ -42,6 +41,3 @@ public: }; } } - - -#endif // JAVAAUTOCOMPLETER_H diff --git a/src/plugins/android/javacompletionassistprovider.h b/src/plugins/android/javacompletionassistprovider.h index 5e90bcf2fe..f58685250f 100644 --- a/src/plugins/android/javacompletionassistprovider.h +++ b/src/plugins/android/javacompletionassistprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JAVACOMPLETIONASSISTPROVIDER_H -#define JAVACOMPLETIONASSISTPROVIDER_H +#pragma once #include <texteditor/codeassist/completionassistprovider.h> @@ -52,5 +51,3 @@ private: } // namespace Internal } // namespace Android - -#endif // JAVACOMPLETIONASSISTPROVIDER_H diff --git a/src/plugins/android/javaeditor.h b/src/plugins/android/javaeditor.h index 6f176b784c..c442484daf 100644 --- a/src/plugins/android/javaeditor.h +++ b/src/plugins/android/javaeditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JAVAEDITOR_H -#define JAVAEDITOR_H +#pragma once #include <texteditor/texteditor.h> @@ -41,5 +40,3 @@ public: } // namespace Internal } // namespace Android - -#endif // JAVAEDITOR_H diff --git a/src/plugins/android/javaindenter.h b/src/plugins/android/javaindenter.h index 9be0b47a95..2b40851fd4 100644 --- a/src/plugins/android/javaindenter.h +++ b/src/plugins/android/javaindenter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JAVAINDENTER_H -#define JAVAINDENTER_H +#pragma once #include <texteditor/indenter.h> @@ -47,5 +46,3 @@ public: }; } // namespace Internal } // namespace Android - -#endif // JAVAINDENTER_H diff --git a/src/plugins/android/javaparser.h b/src/plugins/android/javaparser.h index 6a5d237985..642db44e23 100644 --- a/src/plugins/android/javaparser.h +++ b/src/plugins/android/javaparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JAVAPARSER_H -#define JAVAPARSER_H +#pragma once #include <projectexplorer/ioutputparser.h> #include <utils/fileutils.h> @@ -56,5 +55,3 @@ private: } // namespace Internal } // namespace Android - -#endif // JAVAPARSER_H diff --git a/src/plugins/autotest/autotest_global.h b/src/plugins/autotest/autotest_global.h index 03822d4131..c485ad2185 100644 --- a/src/plugins/autotest/autotest_global.h +++ b/src/plugins/autotest/autotest_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef AUTOTEST_GLOBAL_H -#define AUTOTEST_GLOBAL_H +#pragma once #include <QtGlobal> @@ -33,6 +32,3 @@ #else # define AUTOTESTSHARED_EXPORT Q_DECL_IMPORT #endif - -#endif // AUTOTEST_GLOBAL_H - diff --git a/src/plugins/autotest/autotest_utils.h b/src/plugins/autotest/autotest_utils.h index c9447d3bbd..db3decf6c0 100644 --- a/src/plugins/autotest/autotest_utils.h +++ b/src/plugins/autotest/autotest_utils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef AUTOTEST_UTILS_H -#define AUTOTEST_UTILS_H +#pragma once #include <QStringList> @@ -68,5 +67,3 @@ public: } // namespace Internal } // namespace Autotest - -#endif // AUTOTEST_UTILS_H diff --git a/src/plugins/autotest/autotestconstants.h b/src/plugins/autotest/autotestconstants.h index 5e9f3c56c4..9b1f1a2adb 100644 --- a/src/plugins/autotest/autotestconstants.h +++ b/src/plugins/autotest/autotestconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef AUTOTESTCONSTANTS_H -#define AUTOTESTCONSTANTS_H +#pragma once #include <QtGlobal> @@ -54,6 +53,3 @@ enum TestType } // namespace Internal } // namespace Autotest - -#endif // AUTOTESTCONSTANTS_H - diff --git a/src/plugins/autotest/autotesticons.h b/src/plugins/autotest/autotesticons.h index 88c929dc97..35a9614a5f 100644 --- a/src/plugins/autotest/autotesticons.h +++ b/src/plugins/autotest/autotesticons.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef AUTOTESTICONS_H -#define AUTOTESTICONS_H +#pragma once #include <utils/icon.h> @@ -45,5 +44,3 @@ const Utils::Icon RUN_SELECTED_OVERLAY({ } // namespace Icons } // namespace Autotest - -#endif // AUTOTESTICONS_H diff --git a/src/plugins/autotest/autotestplugin.h b/src/plugins/autotest/autotestplugin.h index 18ffbaf4ed..5cef24fd10 100644 --- a/src/plugins/autotest/autotestplugin.h +++ b/src/plugins/autotest/autotestplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef AUTOTESTPLUGIN_H -#define AUTOTESTPLUGIN_H +#pragma once #include "autotest_global.h" @@ -64,6 +63,3 @@ private: } // namespace Internal } // namespace Autotest - -#endif // AUTOTESTPLUGIN_H - diff --git a/src/plugins/autotest/autotestunittests.h b/src/plugins/autotest/autotestunittests.h index 6eab3749d4..e57d265a40 100644 --- a/src/plugins/autotest/autotestunittests.h +++ b/src/plugins/autotest/autotestunittests.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef AUTOTESTUNITTESTS_H -#define AUTOTESTUNITTESTS_H +#pragma once #include <QObject> #include <QTemporaryDir> @@ -62,5 +61,3 @@ private: } // namespace Internal } // namespace Autotest - -#endif // AUTOTESTUNITTESTS_H diff --git a/src/plugins/autotest/testcodeparser.h b/src/plugins/autotest/testcodeparser.h index 2755d33dd6..1ae34ffa33 100644 --- a/src/plugins/autotest/testcodeparser.h +++ b/src/plugins/autotest/testcodeparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTCODEPARSER_H -#define TESTCODEPARSER_H +#pragma once #include "testtreeitem.h" #include "testtreemodel.h" @@ -107,5 +106,3 @@ private: } // namespace Internal } // Autotest - -#endif // TESTCODEPARSER_H diff --git a/src/plugins/autotest/testconfiguration.h b/src/plugins/autotest/testconfiguration.h index f3bcbbd161..ff00ad0d9f 100644 --- a/src/plugins/autotest/testconfiguration.h +++ b/src/plugins/autotest/testconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTCONFIGURATION_H -#define TESTCONFIGURATION_H +#pragma once #include "autotestconstants.h" @@ -98,5 +97,3 @@ private: } // namespace Internal } // namespace Autotest - -#endif // TESTCONFIGURATION_H diff --git a/src/plugins/autotest/testnavigationwidget.h b/src/plugins/autotest/testnavigationwidget.h index 5f92909b93..02a709162c 100644 --- a/src/plugins/autotest/testnavigationwidget.h +++ b/src/plugins/autotest/testnavigationwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTNAVIGATIONWIDGETTREEVIEW_H -#define TESTNAVIGATIONWIDGETTREEVIEW_H +#pragma once #include <coreplugin/inavigationwidgetfactory.h> @@ -102,5 +101,3 @@ private: } // namespace Internal } // namespace Autotest - -#endif // TESTNAVIGATIONWIDGETTREEVIEW_H diff --git a/src/plugins/autotest/testoutputreader.h b/src/plugins/autotest/testoutputreader.h index 1c557d9dd7..4700af4c8a 100644 --- a/src/plugins/autotest/testoutputreader.h +++ b/src/plugins/autotest/testoutputreader.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTXMLOUTPUTREADER_H -#define TESTXMLOUTPUTREADER_H +#pragma once #include "testresult.h" @@ -106,5 +105,3 @@ private: } // namespace Internal } // namespace Autotest - -#endif // TESTOUTPUTREADER_H diff --git a/src/plugins/autotest/testresult.h b/src/plugins/autotest/testresult.h index 66073f0ca4..86439b4640 100644 --- a/src/plugins/autotest/testresult.h +++ b/src/plugins/autotest/testresult.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTRESULT_H -#define TESTRESULT_H +#pragma once #include "autotestconstants.h" @@ -132,5 +131,3 @@ bool operator==(const TestResult &t1, const TestResult &t2); Q_DECLARE_METATYPE(Autotest::Internal::TestResult) Q_DECLARE_METATYPE(Autotest::Internal::Result::Type) - -#endif // TESTRESULT_H diff --git a/src/plugins/autotest/testresultdelegate.h b/src/plugins/autotest/testresultdelegate.h index 521ac0505d..9e87df63b9 100644 --- a/src/plugins/autotest/testresultdelegate.h +++ b/src/plugins/autotest/testresultdelegate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTRESULTDELEGATE_H -#define TESTRESULTDELEGATE_H +#pragma once #include "testresultmodel.h" @@ -127,5 +126,3 @@ private: } // namespace Internal } // namespace Autotest - -#endif // TESTRESULTDELEGATE_H diff --git a/src/plugins/autotest/testresultmodel.h b/src/plugins/autotest/testresultmodel.h index 2fe124178b..9f32a71450 100644 --- a/src/plugins/autotest/testresultmodel.h +++ b/src/plugins/autotest/testresultmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTRESULTMODEL_H -#define TESTRESULTMODEL_H +#pragma once #include "testresult.h" @@ -101,5 +100,3 @@ private: } // namespace Internal } // namespace Autotest - -#endif // TESTRESULTMODEL_H diff --git a/src/plugins/autotest/testresultspane.h b/src/plugins/autotest/testresultspane.h index 86b9bbd4a9..4955783f89 100644 --- a/src/plugins/autotest/testresultspane.h +++ b/src/plugins/autotest/testresultspane.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTRESULTSPANE_H -#define TESTRESULTSPANE_H +#pragma once #include "testresult.h" @@ -136,5 +135,3 @@ private: } // namespace Internal } // namespace Autotest - -#endif // TESTRESULTSPANE_H diff --git a/src/plugins/autotest/testrunner.h b/src/plugins/autotest/testrunner.h index 63b8eaccbc..aca76ac5ce 100644 --- a/src/plugins/autotest/testrunner.h +++ b/src/plugins/autotest/testrunner.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTRUNNER_H -#define TESTRUNNER_H +#pragma once #include "testconfiguration.h" #include "testresult.h" @@ -79,5 +78,3 @@ private: } // namespace Internal } // namespace Autotest - -#endif // TESTRUNNER_H diff --git a/src/plugins/autotest/testsettings.h b/src/plugins/autotest/testsettings.h index 7a9aa1d97d..e34ab202fa 100644 --- a/src/plugins/autotest/testsettings.h +++ b/src/plugins/autotest/testsettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTSETTINGS_H -#define TESTSETTINGS_H +#pragma once #include <QtGlobal> @@ -70,5 +69,3 @@ inline bool operator!=(const TestSettings &s1, const TestSettings &s2) { return } // namespace Internal } // namespace Autotest - -#endif // TESTSETTINGS_H diff --git a/src/plugins/autotest/testsettingspage.h b/src/plugins/autotest/testsettingspage.h index c41929c667..5ae3b98b3a 100644 --- a/src/plugins/autotest/testsettingspage.h +++ b/src/plugins/autotest/testsettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTSETTINGSPAGE_H -#define TESTSETTINGSPAGE_H +#pragma once #include "ui_testsettingspage.h" @@ -69,5 +68,3 @@ private: } // namespace Internal } // namespace Autotest - -#endif // TESTSETTINGSPAGE_H diff --git a/src/plugins/autotest/testtreeitem.h b/src/plugins/autotest/testtreeitem.h index 5f45a723ef..c38a7ae4fe 100644 --- a/src/plugins/autotest/testtreeitem.h +++ b/src/plugins/autotest/testtreeitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTTREEITEM_H -#define TESTTREEITEM_H +#pragma once #include <utils/treemodel.h> @@ -228,5 +227,3 @@ struct GTestCaseSpec Q_DECLARE_METATYPE(Autotest::Internal::TestTreeItem *) Q_DECLARE_METATYPE(Autotest::Internal::TestCodeLocationAndType) - -#endif // TESTTREEITEM_H diff --git a/src/plugins/autotest/testtreeitemdelegate.h b/src/plugins/autotest/testtreeitemdelegate.h index 0391ea28d3..7c6f0ef67e 100644 --- a/src/plugins/autotest/testtreeitemdelegate.h +++ b/src/plugins/autotest/testtreeitemdelegate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTTREEITEMDELEGATE_H -#define TESTTREEITEMDELEGATE_H +#pragma once #include <QStyledItemDelegate> @@ -44,5 +43,3 @@ public: } // namespace Internal } // namespace Autotest - -#endif // TESTTREEITEMDELEGATE_H diff --git a/src/plugins/autotest/testtreemodel.h b/src/plugins/autotest/testtreemodel.h index dae8d34ba3..5770393779 100644 --- a/src/plugins/autotest/testtreemodel.h +++ b/src/plugins/autotest/testtreemodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTTREEMODEL_H -#define TESTTREEMODEL_H +#pragma once #include "testconfiguration.h" #include "testtreeitem.h" @@ -170,5 +169,3 @@ struct TestParseResult Q_DECLARE_METATYPE(Autotest::Internal::TestTreeModel::Type) Q_DECLARE_METATYPE(Autotest::Internal::TestParseResult) - -#endif // TESTTREEMODEL_H diff --git a/src/plugins/autotest/testtreeview.h b/src/plugins/autotest/testtreeview.h index a75c2fdaa7..dffc3be835 100644 --- a/src/plugins/autotest/testtreeview.h +++ b/src/plugins/autotest/testtreeview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTTREEVIEW_H -#define TESTTREEVIEW_H +#pragma once #include <utils/navigationtreeview.h> @@ -52,5 +51,3 @@ private: } // namespace Internal } // namespace Autotest - -#endif // TESTTREEVIEW_H diff --git a/src/plugins/autotest/testvisitor.h b/src/plugins/autotest/testvisitor.h index 5d171216f5..f79d612a4c 100644 --- a/src/plugins/autotest/testvisitor.h +++ b/src/plugins/autotest/testvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTVISITOR_H -#define TESTVISITOR_H +#pragma once #include "testtreeitem.h" @@ -164,5 +163,3 @@ private: } // namespace Internal } // namespace Autotest - -#endif // TESTVISITOR_H diff --git a/src/plugins/autotest/unit_test/plain/test_plain/tst_simple.h b/src/plugins/autotest/unit_test/plain/test_plain/tst_simple.h index 25523237cb..4c30299624 100644 --- a/src/plugins/autotest/unit_test/plain/test_plain/tst_simple.h +++ b/src/plugins/autotest/unit_test/plain/test_plain/tst_simple.h @@ -1,4 +1,2 @@ -#ifndef TST_SIMPLE_H -#define TST_SIMPLE_H +#pragma once #include <QTest> -#endif // TST_SIMPLE_H diff --git a/src/plugins/baremetal/baremetalconstants.h b/src/plugins/baremetal/baremetalconstants.h index efca7cd688..7b1358cc33 100644 --- a/src/plugins/baremetal/baremetalconstants.h +++ b/src/plugins/baremetal/baremetalconstants.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef BAREMETALCONSTANTS_H -#define BAREMETALCONSTANTS_H +#pragma once namespace BareMetal { namespace Constants { @@ -48,5 +47,3 @@ const char STLINK_UTIL_PROVIDER_ID[] = "BareMetal.GdbServerProvider.STLinkUtil"; } // namespace BareMetal } // namespace Constants - -#endif // BAREMETALCONSTANTS_H diff --git a/src/plugins/baremetal/baremetalcustomrunconfiguration.h b/src/plugins/baremetal/baremetalcustomrunconfiguration.h index a52c58eabb..9c9118033a 100644 --- a/src/plugins/baremetal/baremetalcustomrunconfiguration.h +++ b/src/plugins/baremetal/baremetalcustomrunconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BAREMETALCUSTOMRUNCONFIGURATION_H -#define BAREMETALCUSTOMRUNCONFIGURATION_H +#pragma once #include "baremetalrunconfiguration.h" @@ -63,5 +62,3 @@ private: } // namespace Internal } // namespace BareMetal - -#endif // Include guard. diff --git a/src/plugins/baremetal/baremetaldebugsupport.h b/src/plugins/baremetal/baremetaldebugsupport.h index 502833cd31..5130a62a65 100644 --- a/src/plugins/baremetal/baremetaldebugsupport.h +++ b/src/plugins/baremetal/baremetaldebugsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BAREMETALDEBUGSUPPORT_H -#define BAREMETALDEBUGSUPPORT_H +#pragma once #include <QObject> #include <QPointer> @@ -82,5 +81,3 @@ private: } // namespace Internal } // namespace BareMetal - -#endif // BAREMETALDEBUGSUPPORT_H diff --git a/src/plugins/baremetal/baremetaldevice.h b/src/plugins/baremetal/baremetaldevice.h index 6707040038..6fbb00c7e1 100644 --- a/src/plugins/baremetal/baremetaldevice.h +++ b/src/plugins/baremetal/baremetaldevice.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef BAREMETALDEVICE_H -#define BAREMETALDEVICE_H +#pragma once #include <projectexplorer/devicesupport/idevice.h> @@ -74,5 +73,3 @@ private: } //namespace Internal } //namespace BareMetal - -#endif // BAREMETALDEVICE_H diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationfactory.h b/src/plugins/baremetal/baremetaldeviceconfigurationfactory.h index ee55c7dc22..c05b9afa78 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationfactory.h +++ b/src/plugins/baremetal/baremetaldeviceconfigurationfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BAREMETALDEVICECONFIGURATIONFACTORY_H -#define BAREMETALDEVICECONFIGURATIONFACTORY_H +#pragma once #include <projectexplorer/devicesupport/idevicefactory.h> @@ -49,5 +48,3 @@ public: } // namespace Internal } // namespace BareMetal - -#endif // BAREMETALDEVICECONFIGURATIONFACTORY_H diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h index 660e85c565..520eeb81d8 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef BAREMETALDEVICECONFIGURATIONWIDGET_H -#define BAREMETALDEVICECONFIGURATIONWIDGET_H +#pragma once #include <projectexplorer/devicesupport/idevicewidget.h> @@ -54,5 +53,3 @@ private: } // namespace Internal } // namespace BareMetal - -#endif // BAREMETALDEVICECONFIGURATIONWIDGET_H diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h b/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h index 1e99ec890d..dd49659021 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BAREMETALDEVICECONFIGURATIONWIZARD_H -#define BAREMETALDEVICECONFIGURATIONWIZARD_H +#pragma once #include <projectexplorer/devicesupport/idevice.h> #include <utils/wizard.h> @@ -49,5 +48,3 @@ private: } // namespace Internal } // namespace BareMetal - -#endif // BAREMETALDEVICECONFIGURATIONWIZARD_H diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h b/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h index 71a5cac00f..af61c11d65 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef BAREMETALDEVICECONFIGURATIONWIZARDPAGES_H -#define BAREMETALDEVICECONFIGURATIONWIZARDPAGES_H +#pragma once #include <QWizardPage> @@ -59,5 +58,3 @@ private: } // namespace Internal } // namespace BareMetal - -#endif // BAREMETALDEVICECONFIGURATIONWIZARDPAGES_H diff --git a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h index 8ef99da7ba..0c0b610f7d 100644 --- a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h +++ b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BAREMETALGDBCOMMANDSDEPLOYSTEP_H -#define BAREMETALGDBCOMMANDSDEPLOYSTEP_H +#pragma once #include <projectexplorer/buildstep.h> @@ -83,5 +82,3 @@ private: } // namespace Internal } // namespace BareMetal - -#endif // BAREMETALGDBCOMMANDSDEPLOYSTEP_H diff --git a/src/plugins/baremetal/baremetalplugin.h b/src/plugins/baremetal/baremetalplugin.h index 69ca47fe79..92cb604a82 100644 --- a/src/plugins/baremetal/baremetalplugin.h +++ b/src/plugins/baremetal/baremetalplugin.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef BAREMETAL_H -#define BAREMETAL_H +#pragma once #include <extensionsystem/iplugin.h> @@ -47,5 +46,3 @@ public: } // namespace Internal } // namespace BareMetal - -#endif // BAREMETAL_H diff --git a/src/plugins/baremetal/baremetalrunconfiguration.h b/src/plugins/baremetal/baremetalrunconfiguration.h index b000f31b0b..d69287059b 100644 --- a/src/plugins/baremetal/baremetalrunconfiguration.h +++ b/src/plugins/baremetal/baremetalrunconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BAREMETALRUNCONFIGURATION_H -#define BAREMETALRUNCONFIGURATION_H +#pragma once #include <projectexplorer/runconfiguration.h> @@ -87,5 +86,3 @@ private: } // namespace Internal } // namespace BareMetal - -#endif // BAREMETALRUNCONFIGURATION_H diff --git a/src/plugins/baremetal/baremetalrunconfigurationfactory.h b/src/plugins/baremetal/baremetalrunconfigurationfactory.h index c83fd163a0..eff00764e5 100644 --- a/src/plugins/baremetal/baremetalrunconfigurationfactory.h +++ b/src/plugins/baremetal/baremetalrunconfigurationfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BAREMETALRUNCONFIGURATIONFACTORY_H -#define BAREMETALRUNCONFIGURATIONFACTORY_H +#pragma once #include <projectexplorer/runconfiguration.h> @@ -58,5 +57,3 @@ private: } // namespace Internal } // namespace RemoteLinux - -#endif // BAREMETALRUNCONFIGURATIONFACTORY_H diff --git a/src/plugins/baremetal/baremetalrunconfigurationwidget.h b/src/plugins/baremetal/baremetalrunconfigurationwidget.h index a4e4060dbd..d6c0d5347c 100644 --- a/src/plugins/baremetal/baremetalrunconfigurationwidget.h +++ b/src/plugins/baremetal/baremetalrunconfigurationwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BAREMETALRUNCONFIGURATIONWIDGET_H -#define BAREMETALRUNCONFIGURATIONWIDGET_H +#pragma once #include <QWidget> @@ -63,5 +62,3 @@ private: } // namespace Internal } // namespace BareMetal - -#endif // BAREMETALRUNCONFIGURATIONWIDGET_H diff --git a/src/plugins/baremetal/baremetalruncontrolfactory.h b/src/plugins/baremetal/baremetalruncontrolfactory.h index 740d7138c5..1cab1af9ee 100644 --- a/src/plugins/baremetal/baremetalruncontrolfactory.h +++ b/src/plugins/baremetal/baremetalruncontrolfactory.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef BAREMETALRUNCONTROLFACTORY_H -#define BAREMETALRUNCONTROLFACTORY_H +#pragma once #include "baremetalrunconfiguration.h" @@ -49,5 +48,3 @@ public: } // namespace Internal } // namespace BareMetal - -#endif // BAREMETALRUNCONTROLFACTORY_H diff --git a/src/plugins/baremetal/defaultgdbserverprovider.h b/src/plugins/baremetal/defaultgdbserverprovider.h index de672f2f68..2c114ec63f 100644 --- a/src/plugins/baremetal/defaultgdbserverprovider.h +++ b/src/plugins/baremetal/defaultgdbserverprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEFAULTGDBSERVERPROVIDER_H -#define DEFAULTGDBSERVERPROVIDER_H +#pragma once #include "gdbserverprovider.h" @@ -104,5 +103,3 @@ private: } // namespace Internal } // namespace BareMetal - -#endif // DEFAULTGDBSERVERPROVIDER_H diff --git a/src/plugins/baremetal/gdbserverprovider.h b/src/plugins/baremetal/gdbserverprovider.h index 6718a45bfa..a206f5acb5 100644 --- a/src/plugins/baremetal/gdbserverprovider.h +++ b/src/plugins/baremetal/gdbserverprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GDBSERVERPROVIDER_H -#define GDBSERVERPROVIDER_H +#pragma once #include <QObject> #include <QVariantMap> @@ -197,5 +196,3 @@ private: } // namespace Internal } // namespace BareMetal - -#endif // GDBSERVERPROVIDER_H diff --git a/src/plugins/baremetal/gdbserverproviderchooser.h b/src/plugins/baremetal/gdbserverproviderchooser.h index 9f26f7a2d4..a5e090516a 100644 --- a/src/plugins/baremetal/gdbserverproviderchooser.h +++ b/src/plugins/baremetal/gdbserverproviderchooser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GDBSERVERPROVIDERCHOOSER_H -#define GDBSERVERPROVIDERCHOOSER_H +#pragma once #include <QWidget> @@ -72,5 +71,3 @@ private: } // namespace Internal } // namespace BareMetal - -#endif // GDBSERVERPROVIDERCHOOSER_H diff --git a/src/plugins/baremetal/gdbserverprovidermanager.h b/src/plugins/baremetal/gdbserverprovidermanager.h index 2d5097de32..33cbbcea44 100644 --- a/src/plugins/baremetal/gdbserverprovidermanager.h +++ b/src/plugins/baremetal/gdbserverprovidermanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GDBSERVERPROVIDERMANAGER_H -#define GDBSERVERPROVIDERMANAGER_H +#pragma once #include <QObject> #include <QList> @@ -80,5 +79,3 @@ private: } // namespace Internal } // namespace BareMetal - -#endif // GDBSERVERPROVIDERMANAGER_H diff --git a/src/plugins/baremetal/gdbserverproviderprocess.h b/src/plugins/baremetal/gdbserverproviderprocess.h index af69851780..fde68ab59d 100644 --- a/src/plugins/baremetal/gdbserverproviderprocess.h +++ b/src/plugins/baremetal/gdbserverproviderprocess.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GDBSERVERPROVIDERPROCESS_H -#define GDBSERVERPROVIDERPROCESS_H +#pragma once #include <projectexplorer/devicesupport/deviceprocess.h> @@ -63,5 +62,3 @@ private: } // namespace Internal } // namespace BareMetal - -#endif // GDBSERVERPROVIDERPROCESS_H diff --git a/src/plugins/baremetal/gdbserverproviderssettingspage.h b/src/plugins/baremetal/gdbserverproviderssettingspage.h index 800bdce621..be8e00c422 100644 --- a/src/plugins/baremetal/gdbserverproviderssettingspage.h +++ b/src/plugins/baremetal/gdbserverproviderssettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GDBSERVERPROVIDERSSETTINGSPAGE_H -#define GDBSERVERPROVIDERSSETTINGSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> @@ -95,5 +94,3 @@ private: } // namespace Internal } // namespace BareMetal - -#endif // GDBSERVERPROVIDERSSETTINGSPAGE_H diff --git a/src/plugins/baremetal/openocdgdbserverprovider.h b/src/plugins/baremetal/openocdgdbserverprovider.h index 29db9ebbc3..68ef66bc25 100644 --- a/src/plugins/baremetal/openocdgdbserverprovider.h +++ b/src/plugins/baremetal/openocdgdbserverprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OPENOCDGDBSERVERPROVIDER_H -#define OPENOCDGDBSERVERPROVIDER_H +#pragma once #include "gdbserverprovider.h" @@ -116,5 +115,3 @@ private: } // namespace Internal } // namespace BareMetal - -#endif // OPENOCDGDBSERVERPROVIDER_H diff --git a/src/plugins/baremetal/stlinkutilgdbserverprovider.h b/src/plugins/baremetal/stlinkutilgdbserverprovider.h index 0b9c5b43fc..288bb3177b 100644 --- a/src/plugins/baremetal/stlinkutilgdbserverprovider.h +++ b/src/plugins/baremetal/stlinkutilgdbserverprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef STLINKUTILGDBSERVERPROVIDER_H -#define STLINKUTILGDBSERVERPROVIDER_H +#pragma once #include "gdbserverprovider.h" @@ -128,5 +127,3 @@ private: } // namespace Internal } // namespace BareMetal - -#endif // STLINKUTILGDBSERVERPROVIDER_H diff --git a/src/plugins/beautifier/abstractsettings.h b/src/plugins/beautifier/abstractsettings.h index 88c1dce543..86195857fa 100644 --- a/src/plugins/beautifier/abstractsettings.h +++ b/src/plugins/beautifier/abstractsettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEAUTIFIER_ABSTRACTSETTINGS_H -#define BEAUTIFIER_ABSTRACTSETTINGS_H +#pragma once #include <QCoreApplication> #include <QDir> @@ -89,5 +88,3 @@ private: } // namespace Internal } // namespace Beautifier - -#endif // BEAUTIFIER_ABSTRACTSETTINGS_H diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.h b/src/plugins/beautifier/artisticstyle/artisticstyle.h index 29bc1cce72..1bf00d0c77 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyle.h +++ b/src/plugins/beautifier/artisticstyle/artisticstyle.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEAUTIFIER_ARTISTICSTYLE_H -#define BEAUTIFIER_ARTISTICSTYLE_H +#pragma once #include "../beautifierabstracttool.h" #include "../command.h" @@ -65,5 +64,3 @@ private: } // namespace ArtisticStyle } // namespace Internal } // namespace Beautifier - -#endif // BEAUTIFIER_ARTISTICSTYLE_H diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleconstants.h b/src/plugins/beautifier/artisticstyle/artisticstyleconstants.h index 743c21d4f6..88a98ec457 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleconstants.h +++ b/src/plugins/beautifier/artisticstyle/artisticstyleconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEAUTIFIER_ARTISTICSTYLECONSTANTS_H -#define BEAUTIFIER_ARTISTICSTYLECONSTANTS_H +#pragma once namespace Beautifier { namespace Constants { @@ -39,5 +38,3 @@ const char SETTINGS_NAME[] = "artisticstyle"; } // namespace ArtisticStyle } // namespace Constants } // namespace Beautifier - -#endif // BEAUTIFIER_ARTISTICSTYLECONSTANTS_H diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h index 470d0e6054..d31b8f80f1 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h +++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEAUTIFIER_ARTISTICSTYLEOPTIONSPAGE_H -#define BEAUTIFIER_ARTISTICSTYLEOPTIONSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> @@ -72,6 +71,3 @@ private: } // namespace ArtisticStyle } // namespace Internal } // namespace Beautifier - - -#endif // BEAUTIFIER_ARTISTICSTYLEOPTIONSPAGE_H diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.h b/src/plugins/beautifier/artisticstyle/artisticstylesettings.h index 9085d90165..e1094743c7 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.h +++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEAUTIFIER_ARTISTICSTYLESETTINGS_H -#define BEAUTIFIER_ARTISTICSTYLESETTINGS_H +#pragma once #include "../abstractsettings.h" @@ -75,5 +74,3 @@ private: } // namespace ArtisticStyle } // namespace Internal } // namespace Beautifier - -#endif // BEAUTIFIER_ARTISTICSTYLESETTINGS_H diff --git a/src/plugins/beautifier/beautifierabstracttool.h b/src/plugins/beautifier/beautifierabstracttool.h index 080183c140..3d12980bfa 100644 --- a/src/plugins/beautifier/beautifierabstracttool.h +++ b/src/plugins/beautifier/beautifierabstracttool.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEAUTIFIER_BEAUTIFIERABSTRACTTOOL_H -#define BEAUTIFIER_BEAUTIFIERABSTRACTTOOL_H +#pragma once #include <QList> #include <QObject> @@ -49,5 +48,3 @@ public: } // namespace Internal } // namespace Beautifier - -#endif // BEAUTIFIER_BEAUTIFIERABSTRACTTOOL_H diff --git a/src/plugins/beautifier/beautifierconstants.h b/src/plugins/beautifier/beautifierconstants.h index deb0502b31..3bfa94b39f 100644 --- a/src/plugins/beautifier/beautifierconstants.h +++ b/src/plugins/beautifier/beautifierconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEAUTIFIER_BEAUTIFIERCONSTANTS_H -#define BEAUTIFIER_BEAUTIFIERCONSTANTS_H +#pragma once #include <QtGlobal> @@ -47,6 +46,3 @@ const char DOCUMENTATION_XMLDOC[] = "doc"; } // namespace Constants } // namespace Beautifier - -#endif // BEAUTIFIER_BEAUTIFIERCONSTANTS_H - diff --git a/src/plugins/beautifier/beautifierplugin.h b/src/plugins/beautifier/beautifierplugin.h index 49dfd06690..6e310eb818 100644 --- a/src/plugins/beautifier/beautifierplugin.h +++ b/src/plugins/beautifier/beautifierplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEAUTIFIER_BEAUTIFIER_H -#define BEAUTIFIER_BEAUTIFIER_H +#pragma once #include "command.h" @@ -102,6 +101,3 @@ private: } // namespace Internal } // namespace Beautifier - -#endif // BEAUTIFIER_BEAUTIFIER_H - diff --git a/src/plugins/beautifier/clangformat/clangformat.h b/src/plugins/beautifier/clangformat/clangformat.h index 3a71b3ba93..83f2f5ec5b 100644 --- a/src/plugins/beautifier/clangformat/clangformat.h +++ b/src/plugins/beautifier/clangformat/clangformat.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEAUTIFIER_CLANGFORMAT_H -#define BEAUTIFIER_CLANGFORMAT_H +#pragma once #include "../beautifierabstracttool.h" #include "../command.h" @@ -67,5 +66,3 @@ private: } // namespace ClangFormat } // namespace Internal } // namespace Beautifier - -#endif // BEAUTIFIER_CLANGFORMAT_H diff --git a/src/plugins/beautifier/clangformat/clangformatconstants.h b/src/plugins/beautifier/clangformat/clangformatconstants.h index fb0218cc65..51f6fa1bf8 100644 --- a/src/plugins/beautifier/clangformat/clangformatconstants.h +++ b/src/plugins/beautifier/clangformat/clangformatconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEAUTIFIER_CLANGFORMATCONSTANTS_H -#define BEAUTIFIER_CLANGFORMATCONSTANTS_H +#pragma once namespace Beautifier { namespace Constants { @@ -40,5 +39,3 @@ const char SETTINGS_NAME[] = "clangformat"; } // namespace ClangFormat } // namespace Constants } // namespace Beautifier - -#endif // BEAUTIFIER_CLANGFORMATCONSTANTS_H diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.h b/src/plugins/beautifier/clangformat/clangformatoptionspage.h index 5947fab240..60f9f77b46 100644 --- a/src/plugins/beautifier/clangformat/clangformatoptionspage.h +++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEAUTIFIER_CLANGFORMATOPTIONSPAGE_H -#define BEAUTIFIER_CLANGFORMATOPTIONSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> @@ -72,5 +71,3 @@ private: } // namespace ClangFormat } // namespace Internal } // namespace Beautifier - -#endif // BEAUTIFIER_CLANGFORMATOPTIONSPAGE_H diff --git a/src/plugins/beautifier/clangformat/clangformatsettings.h b/src/plugins/beautifier/clangformat/clangformatsettings.h index f73a6cc7fd..783677123a 100644 --- a/src/plugins/beautifier/clangformat/clangformatsettings.h +++ b/src/plugins/beautifier/clangformat/clangformatsettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEAUTIFIER_CLANGFORMATSETTINGS_H -#define BEAUTIFIER_CLANGFORMATSETTINGS_H +#pragma once #include "../abstractsettings.h" @@ -62,5 +61,3 @@ public: } // namespace ClangFormat } // namespace Internal } // namespace Beautifier - -#endif // BEAUTIFIER_CLANGFORMATSETTINGS_H diff --git a/src/plugins/beautifier/command.h b/src/plugins/beautifier/command.h index e204db17f2..b374debaf1 100644 --- a/src/plugins/beautifier/command.h +++ b/src/plugins/beautifier/command.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEAUTIFIER_COMMAND_H -#define BEAUTIFIER_COMMAND_H +#pragma once #include <QString> #include <QStringList> @@ -67,5 +66,3 @@ private: } // namespace Internal } // namespace Beautifier - -#endif // BEAUTIFIER_COMMAND_H diff --git a/src/plugins/beautifier/configurationdialog.h b/src/plugins/beautifier/configurationdialog.h index 13e1a9825e..cc81096c14 100644 --- a/src/plugins/beautifier/configurationdialog.h +++ b/src/plugins/beautifier/configurationdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEAUTIFIER_CONFIGURATIONDIALOG_H -#define BEAUTIFIER_CONFIGURATIONDIALOG_H +#pragma once #include <QDialog> #include <QString> @@ -63,5 +62,3 @@ private: } // namespace Internal } // namespace Beautifier - -#endif // BEAUTIFIER_CONFIGURATIONDIALOG_H diff --git a/src/plugins/beautifier/configurationeditor.h b/src/plugins/beautifier/configurationeditor.h index 27ed01a03b..9c72c79fc4 100644 --- a/src/plugins/beautifier/configurationeditor.h +++ b/src/plugins/beautifier/configurationeditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEAUTIFIER_CONFIGURATIONEDITOR_H -#define BEAUTIFIER_CONFIGURATIONEDITOR_H +#pragma once #include <QPlainTextEdit> @@ -97,5 +96,3 @@ private: } // namespace Internal } // namespace Beautifier - -#endif // BEAUTIFIER_CONFIGURATIONEDITOR_H diff --git a/src/plugins/beautifier/configurationpanel.h b/src/plugins/beautifier/configurationpanel.h index 670cdc7a18..226f1bcc32 100644 --- a/src/plugins/beautifier/configurationpanel.h +++ b/src/plugins/beautifier/configurationpanel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEAUTIFIER_CONFIGURATIONPANEL_H -#define BEAUTIFIER_CONFIGURATIONPANEL_H +#pragma once #include <QWidget> @@ -62,5 +61,3 @@ private: } // namespace Internal } // namespace Beautifier - -#endif // BEAUTIFIER_CONFIGURATIONPANEL_H diff --git a/src/plugins/beautifier/uncrustify/uncrustify.h b/src/plugins/beautifier/uncrustify/uncrustify.h index 8861910dc5..495111b38f 100644 --- a/src/plugins/beautifier/uncrustify/uncrustify.h +++ b/src/plugins/beautifier/uncrustify/uncrustify.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEAUTIFIER_UNCRUSTIFY_H -#define BEAUTIFIER_UNCRUSTIFY_H +#pragma once #include "../beautifierabstracttool.h" #include "../command.h" @@ -67,5 +66,3 @@ private: } // namespace Uncrustify } // namespace Internal } // namespace Beautifier - -#endif // BEAUTIFIER_UNCRUSTIFY_H diff --git a/src/plugins/beautifier/uncrustify/uncrustifyconstants.h b/src/plugins/beautifier/uncrustify/uncrustifyconstants.h index 4b8dd0de29..9936689c3f 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifyconstants.h +++ b/src/plugins/beautifier/uncrustify/uncrustifyconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEAUTIFIER_UNCRUSTIFYCONSTANTS_H -#define BEAUTIFIER_UNCRUSTIFYCONSTANTS_H +#pragma once namespace Beautifier { namespace Constants { @@ -40,5 +39,3 @@ const char SETTINGS_NAME[] = "uncrustify"; } // namespace Uncrustify } // namespace Constants } // namespace Beautifier - -#endif // BEAUTIFIER_UNCRUSTIFYCONSTANTS_H diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h index 2f833d48fa..656edce2d9 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h +++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEAUTIFIER_UNCRUSTIFYOPTIONSPAGE_H -#define BEAUTIFIER_UNCRUSTIFYOPTIONSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> @@ -72,6 +71,3 @@ private: } // namespace Uncrustify } // namespace Internal } // namespace Beautifier - - -#endif // BEAUTIFIER_UNCRUSTIFYOPTIONSPAGE_H diff --git a/src/plugins/beautifier/uncrustify/uncrustifysettings.h b/src/plugins/beautifier/uncrustify/uncrustifysettings.h index 3306177faf..2725323186 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifysettings.h +++ b/src/plugins/beautifier/uncrustify/uncrustifysettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEAUTIFIER_UNCRUSTIFYSETTINGS_H -#define BEAUTIFIER_UNCRUSTIFYSETTINGS_H +#pragma once #include "../abstractsettings.h" @@ -60,5 +59,3 @@ public: } // namespace Uncrustify } // namespace Internal } // namespace Beautifier - -#endif // BEAUTIFIER_UNCRUSTIFYSETTINGS_H diff --git a/src/plugins/bineditor/bineditor.h b/src/plugins/bineditor/bineditor.h index f8e7433125..a742e9e07d 100644 --- a/src/plugins/bineditor/bineditor.h +++ b/src/plugins/bineditor/bineditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BINEDITOR_H -#define BINEDITOR_H +#pragma once #include "markup.h" @@ -244,5 +243,3 @@ private: }; } // namespace BinEditor - -#endif // BINEDITOR_H diff --git a/src/plugins/bineditor/bineditorconstants.h b/src/plugins/bineditor/bineditorconstants.h index fbade116e5..940f0a0606 100644 --- a/src/plugins/bineditor/bineditorconstants.h +++ b/src/plugins/bineditor/bineditorconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BINEDITORCONSTANTS_H -#define BINEDITORCONSTANTS_H +#pragma once namespace BinEditor { namespace Constants { @@ -35,5 +34,3 @@ const char C_BINEDITOR_MIMETYPE[] = "application/octet-stream"; } // namespace Constants } // namespace BinEditor - -#endif // BINEDITORCONSTANTS_H diff --git a/src/plugins/bineditor/bineditorplugin.h b/src/plugins/bineditor/bineditorplugin.h index eb0b72ad46..2dba62e5e9 100644 --- a/src/plugins/bineditor/bineditorplugin.h +++ b/src/plugins/bineditor/bineditorplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BINEDITORPLUGIN_H -#define BINEDITORPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> #include <coreplugin/editormanager/ieditorfactory.h> @@ -92,5 +91,3 @@ private: } // namespace Internal } // namespace BinEditor - -#endif // BINEDITORPLUGIN_H diff --git a/src/plugins/bineditor/markup.h b/src/plugins/bineditor/markup.h index c024fbd247..3a976ab1d4 100644 --- a/src/plugins/bineditor/markup.h +++ b/src/plugins/bineditor/markup.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MARKUP_H -#define MARKUP_H +#pragma once #include <QColor> #include <QString> @@ -49,5 +48,3 @@ public: } // namespace BinEditor Q_DECLARE_METATYPE(BinEditor::Markup) - -#endif // MARKUP_H diff --git a/src/plugins/bookmarks/bookmark.h b/src/plugins/bookmarks/bookmark.h index e1cb8b6b51..af9c219b9c 100644 --- a/src/plugins/bookmarks/bookmark.h +++ b/src/plugins/bookmarks/bookmark.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BOOKMARK_H -#define BOOKMARK_H +#pragma once #include <texteditor/textmark.h> @@ -57,5 +56,3 @@ private: } // namespace Internal } // namespace Bookmarks - -#endif // BOOKMARK_H diff --git a/src/plugins/bookmarks/bookmarkmanager.h b/src/plugins/bookmarks/bookmarkmanager.h index d136225362..0bc81ad135 100644 --- a/src/plugins/bookmarks/bookmarkmanager.h +++ b/src/plugins/bookmarks/bookmarkmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BOOKMARKMANAGER_H -#define BOOKMARKMANAGER_H +#pragma once #include <utils/itemviews.h> #include <coreplugin/editormanager/ieditor.h> @@ -188,5 +187,3 @@ private: } // namespace Internal } // namespace Bookmarks - -#endif // BOOKMARKMANAGER_H diff --git a/src/plugins/bookmarks/bookmarks_global.h b/src/plugins/bookmarks/bookmarks_global.h index b1cab45207..6f22b7eb09 100644 --- a/src/plugins/bookmarks/bookmarks_global.h +++ b/src/plugins/bookmarks/bookmarks_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BOOKMARKS_GLOBAL_H -#define BOOKMARKS_GLOBAL_H +#pragma once namespace Bookmarks { namespace Constants { @@ -46,6 +45,3 @@ const char BOOKMARKS_CONTEXT[] = "Bookmarks"; } // namespace Constants } // namespace Bookmarks - -#endif // BOOKMARKS_GLOBAL_H - diff --git a/src/plugins/bookmarks/bookmarksplugin.h b/src/plugins/bookmarks/bookmarksplugin.h index 58bbc5e3f2..4cb16b2218 100644 --- a/src/plugins/bookmarks/bookmarksplugin.h +++ b/src/plugins/bookmarks/bookmarksplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BOOKMARKSPLUGIN_H -#define BOOKMARKSPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -81,5 +80,3 @@ private: } // namespace Internal } // namespace Bookmarks - -#endif // BOOKMARKS_H diff --git a/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.h b/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.h index 0e0bd55f84..6bb25da086 100644 --- a/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.h +++ b/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODEMODEL_INTERNAL_ACTIVATIONSEQUENCECONTEXTPROCESSOR_H -#define CLANGCODEMODEL_INTERNAL_ACTIVATIONSEQUENCECONTEXTPROCESSOR_H +#pragma once #include <clangcodemodel/clangcompletionassistinterface.h> @@ -87,5 +86,3 @@ private: } // namespace Internal } // namespace ClangCodeModel - -#endif // CLANGCODEMODEL_INTERNAL_ACTIVATIONSEQUENCECONTEXTPROCESSOR_H diff --git a/src/plugins/clangcodemodel/clangactivationsequenceprocessor.h b/src/plugins/clangcodemodel/clangactivationsequenceprocessor.h index cb674fbf19..d8d4d77ed2 100644 --- a/src/plugins/clangcodemodel/clangactivationsequenceprocessor.h +++ b/src/plugins/clangcodemodel/clangactivationsequenceprocessor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODEMODEL_INTERNAL_ACTIVATIONSEQUENCEPROCESSOR_H -#define CLANGCODEMODEL_INTERNAL_ACTIVATIONSEQUENCEPROCESSOR_H +#pragma once #include <cplusplus/Token.h> @@ -72,5 +71,3 @@ private: } // namespace Internal } // namespace ClangCodeModel - -#endif // CLANGCODEMODEL_INTERNAL_ACTIVATIONSEQUENCEPROCESSOR_H diff --git a/src/plugins/clangcodemodel/clangassistproposal.h b/src/plugins/clangcodemodel/clangassistproposal.h index 9c201c2cc0..8fc29b8374 100644 --- a/src/plugins/clangcodemodel/clangassistproposal.h +++ b/src/plugins/clangcodemodel/clangassistproposal.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODEMODEL_INTERNAL_CLANGASSISTPROPOSAL_H -#define CLANGCODEMODEL_INTERNAL_CLANGASSISTPROPOSAL_H +#pragma once #include "clangassistproposalmodel.h" @@ -44,5 +43,3 @@ public: } // namespace Internal } // namespace ClangCodeModel - -#endif // CLANGCODEMODEL_INTERNAL_CLANGASSISTPROPOSAL_H diff --git a/src/plugins/clangcodemodel/clangassistproposalitem.h b/src/plugins/clangcodemodel/clangassistproposalitem.h index 5e7ec8fefa..442764bdbf 100644 --- a/src/plugins/clangcodemodel/clangassistproposalitem.h +++ b/src/plugins/clangcodemodel/clangassistproposalitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODEMODEL_INTERNAL_CLANGASSISTPROPOSALITEM_H -#define CLANGCODEMODEL_INTERNAL_CLANGASSISTPROPOSALITEM_H +#pragma once #include <codecompletion.h> @@ -70,5 +69,3 @@ private: } // namespace Internal } // namespace ClangCodeModel - -#endif // CLANGCODEMODEL_INTERNAL_CLANGASSISTPROPOSALITEM_H diff --git a/src/plugins/clangcodemodel/clangassistproposalmodel.h b/src/plugins/clangcodemodel/clangassistproposalmodel.h index e722daf03d..32b25bf9d0 100644 --- a/src/plugins/clangcodemodel/clangassistproposalmodel.h +++ b/src/plugins/clangcodemodel/clangassistproposalmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODEMODEL_INTERNAL_CLANGASSISTPROPOSALMODEL_H -#define CLANGCODEMODEL_INTERNAL_CLANGASSISTPROPOSALMODEL_H +#pragma once #include <cplusplus/Token.h> @@ -51,5 +50,3 @@ private: } // namespace Internal } // namespace ClangCodeModel - -#endif // CLANGCODEMODEL_INTERNAL_CLANGASSISTPROPOSALMODEL_H diff --git a/src/plugins/clangcodemodel/clangbackendipcintegration.h b/src/plugins/clangcodemodel/clangbackendipcintegration.h index 2871ec3062..66b9c05111 100644 --- a/src/plugins/clangcodemodel/clangbackendipcintegration.h +++ b/src/plugins/clangcodemodel/clangbackendipcintegration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODEMODEL_INTERNAL_CLANGBACKENDIPCINTEGRATION_H -#define CLANGCODEMODEL_INTERNAL_CLANGBACKENDIPCINTEGRATION_H +#pragma once #include <cpptools/projectpart.h> @@ -187,5 +186,3 @@ private: } // namespace Internal } // namespace ClangCodeModel - -#endif // CLANGCODEMODEL_INTERNAL_CLANGBACKENDIPCINTEGRATION_H diff --git a/src/plugins/clangcodemodel/clangcodemodelplugin.h b/src/plugins/clangcodemodel/clangcodemodelplugin.h index fb6be15ad0..0b94c93c2c 100644 --- a/src/plugins/clangcodemodel/clangcodemodelplugin.h +++ b/src/plugins/clangcodemodel/clangcodemodelplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODEMODELPLUGIN_H -#define CLANGCODEMODELPLUGIN_H +#pragma once #include "clangmodelmanagersupport.h" @@ -52,5 +51,3 @@ private: } // namespace Internal } // namespace Clang - -#endif // CLANGCODEMODELPLUGIN_H diff --git a/src/plugins/clangcodemodel/clangcompletionassistinterface.h b/src/plugins/clangcodemodel/clangcompletionassistinterface.h index 6012cf6508..fc0724777e 100644 --- a/src/plugins/clangcodemodel/clangcompletionassistinterface.h +++ b/src/plugins/clangcodemodel/clangcompletionassistinterface.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODEMODEL_INTERNAL_CLANGCOMPLETIONASSISTINTERFACE_H -#define CLANGCODEMODEL_INTERNAL_CLANGCOMPLETIONASSISTINTERFACE_H +#pragma once #include "clangbackendipcintegration.h" #include "clangutils.h" @@ -63,5 +62,3 @@ private: } // namespace Internal } // namespace ClangCodeModel - -#endif // CLANGCODEMODEL_INTERNAL_CLANGCOMPLETIONASSISTINTERFACE_H diff --git a/src/plugins/clangcodemodel/clangcompletionassistprocessor.h b/src/plugins/clangcodemodel/clangcompletionassistprocessor.h index cfc1604b86..56779a4b01 100644 --- a/src/plugins/clangcodemodel/clangcompletionassistprocessor.h +++ b/src/plugins/clangcodemodel/clangcompletionassistprocessor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODEMODEL_INTERNAL_CLANGCOMPLETIONASSISTPROCESSOR_H -#define CLANGCODEMODEL_INTERNAL_CLANGCOMPLETIONASSISTPROCESSOR_H +#pragma once #include "clangcompletionassistinterface.h" @@ -96,5 +95,3 @@ private: } // namespace Internal } // namespace ClangCodeModel - -#endif // CLANGCODEMODEL_INTERNAL_CLANGCOMPLETIONASSISTPROCESSOR_H diff --git a/src/plugins/clangcodemodel/clangcompletionassistprovider.h b/src/plugins/clangcodemodel/clangcompletionassistprovider.h index 8e752f289f..7c1ac168be 100644 --- a/src/plugins/clangcodemodel/clangcompletionassistprovider.h +++ b/src/plugins/clangcodemodel/clangcompletionassistprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODEMODEL_INTERNAL_CLANGCOMPLETIONASSISTPROVIDER_H -#define CLANGCODEMODEL_INTERNAL_CLANGCOMPLETIONASSISTPROVIDER_H +#pragma once #include "clangbackendipcintegration.h" @@ -58,5 +57,3 @@ private: } // namespace Internal } // namespace ClangCodeModel - -#endif // CLANGCODEMODEL_INTERNAL_CLANGCOMPLETIONASSISTPROVIDER_H diff --git a/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h b/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h index 57c5e2b8f1..8b0590fda6 100644 --- a/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h +++ b/src/plugins/clangcodemodel/clangcompletionchunkstotextconverter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODEMODEL_INTERNAL_COMPLETIONCHUNKSTOTEXTCONVERTER_H -#define CLANGCODEMODEL_INTERNAL_COMPLETIONCHUNKSTOTEXTCONVERTER_H +#pragma once #include <clangbackendipc/codecompletionchunk.h> @@ -106,5 +105,3 @@ private: } // namespace Internal } // namespace ClangCodeModel - -#endif // CLANGCODEMODEL_INTERNAL_COMPLETIONCHUNKSTOTEXTCONVERTER_H diff --git a/src/plugins/clangcodemodel/clangcompletioncontextanalyzer.h b/src/plugins/clangcodemodel/clangcompletioncontextanalyzer.h index 4041f531a4..8f0e79a45b 100644 --- a/src/plugins/clangcodemodel/clangcompletioncontextanalyzer.h +++ b/src/plugins/clangcodemodel/clangcompletioncontextanalyzer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCOMPLETIONCONTEXTANALYZER_H -#define CLANGCOMPLETIONCONTEXTANALYZER_H +#pragma once #include <cplusplus/Token.h> @@ -89,5 +88,3 @@ private: } // namespace Internal } // namespace ClangCodeModel - -#endif // CLANGCOMPLETIONCONTEXTANALYZER_H diff --git a/src/plugins/clangcodemodel/clangconstants.h b/src/plugins/clangcodemodel/clangconstants.h index 90466029f3..6197ba5412 100644 --- a/src/plugins/clangcodemodel/clangconstants.h +++ b/src/plugins/clangcodemodel/clangconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCONSTANTS_H -#define CLANGCONSTANTS_H +#pragma once namespace ClangCodeModel { namespace Constants { @@ -35,5 +34,3 @@ const char CLANG_WARNING[] = "Clang.Warning"; } // namespace Constants } // namespace ClangCodeModel - -#endif // CLANGCONSTANTS_H diff --git a/src/plugins/clangcodemodel/clangdiagnosticfilter.h b/src/plugins/clangcodemodel/clangdiagnosticfilter.h index c4384160be..9329d43ceb 100644 --- a/src/plugins/clangcodemodel/clangdiagnosticfilter.h +++ b/src/plugins/clangcodemodel/clangdiagnosticfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODEMODEL_INTERNAL_CLANGDIAGNOSTICFILTER_H -#define CLANGCODEMODEL_INTERNAL_CLANGDIAGNOSTICFILTER_H +#pragma once #include <clangbackendipc/diagnosticcontainer.h> @@ -59,5 +58,3 @@ private: } // namespace Internal } // namespace ClangCodeModel - -#endif // CLANGCODEMODEL_INTERNAL_CLANGDIAGNOSTICFILTER_H diff --git a/src/plugins/clangcodemodel/clangdiagnosticmanager.h b/src/plugins/clangcodemodel/clangdiagnosticmanager.h index dbfd72ec04..45def83d3a 100644 --- a/src/plugins/clangcodemodel/clangdiagnosticmanager.h +++ b/src/plugins/clangcodemodel/clangdiagnosticmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODEMODEL_INTERNAL_CLANGDIAGNOSTICMANAGER_H -#define CLANGCODEMODEL_INTERNAL_CLANGDIAGNOSTICMANAGER_H +#pragma once #include "clangtextmark.h" @@ -83,5 +82,3 @@ private: } // namespace Internal } // namespace ClangCodeModel - -#endif // CLANGCODEMODEL_INTERNAL_CLANGDIAGNOSTICMANAGER_H diff --git a/src/plugins/clangcodemodel/clangeditordocumentparser.h b/src/plugins/clangcodemodel/clangeditordocumentparser.h index 17749428f0..65da483e2f 100644 --- a/src/plugins/clangcodemodel/clangeditordocumentparser.h +++ b/src/plugins/clangcodemodel/clangeditordocumentparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGEDITORDOCUMENTPARSER_H -#define CLANGEDITORDOCUMENTPARSER_H +#pragma once #include <cpptools/baseeditordocumentparser.h> @@ -42,5 +41,3 @@ private: }; } // namespace ClangCodeModel - -#endif // CLANGEDITORDOCUMENTPARSER_H diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.h b/src/plugins/clangcodemodel/clangeditordocumentprocessor.h index a2a9755e25..31c4f5e9a6 100644 --- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.h +++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGEDITORDOCUMENTPROCESSOR_H -#define CLANGEDITORDOCUMENTPROCESSOR_H +#pragma once #include "clangdiagnosticmanager.h" #include "clangeditordocumentparser.h" @@ -114,5 +113,3 @@ private: } // namespace Internal } // namespace ClangCodeModel - -#endif // CLANGEDITORDOCUMENTPROCESSOR_H diff --git a/src/plugins/clangcodemodel/clangfixitoperation.h b/src/plugins/clangcodemodel/clangfixitoperation.h index 95e0df846f..83a8c8ed2e 100644 --- a/src/plugins/clangcodemodel/clangfixitoperation.h +++ b/src/plugins/clangcodemodel/clangfixitoperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODEMODEL_CLANGFIXITOPERATION_H -#define CLANGCODEMODEL_CLANGFIXITOPERATION_H +#pragma once #include <texteditor/quickfix.h> @@ -66,5 +65,3 @@ private: }; } // namespace ClangCodeModel - -#endif // CLANGCODEMODEL_CLANGFIXITOPERATION_H diff --git a/src/plugins/clangcodemodel/clangfixitoperationsextractor.h b/src/plugins/clangcodemodel/clangfixitoperationsextractor.h index 8477a5308a..e504d27dea 100644 --- a/src/plugins/clangcodemodel/clangfixitoperationsextractor.h +++ b/src/plugins/clangcodemodel/clangfixitoperationsextractor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGFIXITOPERATIONSEXTRACTOR_H -#define CLANGFIXITOPERATIONSEXTRACTOR_H +#pragma once #include <texteditor/quickfix.h> @@ -52,5 +51,3 @@ private: }; } // namespace ClangCodeModel - -#endif // CLANGFIXITOPERATIONSEXTRACTOR_H diff --git a/src/plugins/clangcodemodel/clangfunctionhintmodel.h b/src/plugins/clangcodemodel/clangfunctionhintmodel.h index 32d25db1b4..edfb2f6d74 100644 --- a/src/plugins/clangcodemodel/clangfunctionhintmodel.h +++ b/src/plugins/clangcodemodel/clangfunctionhintmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODEMODEL_INTERNAL_CLANGFUNCTIONHINTMODEL_H -#define CLANGCODEMODEL_INTERNAL_CLANGFUNCTIONHINTMODEL_H +#pragma once #include <codecompletion.h> @@ -50,5 +49,3 @@ private: } // namespace Internal } // namespace ClangCodeModel - -#endif // CLANGCODEMODEL_INTERNAL_CLANGFUNCTIONHINTMODEL_H diff --git a/src/plugins/clangcodemodel/clanghighlightingmarksreporter.h b/src/plugins/clangcodemodel/clanghighlightingmarksreporter.h index b275982d1e..af4f1773b0 100644 --- a/src/plugins/clangcodemodel/clanghighlightingmarksreporter.h +++ b/src/plugins/clangcodemodel/clanghighlightingmarksreporter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODEMODEL_HIGHLIGHTINGMARKSREPORTER_H -#define CLANGCODEMODEL_HIGHLIGHTINGMARKSREPORTER_H +#pragma once #include <QFutureInterface> #include <QObject> @@ -69,5 +68,3 @@ private: }; } // namespace ClangCodeModel - -#endif // CLANGCODEMODEL_HIGHLIGHTINGMARKSREPORTER_H diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.h b/src/plugins/clangcodemodel/clangmodelmanagersupport.h index 8e37c28f18..4a6a791db7 100644 --- a/src/plugins/clangcodemodel/clangmodelmanagersupport.h +++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODEMODEL_INTERNAL_CLANGMODELMANAGERSUPPORT_H -#define CLANGCODEMODEL_INTERNAL_CLANGMODELMANAGERSUPPORT_H +#pragma once #include "clangcompletionassistprovider.h" @@ -112,5 +111,3 @@ public: } // namespace Internal } // namespace ClangCodeModel - -#endif // CLANGCODEMODEL_INTERNAL_CLANGMODELMANAGERSUPPORT_H diff --git a/src/plugins/clangcodemodel/clangpreprocessorassistproposalitem.h b/src/plugins/clangcodemodel/clangpreprocessorassistproposalitem.h index 771cb0aa3d..8498c8514f 100644 --- a/src/plugins/clangcodemodel/clangpreprocessorassistproposalitem.h +++ b/src/plugins/clangcodemodel/clangpreprocessorassistproposalitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODEMODEL_PREPROCESSORASSISTPROPOSALITEM_H -#define CLANGCODEMODEL_PREPROCESSORASSISTPROPOSALITEM_H +#pragma once #include <texteditor/codeassist/assistproposaliteminterface.h> @@ -70,5 +69,3 @@ private: }; } // namespace ClangCodeModel - -#endif // CLANGCODEMODEL_PREPROCESSORASSISTPROPOSALITEM_H diff --git a/src/plugins/clangcodemodel/clangtextmark.h b/src/plugins/clangcodemodel/clangtextmark.h index ac70a50ccf..b669a86d16 100644 --- a/src/plugins/clangcodemodel/clangtextmark.h +++ b/src/plugins/clangcodemodel/clangtextmark.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODEMODEL_CLANGTEXTMARK_H -#define CLANGCODEMODEL_CLANGTEXTMARK_H +#pragma once #include <clangbackendipc_global.h> @@ -47,5 +46,3 @@ private: }; } // namespace ClangCodeModel - -#endif // CLANGCODEMODEL_CLANGTEXTMARK_H diff --git a/src/plugins/clangcodemodel/clangutils.h b/src/plugins/clangcodemodel/clangutils.h index 44b574f368..4bdc6c00d4 100644 --- a/src/plugins/clangcodemodel/clangutils.h +++ b/src/plugins/clangcodemodel/clangutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLS_CLANGUTILS_H -#define CPPTOOLS_CLANGUTILS_H +#pragma once #include <cpptools/projectpart.h> @@ -44,5 +43,3 @@ QString projectPartIdForFile(const QString &filePath); } // namespace Utils } // namespace Clang - -#endif // CPPTOOLS_CLANGUTILS_H diff --git a/src/plugins/clangcodemodel/test/clangcodecompletion_test.h b/src/plugins/clangcodemodel/test/clangcodecompletion_test.h index 54dba98c4e..bd9151bcac 100644 --- a/src/plugins/clangcodemodel/test/clangcodecompletion_test.h +++ b/src/plugins/clangcodemodel/test/clangcodecompletion_test.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGCODECOMPLETIONTEST_H -#define CLANGCODECOMPLETIONTEST_H +#pragma once #include <QObject> @@ -65,5 +64,3 @@ private slots: } // namespace Tests } // namespace Internal } // namespace ClangCodeModel - -#endif // CLANGCODECOMPLETIONTEST_H diff --git a/src/plugins/clangcodemodel/test/data/myheader.h b/src/plugins/clangcodemodel/test/data/myheader.h index da584c9137..b025d66c01 100644 --- a/src/plugins/clangcodemodel/test/data/myheader.h +++ b/src/plugins/clangcodemodel/test/data/myheader.h @@ -1,2 +1 @@ int globalFromHeader; - diff --git a/src/plugins/clangcodemodel/test/data/qt-widgets-app/mainwindow.h b/src/plugins/clangcodemodel/test/data/qt-widgets-app/mainwindow.h index d252888e89..596295b643 100644 --- a/src/plugins/clangcodemodel/test/data/qt-widgets-app/mainwindow.h +++ b/src/plugins/clangcodemodel/test/data/qt-widgets-app/mainwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MAINWINDOW_H -#define MAINWINDOW_H +#pragma once #include <QMainWindow> @@ -43,5 +42,3 @@ public: private: Ui::MainWindow *ui; }; - -#endif // MAINWINDOW_H diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzer_global.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzer_global.h index 39fb523976..c42bd95ccf 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzer_global.h +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzer_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGSTATICANALYZER_GLOBAL_H -#define CLANGSTATICANALYZER_GLOBAL_H +#pragma once #include <QtGlobal> @@ -33,6 +32,3 @@ #else # define CLANGSTATICANALYZER_EXPORT Q_DECL_IMPORT #endif - -#endif // CLANGSTATICANALYZER_GLOBAL_H - diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.h index 4655a07eec..f410670e50 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.h +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerconfigwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGSTATICANALYZERCONFIGWIDGET_H -#define CLANGSTATICANALYZERCONFIGWIDGET_H +#pragma once #include "clangstaticanalyzersettings.h" @@ -51,5 +50,3 @@ private: } // namespace Internal } // namespace ClangStaticAnalyzer - -#endif // CLANGSTATICANALYZERCONFIGWIDGET_H diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerconstants.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerconstants.h index 66b1f149fe..63982c8f1e 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerconstants.h +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGSTATICANALYZERCONSTANTS_H -#define CLANGSTATICANALYZERCONSTANTS_H +#pragma once namespace ClangStaticAnalyzer { namespace Constants { @@ -34,5 +33,3 @@ const char CLANGSTATICANALYZER_RUN_MODE[] = "ClangStaticAnalyzer.RunMode"; } // Constants } // ClangStaticAnalyzer - -#endif // CLANGSTATICANALYZERCONSTANTS_H diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.h index 708b5137f5..e40e90ec98 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.h +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnostic.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGSTATICANALZYERDIAGNOSTIC_H -#define CLANGSTATICANALZYERDIAGNOSTIC_H +#pragma once #include <debugger/analyzer/diagnosticlocation.h> @@ -67,5 +66,3 @@ public: } // namespace ClangStaticAnalyzer Q_DECLARE_METATYPE(ClangStaticAnalyzer::Internal::Diagnostic) - -#endif // CLANGSTATICANALZYERDIAGNOSTIC_H diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.h index e8a30f34ef..d4bdcfbf58 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.h +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGSTATICANALYZERDIAGNOSTICMODEL_H -#define CLANGSTATICANALYZERDIAGNOSTICMODEL_H +#pragma once #include "clangstaticanalyzerdiagnostic.h" #include "clangstaticanalyzerprojectsettings.h" @@ -78,5 +77,3 @@ private: } // namespace Internal } // namespace ClangStaticAnalyzer - -#endif // CLANGSTATICANALYZERDIAGNOSTICMODEL_H diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.h index 55ba24642c..39a58804f9 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.h +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerdiagnosticview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGSTATICANALYZERDIAGNOSTICVIEW_H -#define CLANGSTATICANALYZERDIAGNOSTICVIEW_H +#pragma once #include <debugger/analyzer/detailederrorview.h> @@ -48,5 +47,3 @@ private: } // namespace Internal } // namespace ClangStaticAnalyzer - -#endif // CLANGSTATICANALYZERDIAGNOSTICVIEW_H diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerlogfilereader.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerlogfilereader.h index 8b05ada7aa..e29a4c1a10 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerlogfilereader.h +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerlogfilereader.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGSTATICANALYZERLOGFILEREADER_H -#define CLANGSTATICANALYZERLOGFILEREADER_H +#pragma once #include "clangstaticanalyzerdiagnostic.h" @@ -41,5 +40,3 @@ public: } // namespace Internal } // namespace ClangStaticAnalyzer - -#endif // CLANGSTATICANALYZERLOGFILEREADER_H diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.h index b663a16487..7d8d2fe1d0 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.h +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGSTATICANALYZERPLUGIN_H -#define CLANGSTATICANALYZERPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -56,6 +55,3 @@ private: } // namespace Internal } // namespace ClangStaticAnalyzerPlugin - -#endif // CLANGSTATICANALYZERPLUGIN_H - diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettings.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettings.h index f30298b69f..31a3941005 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettings.h +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGSTATICANALYZERPROJECTSETTINGS_H -#define CLANGSTATICANALYZERPROJECTSETTINGS_H +#pragma once #include <projectexplorer/project.h> #include <utils/fileutils.h> @@ -91,5 +90,3 @@ private: } // namespace Internal } // namespace ClangStaticAnalyzer - -#endif // Include guard. diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingsmanager.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingsmanager.h index a588a7824d..50af615372 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingsmanager.h +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingsmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGSTATICANALYZERPROJECTSETTINGSMANAGER_H -#define CLANGSTATICANALYZERPROJECTSETTINGSMANAGER_H +#pragma once namespace ProjectExplorer { class Project; } @@ -51,5 +50,3 @@ private: } // namespace Internal } // namespace ClangStaticAnalyzer - -#endif // Include guard. diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingswidget.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingswidget.h index b68003b25c..18090788ac 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingswidget.h +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerprojectsettingswidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGSTATICANALYZERPROJECTSETTINGSWIDGET_H -#define CLANGSTATICANALYZERPROJECTSETTINGSWIDGET_H +#pragma once #include <QWidget> @@ -56,5 +55,3 @@ private: } // namespace Internal } // namespace ClangStaticAnalyzer - -#endif // Include guard. diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h index 0293f4d3b1..0d286e17fe 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGSTATICANALYZERRUNCONTROL_H -#define CLANGSTATICANALYZERRUNCONTROL_H +#pragma once #include <debugger/analyzer/analyzerruncontrol.h> #include <cpptools/projectinfo.h> @@ -99,5 +98,3 @@ private: } // namespace Internal } // namespace ClangStaticAnalyzer - -#endif // CLANGSTATICANALYZERRUNCONTROL_H diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.h index a116b1df94..13f4ac8043 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.h +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGSTATICANALYZERRUNCONTROLFACTORY_H -#define CLANGSTATICANALYZERRUNCONTROLFACTORY_H +#pragma once #include "clangstaticanalyzertool.h" @@ -53,5 +52,3 @@ private: } // namespace Internal } // namespace ClangStaticAnalyzer - -#endif // CLANGSTATICANALYZERRUNCONTROLFACTORY_H diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.h index 92852d34c2..eb20359062 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.h +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerrunner.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGSTATICANALYZERRUNNER_H -#define CLANGSTATICANALYZERRUNNER_H +#pragma once #include <QString> #include <QProcess> @@ -82,5 +81,3 @@ private: } // namespace Internal } // namespace ClangStaticAnalyzer - -#endif // CLANGSTATICANALYZERRUNNER_H diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzersettings.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzersettings.h index 5f7d80a01f..1a2ff5286c 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzersettings.h +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzersettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGSTATICANALYZERSETTINGS_H -#define CLANGSTATICANALYZERSETTINGS_H +#pragma once #include <QString> @@ -55,5 +54,3 @@ private: } // namespace Internal } // namespace ClangStaticAnalyzer - -#endif // CLANGSTATICANALYZERSETTINGS_H diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.h index 08580b3953..4e1f491693 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.h +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzertool.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGSTATICANALYZERTOOL_H -#define CLANGSTATICANALYZERTOOL_H +#pragma once #include <debugger/analyzer/analyzermanager.h> #include <cpptools/projectinfo.h> @@ -89,5 +88,3 @@ private: } // namespace Internal } // namespace ClangStaticAnalyzer - -#endif // CLANGSTATICANALYZERTOOL_H diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.h index b49ef5b1d3..cc85fda603 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.h +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerunittests.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGSTATICANALYZERUNITTESTS_H -#define CLANGSTATICANALYZERUNITTESTS_H +#pragma once #include <QObject> #include <QTemporaryDir> @@ -55,6 +54,3 @@ private: } // namespace Internal } // namespace ClangStaticAnalyzerPlugin - -#endif // Include guard - diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerutils.h b/src/plugins/clangstaticanalyzer/clangstaticanalyzerutils.h index 1531d050c6..a4137164de 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerutils.h +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGSTATICANALYZERUTILS_H -#define CLANGSTATICANALYZERUTILS_H +#pragma once #include <coreplugin/id.h> @@ -48,5 +47,3 @@ QString createFullLocationString(const Debugger::DiagnosticLocation &location); } // namespace Internal } // namespace ClangStaticAnalyzer - -#endif // CLANGSTATICANALYZERUTILS_H diff --git a/src/plugins/clangstaticanalyzer/unit-tests/qt-widgets-app/mainwindow.h b/src/plugins/clangstaticanalyzer/unit-tests/qt-widgets-app/mainwindow.h index ce76956bad..77673e9e57 100644 --- a/src/plugins/clangstaticanalyzer/unit-tests/qt-widgets-app/mainwindow.h +++ b/src/plugins/clangstaticanalyzer/unit-tests/qt-widgets-app/mainwindow.h @@ -1,5 +1,4 @@ -#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/src/plugins/classview/classviewconstants.h b/src/plugins/classview/classviewconstants.h index fdb575f70a..424305322c 100644 --- a/src/plugins/classview/classviewconstants.h +++ b/src/plugins/classview/classviewconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLASSVIEWCONSTANTS_H -#define CLASSVIEWCONSTANTS_H +#pragma once namespace ClassView { namespace Constants { @@ -40,5 +39,3 @@ enum ItemRole } // namespace Constants } // namespace ClassView - -#endif // CLASSVIEWCONSTANTS_H diff --git a/src/plugins/classview/classviewmanager.h b/src/plugins/classview/classviewmanager.h index 86b2d96c78..9a2f46524b 100644 --- a/src/plugins/classview/classviewmanager.h +++ b/src/plugins/classview/classviewmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLASSVIEWMANAGER_H -#define CLASSVIEWMANAGER_H +#pragma once #include <QObject> #include <QSharedPointer> @@ -106,5 +105,3 @@ private: } // namespace Internal } // namespace ClassView - -#endif // CLASSVIEWMANAGER_H diff --git a/src/plugins/classview/classviewnavigationwidget.h b/src/plugins/classview/classviewnavigationwidget.h index e1fdae993b..55c15d02a5 100644 --- a/src/plugins/classview/classviewnavigationwidget.h +++ b/src/plugins/classview/classviewnavigationwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLASSVIEWNAVIGATIONWIDGET_H -#define CLASSVIEWNAVIGATIONWIDGET_H +#pragma once #include "classviewtreeitemmodel.h" @@ -90,5 +89,3 @@ private: } // namespace Internal } // namespace ClassView - -#endif // CLASSVIEWNAVIGATIONWIDGET_H diff --git a/src/plugins/classview/classviewnavigationwidgetfactory.h b/src/plugins/classview/classviewnavigationwidgetfactory.h index 5be9b61891..8675760c74 100644 --- a/src/plugins/classview/classviewnavigationwidgetfactory.h +++ b/src/plugins/classview/classviewnavigationwidgetfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLASSVIEWNAVIGATIONWIDGETFACTORY_H -#define CLASSVIEWNAVIGATIONWIDGETFACTORY_H +#pragma once #include <coreplugin/inavigationwidgetfactory.h> @@ -50,5 +49,3 @@ public: } // namespace Internal } // namespace ClassView - -#endif // CLASSVIEWNAVIGATIONWIDGETFACTORY_H diff --git a/src/plugins/classview/classviewparser.h b/src/plugins/classview/classviewparser.h index c230a3eca7..902ec8cb5a 100644 --- a/src/plugins/classview/classviewparser.h +++ b/src/plugins/classview/classviewparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLASSVIEWPARSER_H -#define CLASSVIEWPARSER_H +#pragma once #include <QObject> @@ -128,5 +127,3 @@ private: } // namespace Internal } // namespace ClassView - -#endif // CLASSVIEWPARSER_H diff --git a/src/plugins/classview/classviewparsertreeitem.h b/src/plugins/classview/classviewparsertreeitem.h index e8cb82590c..60ca284cee 100644 --- a/src/plugins/classview/classviewparsertreeitem.h +++ b/src/plugins/classview/classviewparsertreeitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLASSVIEWPARSERTREEITEM_H -#define CLASSVIEWPARSERTREEITEM_H +#pragma once #include "classviewsymbollocation.h" #include "classviewsymbolinformation.h" @@ -99,5 +98,3 @@ private: } // namespace Internal } // namespace ClassView - -#endif // CLASSVIEWPARSERTREEITEM_H diff --git a/src/plugins/classview/classviewplugin.h b/src/plugins/classview/classviewplugin.h index 663cce587f..223a963efc 100644 --- a/src/plugins/classview/classviewplugin.h +++ b/src/plugins/classview/classviewplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLASSVIEWPLUGIN_H -#define CLASSVIEWPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -49,5 +48,3 @@ public: } // namespace Internal } // namespace ClassView - -#endif // CLASSVIEWPLUGIN_H diff --git a/src/plugins/classview/classviewsymbolinformation.h b/src/plugins/classview/classviewsymbolinformation.h index 7032a07d15..80d13a873b 100644 --- a/src/plugins/classview/classviewsymbolinformation.h +++ b/src/plugins/classview/classviewsymbolinformation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLASSVIEWSYMBOLINFORMATION_H -#define CLASSVIEWSYMBOLINFORMATION_H +#pragma once #include <QMetaType> #include <QString> @@ -73,5 +72,3 @@ inline uint qHash(const SymbolInformation &information) } // namespace ClassView Q_DECLARE_METATYPE(ClassView::Internal::SymbolInformation) - -#endif // CLASSVIEWSYMBOLINFORMATION_H diff --git a/src/plugins/classview/classviewsymbollocation.h b/src/plugins/classview/classviewsymbollocation.h index 5f4f5660f4..144c0227cd 100644 --- a/src/plugins/classview/classviewsymbollocation.h +++ b/src/plugins/classview/classviewsymbollocation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLASSVIEWSYMBOLLOCATION_H -#define CLASSVIEWSYMBOLLOCATION_H +#pragma once #include <QMetaType> #include <QString> @@ -68,5 +67,3 @@ inline uint qHash(const SymbolLocation &location) } // namespace ClassView Q_DECLARE_METATYPE(ClassView::Internal::SymbolLocation) - -#endif // CLASSVIEWSYMBOLLOCATION_H diff --git a/src/plugins/classview/classviewtreeitemmodel.h b/src/plugins/classview/classviewtreeitemmodel.h index e3171c8357..9864d179db 100644 --- a/src/plugins/classview/classviewtreeitemmodel.h +++ b/src/plugins/classview/classviewtreeitemmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLASSVIEWTREEITEMMODEL_H -#define CLASSVIEWTREEITEMMODEL_H +#pragma once #include <QStandardItemModel> @@ -59,5 +58,3 @@ private: } // namespace Internal } // namespace ClassView - -#endif // CLASSVIEWTREEMODEL_H diff --git a/src/plugins/classview/classviewutils.h b/src/plugins/classview/classviewutils.h index 4b7001f943..9a731e90e0 100644 --- a/src/plugins/classview/classviewutils.h +++ b/src/plugins/classview/classviewutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLASSVIEWUTILS_H -#define CLASSVIEWUTILS_H +#pragma once #include "classviewsymbollocation.h" #include "classviewsymbolinformation.h" @@ -61,5 +60,3 @@ public: } // namespace Internal } // namespace ClassView - -#endif // CLASSVIEWUTILS_H diff --git a/src/plugins/cmakeprojectmanager/configmodel.h b/src/plugins/cmakeprojectmanager/configmodel.h index d3a335dbe2..ea80eb7a07 100644 --- a/src/plugins/cmakeprojectmanager/configmodel.h +++ b/src/plugins/cmakeprojectmanager/configmodel.h @@ -83,4 +83,3 @@ private: }; } // namespace CMakeProjectManager - diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer.h b/src/plugins/coreplugin/actionmanager/actioncontainer.h index 65b9748042..03d69c4841 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer.h +++ b/src/plugins/coreplugin/actionmanager/actioncontainer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ACTIONCONTAINER_H -#define ACTIONCONTAINER_H +#pragma once #include "coreplugin/core_global.h" #include "coreplugin/icontext.h" @@ -75,5 +74,3 @@ public: }; } // namespace Core - -#endif // ACTIONCONTAINER_H diff --git a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h index 2350119ee7..048f0854a6 100644 --- a/src/plugins/coreplugin/actionmanager/actioncontainer_p.h +++ b/src/plugins/coreplugin/actionmanager/actioncontainer_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ACTIONCONTAINER_P_H -#define ACTIONCONTAINER_P_H +#pragma once #include "actionmanager_p.h" @@ -141,5 +140,3 @@ private: } // namespace Internal } // namespace Core - -#endif // ACTIONCONTAINER_P_H diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.h b/src/plugins/coreplugin/actionmanager/actionmanager.h index 5add94044f..d1128b984b 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.h +++ b/src/plugins/coreplugin/actionmanager/actionmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ACTIONMANAGER_H -#define ACTIONMANAGER_H +#pragma once #include "coreplugin/core_global.h" #include "coreplugin/coreconstants.h" @@ -89,5 +88,3 @@ private: }; } // namespace Core - -#endif // ACTIONMANAGER_H diff --git a/src/plugins/coreplugin/actionmanager/actionmanager_p.h b/src/plugins/coreplugin/actionmanager/actionmanager_p.h index fabfa7917e..0269fc4992 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager_p.h +++ b/src/plugins/coreplugin/actionmanager/actionmanager_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ACTIONMANAGERPRIVATE_H -#define ACTIONMANAGERPRIVATE_H +#pragma once #include <coreplugin/actionmanager/command_p.h> #include <coreplugin/actionmanager/actioncontainer_p.h> @@ -84,5 +83,3 @@ public: } // namespace Internal } // namespace Core - -#endif // ACTIONMANAGERPRIVATE_H diff --git a/src/plugins/coreplugin/actionmanager/command.h b/src/plugins/coreplugin/actionmanager/command.h index 4555abe898..1d9f9c940b 100644 --- a/src/plugins/coreplugin/actionmanager/command.h +++ b/src/plugins/coreplugin/actionmanager/command.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMMAND_H -#define COMMAND_H +#pragma once #include <coreplugin/core_global.h> #include <coreplugin/id.h> @@ -97,5 +96,3 @@ signals: } // namespace Core Q_DECLARE_OPERATORS_FOR_FLAGS(Core::Command::CommandAttributes) - -#endif // COMMAND_H diff --git a/src/plugins/coreplugin/actionmanager/command_p.h b/src/plugins/coreplugin/actionmanager/command_p.h index eec5f814f2..eebb826aab 100644 --- a/src/plugins/coreplugin/actionmanager/command_p.h +++ b/src/plugins/coreplugin/actionmanager/command_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMMAND_P_H -#define COMMAND_P_H +#pragma once #include "command.h" @@ -100,5 +99,3 @@ private: } // namespace Internal } // namespace Core - -#endif // COMMAND_P_H diff --git a/src/plugins/coreplugin/actionmanager/commandbutton.h b/src/plugins/coreplugin/actionmanager/commandbutton.h index 5828eb6563..deb7c1ed0c 100644 --- a/src/plugins/coreplugin/actionmanager/commandbutton.h +++ b/src/plugins/coreplugin/actionmanager/commandbutton.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMMANDBUTTON_H -#define COMMANDBUTTON_H +#pragma once #include <coreplugin/core_global.h> @@ -56,5 +55,3 @@ private: }; } - -#endif // COMMANDBUTTON_H diff --git a/src/plugins/coreplugin/actionmanager/commandmappings.h b/src/plugins/coreplugin/actionmanager/commandmappings.h index 7e9ea25f4d..89abe7efb0 100644 --- a/src/plugins/coreplugin/actionmanager/commandmappings.h +++ b/src/plugins/coreplugin/actionmanager/commandmappings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMMANDMAPPINGS_H -#define COMMANDMAPPINGS_H +#pragma once #include <coreplugin/core_global.h> @@ -80,5 +79,3 @@ private: }; } // namespace Core - -#endif // COMMANDMAPPINGS_H diff --git a/src/plugins/coreplugin/actionmanager/commandsfile.h b/src/plugins/coreplugin/actionmanager/commandsfile.h index a7c2f2db6f..891856383f 100644 --- a/src/plugins/coreplugin/actionmanager/commandsfile.h +++ b/src/plugins/coreplugin/actionmanager/commandsfile.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMMANDSFILE_H -#define COMMANDSFILE_H +#pragma once #include <QObject> #include <QString> @@ -53,5 +52,3 @@ private: } // namespace Internal } // namespace Core - -#endif //COMMANDSFILE_H diff --git a/src/plugins/coreplugin/basefilewizard.h b/src/plugins/coreplugin/basefilewizard.h index b00e7cc13c..860056a040 100644 --- a/src/plugins/coreplugin/basefilewizard.h +++ b/src/plugins/coreplugin/basefilewizard.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BASEFILEWIZARD_H -#define BASEFILEWIZARD_H +#pragma once #include "core_global.h" @@ -64,5 +63,3 @@ private: }; } // namespace Core - -#endif // BASEFILEWIZARD_H diff --git a/src/plugins/coreplugin/basefilewizardfactory.h b/src/plugins/coreplugin/basefilewizardfactory.h index 3f9c95b840..0026a1d638 100644 --- a/src/plugins/coreplugin/basefilewizardfactory.h +++ b/src/plugins/coreplugin/basefilewizardfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BASEFILEWIZARDFACTORY_H -#define BASEFILEWIZARDFACTORY_H +#pragma once #include "core_global.h" #include "generatedfile.h" @@ -126,5 +125,3 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(Core::GeneratedFile::Attributes) Q_DECLARE_OPERATORS_FOR_FLAGS(Core::WizardDialogParameters::DialogParameterFlags) - -#endif // BASEFILEWIZARDFACTORY_H diff --git a/src/plugins/coreplugin/core_global.h b/src/plugins/coreplugin/core_global.h index 4d2ac897e3..663b2e7e5c 100644 --- a/src/plugins/coreplugin/core_global.h +++ b/src/plugins/coreplugin/core_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CORE_GLOBAL_H -#define CORE_GLOBAL_H +#pragma once #include <qglobal.h> @@ -33,5 +32,3 @@ #else # define CORE_EXPORT Q_DECL_IMPORT #endif - -#endif // CORE_GLOBAL_H diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 77052130fd..dd4f11737f 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CORECONSTANTS_H -#define CORECONSTANTS_H +#pragma once #include <QtGlobal> @@ -210,5 +209,3 @@ const int TARGET_ICON_SIZE = 32; } // namespace Constants } // namespace Core - -#endif // CORECONSTANTS_H diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h index cdf6a7d66a..b429060546 100644 --- a/src/plugins/coreplugin/coreicons.h +++ b/src/plugins/coreplugin/coreicons.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COREICONS_H -#define COREICONS_H +#pragma once #include "core_global.h" @@ -99,5 +98,3 @@ CORE_EXPORT extern const Utils::Icon MODE_DESIGN_FLAT_ACTIVE; } // namespace Icons } // namespace Core - -#endif // COREICONS_H diff --git a/src/plugins/coreplugin/corejsextensions.h b/src/plugins/coreplugin/corejsextensions.h index a90584cc4f..861e10bd01 100644 --- a/src/plugins/coreplugin/corejsextensions.h +++ b/src/plugins/coreplugin/corejsextensions.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COREJSEXTENSIONS_H -#define COREJSEXTENSIONS_H +#pragma once #include <utils/stringutils.h> @@ -73,5 +72,3 @@ public: } // namespace Internal } // namespace Core - -#endif // COREJSEXTENSIONS_H diff --git a/src/plugins/coreplugin/coreplugin.h b/src/plugins/coreplugin/coreplugin.h index 246b54c608..c6135ed85c 100644 --- a/src/plugins/coreplugin/coreplugin.h +++ b/src/plugins/coreplugin/coreplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COREPLUGIN_H -#define COREPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -90,5 +89,3 @@ private: } // namespace Internal } // namespace Core - -#endif // COREPLUGIN_H diff --git a/src/plugins/coreplugin/designmode.h b/src/plugins/coreplugin/designmode.h index 7c261f800a..fca1bf03f9 100644 --- a/src/plugins/coreplugin/designmode.h +++ b/src/plugins/coreplugin/designmode.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DESIGNMODE_H -#define DESIGNMODE_H +#pragma once #include <coreplugin/imode.h> @@ -77,5 +76,3 @@ private: }; } // namespace Core - -#endif // DESIGNMODE_H diff --git a/src/plugins/coreplugin/dialogs/addtovcsdialog.h b/src/plugins/coreplugin/dialogs/addtovcsdialog.h index 588ba9c856..2aabc530c2 100644 --- a/src/plugins/coreplugin/dialogs/addtovcsdialog.h +++ b/src/plugins/coreplugin/dialogs/addtovcsdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ADDTOVCSDIALOG_H -#define ADDTOVCSDIALOG_H +#pragma once #include <QDialog> @@ -49,4 +48,3 @@ private: } // namespace Internal } // namespace Core -#endif // ADDTOVCSDIALOG_H diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.h b/src/plugins/coreplugin/dialogs/externaltoolconfig.h index b7f395a653..e0f588b764 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.h +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EXTERNALTOOLCONFIG_H -#define EXTERNALTOOLCONFIG_H +#pragma once #include "coreplugin/externaltool.h" @@ -125,6 +124,3 @@ private: } // Internal } // Core - - -#endif // EXTERNALTOOLCONFIG_H diff --git a/src/plugins/coreplugin/dialogs/ioptionspage.h b/src/plugins/coreplugin/dialogs/ioptionspage.h index 20b7ef7686..c27cec3c3a 100644 --- a/src/plugins/coreplugin/dialogs/ioptionspage.h +++ b/src/plugins/coreplugin/dialogs/ioptionspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOPTIONSPAGE_H -#define IOPTIONSPAGE_H +#pragma once #include <coreplugin/id.h> @@ -107,5 +106,3 @@ protected: }; } // namespace Core - -#endif // IOPTIONSPAGE_H diff --git a/src/plugins/coreplugin/dialogs/newdialog.h b/src/plugins/coreplugin/dialogs/newdialog.h index cd51db330b..13385b7f98 100644 --- a/src/plugins/coreplugin/dialogs/newdialog.h +++ b/src/plugins/coreplugin/dialogs/newdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NEWDIALOG_H -#define NEWDIALOG_H +#pragma once #include "../iwizardfactory.h" @@ -94,5 +93,3 @@ private: } // namespace Internal } // namespace Core - -#endif // NEWDIALOG_H diff --git a/src/plugins/coreplugin/dialogs/openwithdialog.h b/src/plugins/coreplugin/dialogs/openwithdialog.h index 4d1fd3f762..d93ea71d6d 100644 --- a/src/plugins/coreplugin/dialogs/openwithdialog.h +++ b/src/plugins/coreplugin/dialogs/openwithdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OPENWITHDIALOG_H -#define OPENWITHDIALOG_H +#pragma once #include <QDialog> #include "ui_openwithdialog.h" @@ -56,5 +55,3 @@ private: } // namespace Internal } // namespace Core - -#endif // OPENWITHDIALOG_H diff --git a/src/plugins/coreplugin/dialogs/promptoverwritedialog.h b/src/plugins/coreplugin/dialogs/promptoverwritedialog.h index f235d16660..38d93c6a8a 100644 --- a/src/plugins/coreplugin/dialogs/promptoverwritedialog.h +++ b/src/plugins/coreplugin/dialogs/promptoverwritedialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROMPTOVERWRITEDIALOG_H -#define PROMPTOVERWRITEDIALOG_H +#pragma once #include "../core_global.h" @@ -67,5 +66,3 @@ private: }; } // namespace Core - -#endif // PROMPTOVERWRITEDIALOG_H diff --git a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.h b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.h index 25b5d3e517..b0498aaa8e 100644 --- a/src/plugins/coreplugin/dialogs/readonlyfilesdialog.h +++ b/src/plugins/coreplugin/dialogs/readonlyfilesdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef READONLYFILESDIALOG_H -#define READONLYFILESDIALOG_H +#pragma once #include <coreplugin/core_global.h> @@ -81,5 +80,3 @@ private: }; } // namespace Core - -#endif // READONLYFILESDIALOG_H diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.h b/src/plugins/coreplugin/dialogs/saveitemsdialog.h index cd988eb05e..623cb2e85f 100644 --- a/src/plugins/coreplugin/dialogs/saveitemsdialog.h +++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SAVEITEMSDIALOG_H -#define SAVEITEMSDIALOG_H +#pragma once #include <QList> #include <QDialog> @@ -68,5 +67,3 @@ private: } // namespace Internal } // namespace Core - -#endif // SAVEITEMSDIALOG_H diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.h b/src/plugins/coreplugin/dialogs/shortcutsettings.h index 1383523860..4607d68419 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.h +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SHORTCUTSETTINGS_H -#define SHORTCUTSETTINGS_H +#pragma once #include <coreplugin/actionmanager/commandmappings.h> #include <coreplugin/dialogs/ioptionspage.h> @@ -131,5 +130,3 @@ private: } // namespace Internal } // namespace Core - -#endif // SHORTCUTSETTINGS_H diff --git a/src/plugins/coreplugin/documentmanager.h b/src/plugins/coreplugin/documentmanager.h index f2eaf8fc26..bf8692f3cb 100644 --- a/src/plugins/coreplugin/documentmanager.h +++ b/src/plugins/coreplugin/documentmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DOCUMENTMANAGER_H -#define DOCUMENTMANAGER_H +#pragma once #include <coreplugin/id.h> @@ -184,5 +183,3 @@ private: } // namespace Core Q_DECLARE_METATYPE(Core::DocumentManager::RecentFile) - -#endif // DOCUMENTMANAGER_H diff --git a/src/plugins/coreplugin/editmode.h b/src/plugins/coreplugin/editmode.h index a3f9abdde9..7fed4f361b 100644 --- a/src/plugins/coreplugin/editmode.h +++ b/src/plugins/coreplugin/editmode.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EDITMODE_H -#define EDITMODE_H +#pragma once #include <coreplugin/imode.h> @@ -56,5 +55,3 @@ private: } // namespace Internal } // namespace Core - -#endif // EDITMODE_H diff --git a/src/plugins/coreplugin/editormanager/documentmodel.h b/src/plugins/coreplugin/editormanager/documentmodel.h index b7029a65b9..5c9dab8ecf 100644 --- a/src/plugins/coreplugin/editormanager/documentmodel.h +++ b/src/plugins/coreplugin/editormanager/documentmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DOCUMENTMODEL_H -#define DOCUMENTMODEL_H +#pragma once #include "../core_global.h" #include "../id.h" @@ -96,5 +95,3 @@ private: } // namespace Core Q_DECLARE_METATYPE(Core::DocumentModel::Entry *) - -#endif // DOCUMENTMODEL_H diff --git a/src/plugins/coreplugin/editormanager/editorarea.h b/src/plugins/coreplugin/editormanager/editorarea.h index 011f868808..2cbece9065 100644 --- a/src/plugins/coreplugin/editormanager/editorarea.h +++ b/src/plugins/coreplugin/editormanager/editorarea.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EDITORAREA_H -#define EDITORAREA_H +#pragma once #include "editorview.h" @@ -62,5 +61,3 @@ private: } // Internal } // Core - -#endif // EDITORAREA_H diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h index d543db4293..3d80e73e69 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.h +++ b/src/plugins/coreplugin/editormanager/editormanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EDITORMANAGER_H -#define EDITORMANAGER_H +#pragma once #include "../core_global.h" #include "../idocument.h" @@ -210,5 +209,3 @@ private: } // namespace Core Q_DECLARE_OPERATORS_FOR_FLAGS(Core::EditorManager::OpenEditorFlags) - -#endif // EDITORMANAGER_H diff --git a/src/plugins/coreplugin/editormanager/editormanager_p.h b/src/plugins/coreplugin/editormanager/editormanager_p.h index 326a3a2e37..085a392cd8 100644 --- a/src/plugins/coreplugin/editormanager/editormanager_p.h +++ b/src/plugins/coreplugin/editormanager/editormanager_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EDITORMANAGER_P_H -#define EDITORMANAGER_P_H +#pragma once #include "documentmodel.h" #include "editorarea.h" @@ -259,5 +258,3 @@ private: } // Internal } // Core - -#endif // EDITORMANAGER_P_H diff --git a/src/plugins/coreplugin/editormanager/editorview.h b/src/plugins/coreplugin/editormanager/editorview.h index 831b84c3b1..df0a62a9cb 100644 --- a/src/plugins/coreplugin/editormanager/editorview.h +++ b/src/plugins/coreplugin/editormanager/editorview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EDITORVIEW_H -#define EDITORVIEW_H +#pragma once #include "coreplugin/id.h" @@ -213,4 +212,3 @@ private: } } -#endif // EDITORVIEW_H diff --git a/src/plugins/coreplugin/editormanager/editorwindow.h b/src/plugins/coreplugin/editormanager/editorwindow.h index bf02169199..2fc2f324dc 100644 --- a/src/plugins/coreplugin/editormanager/editorwindow.h +++ b/src/plugins/coreplugin/editormanager/editorwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EDITORWINDOW_H -#define EDITORWINDOW_H +#pragma once #include <QWidget> @@ -50,5 +49,3 @@ private: } // Internal } // Core - -#endif // EDITORWINDOW_H diff --git a/src/plugins/coreplugin/editormanager/ieditor.h b/src/plugins/coreplugin/editormanager/ieditor.h index 033064e536..fccf619779 100644 --- a/src/plugins/coreplugin/editormanager/ieditor.h +++ b/src/plugins/coreplugin/editormanager/ieditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IEDITOR_H -#define IEDITOR_H +#pragma once #include <coreplugin/core_global.h> #include <coreplugin/icontext.h> @@ -67,5 +66,3 @@ private: } // namespace Core Q_DECLARE_METATYPE(Core::IEditor*) - -#endif // IEDITOR_H diff --git a/src/plugins/coreplugin/editormanager/ieditorfactory.h b/src/plugins/coreplugin/editormanager/ieditorfactory.h index 1d50cdf26b..583001951c 100644 --- a/src/plugins/coreplugin/editormanager/ieditorfactory.h +++ b/src/plugins/coreplugin/editormanager/ieditorfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IEDITORFACTORY_H -#define IEDITORFACTORY_H +#pragma once #include <coreplugin/core_global.h> #include <coreplugin/id.h> @@ -61,5 +60,3 @@ private: }; } // namespace Core - -#endif // IEDITORFACTORY_H diff --git a/src/plugins/coreplugin/editormanager/iexternaleditor.h b/src/plugins/coreplugin/editormanager/iexternaleditor.h index 0bc67774fa..24784b1e4a 100644 --- a/src/plugins/coreplugin/editormanager/iexternaleditor.h +++ b/src/plugins/coreplugin/editormanager/iexternaleditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IEXTERNALEDITOR_H -#define IEXTERNALEDITOR_H +#pragma once #include <coreplugin/core_global.h> @@ -48,5 +47,3 @@ public: }; } // namespace Core - -#endif // IEXTERNALEDITOR_H diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.h b/src/plugins/coreplugin/editormanager/openeditorsview.h index fcca6b6e42..758a479ede 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsview.h +++ b/src/plugins/coreplugin/editormanager/openeditorsview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OPENEDITORSVIEW_H -#define OPENEDITORSVIEW_H +#pragma once #include <coreplugin/inavigationwidgetfactory.h> #include <coreplugin/opendocumentstreeview.h> @@ -94,6 +93,3 @@ public: } // namespace Internal } // namespace Core - - -#endif // OPENEDITORSVIEW_H diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.h b/src/plugins/coreplugin/editormanager/openeditorswindow.h index 1a18159d56..e497411b77 100644 --- a/src/plugins/coreplugin/editormanager/openeditorswindow.h +++ b/src/plugins/coreplugin/editormanager/openeditorswindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OPENEDITORSWINDOW_H -#define OPENEDITORSWINDOW_H +#pragma once #include "documentmodel.h" #include "editorview.h" @@ -96,5 +95,3 @@ private: } // namespace Internal } // namespace Core - -#endif // OPENEDITORSWINDOW_H diff --git a/src/plugins/coreplugin/editormanager/systemeditor.h b/src/plugins/coreplugin/editormanager/systemeditor.h index 10a90d0f8c..1589dd21ce 100644 --- a/src/plugins/coreplugin/editormanager/systemeditor.h +++ b/src/plugins/coreplugin/editormanager/systemeditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SYSTEMEDITOR_H -#define SYSTEMEDITOR_H +#pragma once #include "iexternaleditor.h" @@ -47,5 +46,3 @@ public: } // namespace Internal } // namespace Core - -#endif // SYSTEMEDITOR_H diff --git a/src/plugins/coreplugin/editortoolbar.h b/src/plugins/coreplugin/editortoolbar.h index e395b4c392..13f50a0943 100644 --- a/src/plugins/coreplugin/editortoolbar.h +++ b/src/plugins/coreplugin/editortoolbar.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EDITORTOOLBAR_H -#define EDITORTOOLBAR_H +#pragma once #include "core_global.h" @@ -114,5 +113,3 @@ private: }; } // namespace Core - -#endif // EDITORTOOLBAR_H diff --git a/src/plugins/coreplugin/externaltool.h b/src/plugins/coreplugin/externaltool.h index eafd198f42..2bd86bd9d9 100644 --- a/src/plugins/coreplugin/externaltool.h +++ b/src/plugins/coreplugin/externaltool.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EXTERNALTOOL_H -#define EXTERNALTOOL_H +#pragma once #include <utils/fileutils.h> #include <utils/environment.h> @@ -159,5 +158,3 @@ private: } // Core Q_DECLARE_METATYPE(Core::Internal::ExternalTool *) - -#endif // EXTERNALTOOL_H diff --git a/src/plugins/coreplugin/externaltoolmanager.h b/src/plugins/coreplugin/externaltoolmanager.h index 142e823a39..6e1ca666ff 100644 --- a/src/plugins/coreplugin/externaltoolmanager.h +++ b/src/plugins/coreplugin/externaltoolmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EXTERNALTOOLMANAGER_H -#define EXTERNALTOOLMANAGER_H +#pragma once #include "core_global.h" @@ -56,6 +55,3 @@ signals: }; } // namespace Core - - -#endif // EXTERNALTOOLMANAGER_H diff --git a/src/plugins/coreplugin/fancyactionbar.h b/src/plugins/coreplugin/fancyactionbar.h index 590694186b..90e1e33b81 100644 --- a/src/plugins/coreplugin/fancyactionbar.h +++ b/src/plugins/coreplugin/fancyactionbar.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FANCYACTIONBAR_H -#define FANCYACTIONBAR_H +#pragma once #include <QToolButton> @@ -78,5 +77,3 @@ private: } // namespace Internal } // namespace Core - -#endif // FANCYACTIONBAR_H diff --git a/src/plugins/coreplugin/fancytabwidget.h b/src/plugins/coreplugin/fancytabwidget.h index b871af08c6..e59d6189ea 100644 --- a/src/plugins/coreplugin/fancytabwidget.h +++ b/src/plugins/coreplugin/fancytabwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FANCYTABWIDGET_H -#define FANCYTABWIDGET_H +#pragma once #include <QIcon> #include <QWidget> @@ -180,5 +179,3 @@ private: } // namespace Internal } // namespace Core - -#endif // FANCYTABWIDGET_H diff --git a/src/plugins/coreplugin/featureprovider.h b/src/plugins/coreplugin/featureprovider.h index 24e8c93222..43c1a3a536 100644 --- a/src/plugins/coreplugin/featureprovider.h +++ b/src/plugins/coreplugin/featureprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FEATUREPROVIDER_H -#define FEATUREPROVIDER_H +#pragma once #include "core_global.h" @@ -48,5 +47,3 @@ public: }; } // namespace Core - -#endif // FEATUREPROVIDER_H diff --git a/src/plugins/coreplugin/fileiconprovider.h b/src/plugins/coreplugin/fileiconprovider.h index 2c1d629912..5262bd26bc 100644 --- a/src/plugins/coreplugin/fileiconprovider.h +++ b/src/plugins/coreplugin/fileiconprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FILEICONPROVIDER_H -#define FILEICONPROVIDER_H +#pragma once #include <coreplugin/core_global.h> @@ -51,5 +50,3 @@ CORE_EXPORT void registerIconOverlayForMimeType(const QIcon &icon, const char *m } // namespace FileIconProvider } // namespace Core - -#endif // FILEICONPROVIDER_H diff --git a/src/plugins/coreplugin/fileutils.h b/src/plugins/coreplugin/fileutils.h index 969deb848c..c82d93bb0e 100644 --- a/src/plugins/coreplugin/fileutils.h +++ b/src/plugins/coreplugin/fileutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CORE_FILEUTILS_H -#define CORE_FILEUTILS_H +#pragma once #include "coreplugin/core_global.h" @@ -49,5 +48,3 @@ struct CORE_EXPORT FileUtils }; } // namespace Core - -#endif // CORE_FILEUTILS_H diff --git a/src/plugins/coreplugin/find/basetextfind.h b/src/plugins/coreplugin/find/basetextfind.h index a0a3b52533..c320cc95bd 100644 --- a/src/plugins/coreplugin/find/basetextfind.h +++ b/src/plugins/coreplugin/find/basetextfind.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BASETEXTFIND_H -#define BASETEXTFIND_H +#pragma once #include "ifindsupport.h" @@ -85,5 +84,3 @@ private: }; } // namespace Core - -#endif // BASETEXTFIND_H diff --git a/src/plugins/coreplugin/find/currentdocumentfind.h b/src/plugins/coreplugin/find/currentdocumentfind.h index 613eab7adc..a0d40d8706 100644 --- a/src/plugins/coreplugin/find/currentdocumentfind.h +++ b/src/plugins/coreplugin/find/currentdocumentfind.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CURRENTDOCUMENTFIND_H -#define CURRENTDOCUMENTFIND_H +#pragma once #include "ifindsupport.h" @@ -83,5 +82,3 @@ private: } // namespace Internal } // namespace Core - -#endif // CURRENTDOCUMENTFIND_H diff --git a/src/plugins/coreplugin/find/findplugin.h b/src/plugins/coreplugin/find/findplugin.h index 67e15bd003..ecb33175e9 100644 --- a/src/plugins/coreplugin/find/findplugin.h +++ b/src/plugins/coreplugin/find/findplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FINDPLUGIN_H -#define FINDPLUGIN_H +#pragma once #include "textfindconstants.h" @@ -78,5 +77,3 @@ private: }; } // namespace Core - -#endif // FINDPLUGIN_H diff --git a/src/plugins/coreplugin/find/findtoolbar.h b/src/plugins/coreplugin/find/findtoolbar.h index 854eba481a..8407645a45 100644 --- a/src/plugins/coreplugin/find/findtoolbar.h +++ b/src/plugins/coreplugin/find/findtoolbar.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FINDTOOLBAR_H -#define FINDTOOLBAR_H +#pragma once #include "ui_findwidget.h" #include "currentdocumentfind.h" @@ -193,5 +192,3 @@ private: } // namespace Internal } // namespace Core - -#endif // FINDTOOLBAR_H diff --git a/src/plugins/coreplugin/find/findtoolwindow.h b/src/plugins/coreplugin/find/findtoolwindow.h index c51a301e5d..641c29d2e7 100644 --- a/src/plugins/coreplugin/find/findtoolwindow.h +++ b/src/plugins/coreplugin/find/findtoolwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FINDTOOLWINDOW_H -#define FINDTOOLWINDOW_H +#pragma once #include "ui_finddialog.h" #include "findplugin.h" @@ -78,5 +77,3 @@ private: } // namespace Internal } // namespace Core - -#endif // FINDTOOLWINDOW_H diff --git a/src/plugins/coreplugin/find/highlightscrollbar.h b/src/plugins/coreplugin/find/highlightscrollbar.h index f8ae3c1667..d049e9b49f 100644 --- a/src/plugins/coreplugin/find/highlightscrollbar.h +++ b/src/plugins/coreplugin/find/highlightscrollbar.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HIGHLIGHTSCROLLBAR_H -#define HIGHLIGHTSCROLLBAR_H +#pragma once #include <QMap> #include <QScrollBar> @@ -116,5 +115,3 @@ private: }; } // namespace Core - -#endif // HIGHLIGHTSCROLLBAR_H diff --git a/src/plugins/coreplugin/find/ifindfilter.h b/src/plugins/coreplugin/find/ifindfilter.h index bf1cd751be..14396f59d4 100644 --- a/src/plugins/coreplugin/find/ifindfilter.h +++ b/src/plugins/coreplugin/find/ifindfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IFINDFILTER_H -#define IFINDFILTER_H +#pragma once #include "textfindconstants.h" @@ -69,5 +68,3 @@ signals: }; } // namespace Core - -#endif // IFINDFILTER_H diff --git a/src/plugins/coreplugin/find/ifindsupport.h b/src/plugins/coreplugin/find/ifindsupport.h index 4861b9aefa..18a2762784 100644 --- a/src/plugins/coreplugin/find/ifindsupport.h +++ b/src/plugins/coreplugin/find/ifindsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IFINDSUPPORT_H -#define IFINDSUPPORT_H +#pragma once #include "textfindconstants.h" @@ -72,5 +71,3 @@ signals: inline void IFindSupport::highlightAll(const QString &, FindFlags) {} } // namespace Core - -#endif // IFINDSUPPORT_H diff --git a/src/plugins/coreplugin/find/itemviewfind.h b/src/plugins/coreplugin/find/itemviewfind.h index c25e9029ea..dad9089dc5 100644 --- a/src/plugins/coreplugin/find/itemviewfind.h +++ b/src/plugins/coreplugin/find/itemviewfind.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ITEMVIEWFIND_H -#define ITEMVIEWFIND_H +#pragma once #include "ifindsupport.h" @@ -81,5 +80,3 @@ private: }; } // namespace Core - -#endif // ITEMVIEWFIND_H diff --git a/src/plugins/coreplugin/find/searchresultcolor.h b/src/plugins/coreplugin/find/searchresultcolor.h index 67b88af269..51da45b9ca 100644 --- a/src/plugins/coreplugin/find/searchresultcolor.h +++ b/src/plugins/coreplugin/find/searchresultcolor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SEARCHRESULTCOLOR_H -#define SEARCHRESULTCOLOR_H +#pragma once #include <QColor> @@ -41,5 +40,3 @@ public: } // namespace Internal } // namespace Core - -#endif // SEARCHRESULTCOLOR_H diff --git a/src/plugins/coreplugin/find/searchresulttreeitemdelegate.h b/src/plugins/coreplugin/find/searchresulttreeitemdelegate.h index 8e4560c9bd..99e05c2248 100644 --- a/src/plugins/coreplugin/find/searchresulttreeitemdelegate.h +++ b/src/plugins/coreplugin/find/searchresulttreeitemdelegate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SEARCHRESULTTREEITEMDELEGATE_H -#define SEARCHRESULTTREEITEMDELEGATE_H +#pragma once #include <QItemDelegate> @@ -49,5 +48,3 @@ private: } // namespace Internal } // namespace Core - -#endif // SEARCHRESULTTREEITEMDELEGATE_H diff --git a/src/plugins/coreplugin/find/searchresulttreeitemroles.h b/src/plugins/coreplugin/find/searchresulttreeitemroles.h index aa504983d3..4563e316b1 100644 --- a/src/plugins/coreplugin/find/searchresulttreeitemroles.h +++ b/src/plugins/coreplugin/find/searchresulttreeitemroles.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SEARCHRESULTTREEITEMROLES_H -#define SEARCHRESULTTREEITEMROLES_H +#pragma once #include <QAbstractItemView> @@ -48,5 +47,3 @@ enum Roles } // namespace Internal } // namespace Core } // namespace ItemDataRoles - -#endif // SEARCHRESULTTREEITEMROLES_H diff --git a/src/plugins/coreplugin/find/searchresulttreeitems.h b/src/plugins/coreplugin/find/searchresulttreeitems.h index 81fee12b86..1709bc11d0 100644 --- a/src/plugins/coreplugin/find/searchresulttreeitems.h +++ b/src/plugins/coreplugin/find/searchresulttreeitems.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SEARCHRESULTTREEITEMS_H -#define SEARCHRESULTTREEITEMS_H +#pragma once #include "searchresultwindow.h" @@ -70,5 +69,3 @@ private: } // namespace Internal } // namespace Core - -#endif // SEARCHRESULTTREEITEMS_H diff --git a/src/plugins/coreplugin/find/searchresulttreemodel.h b/src/plugins/coreplugin/find/searchresulttreemodel.h index bbc69b078f..08237db837 100644 --- a/src/plugins/coreplugin/find/searchresulttreemodel.h +++ b/src/plugins/coreplugin/find/searchresulttreemodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SEARCHRESULTTREEMODEL_H -#define SEARCHRESULTTREEMODEL_H +#pragma once #include "searchresultwindow.h" #include "searchresultcolor.h" @@ -91,5 +90,3 @@ private: } // namespace Internal } // namespace Core - -#endif // SEARCHRESULTTREEMODEL_H diff --git a/src/plugins/coreplugin/find/searchresulttreeview.h b/src/plugins/coreplugin/find/searchresulttreeview.h index c8d6d15aca..bf80cba1ad 100644 --- a/src/plugins/coreplugin/find/searchresulttreeview.h +++ b/src/plugins/coreplugin/find/searchresulttreeview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SEARCHRESULTTREEVIEW_H -#define SEARCHRESULTTREEVIEW_H +#pragma once #include "searchresultwindow.h" @@ -64,5 +63,3 @@ protected: } // namespace Internal } // namespace Core - -#endif // SEARCHRESULTTREEVIEW_H diff --git a/src/plugins/coreplugin/find/searchresultwidget.h b/src/plugins/coreplugin/find/searchresultwidget.h index 2a671b1dee..ef9961f3d8 100644 --- a/src/plugins/coreplugin/find/searchresultwidget.h +++ b/src/plugins/coreplugin/find/searchresultwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SEARCHRESULTWIDGET_H -#define SEARCHRESULTWIDGET_H +#pragma once #include "searchresultwindow.h" @@ -142,5 +141,3 @@ private: } // Internal } // Find - -#endif // SEARCHRESULTWIDGET_H diff --git a/src/plugins/coreplugin/find/searchresultwindow.h b/src/plugins/coreplugin/find/searchresultwindow.h index 25985bcde6..8a7e1b918f 100644 --- a/src/plugins/coreplugin/find/searchresultwindow.h +++ b/src/plugins/coreplugin/find/searchresultwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SEARCHRESULTWINDOW_H -#define SEARCHRESULTWINDOW_H +#pragma once #include <coreplugin/ioutputpane.h> @@ -194,5 +193,3 @@ private: } // namespace Core Q_DECLARE_METATYPE(Core::SearchResultItem) - -#endif // SEARCHRESULTWINDOW_H diff --git a/src/plugins/coreplugin/find/textfindconstants.h b/src/plugins/coreplugin/find/textfindconstants.h index 22eed71a78..d670abd0f0 100644 --- a/src/plugins/coreplugin/find/textfindconstants.h +++ b/src/plugins/coreplugin/find/textfindconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTFINDCONSTANTS_H -#define TEXTFINDCONSTANTS_H +#pragma once #include <coreplugin/core_global.h> @@ -78,5 +77,3 @@ QTextDocument::FindFlags CORE_EXPORT textDocumentFlagsForFindFlags(FindFlags fla Q_DECLARE_OPERATORS_FOR_FLAGS(Core::FindFlags) Q_DECLARE_METATYPE(Core::FindFlags) - -#endif // TEXTFINDCONSTANTS_H diff --git a/src/plugins/coreplugin/findplaceholder.h b/src/plugins/coreplugin/findplaceholder.h index 90afde4b02..4073354dc1 100644 --- a/src/plugins/coreplugin/findplaceholder.h +++ b/src/plugins/coreplugin/findplaceholder.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FINDPLACEHOLDER_H -#define FINDPLACEHOLDER_H +#pragma once #include "core_global.h" @@ -59,5 +58,3 @@ private: }; } // namespace Core - -#endif // FINDPLACEHOLDER_H diff --git a/src/plugins/coreplugin/generalsettings.h b/src/plugins/coreplugin/generalsettings.h index 5fbcaab636..584048bf72 100644 --- a/src/plugins/coreplugin/generalsettings.h +++ b/src/plugins/coreplugin/generalsettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GENERALSETTINGS_H -#define GENERALSETTINGS_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> #include <QPointer> @@ -65,5 +64,3 @@ private: } // namespace Internal } // namespace Core - -#endif // GENERALSETTINGS_H diff --git a/src/plugins/coreplugin/generatedfile.h b/src/plugins/coreplugin/generatedfile.h index de0b8b5e26..9fb2815837 100644 --- a/src/plugins/coreplugin/generatedfile.h +++ b/src/plugins/coreplugin/generatedfile.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CORE_GENERATEDFILE_H -#define CORE_GENERATEDFILE_H +#pragma once #include "coreplugin/id.h" @@ -88,5 +87,3 @@ private: typedef QList<GeneratedFile> GeneratedFiles; } // namespace Core - -#endif // CORE_GENERATEDFILE_H diff --git a/src/plugins/coreplugin/helpmanager.h b/src/plugins/coreplugin/helpmanager.h index 3d2bc7be80..07b22cbe9e 100644 --- a/src/plugins/coreplugin/helpmanager.h +++ b/src/plugins/coreplugin/helpmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HELPMANAGER_H -#define HELPMANAGER_H +#pragma once #include "core_global.h" @@ -109,5 +108,3 @@ private: }; } // Core - -#endif // HELPMANAGER_H diff --git a/src/plugins/coreplugin/icontext.h b/src/plugins/coreplugin/icontext.h index 35deb2c6ea..b2153656a7 100644 --- a/src/plugins/coreplugin/icontext.h +++ b/src/plugins/coreplugin/icontext.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ICONTEXT_H -#define ICONTEXT_H +#pragma once #include <coreplugin/core_global.h> #include <coreplugin/id.h> @@ -85,5 +84,3 @@ protected: }; } // namespace Core - -#endif //ICONTEXT_H diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h index 6dd3561713..5bba154fd0 100644 --- a/src/plugins/coreplugin/icore.h +++ b/src/plugins/coreplugin/icore.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ICORE_H -#define ICORE_H +#pragma once #include "core_global.h" #include "id.h" @@ -156,5 +155,3 @@ private: }; } // namespace Core - -#endif // ICORE_H diff --git a/src/plugins/coreplugin/id.h b/src/plugins/coreplugin/id.h index 1450592cf9..af56c32b10 100644 --- a/src/plugins/coreplugin/id.h +++ b/src/plugins/coreplugin/id.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CORE_ID_H -#define CORE_ID_H +#pragma once #include "core_global.h" @@ -92,5 +91,3 @@ QDataStream &operator<<(QDataStream &ds, Core::Id id); QDataStream &operator>>(QDataStream &ds, Core::Id &id); CORE_EXPORT QDebug operator<<(QDebug dbg, const Core::Id &id); QT_END_NAMESPACE - -#endif // CORE_ID_H diff --git a/src/plugins/coreplugin/idocument.h b/src/plugins/coreplugin/idocument.h index 72a3dd4333..40cd861fa5 100644 --- a/src/plugins/coreplugin/idocument.h +++ b/src/plugins/coreplugin/idocument.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IDOCUMENT_H -#define IDOCUMENT_H +#pragma once #include "core_global.h" @@ -148,5 +147,3 @@ private: }; } // namespace Core - -#endif // IDOCUMENT_H diff --git a/src/plugins/coreplugin/idocumentfactory.h b/src/plugins/coreplugin/idocumentfactory.h index 6b507107d0..518cb23f1f 100644 --- a/src/plugins/coreplugin/idocumentfactory.h +++ b/src/plugins/coreplugin/idocumentfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IDOCUMENTFACTORY_H -#define IDOCUMENTFACTORY_H +#pragma once #include "id.h" @@ -62,5 +61,3 @@ private: }; } // namespace Core - -#endif // IDOCUMENTFACTORY_H diff --git a/src/plugins/coreplugin/ifilewizardextension.h b/src/plugins/coreplugin/ifilewizardextension.h index 79679b7265..2e788eb8c7 100644 --- a/src/plugins/coreplugin/ifilewizardextension.h +++ b/src/plugins/coreplugin/ifilewizardextension.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IFILEWIZARDEXTENSION_H -#define IFILEWIZARDEXTENSION_H +#pragma once #include <coreplugin/core_global.h> @@ -72,5 +71,3 @@ public slots: }; } // namespace Core - -#endif // IFILEWIZARDEXTENSION_H diff --git a/src/plugins/coreplugin/imode.h b/src/plugins/coreplugin/imode.h index 8cd9d558d8..cf745b4516 100644 --- a/src/plugins/coreplugin/imode.h +++ b/src/plugins/coreplugin/imode.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IMODE_H -#define IMODE_H +#pragma once #include "icontext.h" #include "id.h" @@ -65,5 +64,3 @@ private: }; } // namespace Core - -#endif // IMODE_H diff --git a/src/plugins/coreplugin/inavigationwidgetfactory.h b/src/plugins/coreplugin/inavigationwidgetfactory.h index 245c084a68..940e0543b2 100644 --- a/src/plugins/coreplugin/inavigationwidgetfactory.h +++ b/src/plugins/coreplugin/inavigationwidgetfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INAVIGATIONWIDGET_H -#define INAVIGATIONWIDGET_H +#pragma once #include "id.h" @@ -81,5 +80,3 @@ private: }; } // namespace Core - -#endif // INAVIGATIONWIDGET_H diff --git a/src/plugins/coreplugin/infobar.h b/src/plugins/coreplugin/infobar.h index e096e0e9db..8c2cc7f211 100644 --- a/src/plugins/coreplugin/infobar.h +++ b/src/plugins/coreplugin/infobar.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INFOBAR_H -#define INFOBAR_H +#pragma once #include "core_global.h" #include <coreplugin/id.h> @@ -120,5 +119,3 @@ private: }; } // namespace Core - -#endif // INFOBAR_H diff --git a/src/plugins/coreplugin/ioutputpane.h b/src/plugins/coreplugin/ioutputpane.h index e952d5136f..55d266b406 100644 --- a/src/plugins/coreplugin/ioutputpane.h +++ b/src/plugins/coreplugin/ioutputpane.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOUTPUTPANE_H -#define IOUTPUTPANE_H +#pragma once #include "core_global.h" @@ -88,5 +87,3 @@ signals: } // namespace Core Q_DECLARE_OPERATORS_FOR_FLAGS(Core::IOutputPane::Flags) - -#endif // IOUTPUTPANE_H diff --git a/src/plugins/coreplugin/iversioncontrol.h b/src/plugins/coreplugin/iversioncontrol.h index daaa860153..a78775bae3 100644 --- a/src/plugins/coreplugin/iversioncontrol.h +++ b/src/plugins/coreplugin/iversioncontrol.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IVERSIONCONTROL_H -#define IVERSIONCONTROL_H +#pragma once #include "core_global.h" #include "id.h" @@ -264,6 +263,3 @@ private: } // namespace Core #endif - - -#endif // IVERSIONCONTROL_H diff --git a/src/plugins/coreplugin/iwelcomepage.h b/src/plugins/coreplugin/iwelcomepage.h index 465130e6a4..521af86f6a 100644 --- a/src/plugins/coreplugin/iwelcomepage.h +++ b/src/plugins/coreplugin/iwelcomepage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IWELCOMEPAGE_H -#define IWELCOMEPAGE_H +#pragma once #include "core_global.h" @@ -59,5 +58,3 @@ public: }; } // Core - -#endif // IWELCOMEPAGE_H diff --git a/src/plugins/coreplugin/iwizardfactory.h b/src/plugins/coreplugin/iwizardfactory.h index 2adb5be81b..7cf3cbcf8c 100644 --- a/src/plugins/coreplugin/iwizardfactory.h +++ b/src/plugins/coreplugin/iwizardfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IWIZARDFACTORY_H -#define IWIZARDFACTORY_H +#pragma once #include <coreplugin/core_global.h> #include <coreplugin/featureprovider.h> @@ -139,5 +138,3 @@ private: } // namespace Core Q_DECLARE_OPERATORS_FOR_FLAGS(Core::IWizardFactory::WizardFlags) - -#endif // IWIZARDFACTORY_H diff --git a/src/plugins/coreplugin/jsexpander.h b/src/plugins/coreplugin/jsexpander.h index f736cab651..dbffc8c159 100644 --- a/src/plugins/coreplugin/jsexpander.h +++ b/src/plugins/coreplugin/jsexpander.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JSEXPANDER_H -#define JSEXPANDER_H +#pragma once #include "core_global.h" @@ -52,5 +51,3 @@ private: }; } // namespace Core - -#endif // JSEXPANDER_H diff --git a/src/plugins/coreplugin/locator/basefilefilter.h b/src/plugins/coreplugin/locator/basefilefilter.h index b472aadce4..16cfc45c71 100644 --- a/src/plugins/coreplugin/locator/basefilefilter.h +++ b/src/plugins/coreplugin/locator/basefilefilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BASEFILEFILTER_H -#define BASEFILEFILTER_H +#pragma once #include "ilocatorfilter.h" @@ -85,5 +84,3 @@ private: }; } // namespace Core - -#endif // BASEFILEFILTER_H diff --git a/src/plugins/coreplugin/locator/commandlocator.h b/src/plugins/coreplugin/locator/commandlocator.h index bf18b6aee0..f9704fa43b 100644 --- a/src/plugins/coreplugin/locator/commandlocator.h +++ b/src/plugins/coreplugin/locator/commandlocator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMMANDLOCATOR_H -#define COMMANDLOCATOR_H +#pragma once #include "ilocatorfilter.h" @@ -55,5 +54,3 @@ private: }; } // namespace Core - -#endif // COMMANDLOCATOR_H diff --git a/src/plugins/coreplugin/locator/directoryfilter.h b/src/plugins/coreplugin/locator/directoryfilter.h index ae9dfdb3fd..e0c5d0c379 100644 --- a/src/plugins/coreplugin/locator/directoryfilter.h +++ b/src/plugins/coreplugin/locator/directoryfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DIRECTORYFILTER_H -#define DIRECTORYFILTER_H +#pragma once #include "ui_directoryfilter.h" #include "basefilefilter.h" @@ -67,5 +66,3 @@ private: } // namespace Internal } // namespace Core - -#endif // DIRECTORYFILTER_H diff --git a/src/plugins/coreplugin/locator/executefilter.h b/src/plugins/coreplugin/locator/executefilter.h index 988bb9b44c..890468354e 100644 --- a/src/plugins/coreplugin/locator/executefilter.h +++ b/src/plugins/coreplugin/locator/executefilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EXECUTEFILTER_H -#define EXECUTEFILTER_H +#pragma once #include "ilocatorfilter.h" @@ -73,5 +72,3 @@ private: } // namespace Internal } // namespace Core - -#endif // EXECUTEFILTER_H diff --git a/src/plugins/coreplugin/locator/externaltoolsfilter.h b/src/plugins/coreplugin/locator/externaltoolsfilter.h index 13b9a6e706..86ebf5f851 100644 --- a/src/plugins/coreplugin/locator/externaltoolsfilter.h +++ b/src/plugins/coreplugin/locator/externaltoolsfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EXTERNALTOOLSFILTER_H -#define EXTERNALTOOLSFILTER_H +#pragma once #include "ilocatorfilter.h" @@ -49,5 +48,3 @@ private: } // namespace Internal } // namespace Core - -#endif // EXTERNALTOOLSFILTER_H diff --git a/src/plugins/coreplugin/locator/filesystemfilter.h b/src/plugins/coreplugin/locator/filesystemfilter.h index daa4c5c1ca..e7b7bdbc5a 100644 --- a/src/plugins/coreplugin/locator/filesystemfilter.h +++ b/src/plugins/coreplugin/locator/filesystemfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FILESYSTEMFILTER_H -#define FILESYSTEMFILTER_H +#pragma once #include "ilocatorfilter.h" #include "ui_filesystemfilter.h" @@ -61,5 +60,3 @@ private: } // namespace Internal } // namespace Core - -#endif // FILESYSTEMFILTER_H diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.h b/src/plugins/coreplugin/locator/ilocatorfilter.h index e9051712cf..d2d083d8cb 100644 --- a/src/plugins/coreplugin/locator/ilocatorfilter.h +++ b/src/plugins/coreplugin/locator/ilocatorfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ILOCATORFILTER_H -#define ILOCATORFILTER_H +#pragma once #include <coreplugin/id.h> @@ -171,5 +170,3 @@ private: }; } // namespace Core - -#endif // ILOCATORFILTER_H diff --git a/src/plugins/coreplugin/locator/locator.h b/src/plugins/coreplugin/locator/locator.h index c47dd2dc13..62b6d2b896 100644 --- a/src/plugins/coreplugin/locator/locator.h +++ b/src/plugins/coreplugin/locator/locator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LOCATORPLUGIN_H -#define LOCATORPLUGIN_H +#pragma once #include "ilocatorfilter.h" #include "directoryfilter.h" @@ -125,5 +124,3 @@ void Locator::loadSettingsHelper(S *settings) } // namespace Internal } // namespace Core - -#endif // LOCATORPLUGIN_H diff --git a/src/plugins/coreplugin/locator/locatorconstants.h b/src/plugins/coreplugin/locator/locatorconstants.h index 68c0bc7860..35faa771ce 100644 --- a/src/plugins/coreplugin/locator/locatorconstants.h +++ b/src/plugins/coreplugin/locator/locatorconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LOCATORCONSTANTS_H -#define LOCATORCONSTANTS_H +#pragma once #include <QtGlobal> @@ -38,5 +37,3 @@ const char TASK_INDEX[] = "Locator.Task.Index"; } // namespace Constants } // namespace Core - -#endif // LOCATORCONSTANTS_H diff --git a/src/plugins/coreplugin/locator/locatorfiltersfilter.h b/src/plugins/coreplugin/locator/locatorfiltersfilter.h index a6c77f3644..b0e8a1ba0a 100644 --- a/src/plugins/coreplugin/locator/locatorfiltersfilter.h +++ b/src/plugins/coreplugin/locator/locatorfiltersfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LOCATORFILTERSFILTER_H -#define LOCATORFILTERSFILTER_H +#pragma once #include "ilocatorfilter.h" @@ -64,5 +63,3 @@ private: } // namespace Internal } // namespace Core - -#endif // LOCATORFILTERSFILTER_H diff --git a/src/plugins/coreplugin/locator/locatorfiltertest.h b/src/plugins/coreplugin/locator/locatorfiltertest.h index e40df74332..c41d5ba23e 100644 --- a/src/plugins/coreplugin/locator/locatorfiltertest.h +++ b/src/plugins/coreplugin/locator/locatorfiltertest.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LOCATORFILTERTEST_H -#define LOCATORFILTERTEST_H +#pragma once #include "ilocatorfilter.h" @@ -86,5 +85,3 @@ template<> inline char *toString(const Core::Tests::ResultData &data) } // namespace QTest QT_END_NAMESPACE - -#endif // LOCATORFILTERTEST_H diff --git a/src/plugins/coreplugin/locator/locatormanager.h b/src/plugins/coreplugin/locator/locatormanager.h index 1946065ba9..f9edb89f90 100644 --- a/src/plugins/coreplugin/locator/locatormanager.h +++ b/src/plugins/coreplugin/locator/locatormanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LOCATORMANAGER_H -#define LOCATORMANAGER_H +#pragma once #include <coreplugin/core_global.h> @@ -46,5 +45,3 @@ public: }; } // namespace Core - -#endif // LOCATORMANAGER_H diff --git a/src/plugins/coreplugin/locator/locatorsearchutils.h b/src/plugins/coreplugin/locator/locatorsearchutils.h index 47bfdd4b69..cd2582f509 100644 --- a/src/plugins/coreplugin/locator/locatorsearchutils.h +++ b/src/plugins/coreplugin/locator/locatorsearchutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LOCATORSEARCHUTILS_H -#define LOCATORSEARCHUTILS_H +#pragma once #include "ilocatorfilter.h" @@ -37,6 +36,3 @@ void CORE_EXPORT runSearch(QFutureInterface<LocatorFilterEntry> &future, } // namespace Internal } // namespace Core - -#endif // LOCATORSEARCHUTILS_H - diff --git a/src/plugins/coreplugin/locator/locatorsettingspage.h b/src/plugins/coreplugin/locator/locatorsettingspage.h index e1648d9ad7..47cde6d5ad 100644 --- a/src/plugins/coreplugin/locator/locatorsettingspage.h +++ b/src/plugins/coreplugin/locator/locatorsettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LOCATORSETTINGSPAGE_H -#define LOCATORSETTINGSPAGE_H +#pragma once #include "ui_locatorsettingspage.h" @@ -91,5 +90,3 @@ private: } // namespace Internal } // namespace Core - -#endif // LOCATORSETTINGSPAGE_H diff --git a/src/plugins/coreplugin/locator/locatorwidget.h b/src/plugins/coreplugin/locator/locatorwidget.h index 0ff07166c2..876492fa06 100644 --- a/src/plugins/coreplugin/locator/locatorwidget.h +++ b/src/plugins/coreplugin/locator/locatorwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LOCATORWIDGET_H -#define LOCATORWIDGET_H +#pragma once #include "locator.h" @@ -100,5 +99,3 @@ private: } // namespace Internal } // namespace Core - -#endif // LOCATORWIDGET_H diff --git a/src/plugins/coreplugin/locator/opendocumentsfilter.h b/src/plugins/coreplugin/locator/opendocumentsfilter.h index a4a9e49cbf..d676618331 100644 --- a/src/plugins/coreplugin/locator/opendocumentsfilter.h +++ b/src/plugins/coreplugin/locator/opendocumentsfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OPENDOCUMENTSFILTER_H -#define OPENDOCUMENTSFILTER_H +#pragma once #include "ilocatorfilter.h" @@ -67,5 +66,3 @@ private: } // namespace Internal } // namespace Core - -#endif // OPENDOCUMENTSFILTER_H diff --git a/src/plugins/coreplugin/locator/spotlightlocatorfilter.h b/src/plugins/coreplugin/locator/spotlightlocatorfilter.h index 6469ce24c0..0ce8c89230 100644 --- a/src/plugins/coreplugin/locator/spotlightlocatorfilter.h +++ b/src/plugins/coreplugin/locator/spotlightlocatorfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SPOTLIGHTLOCATORFILTER_H -#define SPOTLIGHTLOCATORFILTER_H +#pragma once #include "basefilefilter.h" @@ -42,6 +41,3 @@ public: } // Internal } // Core - -#endif // SPOTLIGHTLOCATORFILTER_H - diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h index 0f1125f2f4..b2e374662d 100644 --- a/src/plugins/coreplugin/mainwindow.h +++ b/src/plugins/coreplugin/mainwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MAINWINDOW_H -#define MAINWINDOW_H +#pragma once #include "icontext.h" #include "icore.h" @@ -204,5 +203,3 @@ private: } // namespace Internal } // namespace Core - -#endif // MAINWINDOW_H diff --git a/src/plugins/coreplugin/manhattanstyle.h b/src/plugins/coreplugin/manhattanstyle.h index 2bdaabffc8..752aa08369 100644 --- a/src/plugins/coreplugin/manhattanstyle.h +++ b/src/plugins/coreplugin/manhattanstyle.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MANHATTANSTYLE_H -#define MANHATTANSTYLE_H +#pragma once #include "core_global.h" @@ -72,5 +71,3 @@ private: ManhattanStylePrivate *d; }; - -#endif // MANHATTANSTYLE_H diff --git a/src/plugins/coreplugin/messagebox.h b/src/plugins/coreplugin/messagebox.h index 3ced8ea3a5..b679636d1f 100644 --- a/src/plugins/coreplugin/messagebox.h +++ b/src/plugins/coreplugin/messagebox.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MESSAGEBOX_H -#define MESSAGEBOX_H +#pragma once #include "core_global.h" @@ -40,6 +39,3 @@ namespace AsynchronousMessageBox { CORE_EXPORT void critical(const QString &title, const QString &desciption); } } - -#endif // MESSAGEBOX_H - diff --git a/src/plugins/coreplugin/messagemanager.h b/src/plugins/coreplugin/messagemanager.h index 4ccdaae977..39daa4d138 100644 --- a/src/plugins/coreplugin/messagemanager.h +++ b/src/plugins/coreplugin/messagemanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MESSAGEMANAGER_H -#define MESSAGEMANAGER_H +#pragma once #include "core_global.h" #include "ioutputpane.h" @@ -71,5 +70,3 @@ private: } // namespace Core Q_DECLARE_METATYPE(Core::MessageManager::PrintToOutputPaneFlags) - -#endif // MESSAGEMANAGER_H diff --git a/src/plugins/coreplugin/messageoutputwindow.h b/src/plugins/coreplugin/messageoutputwindow.h index b926e028a2..bb301f0f0e 100644 --- a/src/plugins/coreplugin/messageoutputwindow.h +++ b/src/plugins/coreplugin/messageoutputwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MESSAGEOUTPUTWINDOW_H -#define MESSAGEOUTPUTWINDOW_H +#pragma once #include "ioutputpane.h" @@ -66,5 +65,3 @@ private: } // namespace Internal } // namespace Core - -#endif // MESSAGEOUTPUTWINDOW_H diff --git a/src/plugins/coreplugin/mimetypemagicdialog.h b/src/plugins/coreplugin/mimetypemagicdialog.h index ffba915ec0..5f5bf8bfe6 100644 --- a/src/plugins/coreplugin/mimetypemagicdialog.h +++ b/src/plugins/coreplugin/mimetypemagicdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MIMETYPEMAGICDIALOG_H -#define MIMETYPEMAGICDIALOG_H +#pragma once #include "ui_mimetypemagicdialog.h" @@ -82,5 +81,3 @@ private: } // Core Q_DECLARE_METATYPE(Core::Internal::MagicData) - -#endif // MIMETYPEMAGICDIALOG_H diff --git a/src/plugins/coreplugin/mimetypesettings.h b/src/plugins/coreplugin/mimetypesettings.h index fe4a075c2e..8153ecbb1b 100644 --- a/src/plugins/coreplugin/mimetypesettings.h +++ b/src/plugins/coreplugin/mimetypesettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MIMETYPESETTINGSPAGE_H -#define MIMETYPESETTINGSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> @@ -52,5 +51,3 @@ private: } // Internal } // Core - -#endif // MIMETYPESETTINGSPAGE_H diff --git a/src/plugins/coreplugin/minisplitter.h b/src/plugins/coreplugin/minisplitter.h index fd571b09fa..8679a8e836 100644 --- a/src/plugins/coreplugin/minisplitter.h +++ b/src/plugins/coreplugin/minisplitter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MINISPLITTER_H -#define MINISPLITTER_H +#pragma once #include "core_global.h" @@ -53,5 +52,3 @@ private: }; } // namespace Core - -#endif // MINISPLITTER_H diff --git a/src/plugins/coreplugin/modemanager.h b/src/plugins/coreplugin/modemanager.h index 0f73a12b79..324684bdd7 100644 --- a/src/plugins/coreplugin/modemanager.h +++ b/src/plugins/coreplugin/modemanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODEMANAGER_H -#define MODEMANAGER_H +#pragma once #include <coreplugin/core_global.h> #include <QObject> @@ -86,5 +85,3 @@ private: }; } // namespace Core - -#endif // MODEMANAGER_H diff --git a/src/plugins/coreplugin/navigationsubwidget.h b/src/plugins/coreplugin/navigationsubwidget.h index 2b945df780..545b0113d3 100644 --- a/src/plugins/coreplugin/navigationsubwidget.h +++ b/src/plugins/coreplugin/navigationsubwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NAVIGATIONSUBWIDGET_H -#define NAVIGATIONSUBWIDGET_H +#pragma once #include <QComboBox> @@ -122,5 +121,3 @@ private: } // namespace Internal } // namespace Core - -#endif // NAVIGATIONSUBWIDGET_H diff --git a/src/plugins/coreplugin/navigationwidget.h b/src/plugins/coreplugin/navigationwidget.h index 444d2365d8..a1909b120c 100644 --- a/src/plugins/coreplugin/navigationwidget.h +++ b/src/plugins/coreplugin/navigationwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NAVIGATIONWIDGET_H -#define NAVIGATIONWIDGET_H +#pragma once #include <coreplugin/minisplitter.h> #include <coreplugin/id.h> @@ -115,5 +114,3 @@ private: }; } // namespace Core - -#endif // NAVIGATIONWIDGET_H diff --git a/src/plugins/coreplugin/opendocumentstreeview.h b/src/plugins/coreplugin/opendocumentstreeview.h index 05d10174e8..50286b63d4 100644 --- a/src/plugins/coreplugin/opendocumentstreeview.h +++ b/src/plugins/coreplugin/opendocumentstreeview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OPENDOCUMENTSTREEVIEW_H -#define OPENDOCUMENTSTREEVIEW_H +#pragma once #include "core_global.h" @@ -53,5 +52,3 @@ private: }; } // namespace Core - -#endif // OPENDOCUMENTSTREEVIEW_H diff --git a/src/plugins/coreplugin/outputpane.h b/src/plugins/coreplugin/outputpane.h index 6486cc999f..1b75131093 100644 --- a/src/plugins/coreplugin/outputpane.h +++ b/src/plugins/coreplugin/outputpane.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OUTPUTPANE_H -#define OUTPUTPANE_H +#pragma once #include "core_global.h" @@ -69,5 +68,3 @@ private: }; } // namespace Core - -#endif // OUTPUTPANE_H diff --git a/src/plugins/coreplugin/outputpanemanager.h b/src/plugins/coreplugin/outputpanemanager.h index 304774856d..b8885dd21d 100644 --- a/src/plugins/coreplugin/outputpanemanager.h +++ b/src/plugins/coreplugin/outputpanemanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OUTPUTPANEMANAGER_H -#define OUTPUTPANEMANAGER_H +#pragma once #include <coreplugin/id.h> @@ -182,5 +181,3 @@ public: } // namespace Internal } // namespace Core - -#endif // OUTPUTPANEMANAGER_H diff --git a/src/plugins/coreplugin/outputwindow.h b/src/plugins/coreplugin/outputwindow.h index 862ead16bf..eee83dd63a 100644 --- a/src/plugins/coreplugin/outputwindow.h +++ b/src/plugins/coreplugin/outputwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OUTPUTWINDOW_H -#define OUTPUTWINDOW_H +#pragma once #include "core_global.h" #include "icontext.h" @@ -98,5 +97,3 @@ private: }; } // namespace Core - -#endif // OUTPUTWINDOW_H diff --git a/src/plugins/coreplugin/patchtool.h b/src/plugins/coreplugin/patchtool.h index 6297460995..9047bce7fb 100644 --- a/src/plugins/coreplugin/patchtool.h +++ b/src/plugins/coreplugin/patchtool.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CORE_PATCHTOOL_H -#define CORE_PATCHTOOL_H +#pragma once #include "coreplugin/core_global.h" @@ -44,5 +43,3 @@ public: }; } // namespace Core - -#endif // CORE_PATCHTOOL_H diff --git a/src/plugins/coreplugin/plugindialog.h b/src/plugins/coreplugin/plugindialog.h index 5ef4e0cfc7..44e84637dd 100644 --- a/src/plugins/coreplugin/plugindialog.h +++ b/src/plugins/coreplugin/plugindialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGINDIALOG_H -#define PLUGINDIALOG_H +#pragma once #include <QDialog> @@ -65,5 +64,3 @@ private: } // namespace Internal } // namespace Core - -#endif // PLUGINDIALOG_H diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.h b/src/plugins/coreplugin/progressmanager/futureprogress.h index 6647103009..e079b7e9e4 100644 --- a/src/plugins/coreplugin/progressmanager/futureprogress.h +++ b/src/plugins/coreplugin/progressmanager/futureprogress.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FUTUREPROGRESS_H -#define FUTUREPROGRESS_H +#pragma once #include <coreplugin/core_global.h> @@ -102,5 +101,3 @@ private: }; } // namespace Core - -#endif // FUTUREPROGRESS_H diff --git a/src/plugins/coreplugin/progressmanager/progressbar.h b/src/plugins/coreplugin/progressmanager/progressbar.h index d2b9abc357..e2334447a2 100644 --- a/src/plugins/coreplugin/progressmanager/progressbar.h +++ b/src/plugins/coreplugin/progressmanager/progressbar.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROGRESSBAR_H -#define PROGRESSBAR_H +#pragma once #include <QString> #include <QWidget> @@ -93,5 +92,3 @@ private: } // namespace Internal } // namespace Core - -#endif // PROGRESSBAR_H diff --git a/src/plugins/coreplugin/progressmanager/progressmanager.h b/src/plugins/coreplugin/progressmanager/progressmanager.h index 6653a70b1f..4d006a45a7 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager.h +++ b/src/plugins/coreplugin/progressmanager/progressmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROGRESSMANAGER_H -#define PROGRESSMANAGER_H +#pragma once #include <coreplugin/core_global.h> #include <coreplugin/id.h> @@ -90,5 +89,3 @@ private: } // namespace Core Q_DECLARE_OPERATORS_FOR_FLAGS(Core::ProgressManager::ProgressFlags) - -#endif //PROGRESSMANAGER_H diff --git a/src/plugins/coreplugin/progressmanager/progressmanager_p.h b/src/plugins/coreplugin/progressmanager/progressmanager_p.h index 2217f78186..47e5c4334a 100644 --- a/src/plugins/coreplugin/progressmanager/progressmanager_p.h +++ b/src/plugins/coreplugin/progressmanager/progressmanager_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROGRESSMANAGER_P_H -#define PROGRESSMANAGER_P_H +#pragma once #include "progressmanager.h" @@ -122,5 +121,3 @@ public: } // namespace Internal } // namespace Core - -#endif // PROGRESSMANAGER_P_H diff --git a/src/plugins/coreplugin/progressmanager/progressview.h b/src/plugins/coreplugin/progressmanager/progressview.h index c8d312fb28..93a030793a 100644 --- a/src/plugins/coreplugin/progressmanager/progressview.h +++ b/src/plugins/coreplugin/progressmanager/progressview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROGRESSVIEW_H -#define PROGRESSVIEW_H +#pragma once #include "progressmanager.h" @@ -71,5 +70,3 @@ private: } // namespace Internal } // namespace Core - -#endif // PROGRESSVIEW_H diff --git a/src/plugins/coreplugin/removefiledialog.h b/src/plugins/coreplugin/removefiledialog.h index db499ce9c7..f79dc82e02 100644 --- a/src/plugins/coreplugin/removefiledialog.h +++ b/src/plugins/coreplugin/removefiledialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOVEFILEDIALOG_H -#define REMOVEFILEDIALOG_H +#pragma once #include "core_global.h" @@ -50,5 +49,3 @@ private: }; } // namespace Core - -#endif // REMOVEFILEDIALOG_H diff --git a/src/plugins/coreplugin/rightpane.h b/src/plugins/coreplugin/rightpane.h index 1170fb6f80..4bcce788bb 100644 --- a/src/plugins/coreplugin/rightpane.h +++ b/src/plugins/coreplugin/rightpane.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RIGHTPANE_H -#define RIGHTPANE_H +#pragma once #include "core_global.h" @@ -89,5 +88,3 @@ private: }; } // namespace Core - -#endif // RIGHTPANE_H diff --git a/src/plugins/coreplugin/settingsdatabase.h b/src/plugins/coreplugin/settingsdatabase.h index d40fea13b4..382618552c 100644 --- a/src/plugins/coreplugin/settingsdatabase.h +++ b/src/plugins/coreplugin/settingsdatabase.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SETTINGSDATABASE_H -#define SETTINGSDATABASE_H +#pragma once #include "core_global.h" @@ -63,5 +62,3 @@ private: }; } // namespace Core - -#endif // SETTINGSDATABASE_H diff --git a/src/plugins/coreplugin/shellcommand.h b/src/plugins/coreplugin/shellcommand.h index 063ec7394a..7de7246d3d 100644 --- a/src/plugins/coreplugin/shellcommand.h +++ b/src/plugins/coreplugin/shellcommand.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CORE_SHELLCOMMAND_H -#define CORE_SHELLCOMMAND_H +#pragma once #include "core_global.h" @@ -46,5 +45,3 @@ protected: }; } // namespace Core - -#endif // CORE_SHELLCOMMAND_H diff --git a/src/plugins/coreplugin/sidebar.h b/src/plugins/coreplugin/sidebar.h index ab25daeea4..2a09357573 100644 --- a/src/plugins/coreplugin/sidebar.h +++ b/src/plugins/coreplugin/sidebar.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SIDEBAR_H -#define SIDEBAR_H +#pragma once #include "core_global.h" #include "minisplitter.h" @@ -126,5 +125,3 @@ private: }; } // namespace Core - -#endif // SIDEBAR_H diff --git a/src/plugins/coreplugin/sidebarwidget.h b/src/plugins/coreplugin/sidebarwidget.h index ad5ab85848..fbc6c09acc 100644 --- a/src/plugins/coreplugin/sidebarwidget.h +++ b/src/plugins/coreplugin/sidebarwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SIDEBARWIDGET_H -#define SIDEBARWIDGET_H +#pragma once #include <QWidget> @@ -80,5 +79,3 @@ private: } // namespace Internal } // namespace Core - -#endif // SIDEBARWIDGET_H diff --git a/src/plugins/coreplugin/statusbarmanager.h b/src/plugins/coreplugin/statusbarmanager.h index 979df19ab9..1ca9c043c6 100644 --- a/src/plugins/coreplugin/statusbarmanager.h +++ b/src/plugins/coreplugin/statusbarmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef STATUSBARMANAGER_H -#define STATUSBARMANAGER_H +#pragma once #include "minisplitter.h" @@ -75,5 +74,3 @@ private: } // namespace Internal } // namespace Core - -#endif // STATUSBARMANAGER_H diff --git a/src/plugins/coreplugin/statusbarwidget.h b/src/plugins/coreplugin/statusbarwidget.h index 45ba8b70f5..a21fbe1300 100644 --- a/src/plugins/coreplugin/statusbarwidget.h +++ b/src/plugins/coreplugin/statusbarwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef STATUSBARWIDGET_H -#define STATUSBARWIDGET_H +#pragma once #include "core_global.h" #include "icontext.h" @@ -49,5 +48,3 @@ private: }; } // namespace Core - -#endif // STATUSBARWIDGET_H diff --git a/src/plugins/coreplugin/styleanimator.h b/src/plugins/coreplugin/styleanimator.h index b4926a00ed..020c00edef 100644 --- a/src/plugins/coreplugin/styleanimator.h +++ b/src/plugins/coreplugin/styleanimator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef STYLEANIMATOR_H -#define STYLEANIMATOR_H +#pragma once #include <QPointer> #include <QTime> @@ -93,5 +92,3 @@ private: QBasicTimer animationTimer; QList <Animation*> animations; }; - -#endif // STYLEANIMATOR_H diff --git a/src/plugins/coreplugin/systemsettings.h b/src/plugins/coreplugin/systemsettings.h index 7645b29eb3..a4b99be557 100644 --- a/src/plugins/coreplugin/systemsettings.h +++ b/src/plugins/coreplugin/systemsettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SYSTEMSETTINGS_H -#define SYSTEMSETTINGS_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> #include <QPointer> @@ -63,5 +62,3 @@ private: } // namespace Internal } // namespace Core - -#endif // SYSTEMSETTINGS_H diff --git a/src/plugins/coreplugin/testdatadir.h b/src/plugins/coreplugin/testdatadir.h index 9e4d779e56..d60b0190d1 100644 --- a/src/plugins/coreplugin/testdatadir.h +++ b/src/plugins/coreplugin/testdatadir.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTDATADIR_H -#define TESTDATADIR_H +#pragma once #include "core_global.h" @@ -57,5 +56,3 @@ private: } // namespace Tests } // namespace Core - -#endif // TESTDATADIR_H diff --git a/src/plugins/coreplugin/textdocument.h b/src/plugins/coreplugin/textdocument.h index 42d38a5d15..1a2b27c356 100644 --- a/src/plugins/coreplugin/textdocument.h +++ b/src/plugins/coreplugin/textdocument.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CORE_TEXTDOCUMENT_H -#define CORE_TEXTDOCUMENT_H +#pragma once #include "idocument.h" @@ -64,5 +63,3 @@ private: }; } // namespace Core - -#endif // CORE_TEXTDOCUMENT_H diff --git a/src/plugins/coreplugin/themechooser.h b/src/plugins/coreplugin/themechooser.h index 58186f116d..e95c480269 100644 --- a/src/plugins/coreplugin/themechooser.h +++ b/src/plugins/coreplugin/themechooser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef THEMECHOOSER_H -#define THEMECHOOSER_H +#pragma once #include "id.h" @@ -70,5 +69,3 @@ private: } // namespace Internal } // namespace Core - -#endif // THEMESETTINGS_H diff --git a/src/plugins/coreplugin/toolsettings.h b/src/plugins/coreplugin/toolsettings.h index c8ed371571..8ce3a8d8ba 100644 --- a/src/plugins/coreplugin/toolsettings.h +++ b/src/plugins/coreplugin/toolsettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TOOLSETTINGS_H -#define TOOLSETTINGS_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> @@ -52,5 +51,3 @@ private: } // namespace Internal } // namespace Core - -#endif // TOOLSETTINGS_H diff --git a/src/plugins/coreplugin/variablechooser.h b/src/plugins/coreplugin/variablechooser.h index cdc4f1be1c..00f79defeb 100644 --- a/src/plugins/coreplugin/variablechooser.h +++ b/src/plugins/coreplugin/variablechooser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef VARIABLECHOOSER_H -#define VARIABLECHOOSER_H +#pragma once #include "core_global.h" @@ -59,5 +58,3 @@ private: }; } // namespace Core - -#endif // VARIABLECHOOSER_H diff --git a/src/plugins/coreplugin/vcsmanager.h b/src/plugins/coreplugin/vcsmanager.h index 51e559b4f9..71e3adeaf8 100644 --- a/src/plugins/coreplugin/vcsmanager.h +++ b/src/plugins/coreplugin/vcsmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef VCSMANAGER_H -#define VCSMANAGER_H +#pragma once #include "core_global.h" @@ -110,5 +109,3 @@ private: }; } // namespace Core - -#endif // VCSMANAGER_H diff --git a/src/plugins/coreplugin/versiondialog.h b/src/plugins/coreplugin/versiondialog.h index bbb39fc1bd..52efab01fe 100644 --- a/src/plugins/coreplugin/versiondialog.h +++ b/src/plugins/coreplugin/versiondialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef VERSIONDIALOG_H -#define VERSIONDIALOG_H +#pragma once #include <QDialog> @@ -47,5 +46,3 @@ public: } // namespace Internal } // namespace Core - -#endif // VERSIONDIALOG_H diff --git a/src/plugins/coreplugin/windowsupport.h b/src/plugins/coreplugin/windowsupport.h index a39a5707c2..6dc13914bf 100644 --- a/src/plugins/coreplugin/windowsupport.h +++ b/src/plugins/coreplugin/windowsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINDOWSUPPORT_H -#define WINDOWSUPPORT_H +#pragma once #include "icontext.h" @@ -84,5 +83,3 @@ private: } // Internal } // Core - -#endif // WINDOWSUPPORT_H diff --git a/src/plugins/cpaster/frontend/argumentscollector.h b/src/plugins/cpaster/frontend/argumentscollector.h index 6fc5d1fefb..d3d94c8b75 100644 --- a/src/plugins/cpaster/frontend/argumentscollector.h +++ b/src/plugins/cpaster/frontend/argumentscollector.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ARGUMENTSCOLLECTOR_H -#define ARGUMENTSCOLLECTOR_H +#pragma once #include <QStringList> @@ -56,5 +55,3 @@ private: QString m_protocol; QString m_errorString; }; - -#endif // ARGUMENTSCOLLECTOR_H diff --git a/src/plugins/cppeditor/cppautocompleter.h b/src/plugins/cppeditor/cppautocompleter.h index 9df35f1330..d58acda608 100644 --- a/src/plugins/cppeditor/cppautocompleter.h +++ b/src/plugins/cppeditor/cppautocompleter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPAUTOCOMPLETER_H -#define CPPAUTOCOMPLETER_H +#pragma once #include <texteditor/autocompleter.h> @@ -50,5 +49,3 @@ public: } // Internal } // CppEditor - -#endif // CPPAUTOCOMPLETER_H diff --git a/src/plugins/cppeditor/cppcanonicalsymbol.h b/src/plugins/cppeditor/cppcanonicalsymbol.h index aca83a387a..293859e9a5 100644 --- a/src/plugins/cppeditor/cppcanonicalsymbol.h +++ b/src/plugins/cppeditor/cppcanonicalsymbol.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPCANONICALSYMBOL_H -#define CPPCANONICALSYMBOL_H +#pragma once #include <cplusplus/LookupContext.h> #include <cplusplus/Symbol.h> @@ -61,5 +60,3 @@ private: } // namespace Internal } // namespace CppEditor - -#endif // CPPCANONICALSYMBOL_H diff --git a/src/plugins/cppeditor/cppcodemodelinspectordialog.h b/src/plugins/cppeditor/cppcodemodelinspectordialog.h index bbb8d35810..ca17d960ba 100644 --- a/src/plugins/cppeditor/cppcodemodelinspectordialog.h +++ b/src/plugins/cppeditor/cppcodemodelinspectordialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPCODEMODELINSPECTORDIALOG_H -#define CPPCODEMODELINSPECTORDIALOG_H +#pragma once #include <cpptools/cppmodelmanager.h> @@ -121,5 +120,3 @@ private: } // namespace Internal } // namespace CppEditor - -#endif // CPPCODEMODELINSPECTORDIALOG_H diff --git a/src/plugins/cppeditor/cppdocumentationcommenthelper.h b/src/plugins/cppeditor/cppdocumentationcommenthelper.h index f384968965..af864b1bfc 100644 --- a/src/plugins/cppeditor/cppdocumentationcommenthelper.h +++ b/src/plugins/cppeditor/cppdocumentationcommenthelper.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPDOCUMENTATIONCOMMENTHELPER_H -#define CPPDOCUMENTATIONCOMMENTHELPER_H +#pragma once #include "cppeditor_global.h" @@ -39,5 +38,3 @@ bool trySplitComment(TextEditor::TextEditorWidget *editorWidget, } // namespace Internal } // namespace CppEditor - -#endif // CPPDOCUMENTATIONCOMMENTHELPER_H diff --git a/src/plugins/cppeditor/cppdoxygen_test.h b/src/plugins/cppeditor/cppdoxygen_test.h index 68f6b2509a..99af70ce0f 100644 --- a/src/plugins/cppeditor/cppdoxygen_test.h +++ b/src/plugins/cppeditor/cppdoxygen_test.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPDOXYGEN_TEST_H -#define CPPDOXYGEN_TEST_H +#pragma once #include "cppeditortestcase.h" @@ -68,5 +67,3 @@ private: } // namespace Tests } // namespace Internal } // namespace CppEditor - -#endif // CPPDOXYGEN_TEST_H diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h index 8b74d74d40..8317ebfd91 100644 --- a/src/plugins/cppeditor/cppeditor.h +++ b/src/plugins/cppeditor/cppeditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPEDITOR_H -#define CPPEDITOR_H +#pragma once #include "cppfunctiondecldeflink.h" @@ -145,5 +144,3 @@ private: } // namespace Internal } // namespace CppEditor - -#endif // CPPEDITOR_H diff --git a/src/plugins/cppeditor/cppeditor_global.h b/src/plugins/cppeditor/cppeditor_global.h index 4491614d7c..df1a19f39e 100644 --- a/src/plugins/cppeditor/cppeditor_global.h +++ b/src/plugins/cppeditor/cppeditor_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPEDITOR_GLOBAL_H -#define CPPEDITOR_GLOBAL_H +#pragma once #include <qglobal.h> @@ -33,5 +32,3 @@ #else # define CPPEDITOR_EXPORT Q_DECL_IMPORT #endif - -#endif // CPPEDITOR_GLOBAL_H diff --git a/src/plugins/cppeditor/cppeditorconstants.h b/src/plugins/cppeditor/cppeditorconstants.h index 417a637351..1d72be7a7a 100644 --- a/src/plugins/cppeditor/cppeditorconstants.h +++ b/src/plugins/cppeditor/cppeditorconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPEDITORCONSTANTS_H -#define CPPEDITORCONSTANTS_H +#pragma once namespace CppEditor { namespace Constants { @@ -53,5 +52,3 @@ const char CPP_PREPROCESSOR_PROJECT_PREFIX[] = "CppPreprocessorProject-"; } // namespace Constants } // namespace CppEditor - -#endif // CPPEDITORCONSTANTS_H diff --git a/src/plugins/cppeditor/cppeditordocument.h b/src/plugins/cppeditor/cppeditordocument.h index c932aa1389..61185f9738 100644 --- a/src/plugins/cppeditor/cppeditordocument.h +++ b/src/plugins/cppeditor/cppeditordocument.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPEDITORDOCUMENT_H -#define CPPEDITORDOCUMENT_H +#pragma once #include <cpptools/baseeditordocumentprocessor.h> #include <cpptools/cppcompletionassistprovider.h> @@ -119,5 +118,3 @@ private: } // namespace Internal } // namespace CppEditor - -#endif // CPPEDITORDOCUMENT_H diff --git a/src/plugins/cppeditor/cppeditorenums.h b/src/plugins/cppeditor/cppeditorenums.h index 6437f38fc8..909073c3ee 100644 --- a/src/plugins/cppeditor/cppeditorenums.h +++ b/src/plugins/cppeditor/cppeditorenums.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPEDITORENUMS_H -#define CPPEDITORENUMS_H +#pragma once namespace CppEditor { namespace Internal { @@ -52,5 +51,3 @@ enum CppFormats { } // namespace Internal } // namespace CppEditor - -#endif // CPPEDITORENUMS_H diff --git a/src/plugins/cppeditor/cppeditorplugin.h b/src/plugins/cppeditor/cppeditorplugin.h index 7c36b2ee7c..935de13e33 100644 --- a/src/plugins/cppeditor/cppeditorplugin.h +++ b/src/plugins/cppeditor/cppeditorplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPEDITORPLUGIN_H -#define CPPEDITORPLUGIN_H +#pragma once #include <coreplugin/editormanager/ieditorfactory.h> @@ -252,5 +251,3 @@ private: } // namespace Internal } // namespace CppEditor - -#endif // CPPEDITORPLUGIN_H diff --git a/src/plugins/cppeditor/cppeditortestcase.h b/src/plugins/cppeditor/cppeditortestcase.h index 4b4239c295..dafca4ec14 100644 --- a/src/plugins/cppeditor/cppeditortestcase.h +++ b/src/plugins/cppeditor/cppeditortestcase.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPEDITORTESTCASE_H -#define CPPEDITORTESTCASE_H +#pragma once #include "cppeditor.h" @@ -76,5 +75,3 @@ public: } // namespace Tests } // namespace Internal } // namespace CppEditor - -#endif // CPPEDITORTESTCASE_H diff --git a/src/plugins/cppeditor/cppelementevaluator.h b/src/plugins/cppeditor/cppelementevaluator.h index a528148350..ffc6bd760a 100644 --- a/src/plugins/cppeditor/cppelementevaluator.h +++ b/src/plugins/cppeditor/cppelementevaluator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPELEMENTEVALUATOR_H -#define CPPELEMENTEVALUATOR_H +#pragma once #include <texteditor/texteditor.h> #include <texteditor/helpitem.h> @@ -193,5 +192,3 @@ public: } // namespace Internal } // namespace CppEditor - -#endif // CPPELEMENTEVALUATOR_H diff --git a/src/plugins/cppeditor/cppfollowsymbolundercursor.h b/src/plugins/cppeditor/cppfollowsymbolundercursor.h index bedea8f4d9..3121fe00e8 100644 --- a/src/plugins/cppeditor/cppfollowsymbolundercursor.h +++ b/src/plugins/cppeditor/cppfollowsymbolundercursor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPFOLLOWSYMBOLUNDERCURSOR_H -#define CPPFOLLOWSYMBOLUNDERCURSOR_H +#pragma once #include <cplusplus/CppDocument.h> #include <texteditor/texteditor.h> @@ -64,5 +63,3 @@ private: } // namespace Internal } // namespace CppEditor - -#endif // CPPFOLLOWSYMBOLUNDERCURSOR_H diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.h b/src/plugins/cppeditor/cppfunctiondecldeflink.h index ec866c551f..03c1992271 100644 --- a/src/plugins/cppeditor/cppfunctiondecldeflink.h +++ b/src/plugins/cppeditor/cppfunctiondecldeflink.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPFUNCTIONDECLDEFLINK_H -#define CPPFUNCTIONDECLDEFLINK_H +#pragma once #include "cppquickfix.h" @@ -118,5 +117,3 @@ private: } // namespace CppEditor Q_DECLARE_METATYPE(CppEditor::Internal::FunctionDeclDefLink::Marker) - -#endif // CPPFUNCTIONDECLDEFLINK_H diff --git a/src/plugins/cppeditor/cpphighlighter.h b/src/plugins/cppeditor/cpphighlighter.h index b7da0c14be..fd9ba578a5 100644 --- a/src/plugins/cppeditor/cpphighlighter.h +++ b/src/plugins/cppeditor/cpphighlighter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPHIGHLIGHTER_H -#define CPPHIGHLIGHTER_H +#pragma once #include <texteditor/syntaxhighlighter.h> @@ -58,5 +57,3 @@ private: } // namespace Internal } // namespace CppEditor - -#endif // CPPHIGHLIGHTER_H diff --git a/src/plugins/cppeditor/cpphoverhandler.h b/src/plugins/cppeditor/cpphoverhandler.h index 7562f42e25..accc275152 100644 --- a/src/plugins/cppeditor/cpphoverhandler.h +++ b/src/plugins/cppeditor/cpphoverhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPHOVERHANDLER_H -#define CPPHOVERHANDLER_H +#pragma once #include <texteditor/basehoverhandler.h> @@ -44,5 +43,3 @@ private: } // namespace Internal } // namespace CppEditor - -#endif // CPPHOVERHANDLER_H diff --git a/src/plugins/cppeditor/cppincludehierarchy.h b/src/plugins/cppeditor/cppincludehierarchy.h index ba50706033..9ae1efdaf8 100644 --- a/src/plugins/cppeditor/cppincludehierarchy.h +++ b/src/plugins/cppeditor/cppincludehierarchy.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPINCLUDEHIERARCHY_H -#define CPPINCLUDEHIERARCHY_H +#pragma once #include <coreplugin/inavigationwidgetfactory.h> @@ -111,5 +110,3 @@ public: } // namespace Internal } // namespace CppEditor - -#endif // CPPINCLUDEHIERARCHY_H diff --git a/src/plugins/cppeditor/cppincludehierarchyitem.h b/src/plugins/cppeditor/cppincludehierarchyitem.h index 8723be14b2..f7cd897dab 100644 --- a/src/plugins/cppeditor/cppincludehierarchyitem.h +++ b/src/plugins/cppeditor/cppincludehierarchyitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPINCLUDEHIERARCHYITEM_H -#define CPPINCLUDEHIERARCHYITEM_H +#pragma once #include <QList> #include <QString> @@ -67,5 +66,3 @@ private: } // namespace Internal } // namespace CppEditor - -#endif // CPPINCLUDEHIERARCHYITEM_H diff --git a/src/plugins/cppeditor/cppincludehierarchymodel.h b/src/plugins/cppeditor/cppincludehierarchymodel.h index 35f96ac7b3..2bc80bcb12 100644 --- a/src/plugins/cppeditor/cppincludehierarchymodel.h +++ b/src/plugins/cppeditor/cppincludehierarchymodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPINCLUDEHIERARCHYMODEL_H -#define CPPINCLUDEHIERARCHYMODEL_H +#pragma once #include <QAbstractItemModel> @@ -89,5 +88,3 @@ private: } // namespace Internal } // namespace CppEditor - -#endif // CPPINCLUDEHIERARCHYMODEL_H diff --git a/src/plugins/cppeditor/cppincludehierarchytreeview.h b/src/plugins/cppeditor/cppincludehierarchytreeview.h index 06b53708cf..083b6f1614 100644 --- a/src/plugins/cppeditor/cppincludehierarchytreeview.h +++ b/src/plugins/cppeditor/cppincludehierarchytreeview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPINCLUDEHIERARCHYTREEVIEW_H -#define CPPINCLUDEHIERARCHYTREEVIEW_H +#pragma once #include <utils/navigationtreeview.h> @@ -41,5 +40,3 @@ protected: } // namespace Internal } // namespace CppEditor - -#endif // CPPINCLUDEHIERARCHYTREEVIEW_H diff --git a/src/plugins/cppeditor/cppinsertvirtualmethods.h b/src/plugins/cppeditor/cppinsertvirtualmethods.h index ea5d2ee1fb..cc48fede93 100644 --- a/src/plugins/cppeditor/cppinsertvirtualmethods.h +++ b/src/plugins/cppeditor/cppinsertvirtualmethods.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INSERTVIRTUALMETHODS_H -#define INSERTVIRTUALMETHODS_H +#pragma once #include "cppquickfix.h" @@ -50,5 +49,3 @@ private: } // namespace Internal } // namespace CppEditor - -#endif // INSERTVIRTUALMETHODS_H diff --git a/src/plugins/cppeditor/cppoutline.h b/src/plugins/cppeditor/cppoutline.h index 573d559bb5..fdc8671639 100644 --- a/src/plugins/cppeditor/cppoutline.h +++ b/src/plugins/cppeditor/cppoutline.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPOUTLINE_H -#define CPPOUTLINE_H +#pragma once #include "cppeditor.h" @@ -100,5 +99,3 @@ public: } // namespace Internal } // namespace CppEditor - -#endif // CPPOUTLINE_H diff --git a/src/plugins/cppeditor/cpppreprocessordialog.h b/src/plugins/cppeditor/cpppreprocessordialog.h index 470a2ad93a..bce7f4e343 100644 --- a/src/plugins/cppeditor/cpppreprocessordialog.h +++ b/src/plugins/cppeditor/cpppreprocessordialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPPREPROCESSORDIALOG_H -#define CPPPREPROCESSORDIALOG_H +#pragma once #include <cpptools/cppmodelmanager.h> @@ -65,5 +64,3 @@ private: } // namespace Internal } // namespace CppEditor - -#endif // CPPPREPROCESSORDIALOG_H diff --git a/src/plugins/cppeditor/cppquickfix.h b/src/plugins/cppeditor/cppquickfix.h index 38b5fe3468..02c63534c7 100644 --- a/src/plugins/cppeditor/cppquickfix.h +++ b/src/plugins/cppeditor/cppquickfix.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPQUICKFIX_H -#define CPPQUICKFIX_H +#pragma once #include "cppeditor_global.h" #include "cppquickfixassistant.h" @@ -64,5 +63,3 @@ public: }; } // namespace CppEditor - -#endif // CPPQUICKFIX_H diff --git a/src/plugins/cppeditor/cppquickfixassistant.h b/src/plugins/cppeditor/cppquickfixassistant.h index 8da6b1da6a..96c259aab4 100644 --- a/src/plugins/cppeditor/cppquickfixassistant.h +++ b/src/plugins/cppeditor/cppquickfixassistant.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPQUICKFIXASSISTANT_H -#define CPPQUICKFIXASSISTANT_H +#pragma once #include <cpptools/cppsemanticinfo.h> #include <texteditor/codeassist/assistinterface.h> @@ -81,5 +80,3 @@ public: } // Internal } // CppEditor - -#endif // CPPQUICKFIXASSISTANT_H diff --git a/src/plugins/cppeditor/cppquickfixes.h b/src/plugins/cppeditor/cppquickfixes.h index eb99e732a4..55e3a4e80c 100644 --- a/src/plugins/cppeditor/cppquickfixes.h +++ b/src/plugins/cppeditor/cppquickfixes.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPQUICKFIXES_H -#define CPPQUICKFIXES_H +#pragma once #include "cppeditor_global.h" #include "cppquickfix.h" @@ -567,5 +566,3 @@ public: } // namespace Internal } // namespace CppEditor - -#endif // CPPQUICKFIXES_H diff --git a/src/plugins/cppeditor/cppsnippetprovider.h b/src/plugins/cppeditor/cppsnippetprovider.h index 361413181d..fd6d3b26bb 100644 --- a/src/plugins/cppeditor/cppsnippetprovider.h +++ b/src/plugins/cppeditor/cppsnippetprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPSNIPPETPROVIDER_H -#define CPPSNIPPETPROVIDER_H +#pragma once #include <texteditor/snippets/isnippetprovider.h> @@ -45,5 +44,3 @@ public: } // Internal } // CppEditor - -#endif // CPPSNIPPETPROVIDER_H diff --git a/src/plugins/cppeditor/cpptypehierarchy.h b/src/plugins/cppeditor/cpptypehierarchy.h index a9d4ac0626..861a7875b3 100644 --- a/src/plugins/cppeditor/cpptypehierarchy.h +++ b/src/plugins/cppeditor/cpptypehierarchy.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTYPEHIERARCHY_H -#define CPPTYPEHIERARCHY_H +#pragma once #include <coreplugin/inavigationwidgetfactory.h> @@ -111,5 +110,3 @@ public: } // namespace Internal } // namespace CppEditor - -#endif // CPPTYPEHIERARCHY_H diff --git a/src/plugins/cppeditor/cppuseselectionsupdater.h b/src/plugins/cppeditor/cppuseselectionsupdater.h index d1bc479dc9..00f173c194 100644 --- a/src/plugins/cppeditor/cppuseselectionsupdater.h +++ b/src/plugins/cppeditor/cppuseselectionsupdater.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPUSESELECTIONSUPDATER_H -#define CPPUSESELECTIONSUPDATER_H +#pragma once #include <cpptools/cppsemanticinfo.h> #include <texteditor/texteditorconstants.h> @@ -114,5 +113,3 @@ private: } // namespace Internal } // namespace CppEditor - -#endif // CPPUSESELECTIONSUPDATER_H diff --git a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.h b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.h index 11c67de2a4..5a930530b5 100644 --- a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.h +++ b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPFOLLOWVIRTUALSYMBOLS_H -#define CPPFOLLOWVIRTUALSYMBOLS_H +#pragma once #include <texteditor/codeassist/iassistprovider.h> @@ -68,5 +67,3 @@ private: } // namespace Internal } // namespace CppEditor - -#endif // CPPFOLLOWVIRTUALSYMBOLS_H diff --git a/src/plugins/cppeditor/cppvirtualfunctionproposalitem.h b/src/plugins/cppeditor/cppvirtualfunctionproposalitem.h index 5a28e1f902..5d86d4b390 100644 --- a/src/plugins/cppeditor/cppvirtualfunctionproposalitem.h +++ b/src/plugins/cppeditor/cppvirtualfunctionproposalitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPVIRTUALFUNCTIONPROPOSALITEM_H -#define CPPVIRTUALFUNCTIONPROPOSALITEM_H +#pragma once #include <texteditor/texteditor.h> #include <texteditor/codeassist/assistproposalitem.h> @@ -49,5 +48,3 @@ private: } // namespace Internal } // namespace CppEditor - -#endif // CPPVIRTUALFUNCTIONPROPOSALITEM_H diff --git a/src/plugins/cpptools/abstracteditorsupport.h b/src/plugins/cpptools/abstracteditorsupport.h index 7db8c69f99..0aacf3a4d2 100644 --- a/src/plugins/cpptools/abstracteditorsupport.h +++ b/src/plugins/cpptools/abstracteditorsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ABSTRACTEDITORSUPPORT_H -#define ABSTRACTEDITORSUPPORT_H +#pragma once #include "cpptools_global.h" @@ -57,5 +56,3 @@ private: }; } // namespace CppTools - -#endif // ABSTRACTEDITORSUPPORT_H diff --git a/src/plugins/cpptools/baseeditordocumentparser.h b/src/plugins/cpptools/baseeditordocumentparser.h index 82d2532326..3822394c61 100644 --- a/src/plugins/cpptools/baseeditordocumentparser.h +++ b/src/plugins/cpptools/baseeditordocumentparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BASEEDITORDOCUMENTPARSER_H -#define BASEEDITORDOCUMENTPARSER_H +#pragma once #include "cpptools_global.h" #include "cppworkingcopy.h" @@ -86,5 +85,3 @@ private: }; } // namespace CppTools - -#endif // BASEEDITORDOCUMENTPARSER_H diff --git a/src/plugins/cpptools/baseeditordocumentprocessor.h b/src/plugins/cpptools/baseeditordocumentprocessor.h index 5f8e9a7353..844cadc64c 100644 --- a/src/plugins/cpptools/baseeditordocumentprocessor.h +++ b/src/plugins/cpptools/baseeditordocumentprocessor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BASEEDITORDOCUMENTPROCESSOR_H -#define BASEEDITORDOCUMENTPROCESSOR_H +#pragma once #include "baseeditordocumentparser.h" #include "cppsemanticinfo.h" @@ -99,6 +98,3 @@ private: }; } // namespace CppTools - -#endif // BASEEDITORDOCUMENTPROCESSOR_H - diff --git a/src/plugins/cpptools/builtineditordocumentparser.h b/src/plugins/cpptools/builtineditordocumentparser.h index e86939ab53..c2eb4c86ee 100644 --- a/src/plugins/cpptools/builtineditordocumentparser.h +++ b/src/plugins/cpptools/builtineditordocumentparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BUILTINEDITORDOCUMENTPARSER_H -#define BUILTINEDITORDOCUMENTPARSER_H +#pragma once #include "baseeditordocumentparser.h" #include "cpptools_global.h" @@ -82,5 +81,3 @@ private: }; } // namespace CppTools - -#endif // BUILTINEDITORDOCUMENTPARSER_H diff --git a/src/plugins/cpptools/builtineditordocumentprocessor.h b/src/plugins/cpptools/builtineditordocumentprocessor.h index e971655101..2efd6af078 100644 --- a/src/plugins/cpptools/builtineditordocumentprocessor.h +++ b/src/plugins/cpptools/builtineditordocumentprocessor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BUILTINEDITORDOCUMENTPROCESSOR_H -#define BUILTINEDITORDOCUMENTPROCESSOR_H +#pragma once #include "baseeditordocumentprocessor.h" #include "builtineditordocumentparser.h" @@ -73,5 +72,3 @@ private: }; } // namespace CppTools - -#endif // BUILTINEDITORDOCUMENTPROCESSOR_H diff --git a/src/plugins/cpptools/builtinindexingsupport.h b/src/plugins/cpptools/builtinindexingsupport.h index d40948a14f..82414338ec 100644 --- a/src/plugins/cpptools/builtinindexingsupport.h +++ b/src/plugins/cpptools/builtinindexingsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BUILTININDEXINGSUPPORT_H -#define BUILTININDEXINGSUPPORT_H +#pragma once #include "cppindexingsupport.h" #include "cppmodelmanager.h" @@ -53,5 +52,3 @@ private: } // namespace Internal } // namespace CppTools - -#endif // BUILTININDEXINGSUPPORT_H diff --git a/src/plugins/cpptools/commentssettings.h b/src/plugins/cpptools/commentssettings.h index d0d3d5da29..f5ba5f0f09 100644 --- a/src/plugins/cpptools/commentssettings.h +++ b/src/plugins/cpptools/commentssettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMMENTSSETTINGS_H -#define COMMENTSSETTINGS_H +#pragma once #include "cpptools_global.h" @@ -56,5 +55,3 @@ inline bool operator!=(const CommentsSettings &a, const CommentsSettings &b) { return !(a == b); } } // namespace CppTools - -#endif // COMMENTSSETTINGS_H diff --git a/src/plugins/cpptools/compileroptionsbuilder.h b/src/plugins/cpptools/compileroptionsbuilder.h index f3e4cbd9df..e83d15f2c1 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.h +++ b/src/plugins/cpptools/compileroptionsbuilder.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLS_COMPILEROPTIONSBUILDER_H -#define CPPTOOLS_COMPILEROPTIONSBUILDER_H +#pragma once #include "cpptools_global.h" @@ -66,5 +65,3 @@ private: }; } // namespace CppTools - -#endif // CPPTOOLS_COMPILEROPTIONSBUILDER_H diff --git a/src/plugins/cpptools/completionsettingspage.h b/src/plugins/cpptools/completionsettingspage.h index f972ab5fa6..3cc1a3eb14 100644 --- a/src/plugins/cpptools/completionsettingspage.h +++ b/src/plugins/cpptools/completionsettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMPLETIONSETTINGSPAGE_H -#define COMPLETIONSETTINGSPAGE_H +#pragma once #include "commentssettings.h" @@ -67,5 +66,3 @@ private: } // namespace Internal } // namespace CppTools - -#endif // COMPLETIONSETTINGSPAGE_H diff --git a/src/plugins/cpptools/cppchecksymbols.h b/src/plugins/cpptools/cppchecksymbols.h index e91bab1f57..1cbd3f1030 100644 --- a/src/plugins/cpptools/cppchecksymbols.h +++ b/src/plugins/cpptools/cppchecksymbols.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUSCHECKSYMBOLS_H -#define CPLUSPLUSCHECKSYMBOLS_H +#pragma once #include "cpptools_global.h" #include "cppsemanticinfo.h" @@ -193,5 +192,3 @@ private: }; } // namespace CppTools - -#endif // CPLUSPLUSCHECKSYMBOLS_H diff --git a/src/plugins/cpptools/cppclassesfilter.h b/src/plugins/cpptools/cppclassesfilter.h index 2ae81cbc57..89d80df26b 100644 --- a/src/plugins/cpptools/cppclassesfilter.h +++ b/src/plugins/cpptools/cppclassesfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPCLASSESFILTER_H -#define CPPCLASSESFILTER_H +#pragma once #include "cpptools_global.h" #include "cpplocatorfilter.h" @@ -48,5 +47,3 @@ protected: }; } // namespace CppTools - -#endif // CPPCLASSESFILTER_H diff --git a/src/plugins/cpptools/cppcodeformatter.h b/src/plugins/cpptools/cppcodeformatter.h index e686deb8b6..f6e2e7e17c 100644 --- a/src/plugins/cpptools/cppcodeformatter.h +++ b/src/plugins/cpptools/cppcodeformatter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPCODEFORMATTER_H -#define CPPCODEFORMATTER_H +#pragma once #include "cpptools_global.h" #include "cppcodestylesettings.h" @@ -288,5 +287,3 @@ private: }; } // namespace CppTools - -#endif // CPPCODEFORMATTER_H diff --git a/src/plugins/cpptools/cppcodemodelinspectordumper.h b/src/plugins/cpptools/cppcodemodelinspectordumper.h index 01b836b75e..c548b92bc4 100644 --- a/src/plugins/cpptools/cppcodemodelinspectordumper.h +++ b/src/plugins/cpptools/cppcodemodelinspectordumper.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPCODEMODELINSPECTORDUMPER_H -#define CPPCODEMODELINSPECTORDUMPER_H +#pragma once #include "cpptools_global.h" @@ -88,5 +87,3 @@ private: } // namespace CppCodeModelInspector } // namespace CppTools - -#endif // CPPCODEMODELINSPECTORDUMPER_H diff --git a/src/plugins/cpptools/cppcodemodelsettings.h b/src/plugins/cpptools/cppcodemodelsettings.h index 81dab011af..92a212f8a8 100644 --- a/src/plugins/cpptools/cppcodemodelsettings.h +++ b/src/plugins/cpptools/cppcodemodelsettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLS_CPPCODEMODELSETTINGS_H -#define CPPTOOLS_CPPCODEMODELSETTINGS_H +#pragma once #include "cpptools_global.h" @@ -78,5 +77,3 @@ private: }; } // namespace CppTools - -#endif // CPPTOOLS_CPPCODEMODELSETTINGS_H diff --git a/src/plugins/cpptools/cppcodemodelsettingspage.h b/src/plugins/cpptools/cppcodemodelsettingspage.h index 29fbb77069..6641c7898c 100644 --- a/src/plugins/cpptools/cppcodemodelsettingspage.h +++ b/src/plugins/cpptools/cppcodemodelsettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLS_INTERNAL_CPPCODEMODELSETTINGSPAGE_H -#define CPPTOOLS_INTERNAL_CPPCODEMODELSETTINGSPAGE_H +#pragma once #include "cppcodemodelsettings.h" @@ -85,5 +84,3 @@ private: } // Internal namespace } // CppTools namespace - -#endif // CPPTOOLS_INTERNAL_CPPCODEMODELSETTINGSPAGE_H diff --git a/src/plugins/cpptools/cppcodestylepreferences.h b/src/plugins/cpptools/cppcodestylepreferences.h index 2190c35b47..7317528a02 100644 --- a/src/plugins/cpptools/cppcodestylepreferences.h +++ b/src/plugins/cpptools/cppcodestylepreferences.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPCODESTYLEPREFERENCES_H -#define CPPCODESTYLEPREFERENCES_H +#pragma once #include "cpptools_global.h" #include "cppcodestylesettings.h" @@ -69,5 +68,3 @@ private: }; } // namespace CppTools - -#endif // CPPCODESTYLEPREFERENCES_H diff --git a/src/plugins/cpptools/cppcodestylepreferencesfactory.h b/src/plugins/cpptools/cppcodestylepreferencesfactory.h index bcd3d46928..05f28ede6e 100644 --- a/src/plugins/cpptools/cppcodestylepreferencesfactory.h +++ b/src/plugins/cpptools/cppcodestylepreferencesfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPCODESTYLEPREFERENCESFACTORY_H -#define CPPCODESTYLEPREFERENCESFACTORY_H +#pragma once #include <texteditor/icodestylepreferencesfactory.h> @@ -46,5 +45,3 @@ public: }; } // namespace CppTools - -#endif // CPPCODESTYLEPREFERENCESFACTORY_H diff --git a/src/plugins/cpptools/cppcodestylesettings.h b/src/plugins/cpptools/cppcodestylesettings.h index 0646010cf5..60dcc2fbf6 100644 --- a/src/plugins/cpptools/cppcodestylesettings.h +++ b/src/plugins/cpptools/cppcodestylesettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPCODESTYLESETTINGS_H -#define CPPCODESTYLESETTINGS_H +#pragma once #include "cpptools_global.h" @@ -110,5 +109,3 @@ public: } // namespace CppTools Q_DECLARE_METATYPE(CppTools::CppCodeStyleSettings) - -#endif // CPPCODESTYLESETTINGS_H diff --git a/src/plugins/cpptools/cppcodestylesettingspage.h b/src/plugins/cpptools/cppcodestylesettingspage.h index 63e3ed4aca..c9ae76e1cd 100644 --- a/src/plugins/cpptools/cppcodestylesettingspage.h +++ b/src/plugins/cpptools/cppcodestylesettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPCODESTYLESETTINGSPAGE_H -#define CPPCODESTYLESETTINGSPAGE_H +#pragma once #include "cpptools_global.h" #include "cppcodestylesettings.h" @@ -98,5 +97,3 @@ private: } // namespace Internal } // namespace CppTools - -#endif // CPPCODESTYLESETTINGSPAGE_H diff --git a/src/plugins/cpptools/cppcompletionassist.h b/src/plugins/cpptools/cppcompletionassist.h index 738840cd15..14a9e9190c 100644 --- a/src/plugins/cpptools/cppcompletionassist.h +++ b/src/plugins/cpptools/cppcompletionassist.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPCOMPLETIONASSIST_H -#define CPPCOMPLETIONASSIST_H +#pragma once #include "builtineditordocumentparser.h" #include "cppcompletionassistprocessor.h" @@ -214,5 +213,3 @@ private: } // CppTools Q_DECLARE_METATYPE(CPlusPlus::Symbol *) - -#endif // CPPCOMPLETIONASSIST_H diff --git a/src/plugins/cpptools/cppcompletionassistprocessor.h b/src/plugins/cpptools/cppcompletionassistprocessor.h index 862d77f53f..49634539ce 100644 --- a/src/plugins/cpptools/cppcompletionassistprocessor.h +++ b/src/plugins/cpptools/cppcompletionassistprocessor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPCOMPLETIONASSISTPROCESSOR_H -#define CPPCOMPLETIONASSISTPROCESSOR_H +#pragma once #include "cpptools_global.h" @@ -54,5 +53,3 @@ private: }; } // namespace CppTools - -#endif // CPPCOMPLETIONASSISTPROCESSOR_H diff --git a/src/plugins/cpptools/cppcompletionassistprovider.h b/src/plugins/cpptools/cppcompletionassistprovider.h index 975f880c61..16382581c7 100644 --- a/src/plugins/cpptools/cppcompletionassistprovider.h +++ b/src/plugins/cpptools/cppcompletionassistprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLS_CPPCOMPLETIONASSISTPROVIDER_H -#define CPPTOOLS_CPPCOMPLETIONASSISTPROVIDER_H +#pragma once #include "cpptools_global.h" @@ -67,5 +66,3 @@ public: }; } // namespace CppTools - -#endif // CPPTOOLS_CPPCOMPLETIONASSISTPROVIDER_H diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.h b/src/plugins/cpptools/cppcurrentdocumentfilter.h index 3b664ac650..3e30f6ddab 100644 --- a/src/plugins/cpptools/cppcurrentdocumentfilter.h +++ b/src/plugins/cpptools/cppcurrentdocumentfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPCURRENTDOCUMENTFILTER_H -#define CPPCURRENTDOCUMENTFILTER_H +#pragma once #include "searchsymbols.h" @@ -69,5 +68,3 @@ private: } // namespace Internal } // namespace CppTools - -#endif // CPPCURRENTDOCUMENTFILTER_H diff --git a/src/plugins/cpptools/cppdoxygen.h b/src/plugins/cpptools/cppdoxygen.h index 29c258a3d1..2eb8b001f1 100644 --- a/src/plugins/cpptools/cppdoxygen.h +++ b/src/plugins/cpptools/cppdoxygen.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPDOXYGEN_H -#define CPPDOXYGEN_H +#pragma once #include "cpptools_global.h" @@ -258,5 +257,3 @@ CPPTOOLS_EXPORT int classifyDoxygenTag(const QChar *s, int n); CPPTOOLS_EXPORT const char *doxygenTagSpell(int index); } // namespace ::CppTools - -#endif // CPPDOXYGEN_H diff --git a/src/plugins/cpptools/cppeditoroutline.h b/src/plugins/cpptools/cppeditoroutline.h index 9c561eec82..361b2fe25a 100644 --- a/src/plugins/cpptools/cppeditoroutline.h +++ b/src/plugins/cpptools/cppeditoroutline.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPEDITOROUTLINE_H -#define CPPEDITOROUTLINE_H +#pragma once #include "cpptools_global.h" @@ -90,5 +89,3 @@ private: }; } // namespace CppTools - -#endif // CPPEDITOROUTLINE_H diff --git a/src/plugins/cpptools/cppfileiterationorder.h b/src/plugins/cpptools/cppfileiterationorder.h index 3db83e749f..3df02ee22b 100644 --- a/src/plugins/cpptools/cppfileiterationorder.h +++ b/src/plugins/cpptools/cppfileiterationorder.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FILEITERATIONORDER_H -#define FILEITERATIONORDER_H +#pragma once #include "cpptools_global.h" @@ -75,5 +74,3 @@ CPPTOOLS_EXPORT bool operator<(const FileIterationOrder::Entry &first, const FileIterationOrder::Entry &second); } // namespace CppTools - -#endif // FILEITERATIONORDER_H diff --git a/src/plugins/cpptools/cppfilesettingspage.h b/src/plugins/cpptools/cppfilesettingspage.h index 24f5b368ec..4731adc7c9 100644 --- a/src/plugins/cpptools/cppfilesettingspage.h +++ b/src/plugins/cpptools/cppfilesettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPFILESETTINGSPAGE_H -#define CPPFILESETTINGSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> @@ -103,5 +102,3 @@ private: } // namespace Internal } // namespace CppTools - -#endif // CPPFILESETTINGSPAGE_H diff --git a/src/plugins/cpptools/cppfindreferences.h b/src/plugins/cpptools/cppfindreferences.h index 233e1bff4d..c747e502dd 100644 --- a/src/plugins/cpptools/cppfindreferences.h +++ b/src/plugins/cpptools/cppfindreferences.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPFINDREFERENCES_H -#define CPPFINDREFERENCES_H +#pragma once #include <cplusplus/FindUsages.h> @@ -100,5 +99,3 @@ private: } // namespace CppTools Q_DECLARE_METATYPE(CppTools::Internal::CppFindReferencesParameters) - -#endif // CPPFINDREFERENCES_H diff --git a/src/plugins/cpptools/cppfunctionsfilter.h b/src/plugins/cpptools/cppfunctionsfilter.h index 6976d4b35f..f052a7a2d2 100644 --- a/src/plugins/cpptools/cppfunctionsfilter.h +++ b/src/plugins/cpptools/cppfunctionsfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPFUNCTIONSFILTER_H -#define CPPFUNCTIONSFILTER_H +#pragma once #include "cpplocatordata.h" #include "cpplocatorfilter.h" @@ -48,5 +47,3 @@ protected: } // namespace Internal } // namespace CppTools - -#endif // CPPFUNCTIONSFILTER_H diff --git a/src/plugins/cpptools/cppincludesfilter.h b/src/plugins/cpptools/cppincludesfilter.h index c1c87a6d38..84700c8a10 100644 --- a/src/plugins/cpptools/cppincludesfilter.h +++ b/src/plugins/cpptools/cppincludesfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPINCLUDESFILTER_H -#define CPPINCLUDESFILTER_H +#pragma once #include <coreplugin/locator/basefilefilter.h> @@ -52,5 +51,3 @@ private: } // namespace Internal } // namespace CppTools - -#endif // CPPINCLUDESFILTER_H diff --git a/src/plugins/cpptools/cppindexingsupport.h b/src/plugins/cpptools/cppindexingsupport.h index d201592663..e97bb50f67 100644 --- a/src/plugins/cpptools/cppindexingsupport.h +++ b/src/plugins/cpptools/cppindexingsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLS_CPPINDEXINGSUPPORT_H -#define CPPTOOLS_CPPINDEXINGSUPPORT_H +#pragma once #include "cpptools_global.h" @@ -90,5 +89,3 @@ public: Q_DECLARE_METATYPE(CppTools::SymbolSearcher::SearchScope) Q_DECLARE_METATYPE(CppTools::SymbolSearcher::Parameters) Q_DECLARE_METATYPE(CppTools::SymbolSearcher::SymbolTypes) - -#endif // CPPTOOLS_CPPINDEXINGSUPPORT_H diff --git a/src/plugins/cpptools/cpplocalsymbols.h b/src/plugins/cpptools/cpplocalsymbols.h index b58a4add01..ef2a37f3aa 100644 --- a/src/plugins/cpptools/cpplocalsymbols.h +++ b/src/plugins/cpptools/cpplocalsymbols.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPLOCALSYMBOLS_H -#define CPPLOCALSYMBOLS_H +#pragma once #include "cpptools_global.h" #include "cppsemanticinfo.h" @@ -42,5 +41,3 @@ public: }; } // namespace CppTools - -#endif // CPPLOCALSYMBOLS_H diff --git a/src/plugins/cpptools/cpplocatordata.h b/src/plugins/cpptools/cpplocatordata.h index 292fa650e0..393d8dc198 100644 --- a/src/plugins/cpptools/cpplocatordata.h +++ b/src/plugins/cpptools/cpplocatordata.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPLOCATORDATA_H -#define CPPLOCATORDATA_H +#pragma once #include <functional> #include <QHash> @@ -84,5 +83,3 @@ private: }; } // CppTools namespace - -#endif // CPPLOCATORDATA_H diff --git a/src/plugins/cpptools/cpplocatorfilter.h b/src/plugins/cpptools/cpplocatorfilter.h index 42f6badc6e..90716a5286 100644 --- a/src/plugins/cpptools/cpplocatorfilter.h +++ b/src/plugins/cpptools/cpplocatorfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPLOCATORFILTER_H -#define CPPLOCATORFILTER_H +#pragma once #include "cpplocatordata.h" #include "searchsymbols.h" @@ -57,5 +56,3 @@ protected: } // namespace Internal } // namespace CppTools - -#endif // CPPLOCATORFILTER_H diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h index 41ec74ee67..b13f3f0bb1 100644 --- a/src/plugins/cpptools/cppmodelmanager.h +++ b/src/plugins/cpptools/cppmodelmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPMODELMANAGER_H -#define CPPMODELMANAGER_H +#pragma once #include "cpptools_global.h" @@ -225,5 +224,3 @@ private: }; } // namespace CppTools - -#endif // CPPMODELMANAGER_H diff --git a/src/plugins/cpptools/cppmodelmanagersupport.h b/src/plugins/cpptools/cppmodelmanagersupport.h index 27fad98094..cfef02e1a0 100644 --- a/src/plugins/cpptools/cppmodelmanagersupport.h +++ b/src/plugins/cpptools/cppmodelmanagersupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLS_CPPMODELMANAGERSUPPORT_H -#define CPPTOOLS_CPPMODELMANAGERSUPPORT_H +#pragma once #include "cpptools_global.h" @@ -63,5 +62,3 @@ public: }; } // CppTools namespace - -#endif // CPPTOOLS_CPPMODELMANAGERSUPPORT_H diff --git a/src/plugins/cpptools/cppmodelmanagersupportinternal.h b/src/plugins/cpptools/cppmodelmanagersupportinternal.h index 3aa9088515..0a2290f595 100644 --- a/src/plugins/cpptools/cppmodelmanagersupportinternal.h +++ b/src/plugins/cpptools/cppmodelmanagersupportinternal.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLS_INTERNAL_CPPMODELMANAGERSUPPORTINTERNAL_H -#define CPPTOOLS_INTERNAL_CPPMODELMANAGERSUPPORTINTERNAL_H +#pragma once #include "cppmodelmanagersupport.h" @@ -60,5 +59,3 @@ public: } // Internal namespace } // CppTools namespace - -#endif // CPPTOOLS_INTERNAL_CPPMODELMANAGERSUPPORTINTERNAL_H diff --git a/src/plugins/cpptools/cpppointerdeclarationformatter.h b/src/plugins/cpptools/cpppointerdeclarationformatter.h index 773f139590..f1e3952709 100644 --- a/src/plugins/cpptools/cpppointerdeclarationformatter.h +++ b/src/plugins/cpptools/cpppointerdeclarationformatter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPPOINTERDECLARATIONFORMATTER_H -#define CPPPOINTERDECLARATIONFORMATTER_H +#pragma once #include "cpptools_global.h" #include "cpprefactoringchanges.h" @@ -120,5 +119,3 @@ private: }; } // namespace CppTools - -#endif // CPPPOINTERDECLARATIONFORMATTER_H diff --git a/src/plugins/cpptools/cppprojectfile.h b/src/plugins/cpptools/cppprojectfile.h index 74539b5d8e..a4b47dee87 100644 --- a/src/plugins/cpptools/cppprojectfile.h +++ b/src/plugins/cpptools/cppprojectfile.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLS_CPPPROJECTFILE_H -#define CPPTOOLS_CPPPROJECTFILE_H +#pragma once #include "cpptools_global.h" @@ -66,5 +65,3 @@ public: QDebug operator<<(QDebug stream, const CppTools::ProjectFile &cxxFile); } // namespace CppTools - -#endif // CPPTOOLS_CPPPROJECTFILE_H diff --git a/src/plugins/cpptools/cppqtstyleindenter.h b/src/plugins/cpptools/cppqtstyleindenter.h index eb3196043a..35b26d60ac 100644 --- a/src/plugins/cpptools/cppqtstyleindenter.h +++ b/src/plugins/cpptools/cppqtstyleindenter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPQTSTYLEINDENTER_H -#define CPPQTSTYLEINDENTER_H +#pragma once #include "cpptools_global.h" @@ -65,5 +64,3 @@ private: }; } // CppTools - -#endif // CPPQTSTYLEINDENTER_H diff --git a/src/plugins/cpptools/cpprefactoringchanges.h b/src/plugins/cpptools/cpprefactoringchanges.h index 7aeecca9f7..af14598c50 100644 --- a/src/plugins/cpptools/cpprefactoringchanges.h +++ b/src/plugins/cpptools/cpprefactoringchanges.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPREFACTORINGCHANGES_H -#define CPPREFACTORINGCHANGES_H +#pragma once #include "cpptools_global.h" @@ -98,5 +97,3 @@ private: }; } // namespace CppTools - -#endif // CPPREFACTORINGCHANGES_H diff --git a/src/plugins/cpptools/cppselectionchanger.h b/src/plugins/cpptools/cppselectionchanger.h index 8e64fbdee4..1a29989df2 100644 --- a/src/plugins/cpptools/cppselectionchanger.h +++ b/src/plugins/cpptools/cppselectionchanger.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPSELECTIONCHANGER_H -#define CPPSELECTIONCHANGER_H +#pragma once #include "cpptools_global.h" @@ -124,5 +123,3 @@ private: }; } // namespace CppTools - -#endif // CPPSELECTIONCHANGER_H diff --git a/src/plugins/cpptools/cppsemanticinfo.h b/src/plugins/cpptools/cppsemanticinfo.h index d3391e9dc4..c9540f2d3c 100644 --- a/src/plugins/cpptools/cppsemanticinfo.h +++ b/src/plugins/cpptools/cppsemanticinfo.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPSEMANTICINFO_H -#define CPPSEMANTICINFO_H +#pragma once #include "cpptools_global.h" @@ -81,5 +80,3 @@ public: }; } // namespace CppTools - -#endif // CPPSEMANTICINFO_H diff --git a/src/plugins/cpptools/cppsemanticinfoupdater.h b/src/plugins/cpptools/cppsemanticinfoupdater.h index 8ecba4a2df..944ffe07d5 100644 --- a/src/plugins/cpptools/cppsemanticinfoupdater.h +++ b/src/plugins/cpptools/cppsemanticinfoupdater.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPSEMANTICINFOUPDATER_H -#define CPPSEMANTICINFOUPDATER_H +#pragma once #include "cppsemanticinfo.h" @@ -56,5 +55,3 @@ private: }; } // namespace CppTools - -#endif // CPPSEMANTICINFOUPDATER_H diff --git a/src/plugins/cpptools/cppsourceprocessertesthelper.h b/src/plugins/cpptools/cppsourceprocessertesthelper.h index 390e1a25d7..5f2d995f4a 100644 --- a/src/plugins/cpptools/cppsourceprocessertesthelper.h +++ b/src/plugins/cpptools/cppsourceprocessertesthelper.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPPSOURCEPROCESSERTESTHELPER_H -#define CPPPSOURCEPROCESSERTESTHELPER_H +#pragma once #include "cpptools_global.h" @@ -50,5 +49,3 @@ public: } // namespace Tests } // namespace CppTools - -#endif // CPPPSOURCEPROCESSERTESTHELPER_H diff --git a/src/plugins/cpptools/cppsourceprocessor.h b/src/plugins/cpptools/cppsourceprocessor.h index 39b612c157..ec1b9ef775 100644 --- a/src/plugins/cpptools/cppsourceprocessor.h +++ b/src/plugins/cpptools/cppsourceprocessor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPSOURCEPROCESSOR_H -#define CPPSOURCEPROCESSOR_H +#pragma once #include "cppmodelmanager.h" #include "cppworkingcopy.h" @@ -124,5 +123,3 @@ private: } // namespace Internal } // namespace CppTools - -#endif // CPPSOURCEPROCESSOR_H diff --git a/src/plugins/cpptools/cpptools_global.h b/src/plugins/cpptools/cpptools_global.h index 322d94cb9d..4396b11cb2 100644 --- a/src/plugins/cpptools/cpptools_global.h +++ b/src/plugins/cpptools/cpptools_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLS_GLOBAL_H -#define CPPTOOLS_GLOBAL_H +#pragma once #include <QtGlobal> @@ -35,5 +34,3 @@ #else # define CPPTOOLS_EXPORT Q_DECL_IMPORT #endif - -#endif // CPPTOOLS_GLOBAL_H diff --git a/src/plugins/cpptools/cpptoolsbridge.h b/src/plugins/cpptools/cpptoolsbridge.h index ba35177850..ef5d12ed81 100644 --- a/src/plugins/cpptools/cpptoolsbridge.h +++ b/src/plugins/cpptools/cpptoolsbridge.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLS_CPPTOOLSBRIDGE_H -#define CPPTOOLS_CPPTOOLSBRIDGE_H +#pragma once #include "cpptools_global.h" @@ -58,5 +57,3 @@ private: }; } // namespace CppTools - -#endif // CPPTOOLS_CPPTOOLSBRIDGE_H diff --git a/src/plugins/cpptools/cpptoolsbridgeinterface.h b/src/plugins/cpptools/cpptoolsbridgeinterface.h index ef9ad38696..c62ee41996 100644 --- a/src/plugins/cpptools/cpptoolsbridgeinterface.h +++ b/src/plugins/cpptools/cpptoolsbridgeinterface.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLSBRIDGEINTERFACE_H -#define CPPTOOLSBRIDGEINTERFACE_H +#pragma once #include <QtGlobal> @@ -53,5 +52,3 @@ public: }; } // namespace CppTools - -#endif // CPPTOOLSBRIDGEINTERFACE_H diff --git a/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.h b/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.h index 88a657dfa5..5570523067 100644 --- a/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.h +++ b/src/plugins/cpptools/cpptoolsbridgeqtcreatorimplementation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLS_CPPTOOLSBRIDGEQTCREATORIMPLEMENTATION_H -#define CPPTOOLS_CPPTOOLSBRIDGEQTCREATORIMPLEMENTATION_H +#pragma once #include "cpptoolsbridgeinterface.h" @@ -44,5 +43,3 @@ public: } // namespace Internal } // namespace CppTools - -#endif // CPPTOOLS_CPPTOOLSBRIDGEQTCREATORIMPLEMENTATION_H diff --git a/src/plugins/cpptools/cpptoolsconstants.h b/src/plugins/cpptools/cpptoolsconstants.h index 5d2d06201c..dbd32dc527 100644 --- a/src/plugins/cpptools/cpptoolsconstants.h +++ b/src/plugins/cpptools/cpptoolsconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLSCONSTANTS_H -#define CPPTOOLSCONSTANTS_H +#pragma once #include <QtGlobal> @@ -70,5 +69,3 @@ const char CPP_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("CppTools", "C++"); } // namespace Constants } // namespace CppTools - -#endif // CPPTOOLSCONSTANTS_H diff --git a/src/plugins/cpptools/cpptoolsjsextension.h b/src/plugins/cpptools/cpptoolsjsextension.h index 9d0d16ebe8..f009c6c259 100644 --- a/src/plugins/cpptools/cpptoolsjsextension.h +++ b/src/plugins/cpptools/cpptoolsjsextension.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLSJSEXTENSION_H -#define CPPTOOLSJSEXTENSION_H +#pragma once #include <QObject> @@ -61,5 +60,3 @@ public: } // namespace Internal } // namespace CppTools - -#endif // CPPTOOLSJSEXTENSION_H diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h index b0f86095d1..c26df354f4 100644 --- a/src/plugins/cpptools/cpptoolsplugin.h +++ b/src/plugins/cpptools/cpptoolsplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLS_H -#define CPPTOOLS_H +#pragma once #include "cpptools_global.h" #include "stringtable.h" @@ -185,5 +184,3 @@ private: } // namespace Internal } // namespace CppTools - -#endif // CPPTOOLS_H diff --git a/src/plugins/cpptools/cpptoolsreuse.h b/src/plugins/cpptools/cpptoolsreuse.h index 22549144c2..cdb86bd565 100644 --- a/src/plugins/cpptools/cpptoolsreuse.h +++ b/src/plugins/cpptools/cpptoolsreuse.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLSREUSE_H -#define CPPTOOLSREUSE_H +#pragma once #include "cpptools_global.h" @@ -77,5 +76,3 @@ int fileSizeLimit(); bool skipFileDueToSizeLimit(const QFileInfo &fileInfo, int limitInMB = fileSizeLimit()); } // CppTools - -#endif // CPPTOOLSREUSE_H diff --git a/src/plugins/cpptools/cpptoolssettings.h b/src/plugins/cpptools/cpptoolssettings.h index efcb74fbfe..bb5234f2dc 100644 --- a/src/plugins/cpptools/cpptoolssettings.h +++ b/src/plugins/cpptools/cpptoolssettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLSSETTINGS_H -#define CPPTOOLSSETTINGS_H +#pragma once #include "cpptools_global.h" @@ -71,5 +70,3 @@ private: }; } // namespace CppTools - -#endif // CPPTOOLSSETTINGS_H diff --git a/src/plugins/cpptools/cpptoolstestcase.h b/src/plugins/cpptools/cpptoolstestcase.h index 98b03047ed..0d9369001c 100644 --- a/src/plugins/cpptools/cpptoolstestcase.h +++ b/src/plugins/cpptools/cpptoolstestcase.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLSTESTCASE_H -#define CPPTOOLSTESTCASE_H +#pragma once #include "cpptools_global.h" @@ -186,5 +185,3 @@ public: } // namespace Tests } // namespace CppTools - -#endif // CPPTOOLSTESTCASE_H diff --git a/src/plugins/cpptools/cppworkingcopy.h b/src/plugins/cpptools/cppworkingcopy.h index 5efd71773f..6c370d5b68 100644 --- a/src/plugins/cpptools/cppworkingcopy.h +++ b/src/plugins/cpptools/cppworkingcopy.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPWORKINGCOPY_H -#define CPPWORKINGCOPY_H +#pragma once #include "cpptools_global.h" @@ -83,5 +82,3 @@ private: }; } // namespace CppTools - -#endif // CPPWORKINGCOPY_H diff --git a/src/plugins/cpptools/doxygengenerator.h b/src/plugins/cpptools/doxygengenerator.h index c816ebfcb9..051ecfbd3e 100644 --- a/src/plugins/cpptools/doxygengenerator.h +++ b/src/plugins/cpptools/doxygengenerator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DOXYGENGENERATOR_H -#define DOXYGENGENERATOR_H +#pragma once #include "cpptools_global.h" @@ -95,5 +94,3 @@ private: }; } // namespace CppTools - -#endif // DOXYGENGENERATOR_H diff --git a/src/plugins/cpptools/editordocumenthandle.h b/src/plugins/cpptools/editordocumenthandle.h index 96bbcd360c..2e7d4784c3 100644 --- a/src/plugins/cpptools/editordocumenthandle.h +++ b/src/plugins/cpptools/editordocumenthandle.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EDITORDOCUMENTHANDLE_H -#define EDITORDOCUMENTHANDLE_H +#pragma once #include "cpptools_global.h" #include "senddocumenttracker.h" @@ -61,5 +60,3 @@ private: }; } // namespace CppTools - -#endif // EDITORDOCUMENTHANDLE_H diff --git a/src/plugins/cpptools/functionutils.h b/src/plugins/cpptools/functionutils.h index 6a5d6b7656..312492a873 100644 --- a/src/plugins/cpptools/functionutils.h +++ b/src/plugins/cpptools/functionutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FUNCTIONUTILS_H -#define FUNCTIONUTILS_H +#pragma once #include "cpptools_global.h" @@ -60,5 +59,3 @@ public: }; } // namespace CppTools - -#endif // FUNCTIONUTILS_H diff --git a/src/plugins/cpptools/includeutils.h b/src/plugins/cpptools/includeutils.h index d1587be1bd..5375877ded 100644 --- a/src/plugins/cpptools/includeutils.h +++ b/src/plugins/cpptools/includeutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INCLUDEUTILS_H -#define INCLUDEUTILS_H +#pragma once #include "cpptools_global.h" @@ -108,5 +107,3 @@ private: } // namespace IncludeUtils } // namespace CppTools - -#endif // INCLUDEUTILS_H diff --git a/src/plugins/cpptools/indexitem.h b/src/plugins/cpptools/indexitem.h index 3b0aa6d3a3..edfa9a75fa 100644 --- a/src/plugins/cpptools/indexitem.h +++ b/src/plugins/cpptools/indexitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLS_INDEXITEM_H -#define CPPTOOLS_INDEXITEM_H +#pragma once #include "cpptools_global.h" @@ -133,5 +132,3 @@ private: } // CppTools namespace Q_DECLARE_METATYPE(CppTools::IndexItem::Ptr) - -#endif // CPPTOOLS_INDEXITEM_H diff --git a/src/plugins/cpptools/insertionpointlocator.h b/src/plugins/cpptools/insertionpointlocator.h index 9eb22a89ca..434af1f0e7 100644 --- a/src/plugins/cpptools/insertionpointlocator.h +++ b/src/plugins/cpptools/insertionpointlocator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INSERTIONPOINTLOCATOR_H -#define INSERTIONPOINTLOCATOR_H +#pragma once #include "cpptools_global.h" #include "cpprefactoringchanges.h" @@ -103,5 +102,3 @@ private: }; } // namespace CppTools - -#endif // INSERTIONPOINTLOCATOR_H diff --git a/src/plugins/cpptools/modelmanagertesthelper.h b/src/plugins/cpptools/modelmanagertesthelper.h index 86a331252e..f7ef4ec189 100644 --- a/src/plugins/cpptools/modelmanagertesthelper.h +++ b/src/plugins/cpptools/modelmanagertesthelper.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLS_INTERNAL_MODELMANAGERTESTHELPER_H -#define CPPTOOLS_INTERNAL_MODELMANAGERTESTHELPER_H +#pragma once #include "cpptools_global.h" #include "cppmodelmanager.h" @@ -90,5 +89,3 @@ private: } // namespace Tests } // namespace CppTools - -#endif // CPPTOOLS_INTERNAL_MODELMANAGERTESTHELPER_H diff --git a/src/plugins/cpptools/projectinfo.h b/src/plugins/cpptools/projectinfo.h index d589599707..4b21ead60e 100644 --- a/src/plugins/cpptools/projectinfo.h +++ b/src/plugins/cpptools/projectinfo.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLS_PROJECTINFO_H -#define CPPTOOLS_PROJECTINFO_H +#pragma once #include "cpptools_global.h" @@ -76,5 +75,3 @@ private: }; } // namespace CppTools - -#endif // CPPTOOLS_PROJECTINFO_H diff --git a/src/plugins/cpptools/projectpart.h b/src/plugins/cpptools/projectpart.h index a9875ee69d..8f1b5b2c1f 100644 --- a/src/plugins/cpptools/projectpart.h +++ b/src/plugins/cpptools/projectpart.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLS_PROJECTPART_H -#define CPPTOOLS_PROJECTPART_H +#pragma once #include "cpptools_global.h" @@ -115,5 +114,3 @@ public: // fields }; } // namespace CppTools - -#endif // CPPTOOLS_PROJECTPART_H diff --git a/src/plugins/cpptools/projectpartbuilder.h b/src/plugins/cpptools/projectpartbuilder.h index a922b48d4a..91eaca910f 100644 --- a/src/plugins/cpptools/projectpartbuilder.h +++ b/src/plugins/cpptools/projectpartbuilder.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLS_PROJECTPARTBUILDER_H -#define CPPTOOLS_PROJECTPARTBUILDER_H +#pragma once #include "cpptools_global.h" @@ -78,5 +77,3 @@ private: }; } // namespace CppTools - -#endif // CPPTOOLS_PROJECTPARTBUILDER_H diff --git a/src/plugins/cpptools/projectpartheaderpath.h b/src/plugins/cpptools/projectpartheaderpath.h index d12e5bdf72..fb554580e5 100644 --- a/src/plugins/cpptools/projectpartheaderpath.h +++ b/src/plugins/cpptools/projectpartheaderpath.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROJECTPARTHEADERPATH_H -#define PROJECTPARTHEADERPATH_H +#pragma once #include <QVector> @@ -79,4 +78,3 @@ inline uint qHash(const ProjectPartHeaderPath &key, uint seed = 0) return ((qHash(key.path) << 2) | key.type) ^ seed; } } // namespace CppTools -#endif // PROJECTPARTHEADERPATH_H diff --git a/src/plugins/cpptools/searchsymbols.h b/src/plugins/cpptools/searchsymbols.h index e0c669bb07..cb4c7dea31 100644 --- a/src/plugins/cpptools/searchsymbols.h +++ b/src/plugins/cpptools/searchsymbols.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SEARCHSYMBOLS_H -#define SEARCHSYMBOLS_H +#pragma once #include "cpptools_global.h" #include "cppindexingsupport.h" @@ -116,5 +115,3 @@ private: } // namespace CppTools Q_DECLARE_OPERATORS_FOR_FLAGS(CppTools::SearchSymbols::SymbolTypes) - -#endif // SEARCHSYMBOLS_H diff --git a/src/plugins/cpptools/semantichighlighter.h b/src/plugins/cpptools/semantichighlighter.h index f69a8d73c7..6305da03d7 100644 --- a/src/plugins/cpptools/semantichighlighter.h +++ b/src/plugins/cpptools/semantichighlighter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SEMANTICHIGHLIGHTER_H -#define SEMANTICHIGHLIGHTER_H +#pragma once #include "cpptools_global.h" @@ -92,5 +91,3 @@ private: }; } // namespace CppTools - -#endif // SEMANTICHIGHLIGHTER_H diff --git a/src/plugins/cpptools/senddocumenttracker.h b/src/plugins/cpptools/senddocumenttracker.h index 70ada43e53..be84a8b16a 100644 --- a/src/plugins/cpptools/senddocumenttracker.h +++ b/src/plugins/cpptools/senddocumenttracker.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLS_SENDDOCUMENTTRACKER_H -#define CPPTOOLS_SENDDOCUMENTTRACKER_H +#pragma once #include "cpptools_global.h" @@ -57,5 +56,3 @@ private: }; } // namespace CppTools - -#endif // CPPTOOLS_SENDDOCUMENTTRACKER_H diff --git a/src/plugins/cpptools/stringtable.h b/src/plugins/cpptools/stringtable.h index c1ee1689f1..62ad48b138 100644 --- a/src/plugins/cpptools/stringtable.h +++ b/src/plugins/cpptools/stringtable.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef STRINGTABLE_H -#define STRINGTABLE_H +#pragma once #include <QAtomicInt> #include <QMutex> @@ -69,5 +68,3 @@ private: } // Internal namespace } // CppTools namespace - -#endif // STRINGTABLE_H diff --git a/src/plugins/cpptools/symbolfinder.h b/src/plugins/cpptools/symbolfinder.h index b463a1287d..a8cf2e6bb7 100644 --- a/src/plugins/cpptools/symbolfinder.h +++ b/src/plugins/cpptools/symbolfinder.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SYMBOLFINDER_H -#define SYMBOLFINDER_H +#pragma once #include "cpptools_global.h" @@ -84,6 +83,3 @@ private: }; } // namespace CppTools - -#endif // SYMBOLFINDER_H - diff --git a/src/plugins/cpptools/symbolsfindfilter.h b/src/plugins/cpptools/symbolsfindfilter.h index 837aabca2f..52b2cde5d9 100644 --- a/src/plugins/cpptools/symbolsfindfilter.h +++ b/src/plugins/cpptools/symbolsfindfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SYMBOLSFINDFILTER_H -#define SYMBOLSFINDFILTER_H +#pragma once #include "searchsymbols.h" @@ -123,5 +122,3 @@ private: } // Internal } // CppTools - -#endif // SYMBOLSFINDFILTER_H diff --git a/src/plugins/cpptools/typehierarchybuilder.h b/src/plugins/cpptools/typehierarchybuilder.h index 00ed68596f..055794687e 100644 --- a/src/plugins/cpptools/typehierarchybuilder.h +++ b/src/plugins/cpptools/typehierarchybuilder.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPPTOOLS_TYPEHIERARCHYBUILDER_H -#define CPPTOOLS_TYPEHIERARCHYBUILDER_H +#pragma once #include "cpptools_global.h" @@ -77,5 +76,3 @@ private: }; } // CppTools - -#endif // CPPTOOLS_TYPEHIERARCHYBUILDER_H diff --git a/src/plugins/debugger/analyzer/analyzerconstants.h b/src/plugins/debugger/analyzer/analyzerconstants.h index c2554f42c2..4260d718c8 100644 --- a/src/plugins/debugger/analyzer/analyzerconstants.h +++ b/src/plugins/debugger/analyzer/analyzerconstants.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef ANALYZERCONSTANTS_H -#define ANALYZERCONSTANTS_H +#pragma once #include <QtGlobal> @@ -45,5 +44,3 @@ const char ANALYZERTASK_ID[] = "Analyzer.TaskId"; } // namespace Constants } // namespace Debugger - -#endif // ANALYZERCONSTANTS_H diff --git a/src/plugins/debugger/analyzer/analyzericons.h b/src/plugins/debugger/analyzer/analyzericons.h index f9f4a69056..c423b27f6d 100644 --- a/src/plugins/debugger/analyzer/analyzericons.h +++ b/src/plugins/debugger/analyzer/analyzericons.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANALYZERICONS_H -#define ANALYZERICONS_H +#pragma once #include <utils/icon.h> @@ -43,5 +42,3 @@ const Utils::Icon MODE_ANALYZE_FLAT_ACTIVE({ } // namespace Icons } // namespace Debugger - -#endif // ANALYZERICONS_H diff --git a/src/plugins/debugger/analyzer/analyzermanager.h b/src/plugins/debugger/analyzer/analyzermanager.h index 70209ea291..c853418d89 100644 --- a/src/plugins/debugger/analyzer/analyzermanager.h +++ b/src/plugins/debugger/analyzer/analyzermanager.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef ANALYZERMANAGER_H -#define ANALYZERMANAGER_H +#pragma once #include "analyzerconstants.h" @@ -150,5 +149,3 @@ DEBUGGER_EXPORT AnalyzerRunControl *createAnalyzerRunControl( ProjectExplorer::RunConfiguration *runConfiguration, Core::Id runMode); } // namespace Debugger - -#endif // ANALYZERMANAGER_H diff --git a/src/plugins/debugger/analyzer/analyzerrunconfigwidget.h b/src/plugins/debugger/analyzer/analyzerrunconfigwidget.h index ad4ba8cc2d..23d028ff95 100644 --- a/src/plugins/debugger/analyzer/analyzerrunconfigwidget.h +++ b/src/plugins/debugger/analyzer/analyzerrunconfigwidget.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef ANALYZERRUNCONFIGWIDGET_H -#define ANALYZERRUNCONFIGWIDGET_H +#pragma once #include <debugger/debugger_global.h> @@ -63,5 +62,3 @@ private: }; } // namespace Debugger - -#endif // ANALYZERRUNCONFIGWIDGET_H diff --git a/src/plugins/debugger/analyzer/analyzerruncontrol.h b/src/plugins/debugger/analyzer/analyzerruncontrol.h index a919a7f363..12b5e4c6f0 100644 --- a/src/plugins/debugger/analyzer/analyzerruncontrol.h +++ b/src/plugins/debugger/analyzer/analyzerruncontrol.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef ANALYZERRUNCONTROL_H -#define ANALYZERRUNCONTROL_H +#pragma once #include <debugger/debugger_global.h> @@ -66,5 +65,3 @@ private: }; } // namespace Debugger - -#endif // ANALYZERRUNCONTROL_H diff --git a/src/plugins/debugger/analyzer/analyzerstartparameters.h b/src/plugins/debugger/analyzer/analyzerstartparameters.h index 73226c0e33..7f5d439d9b 100644 --- a/src/plugins/debugger/analyzer/analyzerstartparameters.h +++ b/src/plugins/debugger/analyzer/analyzerstartparameters.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANALYZERSTARTPARAMETERS_H -#define ANALYZERSTARTPARAMETERS_H +#pragma once #include <debugger/debugger_global.h> @@ -47,5 +46,3 @@ public: DEBUGGER_EXPORT bool operator==(const AnalyzerConnection &c1, const AnalyzerConnection &c2); } // namespace Debugger - -#endif // ANALYZERSTARTPARAMETERS_H diff --git a/src/plugins/debugger/analyzer/analyzerutils.h b/src/plugins/debugger/analyzer/analyzerutils.h index 65f3de5f30..1c5327d4fe 100644 --- a/src/plugins/debugger/analyzer/analyzerutils.h +++ b/src/plugins/debugger/analyzer/analyzerutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANALYZERUTILS_H -#define ANALYZERUTILS_H +#pragma once #include <debugger/debugger_global.h> @@ -38,5 +37,3 @@ namespace AnalyzerUtils DEBUGGER_EXPORT void logToIssuesPane(ProjectExplorer::Task::TaskType type, const QString &message); } - -#endif // ANALYZERUTILS_H diff --git a/src/plugins/debugger/analyzer/detailederrorview.h b/src/plugins/debugger/analyzer/detailederrorview.h index ab141ad57e..c6d483c77a 100644 --- a/src/plugins/debugger/analyzer/detailederrorview.h +++ b/src/plugins/debugger/analyzer/detailederrorview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DETAILEDERRORVIEW_H -#define DETAILEDERRORVIEW_H +#pragma once #include <debugger/debugger_global.h> @@ -68,5 +67,3 @@ private: }; } // namespace Debugger - -#endif // DETAILEDERRORVIEW_H diff --git a/src/plugins/debugger/analyzer/diagnosticlocation.h b/src/plugins/debugger/analyzer/diagnosticlocation.h index 61fdbe2298..31f9036f44 100644 --- a/src/plugins/debugger/analyzer/diagnosticlocation.h +++ b/src/plugins/debugger/analyzer/diagnosticlocation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANALYZERDIAGNOSTIC_H -#define ANALYZERDIAGNOSTIC_H +#pragma once #include <debugger/debugger_global.h> @@ -55,6 +54,3 @@ DEBUGGER_EXPORT QDebug operator<<(QDebug dbg, const DiagnosticLocation &location } // namespace Debugger Q_DECLARE_METATYPE(Debugger::DiagnosticLocation) - -#endif // Include guard. - diff --git a/src/plugins/debugger/analyzer/startremotedialog.h b/src/plugins/debugger/analyzer/startremotedialog.h index ff559a51bf..b7e1c33787 100644 --- a/src/plugins/debugger/analyzer/startremotedialog.h +++ b/src/plugins/debugger/analyzer/startremotedialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef STARTREMOTEDIALOG_H -#define STARTREMOTEDIALOG_H +#pragma once #include <debugger/debugger_global.h> @@ -57,5 +56,3 @@ private: }; } // namespace Debugger - -#endif // STARTREMOTEDIALOG_H diff --git a/src/plugins/debugger/breakhandler.h b/src/plugins/debugger/breakhandler.h index 763db17ce5..922e6fee71 100644 --- a/src/plugins/debugger/breakhandler.h +++ b/src/plugins/debugger/breakhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_BREAKHANDLER_H -#define DEBUGGER_BREAKHANDLER_H +#pragma once #include "breakpoint.h" #include "debuggerprotocol.h" @@ -233,5 +232,3 @@ private: } // namespace Debugger Q_DECLARE_METATYPE(Debugger::Internal::Breakpoint) - -#endif // DEBUGGER_BREAKHANDLER_H diff --git a/src/plugins/debugger/breakpoint.h b/src/plugins/debugger/breakpoint.h index 509f1660c6..deabf6b028 100644 --- a/src/plugins/debugger/breakpoint.h +++ b/src/plugins/debugger/breakpoint.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_BREAKPOINT_H -#define DEBUGGER_BREAKPOINT_H +#pragma once #include <QMetaType> #include <QString> @@ -232,6 +231,3 @@ inline uint qHash(const Debugger::Internal::BreakpointModelId &id) Q_DECLARE_METATYPE(Debugger::Internal::BreakpointModelId) Q_DECLARE_METATYPE(Debugger::Internal::BreakpointResponseId) - - -#endif // DEBUGGER_BREAKPOINT_H diff --git a/src/plugins/debugger/breakwindow.h b/src/plugins/debugger/breakwindow.h index 1af4d25c2a..7feba0c14f 100644 --- a/src/plugins/debugger/breakwindow.h +++ b/src/plugins/debugger/breakwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_BREAKWINDOW_H -#define DEBUGGER_BREAKWINDOW_H +#pragma once #include "breakhandler.h" #include <utils/basetreeview.h> @@ -58,6 +57,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_BREAKWINDOW - diff --git a/src/plugins/debugger/cdb/bytearrayinputstream.h b/src/plugins/debugger/cdb/bytearrayinputstream.h index 2468d361b8..2d2a0f5083 100644 --- a/src/plugins/debugger/cdb/bytearrayinputstream.h +++ b/src/plugins/debugger/cdb/bytearrayinputstream.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BYTEARRAYINPUTSTREAM_H -#define BYTEARRAYINPUTSTREAM_H +#pragma once #include <QString> @@ -100,5 +99,3 @@ QByteArray simplify(const QByteArray &inIn); } // namespace Internal } // namespace Debugger - -#endif // BYTEARRAYINPUTSTREAM_H diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h index 536157f9ce..fd5118e50f 100644 --- a/src/plugins/debugger/cdb/cdbengine.h +++ b/src/plugins/debugger/cdb/cdbengine.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_CDBENGINE_H -#define DEBUGGER_CDBENGINE_H +#pragma once #include <debugger/debuggerengine.h> #include <debugger/breakhandler.h> @@ -265,5 +264,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_CDBENGINE_H diff --git a/src/plugins/debugger/cdb/cdboptionspage.h b/src/plugins/debugger/cdb/cdboptionspage.h index 8ad0d4017c..041c69198d 100644 --- a/src/plugins/debugger/cdb/cdboptionspage.h +++ b/src/plugins/debugger/cdb/cdboptionspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CDBOPTIONSPAGE_H -#define CDBOPTIONSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> #include <utils/savedaction.h> @@ -128,5 +127,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // CDBOPTIONSPAGE_H diff --git a/src/plugins/debugger/cdb/cdbparsehelpers.h b/src/plugins/debugger/cdb/cdbparsehelpers.h index 7bd4322ea6..ebed376db5 100644 --- a/src/plugins/debugger/cdb/cdbparsehelpers.h +++ b/src/plugins/debugger/cdb/cdbparsehelpers.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CDBPARSEHELPERS_H -#define CDBPARSEHELPERS_H +#pragma once #include <debugger/breakpoint.h> @@ -98,5 +97,3 @@ QDebug operator<<(QDebug s, const WinException &e); } // namespace Internal } // namespace Debugger - -#endif // CDBPARSEHELPERS_H diff --git a/src/plugins/debugger/commonoptionspage.h b/src/plugins/debugger/commonoptionspage.h index 8394fb91db..05f4a120fa 100644 --- a/src/plugins/debugger/commonoptionspage.h +++ b/src/plugins/debugger/commonoptionspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_COMMONOPTIONSPAGE_H -#define DEBUGGER_COMMONOPTIONSPAGE_H +#pragma once #include "debuggersourcepathmappingwidget.h" @@ -99,5 +98,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_COMMONOPTIONSPAGE_H diff --git a/src/plugins/debugger/console/console.h b/src/plugins/debugger/console/console.h index e6a16ba950..962df2691f 100644 --- a/src/plugins/debugger/console/console.h +++ b/src/plugins/debugger/console/console.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_CONSOLE_H -#define DEBUGGER_CONSOLE_H +#pragma once #include "consoleitem.h" @@ -103,5 +102,3 @@ Console *debuggerConsole(); } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_CONSOLE_H diff --git a/src/plugins/debugger/console/consoleedit.h b/src/plugins/debugger/console/consoleedit.h index 73691f30fe..b27348f6d9 100644 --- a/src/plugins/debugger/console/consoleedit.h +++ b/src/plugins/debugger/console/consoleedit.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_CONSOLEEDIT_H -#define DEBUGGER_CONSOLEEDIT_H +#pragma once #include <QModelIndex> #include <QString> @@ -60,5 +59,3 @@ private: } // Debugger } // Internal - -#endif // DEBUGGER_CONSOLEEDIT_H diff --git a/src/plugins/debugger/console/consoleitem.h b/src/plugins/debugger/console/consoleitem.h index 3567d35f70..0fd530d3fd 100644 --- a/src/plugins/debugger/console/consoleitem.h +++ b/src/plugins/debugger/console/consoleitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CONSOLEITEM_H -#define CONSOLEITEM_H +#pragma once #include <utils/treemodel.h> @@ -82,5 +81,3 @@ private: } // Internal } // Debugger - -#endif // CONSOLEITEM_H diff --git a/src/plugins/debugger/console/consoleitemdelegate.h b/src/plugins/debugger/console/consoleitemdelegate.h index 114f6ef596..2016a38647 100644 --- a/src/plugins/debugger/console/consoleitemdelegate.h +++ b/src/plugins/debugger/console/consoleitemdelegate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_CONSOLEITEMDELEGATE_H -#define DEBUGGER_CONSOLEITEMDELEGATE_H +#pragma once #include "consoleitemmodel.h" #include "console.h" @@ -173,5 +172,3 @@ public: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_CONSOLEITEMDELEGATE_H diff --git a/src/plugins/debugger/console/consoleitemmodel.h b/src/plugins/debugger/console/consoleitemmodel.h index d5a2a98bfc..c0c7c8485b 100644 --- a/src/plugins/debugger/console/consoleitemmodel.h +++ b/src/plugins/debugger/console/consoleitemmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_CONSOLEITEMMODEL_H -#define DEBUGGER_CONSOLEITEMMODEL_H +#pragma once #include "consoleitem.h" #include <utils/treemodel.h> @@ -64,5 +63,3 @@ private: } // Internal } // Debugger - -#endif // DEBUGGER_CONSOLEITEMMODEL_H diff --git a/src/plugins/debugger/console/consoleproxymodel.h b/src/plugins/debugger/console/consoleproxymodel.h index 5cc9975025..f02346f66c 100644 --- a/src/plugins/debugger/console/consoleproxymodel.h +++ b/src/plugins/debugger/console/consoleproxymodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_CONSOLEPROXYMODEL_H -#define DEBUGGER_CONSOLEPROXYMODEL_H +#pragma once #include "consoleitem.h" @@ -62,5 +61,3 @@ private: } // Internal } // Debugger - -#endif // DEBUGGER_CONSOLEPROXYMODEL_H diff --git a/src/plugins/debugger/console/consoleview.h b/src/plugins/debugger/console/consoleview.h index 7b5a5b31fd..3aedd125e1 100644 --- a/src/plugins/debugger/console/consoleview.h +++ b/src/plugins/debugger/console/consoleview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_CONSOLEVIEW_H -#define DEBUGGER_CONSOLEVIEW_H +#pragma once #include <utils/itemviews.h> @@ -61,5 +60,3 @@ private: } // Internal } // Debugger - -#endif // DEBUGGER_CONSOLEVIEW_H diff --git a/src/plugins/debugger/debugger_global.h b/src/plugins/debugger/debugger_global.h index f19f63874f..fc1597cc82 100644 --- a/src/plugins/debugger/debugger_global.h +++ b/src/plugins/debugger/debugger_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGERGLOBAL_H -#define DEBUGGERGLOBAL_H +#pragma once #include <QtGlobal> @@ -33,5 +32,3 @@ #else # define DEBUGGER_EXPORT Q_DECL_IMPORT #endif - -#endif // DEBUGGERGLOBAL_H diff --git a/src/plugins/debugger/debuggeractions.h b/src/plugins/debugger/debuggeractions.h index 6c1a7100e3..b1f180c53c 100644 --- a/src/plugins/debugger/debuggeractions.h +++ b/src/plugins/debugger/debuggeractions.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_ACTIONS_H -#define DEBUGGER_ACTIONS_H +#pragma once #include <QObject> #include <QHash> @@ -181,5 +180,3 @@ enum DebuggerActionCode } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_WATCHWINDOW_H diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h index 5964860883..0cac2e2628 100644 --- a/src/plugins/debugger/debuggerconstants.h +++ b/src/plugins/debugger/debuggerconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGERCONSTANTS_H -#define DEBUGGERCONSTANTS_H +#pragma once #include <QFlags> @@ -213,5 +212,3 @@ enum DebuggerLanguage Q_DECLARE_FLAGS(DebuggerLanguages, DebuggerLanguage) } // namespace Debugger - -#endif // DEBUGGERCONSTANTS_H diff --git a/src/plugins/debugger/debuggercore.h b/src/plugins/debugger/debuggercore.h index 80e1f9b88a..2b5557f4fd 100644 --- a/src/plugins/debugger/debuggercore.h +++ b/src/plugins/debugger/debuggercore.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGERCORE_H -#define DEBUGGERCORE_H +#pragma once #include "debuggerconstants.h" @@ -111,5 +110,3 @@ bool isReverseDebuggingEnabled(); } // namespace Internal } // namespace Debugger - -#endif // DEBUGGERPLUGIN_H diff --git a/src/plugins/debugger/debuggerdialogs.h b/src/plugins/debugger/debuggerdialogs.h index 8b17bbddfc..6365c3baf5 100644 --- a/src/plugins/debugger/debuggerdialogs.h +++ b/src/plugins/debugger/debuggerdialogs.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_DIALOGS_H -#define DEBUGGER_DIALOGS_H +#pragma once #include "watchhandler.h" @@ -192,5 +191,3 @@ private: } // namespace Debugger } // namespace Internal - -#endif // DEBUGGER_DIALOGS_H diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index 5923f44f7b..830ed08836 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_DEBUGGERENGINE_H -#define DEBUGGER_DEBUGGERENGINE_H +#pragma once #include "debugger_global.h" #include "debuggerconstants.h" @@ -484,5 +483,3 @@ DebuggerRunControl *createAndScheduleRun(const DebuggerRunParameters &rp, const Q_DECLARE_METATYPE(Debugger::Internal::UpdateParameters) Q_DECLARE_METATYPE(Debugger::Internal::ContextData) - -#endif // DEBUGGER_DEBUGGERENGINE_H diff --git a/src/plugins/debugger/debuggericons.h b/src/plugins/debugger/debuggericons.h index 30eed3b782..10c77df10f 100644 --- a/src/plugins/debugger/debuggericons.h +++ b/src/plugins/debugger/debuggericons.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGERICONS_H -#define DEBUGGERICONS_H +#pragma once #include <utils/icon.h> @@ -90,5 +89,3 @@ const Utils::Icon MODE_DEBUGGER_FLAT_ACTIVE({ } // namespace Icons } // namespace Debugger - -#endif // DEBUGGERICONS_H diff --git a/src/plugins/debugger/debuggerinternalconstants.h b/src/plugins/debugger/debuggerinternalconstants.h index 3b9f65977c..9ff0611cac 100644 --- a/src/plugins/debugger/debuggerinternalconstants.h +++ b/src/plugins/debugger/debuggerinternalconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGERINTERNALCONSTANTS_H -#define DEBUGGERINTERNALCONSTANTS_H +#pragma once #include <QtGlobal> @@ -99,6 +98,3 @@ enum ModelRoles }; } // namespace Debugger - -#endif // DEBUGGERINTERNALCONSTANTS_H - diff --git a/src/plugins/debugger/debuggeritem.h b/src/plugins/debugger/debuggeritem.h index 2e0e6ea5af..e48b0108b5 100644 --- a/src/plugins/debugger/debuggeritem.h +++ b/src/plugins/debugger/debuggeritem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_DEBUGGERITEM_H -#define DEBUGGER_DEBUGGERITEM_H +#pragma once #include "debugger_global.h" #include "debuggerconstants.h" @@ -123,5 +122,3 @@ private: }; } // namespace Debugger - -#endif // DEBUGGER_DEBUGGERITEM_H diff --git a/src/plugins/debugger/debuggeritemmanager.h b/src/plugins/debugger/debuggeritemmanager.h index 620c097c40..c4a7101ec9 100644 --- a/src/plugins/debugger/debuggeritemmanager.h +++ b/src/plugins/debugger/debuggeritemmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_DEBUGGERITEMMANAGER_H -#define DEBUGGER_DEBUGGERITEMMANAGER_H +#pragma once #include "debugger_global.h" #include "debuggerconstants.h" @@ -72,5 +71,3 @@ private: }; } // namespace Debugger - -#endif // DEBUGGER_DEBUGGERITEMMANAGER_H diff --git a/src/plugins/debugger/debuggerkitconfigwidget.h b/src/plugins/debugger/debuggerkitconfigwidget.h index a6fd2a09e6..ff89d4e70d 100644 --- a/src/plugins/debugger/debuggerkitconfigwidget.h +++ b/src/plugins/debugger/debuggerkitconfigwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_DEBUGGERKITCONFIGWIDGET_H -#define DEBUGGER_DEBUGGERKITCONFIGWIDGET_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> #include <projectexplorer/kitconfigwidget.h> @@ -81,5 +80,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_DEBUGGERKITCONFIGWIDGET_H diff --git a/src/plugins/debugger/debuggerkitinformation.h b/src/plugins/debugger/debuggerkitinformation.h index 5cc0498cd0..44af814954 100644 --- a/src/plugins/debugger/debuggerkitinformation.h +++ b/src/plugins/debugger/debuggerkitinformation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_DEBUGGERKITINFORMATION_H -#define DEBUGGER_DEBUGGERKITINFORMATION_H +#pragma once #include "debugger_global.h" #include "debuggerconstants.h" @@ -68,5 +67,3 @@ public: }; } // namespace Debugger - -#endif // DEBUGGER_DEBUGGERKITINFORMATION_H diff --git a/src/plugins/debugger/debuggermainwindow.h b/src/plugins/debugger/debuggermainwindow.h index 3c7d221a59..c52870cf38 100644 --- a/src/plugins/debugger/debuggermainwindow.h +++ b/src/plugins/debugger/debuggermainwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGERMAINWINDOW_H -#define DEBUGGERMAINWINDOW_H +#pragma once #include "debugger_global.h" @@ -145,5 +144,3 @@ private: }; } // Utils - -#endif // DEBUGGERMAINWINDOW_H diff --git a/src/plugins/debugger/debuggeroptionspage.h b/src/plugins/debugger/debuggeroptionspage.h index d7ac28cd8f..804addf3df 100644 --- a/src/plugins/debugger/debuggeroptionspage.h +++ b/src/plugins/debugger/debuggeroptionspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_DEBUGGEROPTIONSPAGE_H -#define DEBUGGER_DEBUGGEROPTIONSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> @@ -53,5 +52,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_DEBUGGEROPTIONSPAGE_H diff --git a/src/plugins/debugger/debuggerplugin.h b/src/plugins/debugger/debuggerplugin.h index 1d682b610d..5090960860 100644 --- a/src/plugins/debugger/debuggerplugin.h +++ b/src/plugins/debugger/debuggerplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGERPLUGIN_H -#define DEBUGGERPLUGIN_H +#pragma once #include "debugger_global.h" #include <extensionsystem/iplugin.h> @@ -62,5 +61,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGERPLUGIN_H diff --git a/src/plugins/debugger/debuggerprotocol.h b/src/plugins/debugger/debuggerprotocol.h index b5047a12cc..cc5c558a50 100644 --- a/src/plugins/debugger/debuggerprotocol.h +++ b/src/plugins/debugger/debuggerprotocol.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_PROTOCOL_H -#define DEBUGGER_PROTOCOL_H +#pragma once #include <QByteArray> #include <QList> @@ -255,6 +254,3 @@ enum DebuggerDisplay } // namespace Internal } // namespace Debugger - - -#endif // DEBUGGER_PROTOCOL_H diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.h b/src/plugins/debugger/debuggerrunconfigurationaspect.h index 07bf2da3c2..7e22838310 100644 --- a/src/plugins/debugger/debuggerrunconfigurationaspect.h +++ b/src/plugins/debugger/debuggerrunconfigurationaspect.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGERRUNCONFIGURATIONASPECT_H -#define DEBUGGERRUNCONFIGURATIONASPECT_H +#pragma once #include "debugger_global.h" #include "debuggerconstants.h" @@ -82,5 +81,3 @@ private: }; } // namespace Debugger - -#endif // DEBUGGERRUNCONFIGURATIONASPECT_H diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h index ebeaa378bb..d1c3488862 100644 --- a/src/plugins/debugger/debuggerruncontrol.h +++ b/src/plugins/debugger/debuggerruncontrol.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGERRUNCONTROL_H -#define DEBUGGERRUNCONTROL_H +#pragma once #include "debugger_global.h" #include "debuggerconstants.h" @@ -92,5 +91,3 @@ private: }; } // namespace Debugger - -#endif // DEBUGGERRUNCONTROL_H diff --git a/src/plugins/debugger/debuggersourcepathmappingwidget.h b/src/plugins/debugger/debuggersourcepathmappingwidget.h index fb0e7cecf7..0ae147b15b 100644 --- a/src/plugins/debugger/debuggersourcepathmappingwidget.h +++ b/src/plugins/debugger/debuggersourcepathmappingwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGERSOURCEPATHMAPPINGWIDGET_H -#define DEBUGGERSOURCEPATHMAPPINGWIDGET_H +#pragma once #include <QGroupBox> #include <QMap> @@ -91,5 +90,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGERSOURCEPATHMAPPINGWIDGET_H diff --git a/src/plugins/debugger/debuggerstartparameters.h b/src/plugins/debugger/debuggerstartparameters.h index fafeabc56d..1dd708d377 100644 --- a/src/plugins/debugger/debuggerstartparameters.h +++ b/src/plugins/debugger/debuggerstartparameters.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_DEBUGGERSTARTPARAMETERS_H -#define DEBUGGER_DEBUGGERSTARTPARAMETERS_H +#pragma once #include "debugger_global.h" #include "debuggerconstants.h" @@ -110,6 +109,3 @@ public: Q_DECLARE_METATYPE(Debugger::RemoteSetupResult) Q_DECLARE_METATYPE(Debugger::DebuggerStartParameters) - -#endif // DEBUGGER_DEBUGGERSTARTPARAMETERS_H - diff --git a/src/plugins/debugger/debuggerstringutils.h b/src/plugins/debugger/debuggerstringutils.h index 653bb739f2..11cf8f2aab 100644 --- a/src/plugins/debugger/debuggerstringutils.h +++ b/src/plugins/debugger/debuggerstringutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGERSTRINGUTILS_H -#define DEBUGGERSTRINGUTILS_H +#pragma once #ifndef qdoc @@ -43,5 +42,3 @@ inline QString _(const QByteArray &ba) { return QString::fromLatin1(ba, ba.size( } // namespace Debugger #endif // qdoc - -#endif // DEBUGGERSTRINGUTILS_H diff --git a/src/plugins/debugger/debuggertooltipmanager.h b/src/plugins/debugger/debuggertooltipmanager.h index 0b98fcd6a2..cc479d046a 100644 --- a/src/plugins/debugger/debuggertooltipmanager.h +++ b/src/plugins/debugger/debuggertooltipmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_DEBUGGERTOOLTIPMANAGER_H -#define DEBUGGER_DEBUGGERTOOLTIPMANAGER_H +#pragma once #include "debuggerconstants.h" @@ -102,5 +101,3 @@ public slots: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_INTERNAL_DEBUGGERTOOLTIPMANAGER_H diff --git a/src/plugins/debugger/disassembleragent.h b/src/plugins/debugger/disassembleragent.h index 58f2b5717a..423c949ab6 100644 --- a/src/plugins/debugger/disassembleragent.h +++ b/src/plugins/debugger/disassembleragent.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_DISASSEMBLERAGENT_H -#define DEBUGGER_DISASSEMBLERAGENT_H +#pragma once #include <QObject> @@ -75,5 +74,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_DISASSEMBLERAGENT_H diff --git a/src/plugins/debugger/disassemblerlines.h b/src/plugins/debugger/disassemblerlines.h index 71786db802..ff8586d429 100644 --- a/src/plugins/debugger/disassemblerlines.h +++ b/src/plugins/debugger/disassemblerlines.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_DISASSEMBLERLINES_H -#define DEBUGGER_DISASSEMBLERLINES_H +#pragma once #include <QStringList> #include <QHash> @@ -92,5 +91,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_DISASSEMBLERLINES_H diff --git a/src/plugins/debugger/gdb/attachgdbadapter.h b/src/plugins/debugger/gdb/attachgdbadapter.h index 23597bf017..412e4726d6 100644 --- a/src/plugins/debugger/gdb/attachgdbadapter.h +++ b/src/plugins/debugger/gdb/attachgdbadapter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_ATTACHGDBADAPTER_H -#define DEBUGGER_ATTACHGDBADAPTER_H +#pragma once #include "gdbengine.h" @@ -56,5 +55,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_ATTACHDBADAPTER_H diff --git a/src/plugins/debugger/gdb/coregdbadapter.h b/src/plugins/debugger/gdb/coregdbadapter.h index a72dbd88dd..1e93fb968b 100644 --- a/src/plugins/debugger/gdb/coregdbadapter.h +++ b/src/plugins/debugger/gdb/coregdbadapter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_COREGDBADAPTER_H -#define DEBUGGER_COREGDBADAPTER_H +#pragma once #include "gdbengine.h" @@ -76,5 +75,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_COREDBADAPTER_H diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h index afc1ac7de4..a336ccb272 100644 --- a/src/plugins/debugger/gdb/gdbengine.h +++ b/src/plugins/debugger/gdb/gdbengine.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_GDBENGINE_H -#define DEBUGGER_GDBENGINE_H +#pragma once #include <debugger/debuggerengine.h> @@ -465,5 +464,3 @@ protected: } // namespace Debugger Q_DECLARE_OPERATORS_FOR_FLAGS(Debugger::Internal::GdbEngine::GdbCommandFlags) - -#endif // DEBUGGER_GDBENGINE_H diff --git a/src/plugins/debugger/gdb/gdbplainengine.h b/src/plugins/debugger/gdb/gdbplainengine.h index 86d79ebde6..ab1f809156 100644 --- a/src/plugins/debugger/gdb/gdbplainengine.h +++ b/src/plugins/debugger/gdb/gdbplainengine.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GDBPLAINENGINE_H -#define GDBPLAINENGINE_H +#pragma once #include "gdbengine.h" #include <debugger/outputcollector.h> @@ -60,5 +59,3 @@ private: } // namespace Debugger } // namespace Internal - -#endif // GDBPLAINENGINE_H diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.h b/src/plugins/debugger/gdb/remotegdbserveradapter.h index 95ccc52c98..ed69e5620a 100644 --- a/src/plugins/debugger/gdb/remotegdbserveradapter.h +++ b/src/plugins/debugger/gdb/remotegdbserveradapter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTEGDBSERVERADAPTER_H -#define REMOTEGDBSERVERADAPTER_H +#pragma once #include "gdbengine.h" @@ -71,5 +70,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // REMOTEGDBSERVERADAPTER_H diff --git a/src/plugins/debugger/gdb/startgdbserverdialog.h b/src/plugins/debugger/gdb/startgdbserverdialog.h index 1660318100..df2630e4bc 100644 --- a/src/plugins/debugger/gdb/startgdbserverdialog.h +++ b/src/plugins/debugger/gdb/startgdbserverdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef STARTGDBSERVERDIALOG_H -#define STARTGDBSERVERDIALOG_H +#pragma once #include <QObject> @@ -65,5 +64,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // STARTGDBSERVERDIALOG_H diff --git a/src/plugins/debugger/gdb/termgdbadapter.h b/src/plugins/debugger/gdb/termgdbadapter.h index 125d4bfacc..17dd5a4eb9 100644 --- a/src/plugins/debugger/gdb/termgdbadapter.h +++ b/src/plugins/debugger/gdb/termgdbadapter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_TERMGDBADAPTER_H -#define DEBUGGER_TERMGDBADAPTER_H +#pragma once #include "gdbengine.h" @@ -66,5 +65,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_TERMGDBADAPTER_H diff --git a/src/plugins/debugger/imageviewer.h b/src/plugins/debugger/imageviewer.h index da58eb85d5..ece5465486 100644 --- a/src/plugins/debugger/imageviewer.h +++ b/src/plugins/debugger/imageviewer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IMAGEVIEWER_H -#define IMAGEVIEWER_H +#pragma once #include <QWidget> @@ -77,5 +76,3 @@ private: Data m_data; QString m_info; }; - -#endif // IMAGEVIEWER_H diff --git a/src/plugins/debugger/loadcoredialog.h b/src/plugins/debugger/loadcoredialog.h index 7ba216b73b..bce0d75e41 100644 --- a/src/plugins/debugger/loadcoredialog.h +++ b/src/plugins/debugger/loadcoredialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LOADCOREDIALOG_H -#define LOADCOREDIALOG_H +#pragma once #include <QDialog> @@ -74,5 +73,3 @@ private: } // namespace Debugger } // namespace Internal - -#endif // LOADCOREDIALOG_H diff --git a/src/plugins/debugger/localsandexpressionswindow.h b/src/plugins/debugger/localsandexpressionswindow.h index 05dacd4879..15294640d1 100644 --- a/src/plugins/debugger/localsandexpressionswindow.h +++ b/src/plugins/debugger/localsandexpressionswindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LOCALSANDEXPRESSIONSWINDOW_H -#define LOCALSANDEXPRESSIONSWINDOW_H +#pragma once #include <QWidget> #include <QTimer> @@ -56,5 +55,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // LOCALSANDEXPRESSIONSWINDOW_H diff --git a/src/plugins/debugger/logwindow.h b/src/plugins/debugger/logwindow.h index 6d78adcabc..6f6e3d713e 100644 --- a/src/plugins/debugger/logwindow.h +++ b/src/plugins/debugger/logwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_LOGWINDOW_H -#define DEBUGGER_LOGWINDOW_H +#pragma once #include "debuggerconstants.h" @@ -90,6 +89,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_LOGWINDOW_H - diff --git a/src/plugins/debugger/memoryagent.h b/src/plugins/debugger/memoryagent.h index dc4341eb42..b761eac4c8 100644 --- a/src/plugins/debugger/memoryagent.h +++ b/src/plugins/debugger/memoryagent.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_MEMORYAGENT_H -#define DEBUGGER_MEMORYAGENT_H +#pragma once #include "debuggerconstants.h" @@ -116,5 +115,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_MEMORYAGENT_H diff --git a/src/plugins/debugger/memoryview.h b/src/plugins/debugger/memoryview.h index 307f1c53c9..45c5e0827e 100644 --- a/src/plugins/debugger/memoryview.h +++ b/src/plugins/debugger/memoryview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_INTERNAL_MEMORYVIEW_H -#define DEBUGGER_INTERNAL_MEMORYVIEW_H +#pragma once #include <QWidget> @@ -80,5 +79,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_INTERNAL_MEMORYVIEW_H diff --git a/src/plugins/debugger/moduleshandler.h b/src/plugins/debugger/moduleshandler.h index 9feb8a6af3..004ddeb39b 100644 --- a/src/plugins/debugger/moduleshandler.h +++ b/src/plugins/debugger/moduleshandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_MODULESHANDLER_H -#define DEBUGGER_MODULESHANDLER_H +#pragma once #include <utils/elfreader.h> #include <utils/treemodel.h> @@ -136,5 +135,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_MODULESHANDLER_H diff --git a/src/plugins/debugger/moduleswindow.h b/src/plugins/debugger/moduleswindow.h index 0ce21d35bf..ac32c23f5f 100644 --- a/src/plugins/debugger/moduleswindow.h +++ b/src/plugins/debugger/moduleswindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_MODULESWINDOW_H -#define DEBUGGER_MODULESWINDOW_H +#pragma once #include <utils/basetreeview.h> @@ -45,6 +44,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_MODULESWINDOW_H - diff --git a/src/plugins/debugger/namedemangler/demanglerexceptions.h b/src/plugins/debugger/namedemangler/demanglerexceptions.h index 3b0b4a77c8..eb210c3f7d 100644 --- a/src/plugins/debugger/namedemangler/demanglerexceptions.h +++ b/src/plugins/debugger/namedemangler/demanglerexceptions.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEMANGLEREXCEPTIONS_H -#define DEMANGLEREXCEPTIONS_H +#pragma once #include <QtGlobal> #include <QSharedPointer> @@ -75,5 +74,3 @@ template <typename T> QSharedPointer<T> demanglerCast(const QSharedPointer<Parse } // namespace Internal } // namespace Debugger - -#endif // DEMANGLEREXCEPTIONS_H diff --git a/src/plugins/debugger/namedemangler/globalparsestate.h b/src/plugins/debugger/namedemangler/globalparsestate.h index 3002d931a8..9794d57f7c 100644 --- a/src/plugins/debugger/namedemangler/globalparsestate.h +++ b/src/plugins/debugger/namedemangler/globalparsestate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLOBAL_PARSE_STATE_H -#define GLOBAL_PARSE_STATE_H +#pragma once #include <QByteArray> #include <QSharedPointer> @@ -68,5 +67,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // GLOBAL_PARSE_STATE_H diff --git a/src/plugins/debugger/namedemangler/namedemangler.h b/src/plugins/debugger/namedemangler/namedemangler.h index 16ce555031..9e57e5fba9 100644 --- a/src/plugins/debugger/namedemangler/namedemangler.h +++ b/src/plugins/debugger/namedemangler/namedemangler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NAME_DEMANGLER_H -#define NAME_DEMANGLER_H +#pragma once #include <QtGlobal> @@ -70,5 +69,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // Include guard. diff --git a/src/plugins/debugger/namedemangler/parsetreenodes.h b/src/plugins/debugger/namedemangler/parsetreenodes.h index 8b0bbadce5..782a06cce5 100644 --- a/src/plugins/debugger/namedemangler/parsetreenodes.h +++ b/src/plugins/debugger/namedemangler/parsetreenodes.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PARSETREENODES_H -#define PARSETREENODES_H +#pragma once #include "globalparsestate.h" @@ -829,5 +828,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // PARSETREENODES_H diff --git a/src/plugins/debugger/pdb/pdbengine.h b/src/plugins/debugger/pdb/pdbengine.h index 60882e8189..f71f1911ba 100644 --- a/src/plugins/debugger/pdb/pdbengine.h +++ b/src/plugins/debugger/pdb/pdbengine.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_PDBENGINE_H -#define DEBUGGER_PDBENGINE_H +#pragma once #include <debugger/debuggerengine.h> @@ -123,5 +122,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_PDBENGINE_H diff --git a/src/plugins/debugger/procinterrupt.h b/src/plugins/debugger/procinterrupt.h index 4cfb9ff6b5..b1d71e6db9 100644 --- a/src/plugins/debugger/procinterrupt.h +++ b/src/plugins/debugger/procinterrupt.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_PROCINTERRUPT_H -#define DEBUGGER_PROCINTERRUPT_H +#pragma once #include <QString> @@ -36,5 +35,3 @@ bool interruptProcess(qint64 pID, int engineType, QString *errorMessage, } // Internal } // GdbDebugger - -#endif // DEBUGGER_PROCINTERRUPT_H diff --git a/src/plugins/debugger/qml/interactiveinterpreter.h b/src/plugins/debugger/qml/interactiveinterpreter.h index 95fa2b3db7..541e33a558 100644 --- a/src/plugins/debugger/qml/interactiveinterpreter.h +++ b/src/plugins/debugger/qml/interactiveinterpreter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INTERACTIVEINTERPRETER_H -#define INTERACTIVEINTERPRETER_H +#pragma once #include <qmljs/parser/qmljslexer_p.h> #include <qmljs/parser/qmljsengine_p.h> @@ -57,4 +56,3 @@ private: } } -#endif // INTERACTIVEINTERPRETER_H diff --git a/src/plugins/debugger/qml/qmlcppengine.h b/src/plugins/debugger/qml/qmlcppengine.h index b45f38dbe1..e549a26206 100644 --- a/src/plugins/debugger/qml/qmlcppengine.h +++ b/src/plugins/debugger/qml/qmlcppengine.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLCPPENGINE_H -#define QMLCPPENGINE_H +#pragma once #include <debugger/debuggerengine.h> @@ -139,5 +138,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // QMLCPPENGINE_H diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h index 2ace561a56..b81d4693e7 100644 --- a/src/plugins/debugger/qml/qmlengine.h +++ b/src/plugins/debugger/qml/qmlengine.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLENGINE_H -#define QMLENGINE_H +#pragma once #include <debugger/debuggerengine.h> @@ -150,5 +149,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // QMLENGINE_H diff --git a/src/plugins/debugger/qml/qmlengineutils.h b/src/plugins/debugger/qml/qmlengineutils.h index 46d0995176..abb6c4c103 100644 --- a/src/plugins/debugger/qml/qmlengineutils.h +++ b/src/plugins/debugger/qml/qmlengineutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLENGINEUTILS_H -#define QMLENGINEUTILS_H +#pragma once #include <qmldebug/qdebugmessageclient.h> #include <qmldebug/qmloutputparser.h> @@ -39,5 +38,3 @@ QStringList highlightExceptionCode(int lineNumber, const QString &filePath, cons } // namespace Internal } // namespace Debugger - -#endif // QMLENGINEUTILS_H diff --git a/src/plugins/debugger/qml/qmlinspectoragent.h b/src/plugins/debugger/qml/qmlinspectoragent.h index 611739b7b5..f8ed4e131e 100644 --- a/src/plugins/debugger/qml/qmlinspectoragent.h +++ b/src/plugins/debugger/qml/qmlinspectoragent.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLINSPECTORAGENT_H -#define QMLINSPECTORAGENT_H +#pragma once #include <QStack> #include <QPointer> @@ -161,5 +160,3 @@ private: } // Internal } // Debugger - -#endif // QMLINSPECTORAGENT_H diff --git a/src/plugins/debugger/qml/qmlv8debuggerclientconstants.h b/src/plugins/debugger/qml/qmlv8debuggerclientconstants.h index 2eb60a454f..d3f03db8f3 100644 --- a/src/plugins/debugger/qml/qmlv8debuggerclientconstants.h +++ b/src/plugins/debugger/qml/qmlv8debuggerclientconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLV8DEBUGGERCLIENTCONSTANTS_H -#define QMLV8DEBUGGERCLIENTCONSTANTS_H +#pragma once namespace Debugger { namespace Internal { @@ -115,4 +114,3 @@ const char INTERNAL_FUNCTION[] = "(function(method) { "\ "})"; } //Internal } //Debugger -#endif // QMLV8DEBUGGERCLIENTCONSTANTS_H diff --git a/src/plugins/debugger/registerhandler.h b/src/plugins/debugger/registerhandler.h index f1974ee5b4..f8bf2ca3fe 100644 --- a/src/plugins/debugger/registerhandler.h +++ b/src/plugins/debugger/registerhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_REGISTERHANDLER_H -#define DEBUGGER_REGISTERHANDLER_H +#pragma once #include <utils/treemodel.h> @@ -144,5 +143,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_REGISTERHANDLER_H diff --git a/src/plugins/debugger/registerpostmortemaction.h b/src/plugins/debugger/registerpostmortemaction.h index 3748daf83b..bff1f6c78e 100644 --- a/src/plugins/debugger/registerpostmortemaction.h +++ b/src/plugins/debugger/registerpostmortemaction.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REGISTERPOSTMORTEMACTION_H -#define REGISTERPOSTMORTEMACTION_H +#pragma once #include <utils/savedaction.h> @@ -44,5 +43,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // REGISTERPOSTMORTEMACTION_H diff --git a/src/plugins/debugger/registerwindow.h b/src/plugins/debugger/registerwindow.h index 9a3b11704b..13a6f91c02 100644 --- a/src/plugins/debugger/registerwindow.h +++ b/src/plugins/debugger/registerwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_REGISTERWINDOW_H -#define DEBUGGER_REGISTERWINDOW_H +#pragma once #include <utils/basetreeview.h> @@ -47,5 +46,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_REGISTERWINDOW_H diff --git a/src/plugins/debugger/shared/backtrace.h b/src/plugins/debugger/shared/backtrace.h index 86daa5ca72..ea4ec142eb 100644 --- a/src/plugins/debugger/shared/backtrace.h +++ b/src/plugins/debugger/shared/backtrace.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_BACKTRACE_H -#define DEBUGGER_BACKTRACE_H +#pragma once namespace Debugger { namespace Internal { @@ -33,5 +32,3 @@ void dumpBacktrace(int maxdepth = -1); } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_BACKTRACE_H diff --git a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.h b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.h index b246bcd6d0..8a760d11b1 100644 --- a/src/plugins/debugger/shared/cdbsymbolpathlisteditor.h +++ b/src/plugins/debugger/shared/cdbsymbolpathlisteditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SYMBOLPATHLISTEDITOR_H -#define SYMBOLPATHLISTEDITOR_H +#pragma once #include <utils/pathlisteditor.h> @@ -95,5 +94,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // SYMBOLPATHLISTEDITOR_H diff --git a/src/plugins/debugger/shared/hostutils.h b/src/plugins/debugger/shared/hostutils.h index 7c2a1d6f04..3348530867 100644 --- a/src/plugins/debugger/shared/hostutils.h +++ b/src/plugins/debugger/shared/hostutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_HOSTUTILS_H -#define DEBUGGER_HOSTUTILS_H +#pragma once #include <QList> @@ -68,5 +67,3 @@ bool isDebuggerWinException(unsigned long code); } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_HOSTUTILS_H diff --git a/src/plugins/debugger/shared/peutils.h b/src/plugins/debugger/shared/peutils.h index 47f3ee0bf8..0d25d8ace1 100644 --- a/src/plugins/debugger/shared/peutils.h +++ b/src/plugins/debugger/shared/peutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_PEUTILS_H -#define DEBUGGER_PEUTILS_H +#pragma once #include <qnamespace.h> @@ -43,5 +42,3 @@ bool getPDBFiles(const QString &peExecutableFileName, QStringList *rc, QString * } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_PEUTILS_H diff --git a/src/plugins/debugger/shared/symbolpathsdialog.h b/src/plugins/debugger/shared/symbolpathsdialog.h index d6c0ad89bc..304988e285 100644 --- a/src/plugins/debugger/shared/symbolpathsdialog.h +++ b/src/plugins/debugger/shared/symbolpathsdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SYMBOLPATHSDIALOG_H -#define SYMBOLPATHSDIALOG_H +#pragma once #include <QDialog> #include <QString> @@ -60,5 +59,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // SYMBOLPATHSDIALOG_H diff --git a/src/plugins/debugger/simplifytype.h b/src/plugins/debugger/simplifytype.h index 72dd536780..ac4f981dcc 100644 --- a/src/plugins/debugger/simplifytype.h +++ b/src/plugins/debugger/simplifytype.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_SIMPLIFY_TYPE_H -#define DEBUGGER_SIMPLIFY_TYPE_H +#pragma once #include <QString> @@ -38,6 +37,3 @@ QString simplifyType(const QString &typeIn); } // namespace Internal } // namespace Debugger - - -#endif // DEBUGGER_SIMPLIFY_TYPE_H diff --git a/src/plugins/debugger/snapshothandler.h b/src/plugins/debugger/snapshothandler.h index 71163647c0..fb9225d335 100644 --- a/src/plugins/debugger/snapshothandler.h +++ b/src/plugins/debugger/snapshothandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_SNAPSHOTHANDLER_H -#define DEBUGGER_SNAPSHOTHANDLER_H +#pragma once #include <QAbstractTableModel> #include <QPointer> @@ -79,5 +78,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_SNAPSHOTHANDLER_H diff --git a/src/plugins/debugger/snapshotwindow.h b/src/plugins/debugger/snapshotwindow.h index 6097874a8b..dfcdaf5e6a 100644 --- a/src/plugins/debugger/snapshotwindow.h +++ b/src/plugins/debugger/snapshotwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_SNAPSHOTWINDOW_H -#define DEBUGGER_SNAPSHOTWINDOW_H +#pragma once #include <utils/basetreeview.h> @@ -51,6 +50,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_SNAPSHOTWINDOW_H - diff --git a/src/plugins/debugger/sourceagent.h b/src/plugins/debugger/sourceagent.h index 14a90c8eb3..592d8ce66a 100644 --- a/src/plugins/debugger/sourceagent.h +++ b/src/plugins/debugger/sourceagent.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_SOURCE_AGENT_H -#define DEBUGGER_SOURCE_AGENT_H +#pragma once #include <QString> @@ -49,5 +48,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif diff --git a/src/plugins/debugger/sourcefileshandler.h b/src/plugins/debugger/sourcefileshandler.h index 93cf42c3b4..a859880d1e 100644 --- a/src/plugins/debugger/sourcefileshandler.h +++ b/src/plugins/debugger/sourcefileshandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_SOURCEFILESHANDLER_H -#define DEBUGGER_SOURCEFILESHANDLER_H +#pragma once #include <QAbstractItemModel> #include <QStringList> @@ -65,5 +64,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_SOURCEFILESHANDLER_H diff --git a/src/plugins/debugger/sourcefileswindow.h b/src/plugins/debugger/sourcefileswindow.h index 8080f72551..9a2af38198 100644 --- a/src/plugins/debugger/sourcefileswindow.h +++ b/src/plugins/debugger/sourcefileswindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SOURCEFILESWINDOW_H -#define SOURCEFILESWINDOW_H +#pragma once #include <utils/basetreeview.h> @@ -45,6 +44,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // SOURCEFILESWINDOW_H - diff --git a/src/plugins/debugger/sourceutils.h b/src/plugins/debugger/sourceutils.h index 9b6e51d382..12ea4a338f 100644 --- a/src/plugins/debugger/sourceutils.h +++ b/src/plugins/debugger/sourceutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SOURCE_UTILS_H -#define SOURCE_UTILS_H +#pragma once #include <QString> @@ -58,5 +57,3 @@ ContextData getLocationContext(TextEditor::TextDocument *document, int lineNumbe } // namespace Internal } // namespace Debugger - -#endif // SOURCE_UTILS_H diff --git a/src/plugins/debugger/stackframe.h b/src/plugins/debugger/stackframe.h index df29aa5019..5d7674e642 100644 --- a/src/plugins/debugger/stackframe.h +++ b/src/plugins/debugger/stackframe.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_STACKFRAME_H -#define DEBUGGER_STACKFRAME_H +#pragma once #include "debuggerconstants.h" @@ -74,5 +73,3 @@ typedef QList<StackFrame> StackFrames; } // namespace Debugger Q_DECLARE_METATYPE(Debugger::Internal::StackFrame) - -#endif // DEBUGGER_STACKFRAME_H diff --git a/src/plugins/debugger/stackhandler.h b/src/plugins/debugger/stackhandler.h index e10b9818e5..10649f5b88 100644 --- a/src/plugins/debugger/stackhandler.h +++ b/src/plugins/debugger/stackhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_STACKHANDLER_H -#define DEBUGGER_STACKHANDLER_H +#pragma once #include "stackframe.h" @@ -98,5 +97,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_STACKHANDLER_H diff --git a/src/plugins/debugger/stackwindow.h b/src/plugins/debugger/stackwindow.h index 3dbfb3740d..7a44c996a4 100644 --- a/src/plugins/debugger/stackwindow.h +++ b/src/plugins/debugger/stackwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_STACKWINDOW_H -#define DEBUGGER_STACKWINDOW_H +#pragma once #include <utils/basetreeview.h> #include <QCoreApplication> @@ -50,6 +49,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_STACKWINDOW_H - diff --git a/src/plugins/debugger/terminal.h b/src/plugins/debugger/terminal.h index 2383772d57..67b3bf851a 100644 --- a/src/plugins/debugger/terminal.h +++ b/src/plugins/debugger/terminal.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_TERMINAL_H -#define DEBUGGER_TERMINAL_H +#pragma once #include <QCoreApplication> #include <QSocketNotifier> @@ -63,5 +62,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_TERMINAL_H diff --git a/src/plugins/debugger/threaddata.h b/src/plugins/debugger/threaddata.h index 2a5c2315f4..23f280c105 100644 --- a/src/plugins/debugger/threaddata.h +++ b/src/plugins/debugger/threaddata.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef THREADDATA_H -#define THREADDATA_H +#pragma once #include <QString> #include <QVector> @@ -111,5 +110,3 @@ typedef QVector<ThreadData> Threads; } // namespace Internal } // namespace Debugger - -#endif // THREADDATA_H diff --git a/src/plugins/debugger/threadshandler.h b/src/plugins/debugger/threadshandler.h index 3e644a0387..5ddfbf5dca 100644 --- a/src/plugins/debugger/threadshandler.h +++ b/src/plugins/debugger/threadshandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef THREADSHANDLER_H -#define THREADSHANDLER_H +#pragma once #include "threaddata.h" @@ -90,5 +89,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // THREADSHANDLER_H diff --git a/src/plugins/debugger/threadswindow.h b/src/plugins/debugger/threadswindow.h index 9a814a27c8..8840043fb3 100644 --- a/src/plugins/debugger/threadswindow.h +++ b/src/plugins/debugger/threadswindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef THREADSWINDOW_H -#define THREADSWINDOW_H +#pragma once #include <utils/basetreeview.h> @@ -45,5 +44,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // THREADSWINDOW_H diff --git a/src/plugins/debugger/unstartedappwatcherdialog.h b/src/plugins/debugger/unstartedappwatcherdialog.h index 6ab2cc4caf..47d38c17d9 100644 --- a/src/plugins/debugger/unstartedappwatcherdialog.h +++ b/src/plugins/debugger/unstartedappwatcherdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UNSTARTEDAPPWATCHERDIALOG_H -#define UNSTARTEDAPPWATCHERDIALOG_H +#pragma once #include <QDialog> #include <QTimer> @@ -96,5 +95,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // UNSTARTEDAPPWATCHERDIALOG_H diff --git a/src/plugins/debugger/watchdata.h b/src/plugins/debugger/watchdata.h index 4fe9715783..575c628650 100644 --- a/src/plugins/debugger/watchdata.h +++ b/src/plugins/debugger/watchdata.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_WATCHDATA_H -#define DEBUGGER_WATCHDATA_H +#pragma once #include "debuggerprotocol.h" @@ -129,5 +128,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_WATCHDATA_H diff --git a/src/plugins/debugger/watchdelegatewidgets.h b/src/plugins/debugger/watchdelegatewidgets.h index 139391b368..e9acb3a217 100644 --- a/src/plugins/debugger/watchdelegatewidgets.h +++ b/src/plugins/debugger/watchdelegatewidgets.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WATCHDELEGATEWIDGETS_H -#define WATCHDELEGATEWIDGETS_H +#pragma once #include <QLineEdit> #include <QComboBox> @@ -109,5 +108,3 @@ public: } // namespace Internal } // namespace Debugger - -#endif // WATCHDELEGATEWIDGETS_H diff --git a/src/plugins/debugger/watchhandler.h b/src/plugins/debugger/watchhandler.h index 29c13ae3bd..527c93bb45 100644 --- a/src/plugins/debugger/watchhandler.h +++ b/src/plugins/debugger/watchhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_WATCHHANDLER_H -#define DEBUGGER_WATCHHANDLER_H +#pragma once #include "watchdata.h" @@ -128,5 +127,3 @@ private: } // namespace Debugger Q_DECLARE_METATYPE(Debugger::Internal::DisplayFormat) - -#endif // DEBUGGER_WATCHHANDLER_H diff --git a/src/plugins/debugger/watchutils.h b/src/plugins/debugger/watchutils.h index 91f019b648..0e7e55baaf 100644 --- a/src/plugins/debugger/watchutils.h +++ b/src/plugins/debugger/watchutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WATCHUTILS_H -#define WATCHUTILS_H +#pragma once // NOTE: Don't add dependencies to other files. // This is used in the debugger auto-tests. @@ -54,5 +53,3 @@ QString removeObviousSideEffects(const QString &exp); } // namespace Internal } // namespace Debugger - -#endif // WATCHUTILS_H diff --git a/src/plugins/debugger/watchwindow.h b/src/plugins/debugger/watchwindow.h index 569e436cfd..f7eefe9bd0 100644 --- a/src/plugins/debugger/watchwindow.h +++ b/src/plugins/debugger/watchwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGGER_WATCHWINDOW_H -#define DEBUGGER_WATCHWINDOW_H +#pragma once #include <utils/basetreeview.h> @@ -92,5 +91,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // DEBUGGER_WATCHWINDOW_H diff --git a/src/plugins/designer/codemodelhelpers.h b/src/plugins/designer/codemodelhelpers.h index 9c5385ea9b..9e3e845d74 100644 --- a/src/plugins/designer/codemodelhelpers.h +++ b/src/plugins/designer/codemodelhelpers.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CODEMODELHELPERS_H -#define CODEMODELHELPERS_H +#pragma once #include <QtGlobal> @@ -46,5 +45,3 @@ bool navigateToSlot(const QString &uiFileName, } // namespace Internal } // namespace Designer - -#endif // CODEMODELHELPERS_H diff --git a/src/plugins/designer/cpp/formclasswizard.h b/src/plugins/designer/cpp/formclasswizard.h index 520c3575d4..8dc4868a5e 100644 --- a/src/plugins/designer/cpp/formclasswizard.h +++ b/src/plugins/designer/cpp/formclasswizard.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FORMCLASSWIZARD_H -#define FORMCLASSWIZARD_H +#pragma once #include "formclasswizardparameters.h" @@ -52,5 +51,3 @@ private: } // namespace Internal } // namespace Designer - -#endif // FORMCLASSWIZARD_H diff --git a/src/plugins/designer/cpp/formclasswizarddialog.h b/src/plugins/designer/cpp/formclasswizarddialog.h index 41ddd60345..18c96e0f0f 100644 --- a/src/plugins/designer/cpp/formclasswizarddialog.h +++ b/src/plugins/designer/cpp/formclasswizarddialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FORMCLASSWIZARDDIALOG_H -#define FORMCLASSWIZARDDIALOG_H +#pragma once #include <coreplugin/basefilewizard.h> @@ -66,5 +65,3 @@ private: } // namespace Internal } // namespace Designer - -#endif // FORMCLASSWIZARDDIALOG_H diff --git a/src/plugins/designer/cpp/formclasswizardpage.h b/src/plugins/designer/cpp/formclasswizardpage.h index 37e2b30703..1f442610a5 100644 --- a/src/plugins/designer/cpp/formclasswizardpage.h +++ b/src/plugins/designer/cpp/formclasswizardpage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FORMCLASSWIZARDPAGE_H -#define FORMCLASSWIZARDPAGE_H +#pragma once #include <QWizardPage> @@ -75,5 +74,3 @@ private: } // namespace Internal } // namespace Designer - -#endif //FORMCLASSWIZARDPAGE_H diff --git a/src/plugins/designer/cpp/formclasswizardparameters.h b/src/plugins/designer/cpp/formclasswizardparameters.h index 043c045750..7aa25f5cb3 100644 --- a/src/plugins/designer/cpp/formclasswizardparameters.h +++ b/src/plugins/designer/cpp/formclasswizardparameters.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FORMCLASSWIZARDPARAMETERS_H -#define FORMCLASSWIZARDPARAMETERS_H +#pragma once #include <QString> #include <QMetaType> @@ -48,5 +47,3 @@ public: } // namespace Designer Q_DECLARE_METATYPE(Designer::FormClassWizardParameters) - -#endif // FORMCLASSWIZARDPARAMETERS_H diff --git a/src/plugins/designer/designer_export.h b/src/plugins/designer/designer_export.h index c6c1c25593..000e6c6130 100644 --- a/src/plugins/designer/designer_export.h +++ b/src/plugins/designer/designer_export.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DESIGNER_EXPORT_H -#define DESIGNER_EXPORT_H +#pragma once #include <qglobal.h> @@ -33,5 +32,3 @@ #else # define DESIGNER_EXPORT Q_DECL_IMPORT #endif - -#endif // DESIGNER_EXPORT_H diff --git a/src/plugins/designer/designerconstants.h b/src/plugins/designer/designerconstants.h index 1704211df9..a097a991d0 100644 --- a/src/plugins/designer/designerconstants.h +++ b/src/plugins/designer/designerconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DESIGNERCONSTANTS_H -#define DESIGNERCONSTANTS_H +#pragma once #include <QtGlobal> @@ -73,5 +72,3 @@ namespace Internal { } } // Constants } // Designer - -#endif //DESIGNERCONSTANTS_H diff --git a/src/plugins/designer/designercontext.h b/src/plugins/designer/designercontext.h index 20cb7f1210..11bd0afd8e 100644 --- a/src/plugins/designer/designercontext.h +++ b/src/plugins/designer/designercontext.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DESIGNERCONTEXT_H -#define DESIGNERCONTEXT_H +#pragma once #include <coreplugin/icontext.h> @@ -43,5 +42,3 @@ public: } // namespace Internal } // namespace Designer - -#endif // DESIGNERCONTEXT_H diff --git a/src/plugins/designer/editordata.h b/src/plugins/designer/editordata.h index a2fd63bfbf..c4d92f9a41 100644 --- a/src/plugins/designer/editordata.h +++ b/src/plugins/designer/editordata.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EDITORDATA_H -#define EDITORDATA_H +#pragma once namespace SharedTools { class WidgetHost; } @@ -45,5 +44,3 @@ public: } // namespace Internal } // namespace Designer - -#endif // EDITORDATA_H diff --git a/src/plugins/designer/editorwidget.h b/src/plugins/designer/editorwidget.h index 374157cff2..76e77665f3 100644 --- a/src/plugins/designer/editorwidget.h +++ b/src/plugins/designer/editorwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DESIGNER_EDITORWIDGET_H -#define DESIGNER_EDITORWIDGET_H +#pragma once #include "designerconstants.h" @@ -75,5 +74,3 @@ private: } // namespace Internal } // namespace Designer - -#endif // DESIGNER_EDITORWIDGET_H diff --git a/src/plugins/designer/formeditorfactory.h b/src/plugins/designer/formeditorfactory.h index f81b657317..8c8b898a7e 100644 --- a/src/plugins/designer/formeditorfactory.h +++ b/src/plugins/designer/formeditorfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FORMEDITORFACTORY_H -#define FORMEDITORFACTORY_H +#pragma once #include <coreplugin/editormanager/ieditorfactory.h> @@ -43,5 +42,3 @@ public: } // namespace Internal } // namespace Designer - -#endif // FORMEDITORFACTORY_H diff --git a/src/plugins/designer/formeditorplugin.h b/src/plugins/designer/formeditorplugin.h index 8fa68e3f14..47ecdeda28 100644 --- a/src/plugins/designer/formeditorplugin.h +++ b/src/plugins/designer/formeditorplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FORMEDITORPLUGIN_H -#define FORMEDITORPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -63,5 +62,3 @@ private: } // namespace Internal } // namespace Designer - -#endif // FORMEDITORPLUGIN_H diff --git a/src/plugins/designer/formeditorstack.h b/src/plugins/designer/formeditorstack.h index d8f84c2cde..3d1dc21e1c 100644 --- a/src/plugins/designer/formeditorstack.h +++ b/src/plugins/designer/formeditorstack.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FORMEDITORSTACK_H -#define FORMEDITORSTACK_H +#pragma once #include "editordata.h" @@ -82,5 +81,3 @@ private: } // namespace Internal } // namespace Designer - -#endif // FORMEDITORSTACK_H diff --git a/src/plugins/designer/formeditorw.h b/src/plugins/designer/formeditorw.h index 51eaaf6a13..7dbc96d94f 100644 --- a/src/plugins/designer/formeditorw.h +++ b/src/plugins/designer/formeditorw.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FORMEDITORW_H -#define FORMEDITORW_H +#pragma once #include "designerconstants.h" @@ -90,5 +89,3 @@ public: } // namespace Internal } // namespace Designer - -#endif // FORMEDITORW_H diff --git a/src/plugins/designer/formtemplatewizardpage.h b/src/plugins/designer/formtemplatewizardpage.h index 471837e360..047ca4667e 100644 --- a/src/plugins/designer/formtemplatewizardpage.h +++ b/src/plugins/designer/formtemplatewizardpage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FORMTEMPLATEWIZARDPAGE_H -#define FORMTEMPLATEWIZARDPAGE_H +#pragma once #include <projectexplorer/jsonwizard/jsonwizardpagefactory.h> @@ -80,5 +79,3 @@ private: } // namespace Internal } // namespace Designer - -#endif // FORMTEMPLATEWIZARDPAGE_H diff --git a/src/plugins/designer/formwindoweditor.h b/src/plugins/designer/formwindoweditor.h index 146f528316..80eaeabf24 100644 --- a/src/plugins/designer/formwindoweditor.h +++ b/src/plugins/designer/formwindoweditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FORMWINDOWEDITOR_H -#define FORMWINDOWEDITOR_H +#pragma once #include "designer_export.h" #include <texteditor/texteditor.h> @@ -60,5 +59,3 @@ public: }; } // namespace Designer - -#endif // FORMWINDOWEDITOR_H diff --git a/src/plugins/designer/formwindowfile.h b/src/plugins/designer/formwindowfile.h index 648460b7e1..7ee62bb951 100644 --- a/src/plugins/designer/formwindowfile.h +++ b/src/plugins/designer/formwindowfile.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FORMWINDOWFILE_H -#define FORMWINDOWFILE_H +#pragma once #include <texteditor/textdocument.h> @@ -89,5 +88,3 @@ private: } // namespace Internal } // namespace Designer - -#endif // FORMWINDOWFILE_H diff --git a/src/plugins/designer/qtcreatorintegration.h b/src/plugins/designer/qtcreatorintegration.h index 00baa16bb6..a00540ba8d 100644 --- a/src/plugins/designer/qtcreatorintegration.h +++ b/src/plugins/designer/qtcreatorintegration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTCREATORINTEGRATION_H -#define QTCREATORINTEGRATION_H +#pragma once #include <QtGlobal> #include <QDesignerIntegration> @@ -65,5 +64,3 @@ private: } // namespace Internal } // namespace Designer - -#endif // QTCREATORINTEGRATION_H diff --git a/src/plugins/designer/qtdesignerformclasscodegenerator.h b/src/plugins/designer/qtdesignerformclasscodegenerator.h index 6f67e052ab..96eb76e07f 100644 --- a/src/plugins/designer/qtdesignerformclasscodegenerator.h +++ b/src/plugins/designer/qtdesignerformclasscodegenerator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTDESIGNERFORMCLASSCODEGENERATOR_H -#define QTDESIGNERFORMCLASSCODEGENERATOR_H +#pragma once #include <QString> #include <QVariant> @@ -52,5 +51,3 @@ public: Q_INVOKABLE QVariant generateFormClassCode(const Designer::FormClassWizardParameters ¶meters); }; } // namespace Designer - -#endif // QTDESIGNERFORMCLASSCODEGENERATOR_H diff --git a/src/plugins/designer/resourcehandler.h b/src/plugins/designer/resourcehandler.h index d714a04c1b..4fa3630d7e 100644 --- a/src/plugins/designer/resourcehandler.h +++ b/src/plugins/designer/resourcehandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RESOURCEHANDLER_H -#define RESOURCEHANDLER_H +#pragma once #include <QObject> #include <QStringList> @@ -71,5 +70,3 @@ private: } // namespace Internal } // namespace Designer - -#endif // RESOURCEHANDLER_H diff --git a/src/plugins/designer/settingsmanager.h b/src/plugins/designer/settingsmanager.h index 164f35e11d..2d64d95048 100644 --- a/src/plugins/designer/settingsmanager.h +++ b/src/plugins/designer/settingsmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SETTINGSMANAGER_H -#define SETTINGSMANAGER_H +#pragma once #include <QDesignerSettingsInterface> @@ -51,5 +50,3 @@ private: } // namespace Internal } // namespace Designer - -#endif // SETTINGSMANAGER_H diff --git a/src/plugins/designer/settingspage.h b/src/plugins/designer/settingspage.h index 98360b822f..7e0a6b1836 100644 --- a/src/plugins/designer/settingspage.h +++ b/src/plugins/designer/settingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DESIGNER_SETTINGSPAGE_H -#define DESIGNER_SETTINGSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> @@ -73,5 +72,3 @@ private: } // namespace Internal } // namespace Designer - -#endif // DESIGNER_SETTINGSPAGE_H diff --git a/src/plugins/diffeditor/diffeditor.h b/src/plugins/diffeditor/diffeditor.h index 346b36c498..7539ff31d6 100644 --- a/src/plugins/diffeditor/diffeditor.h +++ b/src/plugins/diffeditor/diffeditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DIFFEDITOR_H -#define DIFFEDITOR_H +#pragma once #include "diffeditorcontroller.h" @@ -111,5 +110,3 @@ private: } // namespace Internal } // namespace DiffEditor - -#endif // DIFFEDITOR_H diff --git a/src/plugins/diffeditor/diffeditor_global.h b/src/plugins/diffeditor/diffeditor_global.h index 4a1ccb9a8c..763096abbf 100644 --- a/src/plugins/diffeditor/diffeditor_global.h +++ b/src/plugins/diffeditor/diffeditor_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DIFFEDITOR_GLOBAL_H -#define DIFFEDITOR_GLOBAL_H +#pragma once #include <QtGlobal> @@ -33,5 +32,3 @@ #else # define DIFFEDITOR_EXPORT Q_DECL_IMPORT #endif - -#endif // DIFFEDITOR_GLOBAL_H diff --git a/src/plugins/diffeditor/diffeditorconstants.h b/src/plugins/diffeditor/diffeditorconstants.h index d9a1a5f9e3..1c9f605aa4 100644 --- a/src/plugins/diffeditor/diffeditorconstants.h +++ b/src/plugins/diffeditor/diffeditorconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DIFFEDITORCONSTANTS_H -#define DIFFEDITORCONSTANTS_H +#pragma once #include <QtGlobal> @@ -40,5 +39,3 @@ const char EXPAND_BRANCHES[] = "Branches: <Expand>"; } // namespace Constants } // namespace DiffEditor - -#endif // DIFFEDITORCONSTANTS_H diff --git a/src/plugins/diffeditor/diffeditorcontroller.h b/src/plugins/diffeditor/diffeditorcontroller.h index 3eb7546610..f73524fff5 100644 --- a/src/plugins/diffeditor/diffeditorcontroller.h +++ b/src/plugins/diffeditor/diffeditorcontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DIFFEDITORCONTROLLER_H -#define DIFFEDITORCONTROLLER_H +#pragma once #include "diffeditor_global.h" #include "diffutils.h" @@ -96,5 +95,3 @@ private: }; } // namespace DiffEditor - -#endif // DIFFEDITORCONTROLLER_H diff --git a/src/plugins/diffeditor/diffeditordocument.h b/src/plugins/diffeditor/diffeditordocument.h index 936d465784..81d98bb42d 100644 --- a/src/plugins/diffeditor/diffeditordocument.h +++ b/src/plugins/diffeditor/diffeditordocument.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DIFFEDITORDOCUMENT_H -#define DIFFEDITORDOCUMENT_H +#pragma once #include "diffutils.h" @@ -107,5 +106,3 @@ private: } // namespace Internal } // namespace DiffEditor - -#endif // DIFFEDITORDOCUMENT_H diff --git a/src/plugins/diffeditor/diffeditorfactory.h b/src/plugins/diffeditor/diffeditorfactory.h index da54f39290..bea963632e 100644 --- a/src/plugins/diffeditor/diffeditorfactory.h +++ b/src/plugins/diffeditor/diffeditorfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DIFFEDITORFACTORY_H -#define DIFFEDITORFACTORY_H +#pragma once #include "diffeditor_global.h" @@ -46,5 +45,3 @@ public: } // namespace Internal } // namespace DiffEditor - -#endif // DIFFEDITORFACTORY_H diff --git a/src/plugins/diffeditor/diffeditoricons.h b/src/plugins/diffeditor/diffeditoricons.h index d10bac9e6b..4db2c02dfc 100644 --- a/src/plugins/diffeditor/diffeditoricons.h +++ b/src/plugins/diffeditor/diffeditoricons.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DIFFEDITORICONS_H -#define DIFFEDITORICONS_H +#pragma once #include <utils/icon.h> @@ -40,5 +39,3 @@ const Utils::Icon SIDEBYSIDE_DIFF({ } // namespace Icons } // namespace DiffEditor - -#endif // DIFFEDITORICONS_H diff --git a/src/plugins/diffeditor/diffeditorplugin.h b/src/plugins/diffeditor/diffeditorplugin.h index 07c2cd6c4a..3f38425517 100644 --- a/src/plugins/diffeditor/diffeditorplugin.h +++ b/src/plugins/diffeditor/diffeditorplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DIFFEDITORPLUGIN_H -#define DIFFEDITORPLUGIN_H +#pragma once #include "diffeditor_global.h" @@ -55,5 +54,3 @@ private slots: } // namespace Internal } // namespace DiffEditor - -#endif // DIFFEDITORPLUGIN_H diff --git a/src/plugins/diffeditor/differ.h b/src/plugins/diffeditor/differ.h index ec8166afea..d841dd0bee 100644 --- a/src/plugins/diffeditor/differ.h +++ b/src/plugins/diffeditor/differ.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DIFFER_H -#define DIFFER_H +#pragma once #include "diffeditor_global.h" #include <QString> @@ -114,5 +113,3 @@ private: }; } // namespace DiffEditor - -#endif // DIFF_H diff --git a/src/plugins/diffeditor/diffutils.h b/src/plugins/diffeditor/diffutils.h index 2412bc5432..417309294b 100644 --- a/src/plugins/diffeditor/diffutils.h +++ b/src/plugins/diffeditor/diffutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DIFFUTILS_H -#define DIFFUTILS_H +#pragma once #include "diffeditor_global.h" @@ -149,5 +148,3 @@ public: }; } // namespace DiffEditor - -#endif // DIFFUTILS_H diff --git a/src/plugins/diffeditor/diffview.h b/src/plugins/diffeditor/diffview.h index 2d2cdc6b88..bf5342f273 100644 --- a/src/plugins/diffeditor/diffview.h +++ b/src/plugins/diffeditor/diffview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DIFFVIEW_H -#define DIFFVIEW_H +#pragma once #include <coreplugin/id.h> @@ -133,5 +132,3 @@ private: } // namespace Internal } // namespace DiffEditor - -#endif // DIFFVIEW_H diff --git a/src/plugins/diffeditor/selectabletexteditorwidget.h b/src/plugins/diffeditor/selectabletexteditorwidget.h index 52eaa911f7..2d04c7b39e 100644 --- a/src/plugins/diffeditor/selectabletexteditorwidget.h +++ b/src/plugins/diffeditor/selectabletexteditorwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SELECTABLETEXTEDITORWIDGET_H -#define SELECTABLETEXTEDITORWIDGET_H +#pragma once #include <texteditor/texteditor.h> @@ -66,5 +65,3 @@ private: } // namespace Internal } // namespace DiffEditor - -#endif // SELECTABLETEXTEDITORWIDGET_H diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.h b/src/plugins/diffeditor/sidebysidediffeditorwidget.h index 8eb7f4efca..bd6fcf3252 100644 --- a/src/plugins/diffeditor/sidebysidediffeditorwidget.h +++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SIDEBYSIDEDIFFEDITORWIDGET_H -#define SIDEBYSIDEDIFFEDITORWIDGET_H +#pragma once #include "diffutils.h" @@ -119,5 +118,3 @@ private: } // namespace Internal } // namespace DiffEditor - -#endif // SIDEBYSIDEDIFFEDITORWIDGET_H diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.h b/src/plugins/diffeditor/unifieddiffeditorwidget.h index abbf0d7780..7deb3bcecc 100644 --- a/src/plugins/diffeditor/unifieddiffeditorwidget.h +++ b/src/plugins/diffeditor/unifieddiffeditorwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UNIFIEDDIFFEDITORWIDGET_H -#define UNIFIEDDIFFEDITORWIDGET_H +#pragma once #include "diffutils.h" #include "selectabletexteditorwidget.h" @@ -141,5 +140,3 @@ private: } // namespace Internal } // namespace DiffEditor - -#endif // UNIFIEDDIFFEDITORWIDGET_H diff --git a/src/plugins/emacskeys/emacskeysconstants.h b/src/plugins/emacskeys/emacskeysconstants.h index 37d4873948..5f87669bbf 100644 --- a/src/plugins/emacskeys/emacskeysconstants.h +++ b/src/plugins/emacskeys/emacskeysconstants.h @@ -22,8 +22,7 @@ ** ****************************************************************************/ -#ifndef EMACSKEYSCONSTANTS_H -#define EMACSKEYSCONSTANTS_H +#pragma once namespace EmacsKeys { namespace Constants { @@ -55,5 +54,3 @@ const char SCROLL_HALF_UP[] = "EmacsKeys.ScrollHalfUp"; } // namespace EmacsKeys } // namespace Constants - -#endif // EMACSKEYSCONSTANTS_H diff --git a/src/plugins/emacskeys/emacskeysplugin.h b/src/plugins/emacskeys/emacskeysplugin.h index a44dda7abf..ec95a6a39a 100644 --- a/src/plugins/emacskeys/emacskeysplugin.h +++ b/src/plugins/emacskeys/emacskeysplugin.h @@ -22,8 +22,7 @@ ** ****************************************************************************/ -#ifndef EMACSKEYS_H -#define EMACSKEYS_H +#pragma once #include <extensionsystem/iplugin.h> @@ -102,5 +101,3 @@ private: } // namespace Internal } // namespace EmacsKeys - -#endif // EMACSKEYS_H diff --git a/src/plugins/emacskeys/emacskeysstate.h b/src/plugins/emacskeys/emacskeysstate.h index 2969ccea95..ff9f7a9b82 100644 --- a/src/plugins/emacskeys/emacskeysstate.h +++ b/src/plugins/emacskeys/emacskeysstate.h @@ -22,8 +22,7 @@ ** ****************************************************************************/ -#ifndef EMACSKEYSSTATE_H -#define EMACSKEYSSTATE_H +#pragma once #include <QObject> @@ -71,5 +70,3 @@ private: } // namespace Internal } // namespace EmacsKeys - -#endif // EMACSKEYSSTATE_H diff --git a/src/plugins/fakevim/fakevimactions.h b/src/plugins/fakevim/fakevimactions.h index 5b2e8889d5..e1c230ba51 100644 --- a/src/plugins/fakevim/fakevimactions.h +++ b/src/plugins/fakevim/fakevimactions.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FAKEVIM_ACTIONS_H -#define FAKEVIM_ACTIONS_H +#pragma once #ifndef FAKEVIM_STANDALONE # include <utils/savedaction.h> @@ -143,5 +142,3 @@ FakeVimAction *theFakeVimSetting(int code); } // namespace Internal } // namespace FakeVim - -#endif // FAKEVIM_ACTTIONS_H diff --git a/src/plugins/fakevim/fakevimhandler.h b/src/plugins/fakevim/fakevimhandler.h index f9c71e87a0..cd4e17117e 100644 --- a/src/plugins/fakevim/fakevimhandler.h +++ b/src/plugins/fakevim/fakevimhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FAKEVIM_HANDLER_H -#define FAKEVIM_HANDLER_H +#pragma once #include <QObject> #include <QTextEdit> @@ -169,6 +168,3 @@ private: } // namespace FakeVim Q_DECLARE_METATYPE(FakeVim::Internal::ExCommand) - - -#endif // FAKEVIM_HANDLER_H diff --git a/src/plugins/fakevim/fakevimplugin.h b/src/plugins/fakevim/fakevimplugin.h index 4f3ee2201d..edbf6ab0b9 100644 --- a/src/plugins/fakevim/fakevimplugin.h +++ b/src/plugins/fakevim/fakevimplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FAKEVIMPLUGIN_H -#define FAKEVIMPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -184,5 +183,3 @@ private: } // namespace Internal } // namespace FakeVim - -#endif // FAKEVIMPLUGIN_H diff --git a/src/plugins/fakevim/fakevimtr.h b/src/plugins/fakevim/fakevimtr.h index 42bc0ac79d..cb6f2b47ea 100644 --- a/src/plugins/fakevim/fakevimtr.h +++ b/src/plugins/fakevim/fakevimtr.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FAKEVIMTR_H -#define FAKEVIMTR_H +#pragma once #include <QCoreApplication> @@ -36,5 +35,3 @@ struct Tr }; } // namespace FakeVim - -#endif // FAKEVIMTR diff --git a/src/plugins/git/gerrit/branchcombobox.h b/src/plugins/git/gerrit/branchcombobox.h index fe34abc61c..fcc97693a6 100644 --- a/src/plugins/git/gerrit/branchcombobox.h +++ b/src/plugins/git/gerrit/branchcombobox.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BRANCHCOMBOBOX_H -#define BRANCHCOMBOBOX_H +#pragma once #include <QComboBox> @@ -48,5 +47,3 @@ private: } // namespace Internal } // namespace Gerrit - -#endif // BRANCHCOMBOBOX_H diff --git a/src/plugins/git/gerrit/gerritdialog.h b/src/plugins/git/gerrit/gerritdialog.h index 48b657ec72..5f2fc2ec65 100644 --- a/src/plugins/git/gerrit/gerritdialog.h +++ b/src/plugins/git/gerrit/gerritdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GERRIT_INTERNAL_GERRITDIALOG_H -#define GERRIT_INTERNAL_GERRITDIALOG_H +#pragma once #include <utils/pathchooser.h> @@ -115,5 +114,3 @@ private: } // namespace Internal } // namespace Gerrit - -#endif // GERRIT_INTERNAL_GERRITDIALOG_H diff --git a/src/plugins/git/gerrit/gerritmodel.h b/src/plugins/git/gerrit/gerritmodel.h index b0a8803a26..1ceb7e7980 100644 --- a/src/plugins/git/gerrit/gerritmodel.h +++ b/src/plugins/git/gerrit/gerritmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GERRIT_INTERNAL_GERRITMODEL_H -#define GERRIT_INTERNAL_GERRITMODEL_H +#pragma once #include <QStandardItemModel> #include <QSharedPointer> @@ -147,5 +146,3 @@ private: } // namespace Gerrit Q_DECLARE_METATYPE(Gerrit::Internal::GerritChangePtr) - -#endif // GERRIT_INTERNAL_GERRITMODEL_H diff --git a/src/plugins/git/gerrit/gerritoptionspage.h b/src/plugins/git/gerrit/gerritoptionspage.h index 59e9ebba8c..0a63fea958 100644 --- a/src/plugins/git/gerrit/gerritoptionspage.h +++ b/src/plugins/git/gerrit/gerritoptionspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GERRIT_INTERNAL_GERRITOPTIONSPAGE_H -#define GERRIT_INTERNAL_GERRITOPTIONSPAGE_H +#pragma once #include <vcsbase/vcsbaseoptionspage.h> @@ -81,5 +80,3 @@ private: } // namespace Internal } // namespace Gerrit - -#endif // GERRIT_INTERNAL_GERRITOPTIONSPAGE_H diff --git a/src/plugins/git/gerrit/gerritparameters.h b/src/plugins/git/gerrit/gerritparameters.h index bfc7959745..1d2de0fb25 100644 --- a/src/plugins/git/gerrit/gerritparameters.h +++ b/src/plugins/git/gerrit/gerritparameters.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GERRITPARAMETERS_H -#define GERRITPARAMETERS_H +#pragma once #include <QStringList> @@ -63,5 +62,3 @@ inline bool operator!=(const GerritParameters &p1, const GerritParameters &p2) } // namespace Internal } // namespace Gerrit - -#endif // GERRITPARAMETERS_H diff --git a/src/plugins/git/gerrit/gerritplugin.h b/src/plugins/git/gerrit/gerritplugin.h index 140d3091d0..b0d0cc51d6 100644 --- a/src/plugins/git/gerrit/gerritplugin.h +++ b/src/plugins/git/gerrit/gerritplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GERRIT_INTERNAL_GERRITPLUGIN_H -#define GERRIT_INTERNAL_GERRITPLUGIN_H +#pragma once #include <utils/fileutils.h> @@ -89,5 +88,3 @@ private: } // namespace Internal } // namespace Gerrit - -#endif // GERRIT_INTERNAL_GERRITPLUGIN_H diff --git a/src/plugins/git/gerrit/gerritpushdialog.h b/src/plugins/git/gerrit/gerritpushdialog.h index e46a84ccf4..ace926fdc5 100644 --- a/src/plugins/git/gerrit/gerritpushdialog.h +++ b/src/plugins/git/gerrit/gerritpushdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GERRITPUSHDIALOG_H -#define GERRITPUSHDIALOG_H +#pragma once #include <QDialog> #include <QMultiMap> @@ -76,5 +75,3 @@ private: } // namespace Internal } // namespace Gerrit - -#endif // GERRITPUSHDIALOG_H diff --git a/src/plugins/glsleditor/glslautocompleter.h b/src/plugins/glsleditor/glslautocompleter.h index c117d568d1..8f09d242cd 100644 --- a/src/plugins/glsleditor/glslautocompleter.h +++ b/src/plugins/glsleditor/glslautocompleter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLSLAUTOCOMPLETER_H -#define GLSLAUTOCOMPLETER_H +#pragma once #include <texteditor/autocompleter.h> @@ -50,5 +49,3 @@ public: } // namespace Internal } // namespace GlslEditor - -#endif // GLSLAUTOCOMPLETER_H diff --git a/src/plugins/glsleditor/glslcompletionassist.h b/src/plugins/glsleditor/glslcompletionassist.h index 8cc29e6c77..3714c3e383 100644 --- a/src/plugins/glsleditor/glslcompletionassist.h +++ b/src/plugins/glsleditor/glslcompletionassist.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLSLCOMPLETIONASSIST_H -#define GLSLCOMPLETIONASSIST_H +#pragma once #include "glsleditor.h" @@ -138,5 +137,3 @@ private: } // namespace Internal } // namespace GlslEditor - -#endif // GLSLCOMPLETIONASSIST_H diff --git a/src/plugins/glsleditor/glsleditor.h b/src/plugins/glsleditor/glsleditor.h index 4c1deab1e0..99411bfe8b 100644 --- a/src/plugins/glsleditor/glsleditor.h +++ b/src/plugins/glsleditor/glsleditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLSLEDITOR_H -#define GLSLEDITOR_H +#pragma once #include <texteditor/texteditor.h> @@ -43,5 +42,3 @@ public: } // namespace Internal } // namespace GlslEditor - -#endif // GLSLEDITOR_H diff --git a/src/plugins/glsleditor/glsleditorconstants.h b/src/plugins/glsleditor/glsleditorconstants.h index 6a5c973e61..8121517e0f 100644 --- a/src/plugins/glsleditor/glsleditorconstants.h +++ b/src/plugins/glsleditor/glsleditorconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLSLEDITOR_CONSTANTS_H -#define GLSLEDITOR_CONSTANTS_H +#pragma once #include <QtGlobal> @@ -50,5 +49,3 @@ const char WIZARD_TR_CATEGORY_GLSL[] = QT_TRANSLATE_NOOP("GLSLEditor", "GLSL"); } // namespace Constants } // namespace GlslEditor - -#endif // GLSLEDITOR_CONSTANTS_H diff --git a/src/plugins/glsleditor/glsleditorplugin.h b/src/plugins/glsleditor/glsleditorplugin.h index e29e2fadae..31925dc7b9 100644 --- a/src/plugins/glsleditor/glsleditorplugin.h +++ b/src/plugins/glsleditor/glsleditorplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLSLEDITORPLUGIN_H -#define GLSLEDITORPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> #include <glsl/glsl.h> @@ -67,5 +66,3 @@ public: } // namespace Internal } // namespace GlslEditor - -#endif // GLSLEDITORPLUGIN_H diff --git a/src/plugins/glsleditor/glslhighlighter.h b/src/plugins/glsleditor/glslhighlighter.h index c2329d1fbe..afbe882a41 100644 --- a/src/plugins/glsleditor/glslhighlighter.h +++ b/src/plugins/glsleditor/glslhighlighter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLSLHIGHLIGHTER_H -#define GLSLHIGHLIGHTER_H +#pragma once #include <texteditor/syntaxhighlighter.h> @@ -62,5 +61,3 @@ protected: } // namespace Internal } // namespace GlslEditor - -#endif // GLSLHIGHLIGHTER_H diff --git a/src/plugins/glsleditor/glslhoverhandler.h b/src/plugins/glsleditor/glslhoverhandler.h index d7cc27a4bf..f15c8b9948 100644 --- a/src/plugins/glsleditor/glslhoverhandler.h +++ b/src/plugins/glsleditor/glslhoverhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLSLHOVERHANDLER_H -#define GLSLHOVERHANDLER_H +#pragma once #include <texteditor/basehoverhandler.h> @@ -43,5 +42,3 @@ private: } // namespace Internal } // namespace GlslEditor - -#endif // GLSLHOVERHANDLER_H diff --git a/src/plugins/glsleditor/glslindenter.h b/src/plugins/glsleditor/glslindenter.h index 499c99a164..e52a024b10 100644 --- a/src/plugins/glsleditor/glslindenter.h +++ b/src/plugins/glsleditor/glslindenter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GLSLINDENTER_H -#define GLSLINDENTER_H +#pragma once #include <texteditor/indenter.h> @@ -53,5 +52,3 @@ public: } // namespace Internal } // namespace GlslEditor - -#endif // GLSLINDENTER_H diff --git a/src/plugins/helloworld/helloworldplugin.h b/src/plugins/helloworld/helloworldplugin.h index 0172b7b8f9..c8d08d5484 100644 --- a/src/plugins/helloworld/helloworldplugin.h +++ b/src/plugins/helloworld/helloworldplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HELLOWORLDPLUGIN_H -#define HELLOWORLDPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -51,5 +50,3 @@ private slots: } // namespace Internal } // namespace HelloWorld - -#endif // HELLOWORLDPLUGIN_H diff --git a/src/plugins/helloworld/helloworldwindow.h b/src/plugins/helloworld/helloworldwindow.h index 6332cf35b7..382dac8f22 100644 --- a/src/plugins/helloworld/helloworldwindow.h +++ b/src/plugins/helloworld/helloworldwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HELLOWORLDWINDOW_H -#define HELLOWORLDWINDOW_H +#pragma once #include <QWidget> @@ -41,5 +40,3 @@ public: } // namespace Internal } // namespace HelloWorld - -#endif // HELLOWORLDWINDOW_H diff --git a/src/plugins/help/centralwidget.h b/src/plugins/help/centralwidget.h index b2cc68fd6e..088487e349 100644 --- a/src/plugins/help/centralwidget.h +++ b/src/plugins/help/centralwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CENTRALWIDGET_H -#define CENTRALWIDGET_H +#pragma once #include "helpwidget.h" @@ -49,5 +48,3 @@ public: } // namespace Internal } // namespace Help - -#endif // CENTRALWIDGET_H diff --git a/src/plugins/help/docsettingspage.h b/src/plugins/help/docsettingspage.h index a4d7ca48e4..e3ea9156db 100644 --- a/src/plugins/help/docsettingspage.h +++ b/src/plugins/help/docsettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DOCSETTINGSPAGE_H -#define DOCSETTINGSPAGE_H +#pragma once #include "ui_docsettingspage.h" #include <coreplugin/dialogs/ioptionspage.h> @@ -77,5 +76,3 @@ private: } // namespace Help } // namespace Internal - -#endif // DOCSETTINGSPAGE_H diff --git a/src/plugins/help/filtersettingspage.h b/src/plugins/help/filtersettingspage.h index 6d151c9489..0e5b917bd5 100644 --- a/src/plugins/help/filtersettingspage.h +++ b/src/plugins/help/filtersettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FILTERSETTINGSPAGE_H -#define FILTERSETTINGSPAGE_H +#pragma once #include "ui_filtersettingspage.h" #include <coreplugin/dialogs/ioptionspage.h> @@ -72,5 +71,3 @@ private: } // namespace Help } // namespace Internal - -#endif // DOCSETTINGSPAGE_H diff --git a/src/plugins/help/generalsettingspage.h b/src/plugins/help/generalsettingspage.h index 1ca5cf4770..d8d133c886 100644 --- a/src/plugins/help/generalsettingspage.h +++ b/src/plugins/help/generalsettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GENERALSETTINGSPAGE_H -#define GENERALSETTINGSPAGE_H +#pragma once #include "ui_generalsettingspage.h" #include <coreplugin/dialogs/ioptionspage.h> @@ -79,5 +78,3 @@ private: } // Internal } // Help - -#endif // GENERALSETTINGSPAGE_H diff --git a/src/plugins/help/helpconstants.h b/src/plugins/help/helpconstants.h index f5c2622cd6..a832eb29b2 100644 --- a/src/plugins/help/helpconstants.h +++ b/src/plugins/help/helpconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HELPCONSTANTS_H -#define HELPCONSTANTS_H +#pragma once #include <QtGlobal> #include <QLatin1String> @@ -66,5 +65,3 @@ static const char SB_SEARCH[] = QT_TRANSLATE_NOOP("Help::Internal::HelpPlugin", } // Constants } // Help - -#endif // HELPCONSTANTS_H diff --git a/src/plugins/help/helpfindsupport.h b/src/plugins/help/helpfindsupport.h index d9007cbaa1..3c5cd393a0 100644 --- a/src/plugins/help/helpfindsupport.h +++ b/src/plugins/help/helpfindsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HELPFINDSUPPORT_H -#define HELPFINDSUPPORT_H +#pragma once #include "centralwidget.h" @@ -58,5 +57,3 @@ private: } // namespace Internal } // namespace Help - -#endif // HELPFINDSUPPORT_H diff --git a/src/plugins/help/helpindexfilter.h b/src/plugins/help/helpindexfilter.h index abbd13c8d0..f0edb547f6 100644 --- a/src/plugins/help/helpindexfilter.h +++ b/src/plugins/help/helpindexfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HELPINDEXFILTER_H -#define HELPINDEXFILTER_H +#pragma once #include <coreplugin/locator/ilocatorfilter.h> @@ -68,5 +67,3 @@ private: } // namespace Internal } // namespace Help - -#endif // HELPINDEXFILTER_H diff --git a/src/plugins/help/helpmode.h b/src/plugins/help/helpmode.h index 6036f81472..cc3c93222d 100644 --- a/src/plugins/help/helpmode.h +++ b/src/plugins/help/helpmode.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HELPMODE_H -#define HELPMODE_H +#pragma once #include <coreplugin/imode.h> @@ -42,5 +41,3 @@ public: } // namespace Internal } // namespace Help - -#endif // HELPMODE_H diff --git a/src/plugins/help/helpplugin.h b/src/plugins/help/helpplugin.h index db48dd76f6..9991704610 100644 --- a/src/plugins/help/helpplugin.h +++ b/src/plugins/help/helpplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HELPPLUGIN_H -#define HELPPLUGIN_H +#pragma once #include "helpwidget.h" @@ -135,5 +134,3 @@ private: } // namespace Internal } // namespace Help - -#endif // HELPPLUGIN_H diff --git a/src/plugins/help/helpviewer.h b/src/plugins/help/helpviewer.h index e1f52de833..4ceccb176f 100644 --- a/src/plugins/help/helpviewer.h +++ b/src/plugins/help/helpviewer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HELPVIEWER_H -#define HELPVIEWER_H +#pragma once #include <coreplugin/find/textfindconstants.h> @@ -105,5 +104,3 @@ protected slots: } // namespace Internal } // namespace Help - -#endif // HELPVIEWER_H diff --git a/src/plugins/help/helpwidget.h b/src/plugins/help/helpwidget.h index bff37b68b0..5d29dd3e6b 100644 --- a/src/plugins/help/helpwidget.h +++ b/src/plugins/help/helpwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HELPWIDGET_H -#define HELPWIDGET_H +#pragma once #include <coreplugin/icontext.h> @@ -147,5 +146,3 @@ private: } // Internal } // Help - -#endif // HELPWIDGET_H diff --git a/src/plugins/help/localhelpmanager.h b/src/plugins/help/localhelpmanager.h index 6fdae1743e..4eae028e3e 100644 --- a/src/plugins/help/localhelpmanager.h +++ b/src/plugins/help/localhelpmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LOCALHELPMANAGER_H -#define LOCALHELPMANAGER_H +#pragma once #include <coreplugin/helpmanager.h> @@ -129,5 +128,3 @@ private: } // Help Q_DECLARE_METATYPE(Help::Internal::LocalHelpManager::HelpData) - -#endif // LOCALHELPMANAGER_H diff --git a/src/plugins/help/macwebkithelpviewer.h b/src/plugins/help/macwebkithelpviewer.h index 33c8cf1567..9c4d5ab6ab 100644 --- a/src/plugins/help/macwebkithelpviewer.h +++ b/src/plugins/help/macwebkithelpviewer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MACWEBKITHELPVIEWER_H -#define MACWEBKITHELPVIEWER_H +#pragma once #include "helpviewer.h" @@ -135,5 +134,3 @@ private: } // namespace Internal } // namespace Help - -#endif // MACWEBKITHELPVIEWER_H diff --git a/src/plugins/help/openpagesmanager.h b/src/plugins/help/openpagesmanager.h index d94f82392c..f27164d20b 100644 --- a/src/plugins/help/openpagesmanager.h +++ b/src/plugins/help/openpagesmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OPENPAGESMANAGER_H -#define OPENPAGESMANAGER_H +#pragma once #include <QObject> @@ -94,5 +93,3 @@ private: } // namespace Internal } // namespace Help - -#endif // OPENPAGESMANAGER_H diff --git a/src/plugins/help/openpagesmodel.h b/src/plugins/help/openpagesmodel.h index b657666430..3db1cec3b5 100644 --- a/src/plugins/help/openpagesmodel.h +++ b/src/plugins/help/openpagesmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OPENPAGESMODEL_H -#define OPENPAGESMODEL_H +#pragma once #include <QList> #include <QAbstractTableModel> @@ -60,5 +59,3 @@ private: } // namespace Internal } // namespace Help - -#endif // OPENPAGESMODEL_H diff --git a/src/plugins/help/openpagesswitcher.h b/src/plugins/help/openpagesswitcher.h index 962da8a3f3..2903e486ad 100644 --- a/src/plugins/help/openpagesswitcher.h +++ b/src/plugins/help/openpagesswitcher.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OPENPAGESSWITCHER_H -#define OPENPAGESSWITCHER_H +#pragma once #include <QFrame> @@ -68,5 +67,3 @@ private: } // namespace Internal } // namespace Help - -#endif // OPENPAGESSWITCHER_H diff --git a/src/plugins/help/openpageswidget.h b/src/plugins/help/openpageswidget.h index cc07765f2c..1cfb931be9 100644 --- a/src/plugins/help/openpageswidget.h +++ b/src/plugins/help/openpageswidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OPENPAGESWIDGET_H -#define OPENPAGESWIDGET_H +#pragma once #include <coreplugin/opendocumentstreeview.h> @@ -62,5 +61,3 @@ private: } // namespace Internal } // namespace Help - -#endif // OPENPAGESWIDGET_H diff --git a/src/plugins/help/qtwebkithelpviewer.h b/src/plugins/help/qtwebkithelpviewer.h index 2e2b94503b..186d6f4b18 100644 --- a/src/plugins/help/qtwebkithelpviewer.h +++ b/src/plugins/help/qtwebkithelpviewer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTWEBKITHELPVIEWER_H -#define QTWEBKITHELPVIEWER_H +#pragma once #include "helpviewer.h" @@ -157,5 +156,3 @@ private: } // namespace Help #endif // !QT_NO_WEBKIT - -#endif // QTWEBKITHELPVIEWER_H diff --git a/src/plugins/help/remotehelpfilter.h b/src/plugins/help/remotehelpfilter.h index e10a02eea5..19309d753c 100644 --- a/src/plugins/help/remotehelpfilter.h +++ b/src/plugins/help/remotehelpfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTEHELPFILTER_H -#define REMOTEHELPFILTER_H +#pragma once #include "ui_remotehelpfilter.h" @@ -82,5 +81,3 @@ private: } // namespace Internal } // namespace Help - -#endif // REMOTEHELPFILTER_H diff --git a/src/plugins/help/searchtaskhandler.h b/src/plugins/help/searchtaskhandler.h index 9cfac3eff1..4f117510ba 100644 --- a/src/plugins/help/searchtaskhandler.h +++ b/src/plugins/help/searchtaskhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HELP_SEARCHTASKHANDLER_H -#define HELP_SEARCHTASKHANDLER_H +#pragma once #include <projectexplorer/itaskhandler.h> @@ -50,5 +49,3 @@ signals: } // namespace Internal } // namespace Help - -#endif // HELP_SEARCHTASKHANDLER_H diff --git a/src/plugins/help/searchwidget.h b/src/plugins/help/searchwidget.h index 95cdd92aa4..3c2bdf670d 100644 --- a/src/plugins/help/searchwidget.h +++ b/src/plugins/help/searchwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SEARCHWIDGET_H -#define SEARCHWIDGET_H +#pragma once #include <coreplugin/sidebar.h> @@ -103,5 +102,3 @@ private: } // namespace Internal } // namespace Help - -#endif // SEARCHWIDGET_H diff --git a/src/plugins/help/textbrowserhelpviewer.h b/src/plugins/help/textbrowserhelpviewer.h index d71bf2b5ef..cbe56524ec 100644 --- a/src/plugins/help/textbrowserhelpviewer.h +++ b/src/plugins/help/textbrowserhelpviewer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTBROWSERHELPVIEWER_H -#define TEXTBROWSERHELPVIEWER_H +#pragma once #include "centralwidget.h" #include "helpviewer.h" @@ -119,5 +118,3 @@ public: } // namespace Internal } // namespace Help - -#endif // TEXTBROWSERHELPVIEWER_H diff --git a/src/plugins/help/xbelsupport.h b/src/plugins/help/xbelsupport.h index 4927c34a6a..dedd112f7f 100644 --- a/src/plugins/help/xbelsupport.h +++ b/src/plugins/help/xbelsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef XBELSUPPORT_H -#define XBELSUPPORT_H +#pragma once #include <QIcon> #include <QXmlStreamReader> @@ -75,5 +74,3 @@ private: } // Internal } // Help - -#endif // XBELSUPPORT_H diff --git a/src/plugins/imageviewer/imageview.h b/src/plugins/imageviewer/imageview.h index b120dac26d..9c9020c2c4 100644 --- a/src/plugins/imageviewer/imageview.h +++ b/src/plugins/imageviewer/imageview.h @@ -48,8 +48,7 @@ ** ****************************************************************************/ -#ifndef IMAGEVIEW_H -#define IMAGEVIEW_H +#pragma once #include <QGraphicsView> @@ -104,5 +103,3 @@ private: } // namespace Internal } // namespace ImageViewer - -#endif // IMAGEVIEW_H diff --git a/src/plugins/imageviewer/imageviewer.h b/src/plugins/imageviewer/imageviewer.h index 5d65c6760a..8820b6ca90 100644 --- a/src/plugins/imageviewer/imageviewer.h +++ b/src/plugins/imageviewer/imageviewer.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef IMAGEVIEWER_H -#define IMAGEVIEWER_H +#pragma once #include <coreplugin/editormanager/ieditor.h> #include <coreplugin/idocument.h> @@ -81,5 +80,3 @@ private: } // namespace Internal } // namespace ImageViewer - -#endif // IMAGEVIEWER_H diff --git a/src/plugins/imageviewer/imageviewerconstants.h b/src/plugins/imageviewer/imageviewerconstants.h index 3152295dd3..496d3a8d6a 100644 --- a/src/plugins/imageviewer/imageviewerconstants.h +++ b/src/plugins/imageviewer/imageviewerconstants.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef IMAGEVIEWERCONSTANTS_H -#define IMAGEVIEWERCONSTANTS_H +#pragma once namespace ImageViewer { namespace Constants { @@ -44,5 +43,3 @@ const char ACTION_TOGGLE_ANIMATION[] = "ImageViewer.ToggleAnimation"; } // namespace Constants } // namespace ImageViewer - -#endif // IMAGEVIEWERCONSTANTS_H diff --git a/src/plugins/imageviewer/imageviewerfactory.h b/src/plugins/imageviewer/imageviewerfactory.h index d288ddaf4b..de307ebdfb 100644 --- a/src/plugins/imageviewer/imageviewerfactory.h +++ b/src/plugins/imageviewer/imageviewerfactory.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef IMAGEVIEWERFACTORY_H -#define IMAGEVIEWERFACTORY_H +#pragma once #include <coreplugin/editormanager/ieditorfactory.h> #include <coreplugin/editormanager/ieditor.h> @@ -45,5 +44,3 @@ public: } // namespace Internal } // namespace ImageViewer - -#endif // IMAGEVIEWERFACTORY_H diff --git a/src/plugins/imageviewer/imageviewerfile.h b/src/plugins/imageviewer/imageviewerfile.h index 772dc42955..9442e7821d 100644 --- a/src/plugins/imageviewer/imageviewerfile.h +++ b/src/plugins/imageviewer/imageviewerfile.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef IMAGEVIEWERFILE_H -#define IMAGEVIEWERFILE_H +#pragma once #include <coreplugin/idocument.h> @@ -94,5 +93,3 @@ private: } // namespace Internal } // namespace ImageViewer - -#endif // IMAGEVIEWERFILE_H diff --git a/src/plugins/imageviewer/imageviewerplugin.h b/src/plugins/imageviewer/imageviewerplugin.h index 841295dd88..83868edc11 100644 --- a/src/plugins/imageviewer/imageviewerplugin.h +++ b/src/plugins/imageviewer/imageviewerplugin.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef IMAGEVIEWERPLUGIN_H -#define IMAGEVIEWERPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -63,5 +62,3 @@ private: } // namespace Internal } // namespace ImageViewer - -#endif // IMAGEVIEWERPLUGIN_H diff --git a/src/plugins/ios/iosanalyzesupport.h b/src/plugins/ios/iosanalyzesupport.h index 2b18c5f693..2de2a1bb4e 100644 --- a/src/plugins/ios/iosanalyzesupport.h +++ b/src/plugins/ios/iosanalyzesupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSANALYZESUPPORT_H -#define IOSANALYZESUPPORT_H +#pragma once #include "iosrunconfiguration.h" @@ -67,5 +66,3 @@ private: } // namespace Internal } // namespace Ios - -#endif // IOSANALYZESUPPORT_H diff --git a/src/plugins/ios/iosbuildstep.h b/src/plugins/ios/iosbuildstep.h index a89df243e8..9a08d43f9f 100644 --- a/src/plugins/ios/iosbuildstep.h +++ b/src/plugins/ios/iosbuildstep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSBUILDSTEP_H -#define IOSBUILDSTEP_H +#pragma once #include <projectexplorer/abstractprocessstep.h> @@ -125,5 +124,3 @@ public: } // namespace Internal } // namespace Ios - -#endif // IOSBUILDSTEP_H diff --git a/src/plugins/ios/iosconfigurations.h b/src/plugins/ios/iosconfigurations.h index 94ebeb1384..15b457c17f 100644 --- a/src/plugins/ios/iosconfigurations.h +++ b/src/plugins/ios/iosconfigurations.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSCONFIGURATIONS_H -#define IOSCONFIGURATIONS_H +#pragma once #include <projectexplorer/abi.h> #include <projectexplorer/toolchain.h> @@ -81,5 +80,3 @@ private: } // namespace Internal } // namespace Ios - -#endif // IOSCONFIGURATIONS_H diff --git a/src/plugins/ios/iosconstants.h b/src/plugins/ios/iosconstants.h index 559994491f..4bb8e9b832 100644 --- a/src/plugins/ios/iosconstants.h +++ b/src/plugins/ios/iosconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSCONSTANTS_H -#define IOSCONSTANTS_H +#pragma once #include <QtGlobal> #include <QLoggingCategory> @@ -56,5 +55,3 @@ const char EXTRA_INFO_KEY[] = "extraInfo"; } // namespace Constants; } // namespace Ios - -#endif // IOSCONSTANTS_H diff --git a/src/plugins/ios/iosdebugsupport.h b/src/plugins/ios/iosdebugsupport.h index e5f12c7699..a645f2f1a5 100644 --- a/src/plugins/ios/iosdebugsupport.h +++ b/src/plugins/ios/iosdebugsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSDEBUGSUPPORT_H -#define IOSDEBUGSUPPORT_H +#pragma once #include "iosrunconfiguration.h" #include <QProcess> @@ -65,5 +64,3 @@ private: } // namespace Internal } // namespace Ios - -#endif // IOSDEBUGSUPPORT_H diff --git a/src/plugins/ios/iosdeployconfiguration.h b/src/plugins/ios/iosdeployconfiguration.h index 2fc7113814..2dc92fdfce 100644 --- a/src/plugins/ios/iosdeployconfiguration.h +++ b/src/plugins/ios/iosdeployconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSDEPLOYCONFIGURATION_H -#define IOSDEPLOYCONFIGURATION_H +#pragma once #include <projectexplorer/deployconfiguration.h> @@ -69,5 +68,3 @@ public: } // namespace Internal } // namespace Ios - -#endif // IOSDEPLOYCONFIGURATION_H diff --git a/src/plugins/ios/iosdeploystep.h b/src/plugins/ios/iosdeploystep.h index d5064f3da7..f7b1efcb9d 100644 --- a/src/plugins/ios/iosdeploystep.h +++ b/src/plugins/ios/iosdeploystep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSDEPLOYSTEP_H -#define IOSDEPLOYSTEP_H +#pragma once #include "iosconfigurations.h" #include "iosdevice.h" @@ -110,5 +109,3 @@ private: } // namespace Internal } // namespace Ios - -#endif // IOSDEPLOYSTEP_H diff --git a/src/plugins/ios/iosdeploystepfactory.h b/src/plugins/ios/iosdeploystepfactory.h index 63bc1e92ae..93ac9b784f 100644 --- a/src/plugins/ios/iosdeploystepfactory.h +++ b/src/plugins/ios/iosdeploystepfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSDEPLOYSTEPFACTORY_H -#define IOSDEPLOYSTEPFACTORY_H +#pragma once #include <projectexplorer/buildstep.h> @@ -55,5 +54,3 @@ public: } // namespace Internal } // namespace Ios - -#endif // IOSDEPLOYSTEPFACTORY_H diff --git a/src/plugins/ios/iosdeploystepwidget.h b/src/plugins/ios/iosdeploystepwidget.h index 331857d2ce..38c91ab9b2 100644 --- a/src/plugins/ios/iosdeploystepwidget.h +++ b/src/plugins/ios/iosdeploystepwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSDEPLOYSTEPWIDGET_H -#define IOSDEPLOYSTEPWIDGET_H +#pragma once #include <projectexplorer/buildstep.h> @@ -54,5 +53,3 @@ private: } // namespace Internal } // namespace Ios - -#endif // IOSDEPLOYSTEPWIDGET_H diff --git a/src/plugins/ios/iosdevice.h b/src/plugins/ios/iosdevice.h index bac9c3d201..69c9e18e2e 100644 --- a/src/plugins/ios/iosdevice.h +++ b/src/plugins/ios/iosdevice.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSDEVICE_H -#define IOSDEVICE_H +#pragma once #include "iostoolhandler.h" @@ -116,5 +115,3 @@ IosDevice::ConstPtr device(ProjectExplorer::Kit *); } // namespace Internal } // namespace Ios - -#endif // IOSDEVICE_H diff --git a/src/plugins/ios/iosdevicefactory.h b/src/plugins/ios/iosdevicefactory.h index 105b468d22..5e2e39b59f 100644 --- a/src/plugins/ios/iosdevicefactory.h +++ b/src/plugins/ios/iosdevicefactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSDEVICEFACTORY_H -#define IOSDEVICEFACTORY_H +#pragma once #include <projectexplorer/devicesupport/idevicefactory.h> @@ -52,5 +51,3 @@ public: } // namespace Internal } // namespace Ios - -#endif // IOSDEVICEFACTORY_H diff --git a/src/plugins/ios/iosdsymbuildstep.h b/src/plugins/ios/iosdsymbuildstep.h index 034570275a..819347ce53 100644 --- a/src/plugins/ios/iosdsymbuildstep.h +++ b/src/plugins/ios/iosdsymbuildstep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSDSYMBUILDSTEP_H -#define IOSDSYMBUILDSTEP_H +#pragma once #include <projectexplorer/abstractprocessstep.h> @@ -138,5 +137,3 @@ public: } // namespace Internal } // namespace Ios - -#endif // IOSDSYMBUILDSTEP_H diff --git a/src/plugins/ios/iosmanager.h b/src/plugins/ios/iosmanager.h index 0a3c36c24a..06c665e23e 100644 --- a/src/plugins/ios/iosmanager.h +++ b/src/plugins/ios/iosmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSMANAGER_H -#define IOSMANAGER_H +#pragma once #include <utils/fileutils.h> @@ -48,5 +47,3 @@ public: } // namespace Internal } // namespace Ios - -#endif // IOSMANAGER_H diff --git a/src/plugins/ios/iosplugin.h b/src/plugins/ios/iosplugin.h index bcef3298de..f53a6bb568 100644 --- a/src/plugins/ios/iosplugin.h +++ b/src/plugins/ios/iosplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSPLUGIN_H -#define IOSPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -45,5 +44,3 @@ private slots: }; } // namespace Ios - -#endif // IOSPLUGIN_H diff --git a/src/plugins/ios/iosprobe.h b/src/plugins/ios/iosprobe.h index 9be5dd55e8..8d192b9611 100644 --- a/src/plugins/ios/iosprobe.h +++ b/src/plugins/ios/iosprobe.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSPROBE_H -#define IOSPROBE_H +#pragma once #include <QSettings> #include <QSharedPointer> #include <QString> @@ -76,5 +75,3 @@ private: QStringList m_developerPaths; }; } // namespace Ios - -#endif // IOSPROBE_H diff --git a/src/plugins/ios/iosqtversion.h b/src/plugins/ios/iosqtversion.h index 16840cb892..6d4a093ba5 100644 --- a/src/plugins/ios/iosqtversion.h +++ b/src/plugins/ios/iosqtversion.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSQTVERSION_H -#define IOSQTVERSION_H +#pragma once #include <qtsupport/baseqtversion.h> @@ -59,5 +58,3 @@ public: } // namespace Internal } // namespace Ios - -#endif // IOSQTVERSION_H diff --git a/src/plugins/ios/iosqtversionfactory.h b/src/plugins/ios/iosqtversionfactory.h index 59a2657342..820f6bf329 100644 --- a/src/plugins/ios/iosqtversionfactory.h +++ b/src/plugins/ios/iosqtversionfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSQTVERSIONFACTORY_H -#define IOSQTVERSIONFACTORY_H +#pragma once #include <qtsupport/qtversionfactory.h> @@ -47,5 +46,3 @@ public: } // namespace Internal } // namespace Ios - -#endif // IOSQTVERSIONFACTORY_H diff --git a/src/plugins/ios/iosrunconfiguration.h b/src/plugins/ios/iosrunconfiguration.h index d73c0c027e..e82a84a054 100644 --- a/src/plugins/ios/iosrunconfiguration.h +++ b/src/plugins/ios/iosrunconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSRUNCONFIGURATION_H -#define IOSRUNCONFIGURATION_H +#pragma once #include "iosconstants.h" #include "iosconfigurations.h" @@ -93,5 +92,3 @@ private: } // namespace Internal } // namespace Ios - -#endif // IOSRUNCONFIGURATION_H diff --git a/src/plugins/ios/iosruncontrol.h b/src/plugins/ios/iosruncontrol.h index e265025640..97f5784d69 100644 --- a/src/plugins/ios/iosruncontrol.h +++ b/src/plugins/ios/iosruncontrol.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSRUNCONTROL_H -#define IOSRUNCONTROL_H +#pragma once #include <projectexplorer/runconfiguration.h> @@ -60,5 +59,3 @@ private: } // namespace Internal } // namespace Ios - -#endif // IOSRUNCONTROL_H diff --git a/src/plugins/ios/iosrunfactories.h b/src/plugins/ios/iosrunfactories.h index 0c0d9c16fa..325deb8d87 100644 --- a/src/plugins/ios/iosrunfactories.h +++ b/src/plugins/ios/iosrunfactories.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSRUNFACTORIES_H -#define IOSRUNFACTORIES_H +#pragma once #include <projectexplorer/runconfiguration.h> #include <qmakeprojectmanager/qmakerunconfigurationfactory.h> @@ -87,5 +86,3 @@ private: } // namespace Internal } // namespace Ios - -#endif // IOSRUNFACTORIES_H diff --git a/src/plugins/ios/iosrunner.h b/src/plugins/ios/iosrunner.h index b00b5f9b4e..95c1888cda 100644 --- a/src/plugins/ios/iosrunner.h +++ b/src/plugins/ios/iosrunner.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSRUNNER_H -#define IOSRUNNER_H +#pragma once #include "iosconfigurations.h" #include "iostoolhandler.h" @@ -100,5 +99,3 @@ private: } // namespace Internal } // namespace Ios - -#endif // IOSRUNNER_H diff --git a/src/plugins/ios/iossettingspage.h b/src/plugins/ios/iossettingspage.h index b71f820058..0f2c48e885 100644 --- a/src/plugins/ios/iossettingspage.h +++ b/src/plugins/ios/iossettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSSETTINGSPAGE_H -#define IOSSETTINGSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> @@ -52,5 +51,3 @@ private: } // namespace Internal } // namespace Ios - -#endif // IOSSETTINGSPAGE_H diff --git a/src/plugins/ios/iossettingswidget.h b/src/plugins/ios/iossettingswidget.h index c15608b294..f42134e493 100644 --- a/src/plugins/ios/iossettingswidget.h +++ b/src/plugins/ios/iossettingswidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSSETTINGSWIDGET_H -#define IOSSETTINGSWIDGET_H +#pragma once #include "iosconfigurations.h" @@ -61,5 +60,3 @@ private: } // namespace Internal } // namespace Ios - -#endif // IOSSETTINGSWIDGET_H diff --git a/src/plugins/ios/iossimulator.h b/src/plugins/ios/iossimulator.h index 1e3c614698..3e7e7444d1 100644 --- a/src/plugins/ios/iossimulator.h +++ b/src/plugins/ios/iossimulator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSSIMULATOR_H -#define IOSSIMULATOR_H +#pragma once #include <projectexplorer/devicesupport/idevice.h> #include <utils/fileutils.h> @@ -103,5 +102,3 @@ IosSimulator::ConstPtr simulator(ProjectExplorer::Kit *kit); } // namespace Ios Q_DECLARE_METATYPE(Ios::Internal::IosDeviceType) - -#endif // IOSSIMULATOR_H diff --git a/src/plugins/ios/iossimulatorfactory.h b/src/plugins/ios/iossimulatorfactory.h index 395c72e8a2..0b8d222235 100644 --- a/src/plugins/ios/iossimulatorfactory.h +++ b/src/plugins/ios/iossimulatorfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSSIMULATORFACTORY_H -#define IOSSIMULATORFACTORY_H +#pragma once #include <projectexplorer/devicesupport/idevicefactory.h> @@ -48,5 +47,3 @@ public: } // namespace Internal } // namespace Ios - -#endif // IOSSIMULATORFACTORY_H diff --git a/src/plugins/ios/iostoolhandler.h b/src/plugins/ios/iostoolhandler.h index 1649997cc2..a3eba3476a 100644 --- a/src/plugins/ios/iostoolhandler.h +++ b/src/plugins/ios/iostoolhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSTOOLHANDLER_H -#define IOSTOOLHANDLER_H +#pragma once #include <QObject> #include <QMap> @@ -95,5 +94,3 @@ private: }; } // namespace Ios - -#endif // IOSTOOLHANDLER_H diff --git a/src/plugins/macros/actionmacrohandler.h b/src/plugins/macros/actionmacrohandler.h index 8c7a87d4b2..77c766d682 100644 --- a/src/plugins/macros/actionmacrohandler.h +++ b/src/plugins/macros/actionmacrohandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ACTIOMACROHANDLER_H -#define ACTIOMACROHANDLER_H +#pragma once #include "imacrohandler.h" @@ -65,5 +64,3 @@ private: } // namespace Internal } // namespace Macros - -#endif // ACTIOMACROHANDLER_H diff --git a/src/plugins/macros/findmacrohandler.h b/src/plugins/macros/findmacrohandler.h index 49503eba5d..78eb338a47 100644 --- a/src/plugins/macros/findmacrohandler.h +++ b/src/plugins/macros/findmacrohandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FINDMACROHANDLER_H -#define FINDMACROHANDLER_H +#pragma once #include "imacrohandler.h" @@ -61,5 +60,3 @@ private slots: } // namespace Internal } // namespace Macros - -#endif // FINDMACROHANDLER_H diff --git a/src/plugins/macros/imacrohandler.h b/src/plugins/macros/imacrohandler.h index 403aa3e800..e05e4c063c 100644 --- a/src/plugins/macros/imacrohandler.h +++ b/src/plugins/macros/imacrohandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MACROSPLUGIN_IMACROHANDLER_H -#define MACROSPLUGIN_IMACROHANDLER_H +#pragma once #include <QObject> @@ -65,5 +64,3 @@ private: } // namespace Internal } // namespace Macros - -#endif // MACROSPLUGIN_IMACROHANDLER_H diff --git a/src/plugins/macros/macro.h b/src/plugins/macros/macro.h index 1c81acbb30..d2f4befa45 100644 --- a/src/plugins/macros/macro.h +++ b/src/plugins/macros/macro.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MACROSPLUGIN_MACRO_H -#define MACROSPLUGIN_MACRO_H +#pragma once #include <QList> #include <QString> @@ -69,5 +68,3 @@ private: } // namespace Internal } // namespace Macros - -#endif // MACROSPLUGIN_MACRO_H diff --git a/src/plugins/macros/macroevent.h b/src/plugins/macros/macroevent.h index 043e860334..72ae9942d4 100644 --- a/src/plugins/macros/macroevent.h +++ b/src/plugins/macros/macroevent.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MACROSPLUGIN_MACROEVENT_H -#define MACROSPLUGIN_MACROEVENT_H +#pragma once #include <coreplugin/id.h> @@ -60,5 +59,3 @@ private: } // namespace Internal } // namespace Macros - -#endif // MACROSPLUGIN_MACROEVENT_H diff --git a/src/plugins/macros/macrolocatorfilter.h b/src/plugins/macros/macrolocatorfilter.h index 32264c20d8..a20b296ce6 100644 --- a/src/plugins/macros/macrolocatorfilter.h +++ b/src/plugins/macros/macrolocatorfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MACROSPLUGIN_MACROLOCATORFILTER_H -#define MACROSPLUGIN_MACROLOCATORFILTER_H +#pragma once #include <coreplugin/locator/ilocatorfilter.h> @@ -54,5 +53,3 @@ private: } // namespace Internal } // namespace Macros - -#endif // MACROSPLUGIN_MACROLOCATORFILTER_H diff --git a/src/plugins/macros/macromanager.h b/src/plugins/macros/macromanager.h index e88870d448..2d1c8b6596 100644 --- a/src/plugins/macros/macromanager.h +++ b/src/plugins/macros/macromanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MACROSPLUGIN_MACROMANAGER_H -#define MACROSPLUGIN_MACROMANAGER_H +#pragma once #include <QObject> #include <QMap> @@ -80,5 +79,3 @@ private: } // namespace Internal } // namespace Macros - -#endif // MACROSPLUGIN_MACROMANAGER_H diff --git a/src/plugins/macros/macrooptionspage.h b/src/plugins/macros/macrooptionspage.h index 7d13062c9b..88b44f32f5 100644 --- a/src/plugins/macros/macrooptionspage.h +++ b/src/plugins/macros/macrooptionspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MACROSPLUGIN_MACROOPTIONSPAGE_H -#define MACROSPLUGIN_MACROOPTIONSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> @@ -53,5 +52,3 @@ private: } // namespace Internal } // namespace Macros - -#endif // MACROSPLUGIN_MACROOPTIONSPAGE_H diff --git a/src/plugins/macros/macrooptionswidget.h b/src/plugins/macros/macrooptionswidget.h index 156aff462a..135d01b858 100644 --- a/src/plugins/macros/macrooptionswidget.h +++ b/src/plugins/macros/macrooptionswidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MACROSPLUGIN_MACROOPTIONSWIDGET_H -#define MACROSPLUGIN_MACROOPTIONSWIDGET_H +#pragma once #include <QWidget> @@ -73,5 +72,3 @@ private: } // namespace Internal } // namespace Macros - -#endif // MACROSPLUGIN_MACROOPTIONSWIDGET_H diff --git a/src/plugins/macros/macrosconstants.h b/src/plugins/macros/macrosconstants.h index 491e34a222..056677b2b7 100644 --- a/src/plugins/macros/macrosconstants.h +++ b/src/plugins/macros/macrosconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MACROSPLUGIN_MACROSCONSTANTS_H -#define MACROSPLUGIN_MACROSCONSTANTS_H +#pragma once namespace Macros { namespace Constants { @@ -46,5 +45,3 @@ const char M_EXTENSION[] = "mac"; } // namespace Constants } // namespace Macros - -#endif // MACROSPLUGIN_MACROSCONSTANTS_H diff --git a/src/plugins/macros/macrosplugin.h b/src/plugins/macros/macrosplugin.h index d202b619f2..dcb14694b8 100644 --- a/src/plugins/macros/macrosplugin.h +++ b/src/plugins/macros/macrosplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MACROSPLUGIN_MACROSPLUGIN_H -#define MACROSPLUGIN_MACROSPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -51,5 +50,3 @@ private: } // namespace Internal } // namespace Macros - -#endif // MACROSPLUGIN_MACROSPLUGIN_H diff --git a/src/plugins/macros/macrotextfind.h b/src/plugins/macros/macrotextfind.h index 71e65028ac..fd1f9d1638 100644 --- a/src/plugins/macros/macrotextfind.h +++ b/src/plugins/macros/macrotextfind.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MACROSPLUGIN_MACROTEXTFIND_H -#define MACROSPLUGIN_MACROTEXTFIND_H +#pragma once #include <coreplugin/find/ifindsupport.h> @@ -74,5 +73,3 @@ private: } // namespace Internal } // namespace Macros - -#endif // MACROSPLUGIN_MACROTEXTFIND_H diff --git a/src/plugins/macros/savedialog.h b/src/plugins/macros/savedialog.h index 7ad3695665..a45c04dcfc 100644 --- a/src/plugins/macros/savedialog.h +++ b/src/plugins/macros/savedialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MACROSPLUGIN_SAVEDIALOG_H -#define MACROSPLUGIN_SAVEDIALOG_H +#pragma once #include <QDialog> @@ -51,5 +50,3 @@ private: } // namespace Internal } // namespace Macros - -#endif // MACROSPLUGIN_SAVEDIALOG_H diff --git a/src/plugins/macros/texteditormacrohandler.h b/src/plugins/macros/texteditormacrohandler.h index fc39522af2..a213425a35 100644 --- a/src/plugins/macros/texteditormacrohandler.h +++ b/src/plugins/macros/texteditormacrohandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTEDITORMACROHANDLER_H -#define TEXTEDITORMACROHANDLER_H +#pragma once #include "imacrohandler.h" @@ -60,5 +59,3 @@ private: } // namespace Internal } // namespace Macros - -#endif // TEXTEDITORMACROHANDLER_H diff --git a/src/plugins/modeleditor/actionhandler.h b/src/plugins/modeleditor/actionhandler.h index b595db1436..5bd2ce0e91 100644 --- a/src/plugins/modeleditor/actionhandler.h +++ b/src/plugins/modeleditor/actionhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ACTIONHANDLER_H -#define ACTIONHANDLER_H +#pragma once #include <QObject> @@ -94,5 +93,3 @@ private: } // namespace Internal } // namespace ModelEditor - -#endif // ACTIONHANDLER_H diff --git a/src/plugins/modeleditor/classviewcontroller.h b/src/plugins/modeleditor/classviewcontroller.h index 7af4ad6238..4bf67d480e 100644 --- a/src/plugins/modeleditor/classviewcontroller.h +++ b/src/plugins/modeleditor/classviewcontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLASSVIEWCONTROLLER_H -#define CLASSVIEWCONTROLLER_H +#pragma once #include <QObject> @@ -50,5 +49,3 @@ public: } // namespace Internal } // namespace ModelEditor - -#endif // CLASSVIEWCONTROLLER_H diff --git a/src/plugins/modeleditor/componentviewcontroller.h b/src/plugins/modeleditor/componentviewcontroller.h index df46a4f859..6d73a6cdcd 100644 --- a/src/plugins/modeleditor/componentviewcontroller.h +++ b/src/plugins/modeleditor/componentviewcontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMPONENTVIEWCONTROLLER_H -#define COMPONENTVIEWCONTROLLER_H +#pragma once #include <QObject> @@ -64,5 +63,3 @@ private: } // namespace Internal } // namespace ModelEditor - -#endif // COMPONENTVIEWCONTROLLER_H diff --git a/src/plugins/modeleditor/diagramsviewmanager.h b/src/plugins/modeleditor/diagramsviewmanager.h index 7e75410dca..0811d6cd70 100644 --- a/src/plugins/modeleditor/diagramsviewmanager.h +++ b/src/plugins/modeleditor/diagramsviewmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DIAGRAMSVIEWMANAGER_H -#define DIAGRAMSVIEWMANAGER_H +#pragma once #include <QObject> #include "qmt/diagram_ui/diagramsviewinterface.h" @@ -65,5 +64,3 @@ public: } // namespace Internal } // namespace ModelEditor - -#endif // DIAGRAMSVIEWMANAGER_H diff --git a/src/plugins/modeleditor/dragtool.h b/src/plugins/modeleditor/dragtool.h index 08939e0be0..5764f97ec6 100644 --- a/src/plugins/modeleditor/dragtool.h +++ b/src/plugins/modeleditor/dragtool.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DRAGTOOL_H -#define DRAGTOOL_H +#pragma once #include <QWidget> #include <QIcon> @@ -58,5 +57,3 @@ private: } // namespace Internal } // namespace ModelEditor - -#endif // DRAGTOOL_H diff --git a/src/plugins/modeleditor/editordiagramview.h b/src/plugins/modeleditor/editordiagramview.h index f637941db6..f0183d1dd7 100644 --- a/src/plugins/modeleditor/editordiagramview.h +++ b/src/plugins/modeleditor/editordiagramview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EDITORDIAGRAMVIEW_H -#define EDITORDIAGRAMVIEW_H +#pragma once #include "qmt/diagram_widgets_ui/diagramview.h" @@ -53,5 +52,3 @@ private: } // namespace Internal } // namespace ModelEditor - -#endif // EDITORDIAGRAMVIEW_H diff --git a/src/plugins/modeleditor/elementtasks.h b/src/plugins/modeleditor/elementtasks.h index 1b29cc6b85..9e38b43abe 100644 --- a/src/plugins/modeleditor/elementtasks.h +++ b/src/plugins/modeleditor/elementtasks.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ELEMENTTASKS_H -#define ELEMENTTASKS_H +#pragma once #include "qmt/tasks/ielementtasks.h" @@ -89,5 +88,3 @@ private: } // namespace Internal } // namespace ModelEditor - -#endif // ELEMENTTASKS_H diff --git a/src/plugins/modeleditor/extdocumentcontroller.h b/src/plugins/modeleditor/extdocumentcontroller.h index ab6d6ac2f7..28f3bed9ed 100644 --- a/src/plugins/modeleditor/extdocumentcontroller.h +++ b/src/plugins/modeleditor/extdocumentcontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EXTDOCUMENTCONTROLLER_H -#define EXTDOCUMENTCONTROLLER_H +#pragma once #include "qmt/document_controller/documentcontroller.h" @@ -56,5 +55,3 @@ private: } // namespace Internal } // namespace ModelEditor - -#endif // EXTDOCUMENTCONTROLLER_H diff --git a/src/plugins/modeleditor/extpropertiesmview.h b/src/plugins/modeleditor/extpropertiesmview.h index 1ad45aff81..673fcd9d39 100644 --- a/src/plugins/modeleditor/extpropertiesmview.h +++ b/src/plugins/modeleditor/extpropertiesmview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EXTPROPERTIESMVIEW_H -#define EXTPROPERTIESMVIEW_H +#pragma once #include "qmt/model_widgets_ui/propertiesviewmview.h" @@ -57,5 +56,3 @@ private: } // namespace Interal } // namespace ModelEditor - -#endif // EXTPROPERTIESMVIEW_H diff --git a/src/plugins/modeleditor/jsextension.h b/src/plugins/modeleditor/jsextension.h index 3a969f54af..be2479fd68 100644 --- a/src/plugins/modeleditor/jsextension.h +++ b/src/plugins/modeleditor/jsextension.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JSEXTENSION_H -#define JSEXTENSION_H +#pragma once #include <QObject> @@ -44,5 +43,3 @@ public: } // namespace Internal } // namespace ModelEditor - -#endif // JSEXTENSION_H diff --git a/src/plugins/modeleditor/modeldocument.h b/src/plugins/modeleditor/modeldocument.h index f5bc05022c..5998065157 100644 --- a/src/plugins/modeleditor/modeldocument.h +++ b/src/plugins/modeleditor/modeldocument.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODELDOCUMENT_H -#define MODELDOCUMENT_H +#pragma once #include <coreplugin/idocument.h> @@ -66,5 +65,3 @@ private: } // namespace Internal } // namespace ModelEditor - -#endif // MODELDOCUMENT_H diff --git a/src/plugins/modeleditor/modeleditor.h b/src/plugins/modeleditor/modeleditor.h index b8ab618138..5d741f1008 100644 --- a/src/plugins/modeleditor/modeleditor.h +++ b/src/plugins/modeleditor/modeleditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODELDIAGRAMEDITOR_H -#define MODELDIAGRAMEDITOR_H +#pragma once #include <coreplugin/editormanager/ieditor.h> @@ -154,5 +153,3 @@ private: } // namespace Internal } // namespace ModelEditor - -#endif // MODELDIAGRAMEDITOR_H diff --git a/src/plugins/modeleditor/modeleditor_constants.h b/src/plugins/modeleditor/modeleditor_constants.h index 32e8759b8e..a1314874f3 100644 --- a/src/plugins/modeleditor/modeleditor_constants.h +++ b/src/plugins/modeleditor/modeleditor_constants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODELEDITORCONSTANTS_H -#define MODELEDITORCONSTANTS_H +#pragma once namespace ModelEditor { namespace Constants { @@ -63,5 +62,3 @@ const char SETTINGS_RIGHT_HORIZ_SPLITTER[] = "RightHorizSplitter"; } // namespace Constants } // namespace ModelEditor - -#endif // MODELEDITORCONSTANTS_H diff --git a/src/plugins/modeleditor/modeleditor_global.h b/src/plugins/modeleditor/modeleditor_global.h index 054225f141..0327c570e3 100644 --- a/src/plugins/modeleditor/modeleditor_global.h +++ b/src/plugins/modeleditor/modeleditor_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODELEDITOR_GLOBAL_H -#define MODELEDITOR_GLOBAL_H +#pragma once #include <QtGlobal> @@ -33,5 +32,3 @@ #else # define MODELEDITOR_EXPORT Q_DECL_IMPORT #endif - -#endif // MODELEDITOR_GLOBAL_H diff --git a/src/plugins/modeleditor/modeleditor_plugin.h b/src/plugins/modeleditor/modeleditor_plugin.h index 0dcf89642d..5ab927361d 100644 --- a/src/plugins/modeleditor/modeleditor_plugin.h +++ b/src/plugins/modeleditor/modeleditor_plugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODELEDITORPLUGIN_H -#define MODELEDITORPLUGIN_H +#pragma once #include "modeleditor_global.h" @@ -58,5 +57,3 @@ private: } // namespace Internal } // namespace ModelEditor - -#endif // MODELEDITORPLUGIN_H diff --git a/src/plugins/modeleditor/modeleditorfactory.h b/src/plugins/modeleditor/modeleditorfactory.h index 797b06a311..972a1ae44e 100644 --- a/src/plugins/modeleditor/modeleditorfactory.h +++ b/src/plugins/modeleditor/modeleditorfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef STRUCTUREDIAGRAMEDITORFACTORY_H -#define STRUCTUREDIAGRAMEDITORFACTORY_H +#pragma once #include <coreplugin/editormanager/ieditorfactory.h> @@ -53,5 +52,3 @@ private: } // namespace Internal } // namespace ModelEditor - -#endif // STRUCTUREDIAGRAMEDITORFACTORY_H diff --git a/src/plugins/modeleditor/modelindexer.h b/src/plugins/modeleditor/modelindexer.h index e7d6aaad3a..19694e60b1 100644 --- a/src/plugins/modeleditor/modelindexer.h +++ b/src/plugins/modeleditor/modelindexer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODELINDEXER_H -#define MODELINDEXER_H +#pragma once #include <QObject> @@ -86,5 +85,3 @@ private: } // namespace Internal } // namespace ModelEditor - -#endif // MODELINDEXER_H diff --git a/src/plugins/modeleditor/modelsmanager.h b/src/plugins/modeleditor/modelsmanager.h index fb93f7e59c..9232f16df3 100644 --- a/src/plugins/modeleditor/modelsmanager.h +++ b/src/plugins/modeleditor/modelsmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODELSMANAGER_H -#define MODELSMANAGER_H +#pragma once #include <QObject> @@ -75,5 +74,3 @@ private: } // namespace Internal } // namespace ModelEditor - -#endif // MODELSMANAGER_H diff --git a/src/plugins/modeleditor/openelementvisitor.h b/src/plugins/modeleditor/openelementvisitor.h index dcd5fca2d7..48e0408076 100644 --- a/src/plugins/modeleditor/openelementvisitor.h +++ b/src/plugins/modeleditor/openelementvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OPENELEMENTVISITOR_H -#define OPENELEMENTVISITOR_H +#pragma once #include "qmt/diagram/dconstvisitor.h" #include "qmt/model/mconstvisitor.h" @@ -87,5 +86,3 @@ private: } // namespace Internal } // namespace ModelEditor - -#endif // OPENELEMENTVISITOR_H diff --git a/src/plugins/modeleditor/pxnodecontroller.h b/src/plugins/modeleditor/pxnodecontroller.h index 5f16ab632a..7bfcbd41aa 100644 --- a/src/plugins/modeleditor/pxnodecontroller.h +++ b/src/plugins/modeleditor/pxnodecontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PXNODECONTROLLER_H -#define PXNODECONTROLLER_H +#pragma once #include <QObject> @@ -71,5 +70,3 @@ private: } // namespace Internal } // namespace ModelEditor - -#endif // PXNODECONTROLLER_H diff --git a/src/plugins/modeleditor/pxnodeutilities.h b/src/plugins/modeleditor/pxnodeutilities.h index 4d80ff1c51..1aea2f1b9a 100644 --- a/src/plugins/modeleditor/pxnodeutilities.h +++ b/src/plugins/modeleditor/pxnodeutilities.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PXNODEUTILITIES_H -#define PXNODEUTILITIES_H +#pragma once #include <QObject> @@ -63,5 +62,3 @@ private: } // namespace Internal } // namespace ModelEditor - -#endif // PXNODEUTILITIES_H diff --git a/src/plugins/modeleditor/settingscontroller.h b/src/plugins/modeleditor/settingscontroller.h index 63080b820f..9400cd6282 100644 --- a/src/plugins/modeleditor/settingscontroller.h +++ b/src/plugins/modeleditor/settingscontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SETTINGS_H -#define SETTINGS_H +#pragma once #include <QObject> @@ -56,5 +55,3 @@ public: } // namespace Internal } // namespace ModelEditor - -#endif // SETTINGS_H diff --git a/src/plugins/modeleditor/uicontroller.h b/src/plugins/modeleditor/uicontroller.h index 8a48c79bd4..76496be10a 100644 --- a/src/plugins/modeleditor/uicontroller.h +++ b/src/plugins/modeleditor/uicontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UICONTROLLER_H -#define UICONTROLLER_H +#pragma once #include <QObject> @@ -67,5 +66,3 @@ private: } // namespace Internal } // namespace ModelEditor - -#endif // UICONTROLLER_H diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h index 741227c03a..53408c1fc9 100644 --- a/src/plugins/projectexplorer/buildconfiguration.h +++ b/src/plugins/projectexplorer/buildconfiguration.h @@ -152,4 +152,3 @@ signals: }; } // namespace ProjectExplorer - diff --git a/src/plugins/projectexplorer/buildsteplist.h b/src/plugins/projectexplorer/buildsteplist.h index a24e8190bf..57e34ef8a9 100644 --- a/src/plugins/projectexplorer/buildsteplist.h +++ b/src/plugins/projectexplorer/buildsteplist.h @@ -78,4 +78,3 @@ private: }; } // namespace ProjectExplorer - diff --git a/src/plugins/projectexplorer/customwizard/customwizard.h b/src/plugins/projectexplorer/customwizard/customwizard.h index 28eee0ef89..beeff9825a 100644 --- a/src/plugins/projectexplorer/customwizard/customwizard.h +++ b/src/plugins/projectexplorer/customwizard/customwizard.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CUSTOMWIZARD_H -#define CUSTOMWIZARD_H +#pragma once #include "../projectexplorer_export.h" @@ -151,5 +150,3 @@ private: }; } // namespace ProjectExplorer - -#endif // CUSTOMWIZARD_H diff --git a/src/plugins/projectexplorer/customwizard/customwizardpage.h b/src/plugins/projectexplorer/customwizard/customwizardpage.h index 40f96de412..87077e875b 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardpage.h +++ b/src/plugins/projectexplorer/customwizard/customwizardpage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CUSTOMWIZARDPAGE_H -#define CUSTOMWIZARDPAGE_H +#pragma once #include <QComboBox> #include <QCheckBox> @@ -135,5 +134,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // CUSTOMWIZARDPAGE_H diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.h b/src/plugins/projectexplorer/customwizard/customwizardparameters.h index 01916ebcd6..0dd10a8df3 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardparameters.h +++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CUSTOMWIZARDPARAMETERS_H -#define CUSTOMWIZARDPARAMETERS_H +#pragma once #include <coreplugin/iwizardfactory.h> @@ -162,5 +161,3 @@ extern const char customWizardFileOpenProjectAttributeC[]; } // namespace Internal } // namespace ProjectExplorer - -#endif // CUSTOMWIZARDPARAMETERS_H diff --git a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h index a36c4edb22..4581c88cc4 100644 --- a/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h +++ b/src/plugins/projectexplorer/customwizard/customwizardscriptgenerator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CUSTOMWIZARDSCRIPTGENERATOR_H -#define CUSTOMWIZARDSCRIPTGENERATOR_H +#pragma once #include <QMap> #include <QStringList> @@ -56,5 +55,3 @@ bool runCustomWizardGeneratorScript(const QString &targetPath, } // namespace Internal } // namespace ProjectExplorer - -#endif // CUSTOMWIZARDSCRIPTGENERATOR_H diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h index 5648cbe15c..31bff0158a 100644 --- a/src/plugins/projectexplorer/deployconfiguration.h +++ b/src/plugins/projectexplorer/deployconfiguration.h @@ -130,4 +130,3 @@ private: }; } // namespace ProjectExplorer - diff --git a/src/plugins/projectexplorer/ioutputparser.h b/src/plugins/projectexplorer/ioutputparser.h index 92bcbb0f16..2ab74acbd5 100644 --- a/src/plugins/projectexplorer/ioutputparser.h +++ b/src/plugins/projectexplorer/ioutputparser.h @@ -74,4 +74,3 @@ private: }; } // namespace ProjectExplorer - diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h index ffa5031346..debc1e6393 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JSONFIELDPAGE_H -#define JSONFIELDPAGE_H +#pragma once #include "../projectexplorer_export.h" @@ -140,5 +139,3 @@ private: }; } // namespace ProjectExplorer - -#endif // JSONFIELDPAGE_H diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage_p.h b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage_p.h index 7478a3020f..4a03d114fc 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage_p.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JSONFIELDPAGE_P_H -#define JSONFIELDPAGE_P_H +#pragma once #include "jsonfieldpage.h" @@ -208,5 +207,3 @@ private: }; } // namespace ProjectExplorer - -#endif // JSONFIELDPAGE_P_H diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfilepage.h b/src/plugins/projectexplorer/jsonwizard/jsonfilepage.h index 9753171cec..744e81e369 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonfilepage.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonfilepage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JSONFILEPAGE_H -#define JSONFILEPAGE_H +#pragma once #include <utils/filewizardpage.h> @@ -43,5 +42,3 @@ public: }; } // namespace ProjectExplorer - -#endif // JSONFILEPAGE_H diff --git a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h index 5924310eb9..28ac2af4f1 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JSONKITSPAGE_H -#define JSONKITSPAGE_H +#pragma once #include "jsonwizard.h" #include "../targetsetuppage.h" @@ -75,5 +74,3 @@ private: }; } // namespace ProjectExplorer - -#endif // JSONKITSPAGE_H diff --git a/src/plugins/projectexplorer/jsonwizard/jsonprojectpage.h b/src/plugins/projectexplorer/jsonwizard/jsonprojectpage.h index 8a7e3d9c90..17ecc63e80 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonprojectpage.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonprojectpage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JSONPROJECTPAGE_H -#define JSONPROJECTPAGE_H +#pragma once #include <utils/projectintropage.h> @@ -45,5 +44,3 @@ public: }; } // namespace ProjectExplorer - -#endif // JSONPROJECTPAGE_H diff --git a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.h b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.h index 09e0677537..9ca0ad20c5 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonsummarypage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JSONSUMMARYPAGE_H -#define JSONSUMMARYPAGE_H +#pragma once #include "../projectwizardpage.h" #include "jsonwizard.h" @@ -63,5 +62,3 @@ private: }; } // namespace ProjectExplorer - -#endif // JSONSUMMARYPAGE_H diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizard.h b/src/plugins/projectexplorer/jsonwizard/jsonwizard.h index c550e4008a..5fdfe27561 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizard.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizard.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JSONWIZARD_H -#define JSONWIZARD_H +#pragma once #include "../projectexplorer_export.h" @@ -129,5 +128,3 @@ private: }; } // namespace ProjectExplorer - -#endif // JSONWIZARD_H diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h index 949f371fd5..7ae4a43f6d 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JSONWIZARDFACTORY_H -#define JSONWIZARDFACTORY_H +#pragma once #include "../projectexplorer_export.h" @@ -123,5 +122,3 @@ private: }; } //namespace ProjectExplorer - -#endif // JSONWIZARDFACTORY_H diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.h index cf0a25b60a..5f9597079b 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JSONWIZARDFILEGENERATOR_H -#define JSONWIZARDFILEGENERATOR_H +#pragma once #include "jsonwizardgeneratorfactory.h" @@ -68,5 +67,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // JSONWIZARDFILEGENERATOR_H diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h index 3e4e2ba296..9621e5beae 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JSONWIZARDGENERATORFACTORY_H -#define JSONWIZARDGENERATORFACTORY_H +#pragma once #include "../projectexplorer_export.h" @@ -119,5 +118,3 @@ public: } // namespace Internal } // namespace ProjectExplorer - -#endif // JSONWIZARDGENERATORFACTORY_H diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory.h index ee676d938e..5752b3b4cb 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JSONWIZARDPAGEFACTORY_H -#define JSONWIZARDPAGEFACTORY_H +#pragma once #include "../projectexplorer_export.h" @@ -61,5 +60,3 @@ private: }; } // namespace ProjectExplorer - -#endif // JSONWIZARDPAGEFACTORY_H diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.h index 31ea597ecf..fe8f13221c 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JSONWIZARDPAGEFACTORY_P_H -#define JSONWIZARDPAGEFACTORY_P_H +#pragma once #include "jsonwizardpagefactory.h" @@ -78,5 +77,3 @@ public: } // namespace Internal } // namespace ProjectExplorer - -#endif // JSONWIZARDPAGEFACTORY_P_H diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.h b/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.h index a6e395fccb..01930a847d 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.h +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef JSONWIZARDSCANNERGENERATOR_H -#define JSONWIZARDSCANNERGENERATOR_H +#pragma once #include "jsonwizardgeneratorfactory.h" @@ -56,5 +55,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // JSONWIZARDSCANNERGENERATOR_H diff --git a/src/plugins/projectexplorer/pluginfilefactory.h b/src/plugins/projectexplorer/pluginfilefactory.h index 7440106ded..725b1f8a9c 100644 --- a/src/plugins/projectexplorer/pluginfilefactory.h +++ b/src/plugins/projectexplorer/pluginfilefactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGINFILEFACTORY_H -#define PLUGINFILEFACTORY_H +#pragma once #include <coreplugin/idocumentfactory.h> @@ -54,5 +53,3 @@ private: } // namespace Internal } // namespace ProjectExplorer - -#endif // PLUGINFILEFACTORY diff --git a/src/plugins/projectexplorer/projectconfiguration.h b/src/plugins/projectexplorer/projectconfiguration.h index 9f0103eae2..d784c00b75 100644 --- a/src/plugins/projectexplorer/projectconfiguration.h +++ b/src/plugins/projectexplorer/projectconfiguration.h @@ -81,4 +81,3 @@ PROJECTEXPLORER_EXPORT Core::Id idFromMap(const QVariantMap &map); PROJECTEXPLORER_EXPORT QString displayNameFromMap(const QVariantMap &map); } // namespace ProjectExplorer - diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index c5b6e2f82f..ddd9e222f4 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -405,4 +405,3 @@ private: }; } // namespace ProjectExplorer - diff --git a/src/plugins/projectexplorer/target.h b/src/plugins/projectexplorer/target.h index b3498b0a29..c83da9c1a2 100644 --- a/src/plugins/projectexplorer/target.h +++ b/src/plugins/projectexplorer/target.h @@ -174,4 +174,3 @@ private: }; } // namespace ProjectExplorer - diff --git a/src/plugins/pythoneditor/pythoneditor.h b/src/plugins/pythoneditor/pythoneditor.h index 5ac8a7413a..914b28000a 100644 --- a/src/plugins/pythoneditor/pythoneditor.h +++ b/src/plugins/pythoneditor/pythoneditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PYTHONEDITOR_EDITOR_H -#define PYTHONEDITOR_EDITOR_H +#pragma once #include <texteditor/texteditor.h> @@ -41,5 +40,3 @@ public: } // namespace Internal } // namespace PythonEditor - -#endif // PYTHONEDITOR_EDITOR_H diff --git a/src/plugins/pythoneditor/pythoneditorconstants.h b/src/plugins/pythoneditor/pythoneditorconstants.h index 24a8cff3ef..a84281aaa5 100644 --- a/src/plugins/pythoneditor/pythoneditorconstants.h +++ b/src/plugins/pythoneditor/pythoneditorconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PYTHONEDITOR_CONSTANTS_H -#define PYTHONEDITOR_CONSTANTS_H +#pragma once #include <QtGlobal> @@ -43,5 +42,3 @@ const char C_PY_MIME_ICON[] = "text-x-python"; } // namespace Constants } // namespace PythonEditor - -#endif // PYTHONEDITOR_CONSTANTS_H diff --git a/src/plugins/pythoneditor/pythoneditorplugin.h b/src/plugins/pythoneditor/pythoneditorplugin.h index 0e6aa8a5aa..ae2634c188 100644 --- a/src/plugins/pythoneditor/pythoneditorplugin.h +++ b/src/plugins/pythoneditor/pythoneditorplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PYTHONEDITOR_PLUGIN_H -#define PYTHONEDITOR_PLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> #include <projectexplorer/runconfiguration.h> @@ -59,5 +58,3 @@ private: } // namespace Internal } // namespace PythonEditor - -#endif // PYTHONEDITOR_PLUGIN_H diff --git a/src/plugins/pythoneditor/tools/lexical/pythonformattoken.h b/src/plugins/pythoneditor/tools/lexical/pythonformattoken.h index 528d2fbd40..9ae0d4c21c 100644 --- a/src/plugins/pythoneditor/tools/lexical/pythonformattoken.h +++ b/src/plugins/pythoneditor/tools/lexical/pythonformattoken.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PYTHONFORMATTOKEN_H -#define PYTHONFORMATTOKEN_H +#pragma once #include <stdlib.h> @@ -73,5 +72,3 @@ private: } // namespace Internal } // namespace PythonEditor - -#endif // PYTHONFORMATTOKEN_H diff --git a/src/plugins/pythoneditor/tools/lexical/pythonscanner.h b/src/plugins/pythoneditor/tools/lexical/pythonscanner.h index 831184e7b7..0b8dea5800 100644 --- a/src/plugins/pythoneditor/tools/lexical/pythonscanner.h +++ b/src/plugins/pythoneditor/tools/lexical/pythonscanner.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PYTHONSCANNER_H -#define PYTHONSCANNER_H +#pragma once #include "pythonformattoken.h" #include "sourcecodestream.h" @@ -85,5 +84,3 @@ private: } // namespace Internal } // namespace PythonEditor - -#endif // PYTHONSCANNER_H diff --git a/src/plugins/pythoneditor/tools/lexical/sourcecodestream.h b/src/plugins/pythoneditor/tools/lexical/sourcecodestream.h index 3326e4f5cf..7c8183b453 100644 --- a/src/plugins/pythoneditor/tools/lexical/sourcecodestream.h +++ b/src/plugins/pythoneditor/tools/lexical/sourcecodestream.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PYTHONEDITOR_SOURCECODESTREAM_H -#define PYTHONEDITOR_SOURCECODESTREAM_H +#pragma once #include <QString> @@ -94,5 +93,3 @@ private: } // namespace Internal } // namespace PythonEditor - -#endif // PYTHONEDITOR_SOURCECODESTREAM_H diff --git a/src/plugins/pythoneditor/tools/pythonhighlighter.h b/src/plugins/pythoneditor/tools/pythonhighlighter.h index e78038ca17..6f78a46624 100644 --- a/src/plugins/pythoneditor/tools/pythonhighlighter.h +++ b/src/plugins/pythoneditor/tools/pythonhighlighter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PYTHONHIGHLIGHTER_H -#define PYTHONHIGHLIGHTER_H +#pragma once #include <texteditor/syntaxhighlighter.h> @@ -48,5 +47,3 @@ private: } // namespace Internal } // namespace PythonEditor - -#endif // PYTHONHIGHLIGHTER_H diff --git a/src/plugins/pythoneditor/tools/pythonindenter.h b/src/plugins/pythoneditor/tools/pythonindenter.h index 6846aa1ba8..c44a002439 100644 --- a/src/plugins/pythoneditor/tools/pythonindenter.h +++ b/src/plugins/pythoneditor/tools/pythonindenter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PYTHONINDENTER_H -#define PYTHONINDENTER_H +#pragma once #include <texteditor/indenter.h> #include <QStringList> @@ -51,5 +50,3 @@ private: }; } // namespace PythonEditor - -#endif // PYTHONINDENTER_H diff --git a/src/plugins/qbsprojectmanager/customqbspropertiesdialog.h b/src/plugins/qbsprojectmanager/customqbspropertiesdialog.h index 56a33c22b2..0668f77720 100644 --- a/src/plugins/qbsprojectmanager/customqbspropertiesdialog.h +++ b/src/plugins/qbsprojectmanager/customqbspropertiesdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTC_CUSTOMQBSPROPERTIESDIALOG_H -#define QTC_CUSTOMQBSPROPERTIESDIALOG_H +#pragma once #include <QVariantMap> #include <QDialog> @@ -54,5 +53,3 @@ private: } // namespace Internal } // namespace QbsProjectManager - -#endif // Include guard. diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.h b/src/plugins/qbsprojectmanager/defaultpropertyprovider.h index 08c1e5e020..9e7d36f628 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.h +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEFAULTPROPERTYPROVIDER_H -#define DEFAULTPROPERTYPROVIDER_H +#pragma once #include "propertyprovider.h" @@ -46,5 +45,3 @@ private: } // namespace Internal } // namespace QbsProjectManager - -#endif // DEFAULTPROPERTYPROVIDER_H diff --git a/src/plugins/qbsprojectmanager/propertyprovider.h b/src/plugins/qbsprojectmanager/propertyprovider.h index 960baf28b4..1d99c1aea5 100644 --- a/src/plugins/qbsprojectmanager/propertyprovider.h +++ b/src/plugins/qbsprojectmanager/propertyprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROPERTYPROVIDER_H -#define PROPERTYPROVIDER_H +#pragma once #include "qbsprojectmanager_global.h" @@ -45,5 +44,3 @@ public: }; } // namespace QbsProjectManager - -#endif // PROPERTYPROVIDER_H diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h index cc367f4239..1dd37792bc 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QBSBUILDCONFIGURATION_H -#define QBSBUILDCONFIGURATION_H +#pragma once #include "qbsprojectmanager_global.h" @@ -135,5 +134,3 @@ private: } // namespace Internal } // namespace QbsProjectManager - -#endif // QBSBUILDCONFIGURATION_H diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfigurationwidget.h b/src/plugins/qbsprojectmanager/qbsbuildconfigurationwidget.h index 04acc4abaa..b8309ede83 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfigurationwidget.h +++ b/src/plugins/qbsprojectmanager/qbsbuildconfigurationwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QBSBUILDCONFIGURATIONWIDGET_H -#define QBSBUILDCONFIGURATIONWIDGET_H +#pragma once #include <projectexplorer/namedwidget.h> @@ -59,5 +58,3 @@ private: } // namespace Internal } // namespace QbsProjectManager - -#endif // QBSBUILDCONFIGURATIONWIDGET_H diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.h b/src/plugins/qbsprojectmanager/qbsbuildstep.h index 27f7d38b53..af15dd2b4e 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.h +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QBSBUILDSTEP_H -#define QBSBUILDSTEP_H +#pragma once #include "qbsbuildconfiguration.h" @@ -184,5 +183,3 @@ public: } // namespace Internal } // namespace QbsProjectManager - -#endif // QBSBUILDSTEP_H diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.h b/src/plugins/qbsprojectmanager/qbscleanstep.h index 4f454b2e2f..265d538914 100644 --- a/src/plugins/qbsprojectmanager/qbscleanstep.h +++ b/src/plugins/qbsprojectmanager/qbscleanstep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QBSCLEANSTEP_H -#define QBSCLEANSTEP_H +#pragma once #include "qbsbuildconfiguration.h" @@ -138,5 +137,3 @@ public: } // namespace Internal } // namespace QbsProjectManager - -#endif // QBSCLEANSTEP_H diff --git a/src/plugins/qbsprojectmanager/qbsconstants.h b/src/plugins/qbsprojectmanager/qbsconstants.h index 66a3a2c21b..61884c7272 100644 --- a/src/plugins/qbsprojectmanager/qbsconstants.h +++ b/src/plugins/qbsprojectmanager/qbsconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QBSCONSTANTS_H -#define QBSCONSTANTS_H +#pragma once namespace QbsProjectManager { namespace Constants { @@ -54,5 +53,3 @@ const char QBS_PROPERTIES_KEY_FOR_KITS[] = "QbsProjectManager.qbs-properties"; } // namespace Constants } // namespace QbsProjectManager - -#endif // QBSCONSTANTS_H diff --git a/src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.h b/src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.h index 6f7553622b..5f12cc2820 100644 --- a/src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.h +++ b/src/plugins/qbsprojectmanager/qbsdeployconfigurationfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QBSDEPLOYCONFIGURATIONFACTORY_H -#define QBSDEPLOYCONFIGURATIONFACTORY_H +#pragma once #include <projectexplorer/deployconfiguration.h> @@ -71,5 +70,3 @@ public: } // namespace Internal } // namespace QbsProjectManager - -#endif // QBSDEPLOYCONFIGURATIONFACTORY_H diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.h b/src/plugins/qbsprojectmanager/qbsinstallstep.h index 6f50e53f7a..95f8434eaf 100644 --- a/src/plugins/qbsprojectmanager/qbsinstallstep.h +++ b/src/plugins/qbsprojectmanager/qbsinstallstep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QBSINSTALLSTEP_H -#define QBSINSTALLSTEP_H +#pragma once #include "qbsbuildconfiguration.h" @@ -144,5 +143,3 @@ public: } // namespace Internal } // namespace QbsProjectManager - -#endif // QBSINSTALLSTEP_H diff --git a/src/plugins/qbsprojectmanager/qbslogsink.h b/src/plugins/qbsprojectmanager/qbslogsink.h index bd040a8a6d..f17c4833e1 100644 --- a/src/plugins/qbsprojectmanager/qbslogsink.h +++ b/src/plugins/qbsprojectmanager/qbslogsink.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QBSLOGSINK_H -#define QBSLOGSINK_H +#pragma once #include <projectexplorer/task.h> @@ -59,5 +58,3 @@ private: } // namespace Internal } // namespace QbsProjectManager - -#endif // QBSLOGSINK_H diff --git a/src/plugins/qbsprojectmanager/qbsnodes.h b/src/plugins/qbsprojectmanager/qbsnodes.h index d6b7dfe614..9ada718d8d 100644 --- a/src/plugins/qbsprojectmanager/qbsnodes.h +++ b/src/plugins/qbsprojectmanager/qbsnodes.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QBSNODES_H -#define QBSNODES_H +#pragma once #include <projectexplorer/projectnodes.h> @@ -199,5 +198,3 @@ private: } // namespace Internal } // namespace QbsProjectManager - -#endif // QBSNODES_H diff --git a/src/plugins/qbsprojectmanager/qbsparser.h b/src/plugins/qbsprojectmanager/qbsparser.h index 7b3aeaff2a..6fa8a86c80 100644 --- a/src/plugins/qbsprojectmanager/qbsparser.h +++ b/src/plugins/qbsprojectmanager/qbsparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QBSPARSER_H -#define QBSPARSER_H +#pragma once #include "qbsprojectmanager_global.h" @@ -53,5 +52,3 @@ private: } // namespace Internal } // namespace QbsProjectManager - -#endif // QBSPARSER_H diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.h b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.h index c2933ab6c4..9c851daa0d 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.h +++ b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QBSPROFILESSETTINGSPAGE_H -#define QBSPROFILESSETTINGSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> @@ -48,5 +47,3 @@ private: } // namespace Internal } // namespace QbsProjectManager - -#endif // Include guard. diff --git a/src/plugins/qbsprojectmanager/qbsproject.h b/src/plugins/qbsprojectmanager/qbsproject.h index 73b0917eb4..c22a161cd8 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.h +++ b/src/plugins/qbsprojectmanager/qbsproject.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QBSPROJECT_H -#define QBSPROJECT_H +#pragma once #include "qbsprojectmanager.h" @@ -174,5 +173,3 @@ private: } // namespace Internal } // namespace QbsProjectManager - -#endif // QBSPROJECT_H diff --git a/src/plugins/qbsprojectmanager/qbsprojectfile.h b/src/plugins/qbsprojectmanager/qbsprojectfile.h index fae5c1ec31..80cf70113b 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectfile.h +++ b/src/plugins/qbsprojectmanager/qbsprojectfile.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QBSPROJECTFILE_H -#define QBSPROJECTFILE_H +#pragma once #include <coreplugin/idocument.h> @@ -47,5 +46,3 @@ private: } // namespace Internal } // namespace QbsProjectManager - -#endif // QBSPROJECTFILE_H diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.h b/src/plugins/qbsprojectmanager/qbsprojectmanager.h index 99eb2002f4..0d36825072 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager.h +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QBSPROJECTMANAGER_H -#define QBSPROJECTMANAGER_H +#pragma once #include "qbsprojectmanager_global.h" @@ -92,5 +91,3 @@ private: } // namespace Internal } // namespace QbsProjectManager - -#endif // QBSPROJECTMANAGER_H diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager_global.h b/src/plugins/qbsprojectmanager/qbsprojectmanager_global.h index d9d28454d9..7b53f201e3 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager_global.h +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QBSPROJECTMANAGER_GLOBAL_H -#define QBSPROJECTMANAGER_GLOBAL_H +#pragma once #include <qglobal.h> @@ -33,5 +32,3 @@ #else # define QBSPROJECTMANAGER_EXPORT Q_DECL_IMPORT #endif - -#endif // QBSPROJECTMANAGER_GLOBAL_H diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h b/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h index e085eb5aa5..ce89cccd11 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QBSPROJECTMANAGERCONSTANTS_H -#define QBSPROJECTMANAGERCONSTANTS_H +#pragma once #include <QtGlobal> @@ -67,6 +66,3 @@ static const char QBS_PRODUCT_OVERLAY_ICON[] = ":/qbsprojectmanager/images/produ } // namespace Constants } // namespace QbsProjectManager - -#endif // QBSPROJECTMANAGERCONSTANTS_H - diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h index 7f28b0322d..eb54681c7d 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QBSPROJECTMANAGERPLUGIN_H -#define QBSPROJECTMANAGERPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> #include <utils/parameteraction.h> @@ -109,5 +108,3 @@ private: } // namespace Internal } // namespace QbsProjectManager - -#endif // QBSPROJECTMANAGERPLUGIN_H diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagersettings.h b/src/plugins/qbsprojectmanager/qbsprojectmanagersettings.h index afc6c2aad4..08eb11cafc 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagersettings.h +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagersettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QBSPROJECTMANAGERSETTINGS_H -#define QBSPROJECTMANAGERSETTINGS_H +#pragma once #include <QObject> @@ -56,5 +55,3 @@ private: } // namespace Internal } // namespace QbsProjectManager - -#endif // Include guard. diff --git a/src/plugins/qbsprojectmanager/qbsprojectparser.h b/src/plugins/qbsprojectmanager/qbsprojectparser.h index c00450e574..d354a66079 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectparser.h +++ b/src/plugins/qbsprojectmanager/qbsprojectparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QBSPROJECTPARSER_H -#define QBSPROJECTPARSER_H +#pragma once #include <utils/environment.h> @@ -82,5 +81,3 @@ private: } // namespace Internal } // namespace QbsProjectManager - -#endif // QBSPROJECTPARSER_H diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h index 25d7b33a82..9351d30ac3 100644 --- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h +++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QBSRUNCONFIGURATION_H -#define QBSRUNCONFIGURATION_H +#pragma once #include <projectexplorer/runnables.h> @@ -153,5 +152,3 @@ private: } // namespace Internal } // namespace QbsProjectManager - -#endif // QBSRUNCONFIGURATION_H diff --git a/src/plugins/qmakeandroidsupport/androidextralibrarylistmodel.h b/src/plugins/qmakeandroidsupport/androidextralibrarylistmodel.h index b4d5dacc5c..f9959d556a 100644 --- a/src/plugins/qmakeandroidsupport/androidextralibrarylistmodel.h +++ b/src/plugins/qmakeandroidsupport/androidextralibrarylistmodel.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDEXTRALIBRARYLISTMODEL_H -#define ANDROIDEXTRALIBRARYLISTMODEL_H +#pragma once #include <QAbstractItemModel> #include <QStringList> @@ -73,5 +72,3 @@ private: } // namespace Internal } // namespace QmakeAndroidSupport - -#endif // ANDROIDEXTRALIBRARYLISTMODEL_H diff --git a/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.h b/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.h index 9bb3ce1fe7..f870689439 100644 --- a/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.h +++ b/src/plugins/qmakeandroidsupport/androidpackageinstallationfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDPACKAGEINSTALLATIONFACTORY_H -#define ANDROIDPACKAGEINSTALLATIONFACTORY_H +#pragma once #include <projectexplorer/buildstep.h> @@ -55,5 +54,3 @@ public: } // namespace Internal } // namespace QmakeAndroidSupport - -#endif // ANDROIDPACKAGEINSTALLATIONFACTORY_H diff --git a/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h b/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h index ca1cfbb44f..c27d43aa4f 100644 --- a/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h +++ b/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDPACKAGEINSTALLATIONSTEP_H -#define ANDROIDPACKAGEINSTALLATIONSTEP_H +#pragma once #include <projectexplorer/buildstep.h> #include <projectexplorer/abstractprocessstep.h> @@ -67,5 +66,3 @@ private: } // namespace Internal } // namespace QmakeAndroidSupport - -#endif // ANDROIDPACKAGEINSTALLATIONSTEP_H diff --git a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h index c2044cc1ad..25783a05cb 100644 --- a/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h +++ b/src/plugins/qmakeandroidsupport/androidqmakebuildconfigurationfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANDROIDQMAKEBUILDCONFIGURATIONFACTORY_H -#define ANDROIDQMAKEBUILDCONFIGURATIONFACTORY_H +#pragma once #include <qmakeprojectmanager/qmakebuildconfiguration.h> @@ -65,6 +64,3 @@ private: } // namespace Internal } // namespace QmakeAndroidSupport - - -#endif // ANDROIDQMAKEBUILDCONFIGURATIONFACTORY_H diff --git a/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.h b/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.h index eb6cd5bc41..feba63241f 100644 --- a/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.h +++ b/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CREATEANDROIDMANIFESTWIZARD_H -#define CREATEANDROIDMANIFESTWIZARD_H +#pragma once #include <utils/fileutils.h> #include <utils/pathchooser.h> @@ -120,5 +119,3 @@ private: } //namespace QmakeAndroidSupport } //namespace Internal - -#endif // CREATEANDROIDMANIFESTWIZARD_H diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h index a3b56871c5..8367236ca0 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef QMAKEANDROIDBUILDAPKSTEP_H -#define QMAKEANDROIDBUILDAPKSTEP_H +#pragma once #include <android/androidbuildapkstep.h> @@ -90,5 +89,3 @@ private: } // namespace Internal } // namespace QmakeAndroidSupport - -#endif // QMAKEANDROIDBUILDAPKSTEP_H diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.h b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.h index b7c435c255..d7adbb111b 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEANDROIDBUILDAPKWIDGET_H -#define QMAKEANDROIDBUILDAPKWIDGET_H +#pragma once #include "androidextralibrarylistmodel.h" @@ -75,5 +74,3 @@ public: } // namespace Internal } // namespace QmakeAndroidSupport - -#endif // QMAKEANDROIDBUILDAPKWIDGET_H diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h index 95d06021ef..fcdd1270a2 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKE_ANDROIDRUNCONFIGURATION_H -#define QMAKE_ANDROIDRUNCONFIGURATION_H +#pragma once #include <android/androidrunconfiguration.h> @@ -69,5 +68,3 @@ private: } // namespace Internal } // namespace QmakeAndroidSupport - -#endif // QMAKE_ANDROIDRUNCONFIGURATION_H diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h index e11c6d4ea1..03c6702631 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKE_ANDROIDRUNFACTORIES_H -#define QMAKE_ANDROIDRUNFACTORIES_H +#pragma once #include <android/androidrunfactories.h> #include <projectexplorer/runconfiguration.h> @@ -70,5 +69,3 @@ private: } // namespace Internal } // namespace QmakeAndroidSupport - -#endif // ANDROIDRUNFACTORIES_H diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h index 1a9e4f69c3..52557f1881 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEANDROIDSUPPORT_H -#define QMAKEANDROIDSUPPORT_H +#pragma once #include <android/androidqtsupport.h> @@ -49,5 +48,3 @@ public: } // namespace Internal } // namespace QmakeAndroidSupport - -#endif // QMAKEANDROIDSUPPORT_H diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.h b/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.h index ba5fa5e98f..e2f8be83b2 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEANDROIDSUPPORTPLUGIN_H -#define QMAKEANDROIDSUPPORTPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -45,5 +44,3 @@ public: } // namespace Internal } // namespace QmakeAndroidSupport - -#endif // QMAKEANDROIDSUPPORTPLUGIN_H diff --git a/src/plugins/qmakeprojectmanager/addlibrarywizard.h b/src/plugins/qmakeprojectmanager/addlibrarywizard.h index 7aa90141a1..6a0201c398 100644 --- a/src/plugins/qmakeprojectmanager/addlibrarywizard.h +++ b/src/plugins/qmakeprojectmanager/addlibrarywizard.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ADDLIBRARYWIZARD_H -#define ADDLIBRARYWIZARD_H +#pragma once #include <utils/wizard.h> #include <utils/pathchooser.h> @@ -141,5 +140,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // ADDLIBRARYWIZARD_H diff --git a/src/plugins/qmakeprojectmanager/applicationlauncher.h b/src/plugins/qmakeprojectmanager/applicationlauncher.h index 4732497f92..4889a5bc57 100644 --- a/src/plugins/qmakeprojectmanager/applicationlauncher.h +++ b/src/plugins/qmakeprojectmanager/applicationlauncher.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef APPLICATIONLAUNCHER_H -#define APPLICATIONLAUNCHER_H +#pragma once #include <QObject> #include <QStringList> @@ -77,5 +76,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // APPLICATIONLAUNCHER_H diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/classdefinition.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/classdefinition.h index 8142ec82c6..ab6280659b 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/classdefinition.h +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/classdefinition.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLASSDEFINITION_H -#define CLASSDEFINITION_H +#pragma once #include "ui_classdefinition.h" #include "filenamingparameters.h" @@ -67,5 +66,3 @@ private: } } - -#endif diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/classlist.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/classlist.h index baacbaf657..39c04deafe 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/classlist.h +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/classlist.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLASSLIST_H -#define CLASSLIST_H +#pragma once #include <QListView> @@ -68,4 +67,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager -#endif diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.h index dece6b2d8b..38b8c9c727 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.h +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetpluginwizardpage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CUSTOMWIDGETPLUGINWIZARDPAGE_H -#define CUSTOMWIDGETPLUGINWIZARDPAGE_H +#pragma once #include "filenamingparameters.h" @@ -75,5 +74,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // CUSTOMWIDGETPLUGINWIZARDPAGE_H diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h index d01f053073..6d9ed8d1ad 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwidgetswizardpage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CUSTOMWIDGETWIDGETSWIZARDPAGE_H -#define CUSTOMWIDGETWIDGETSWIZARDPAGE_H +#pragma once #include "pluginoptions.h" #include "filenamingparameters.h" @@ -83,5 +82,3 @@ private: } } - -#endif // CUSTOMWIDGETWIDGETSWIZARDPAGE_H diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.h index 4618d5a3e0..029c81fea2 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.h +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CUSTOMWIDGETWIZARD_H -#define CUSTOMWIDGETWIZARD_H +#pragma once #include "../wizards/qtwizard.h" @@ -46,5 +45,3 @@ protected: } // namespace Internal } // namespace QmakeProjectManager - -#endif // CUSTOMWIDGETWIZARD_H diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.h index 5e72537aea..feeddb5c0b 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.h +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CUSTOMWIDGETWIZARDDIALOG_H -#define CUSTOMWIDGETWIZARDDIALOG_H +#pragma once #include "../wizards/qtwizard.h" @@ -63,5 +62,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // CUSTOMWIDGETWIZARDDIALOG_H diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/filenamingparameters.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/filenamingparameters.h index bc6a1eee88..7f130f3339 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/filenamingparameters.h +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/filenamingparameters.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FILENAMINGPARAMETERS_H -#define FILENAMINGPARAMETERS_H +#pragma once #include <QString> #include <QFileInfo> @@ -79,4 +78,3 @@ struct FileNamingParameters } } -#endif // FILENAMINGPARAMETERS_H diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h index c9c2e4afa7..2307a4ba77 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGINGENERATOR_H -#define PLUGINGENERATOR_H +#pragma once #include <QObject> #include <QString> @@ -65,5 +64,3 @@ private: } } - -#endif diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/pluginoptions.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/pluginoptions.h index 8e040c7242..6ff77c8426 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/pluginoptions.h +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/pluginoptions.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGINOPTIONS_H -#define PLUGINOPTIONS_H +#pragma once #include <QString> #include <QList> @@ -66,5 +65,3 @@ struct PluginOptions { } } - -#endif diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h index 5e5d427e73..0eba545650 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DESKTOPQMAKERUNCONFIGURATION_H -#define DESKTOPQMAKERUNCONFIGURATION_H +#pragma once #include <qmakeprojectmanager/qmakerunconfigurationfactory.h> @@ -171,5 +170,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // DESKTOPQMAKERUNCONFIGURATION_H diff --git a/src/plugins/qmakeprojectmanager/externaleditors.h b/src/plugins/qmakeprojectmanager/externaleditors.h index 767f1f40e3..f60e355b64 100644 --- a/src/plugins/qmakeprojectmanager/externaleditors.h +++ b/src/plugins/qmakeprojectmanager/externaleditors.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EXTERNALEDITORS_H -#define EXTERNALEDITORS_H +#pragma once #include <coreplugin/editormanager/iexternaleditor.h> #include <coreplugin/id.h> @@ -139,5 +138,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // EXTERNALEDITORS_H diff --git a/src/plugins/qmakeprojectmanager/findqmakeprofiles.h b/src/plugins/qmakeprojectmanager/findqmakeprofiles.h index 17ab34626d..ba1772c78c 100644 --- a/src/plugins/qmakeprojectmanager/findqmakeprofiles.h +++ b/src/plugins/qmakeprojectmanager/findqmakeprofiles.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FINDQMAKEPROFILES_H -#define FINDQMAKEPROFILES_H +#pragma once #include <projectexplorer/nodesvisitor.h> @@ -44,6 +43,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // FINDQMAKEPROFILES_H - diff --git a/src/plugins/qmakeprojectmanager/librarydetailscontroller.h b/src/plugins/qmakeprojectmanager/librarydetailscontroller.h index 2557fa619d..b6388c75d1 100644 --- a/src/plugins/qmakeprojectmanager/librarydetailscontroller.h +++ b/src/plugins/qmakeprojectmanager/librarydetailscontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LIBRARYDETAILSCONTROLLER_H -#define LIBRARYDETAILSCONTROLLER_H +#pragma once #include "addlibrarywizard.h" @@ -198,5 +197,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // LIBRARYDETAILSCONTROLLER_H diff --git a/src/plugins/qmakeprojectmanager/makefileparse.h b/src/plugins/qmakeprojectmanager/makefileparse.h index 33e9d7afcb..9a8783d247 100644 --- a/src/plugins/qmakeprojectmanager/makefileparse.h +++ b/src/plugins/qmakeprojectmanager/makefileparse.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MAKEFILEPARSE_H -#define MAKEFILEPARSE_H +#pragma once #include <utils/fileutils.h> #include <qtsupport/baseqtversion.h> @@ -87,6 +86,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - - -#endif // MAKEFILEPARSE_H diff --git a/src/plugins/qmakeprojectmanager/makestep.h b/src/plugins/qmakeprojectmanager/makestep.h index 2d49ba5fb6..e3618f4f9c 100644 --- a/src/plugins/qmakeprojectmanager/makestep.h +++ b/src/plugins/qmakeprojectmanager/makestep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MAKESTEP_H -#define MAKESTEP_H +#pragma once #include "qmakeprojectmanager_global.h" @@ -137,5 +136,3 @@ private: }; } // QmakeProjectManager - -#endif // MAKESTEP_H diff --git a/src/plugins/qmakeprojectmanager/profilecompletionassist.h b/src/plugins/qmakeprojectmanager/profilecompletionassist.h index 1104d9548a..a63f3e7a8d 100644 --- a/src/plugins/qmakeprojectmanager/profilecompletionassist.h +++ b/src/plugins/qmakeprojectmanager/profilecompletionassist.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROFILECOMPLETIONASSIST_H -#define PROFILECOMPLETIONASSIST_H +#pragma once #include <texteditor/codeassist/completionassistprovider.h> @@ -53,5 +52,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // PROFILECOMPLETIONASSIST_H diff --git a/src/plugins/qmakeprojectmanager/profileeditor.h b/src/plugins/qmakeprojectmanager/profileeditor.h index 6f1fb49107..048a0f0b13 100644 --- a/src/plugins/qmakeprojectmanager/profileeditor.h +++ b/src/plugins/qmakeprojectmanager/profileeditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROFILEEDITOR_H -#define PROFILEEDITOR_H +#pragma once #include <texteditor/texteditor.h> @@ -41,5 +40,3 @@ public: } // namespace Internal } // namespace QmakeProjectManager - -#endif // PROFILEEDITOR_H diff --git a/src/plugins/qmakeprojectmanager/profilehighlighter.h b/src/plugins/qmakeprojectmanager/profilehighlighter.h index 417cb49a1f..98de83c9c2 100644 --- a/src/plugins/qmakeprojectmanager/profilehighlighter.h +++ b/src/plugins/qmakeprojectmanager/profilehighlighter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROFILEHIGHLIGHTER_H -#define PROFILEHIGHLIGHTER_H +#pragma once #include <texteditor/syntaxhighlighter.h> #include <texteditor/codeassist/keywordscompletionassist.h> @@ -52,5 +51,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // PROFILEHIGHLIGHTER_H diff --git a/src/plugins/qmakeprojectmanager/profilehoverhandler.h b/src/plugins/qmakeprojectmanager/profilehoverhandler.h index 890701c7ad..407c1f4d28 100644 --- a/src/plugins/qmakeprojectmanager/profilehoverhandler.h +++ b/src/plugins/qmakeprojectmanager/profilehoverhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROFILEHOVERHANDLER_H -#define PROFILEHOVERHANDLER_H +#pragma once #include <texteditor/basehoverhandler.h> #include <texteditor/codeassist/keywordscompletionassist.h> @@ -67,5 +66,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // PROFILEHOVERHANDLER_H diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h index ffb3775f00..a8793b408c 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEBUILDCONFIGURATION_H -#define QMAKEBUILDCONFIGURATION_H +#pragma once #include "qmakeprojectmanager_global.h" @@ -180,5 +179,3 @@ private: }; } // namespace QmakeProjectManager - -#endif // QMAKEBUILDCONFIGURATION_H diff --git a/src/plugins/qmakeprojectmanager/qmakebuildinfo.h b/src/plugins/qmakeprojectmanager/qmakebuildinfo.h index 9d8c0f49e0..41e3eeb507 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildinfo.h +++ b/src/plugins/qmakeprojectmanager/qmakebuildinfo.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEBUILDINFO_H -#define QMAKEBUILDINFO_H +#pragma once #include "qmakebuildconfiguration.h" #include "qmakestep.h" @@ -63,5 +62,3 @@ public: }; } // namespace QmakeProjectManager - -#endif // QMAKEBUILDINFO_H diff --git a/src/plugins/qmakeprojectmanager/qmakekitconfigwidget.h b/src/plugins/qmakeprojectmanager/qmakekitconfigwidget.h index 234d7221c4..43bd4e8ac7 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitconfigwidget.h +++ b/src/plugins/qmakeprojectmanager/qmakekitconfigwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEKITCONFIGWIDGET_H -#define QMAKEKITCONFIGWIDGET_H +#pragma once #include <projectexplorer/kitconfigwidget.h> @@ -62,5 +61,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // QMAKEKITCONFIGWIDGET_H diff --git a/src/plugins/qmakeprojectmanager/qmakekitinformation.h b/src/plugins/qmakeprojectmanager/qmakekitinformation.h index 79e73a5f3b..0e77153d55 100644 --- a/src/plugins/qmakeprojectmanager/qmakekitinformation.h +++ b/src/plugins/qmakeprojectmanager/qmakekitinformation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEKITINFORMATION_H -#define QMAKEKITINFORMATION_H +#pragma once #include "qmakeprojectmanager_global.h" @@ -56,5 +55,3 @@ public: }; } // namespace QmakeProjectManager - -#endif // QMAKEKITINFORMATION_H diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.h b/src/plugins/qmakeprojectmanager/qmakenodes.h index 5df6442346..5e70c708a8 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.h +++ b/src/plugins/qmakeprojectmanager/qmakenodes.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKENODES_H -#define QMAKENODES_H +#pragma once #include "qmakeprojectmanager_global.h" #include "proparser/prowriter.h" @@ -419,5 +418,3 @@ private: }; } // namespace QmakeProjectManager - -#endif // QMAKENODES_H diff --git a/src/plugins/qmakeprojectmanager/qmakeparser.h b/src/plugins/qmakeprojectmanager/qmakeparser.h index 98432573fd..c5dbb91a5c 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparser.h +++ b/src/plugins/qmakeprojectmanager/qmakeparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEPARSER_H -#define QMAKEPARSER_H +#pragma once #include "qmakeprojectmanager_global.h" @@ -47,5 +46,3 @@ private: }; } // namespace QmakeProjectManager - -#endif // QMAKEPARSER_H diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.h b/src/plugins/qmakeprojectmanager/qmakeproject.h index c338a81312..77f6c7e756 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.h +++ b/src/plugins/qmakeprojectmanager/qmakeproject.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEPROJECT_H -#define QMAKEPROJECT_H +#pragma once #include "qmakeprojectmanager_global.h" #include "qmakeprojectmanager.h" @@ -206,6 +205,3 @@ private: }; } // namespace QmakeProjectManager - - -#endif // QMAKEPROJECT_H diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h index 8e84e61a2b..2d775fcd80 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h +++ b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEPROJECTCONFIGWIDGET_H -#define QMAKEPROJECTCONFIGWIDGET_H +#pragma once #include <projectexplorer/namedwidget.h> @@ -73,5 +72,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // QMAKEPROJECTCONFIGWIDGET_H diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.h b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.h index 725186a1d5..a6e8dce3c7 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.h +++ b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEPROJECTIMPORTER_H -#define QMAKEPROJECTIMPORTER_H +#pragma once #include "qmakestep.h" @@ -61,5 +60,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // QMAKEPROJECTIMPORTER_H diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager_global.h b/src/plugins/qmakeprojectmanager/qmakeprojectmanager_global.h index 46c3e2501c..7dee97cb25 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager_global.h +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEPROJECTMANAGER_GLOBAL_H -#define QMAKEPROJECTMANAGER_GLOBAL_H +#pragma once #include <qglobal.h> @@ -33,5 +32,3 @@ #else # define QMAKEPROJECTMANAGER_EXPORT Q_DECL_IMPORT #endif - -#endif // QMAKEPROJECTMANAGER_GLOBAL_H diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h index 649c61bbc6..fcb102589b 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEPROJECTMANAGERCONSTANTS_H -#define QMAKEPROJECTMANAGERCONSTANTS_H +#pragma once #include <QtGlobal> @@ -69,5 +68,3 @@ const char ICON_QTQUICK_APP[] = ":/wizards/images/qtquickapp.png"; } // namespace Constants } // namespace QmakeProjectManager - -#endif // QMAKEPROJECTMANAGERCONSTANTS_H diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.h b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.h index 2029fe2b9e..473065f5f1 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.h +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEPROJECTMANAGERPLUGIN_H -#define QMAKEPROJECTMANAGERPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> #include <coreplugin/icontext.h> @@ -94,5 +93,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // QMAKEPROJECTMANAGERPLUGIN_H diff --git a/src/plugins/qmakeprojectmanager/qmakerunconfigurationfactory.h b/src/plugins/qmakeprojectmanager/qmakerunconfigurationfactory.h index a40978453d..3f0bfc419c 100644 --- a/src/plugins/qmakeprojectmanager/qmakerunconfigurationfactory.h +++ b/src/plugins/qmakeprojectmanager/qmakerunconfigurationfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKERUNCONFIGURATIONFACTORY_H -#define QMAKERUNCONFIGURATIONFACTORY_H +#pragma once #include "qmakeprojectmanager_global.h" @@ -49,5 +48,3 @@ public: }; } // namespace QmakeProjectManager - -#endif // QMAKERUNCONFIGURATIONFACTORY_H diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h index 3509e85981..5d80671d07 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.h +++ b/src/plugins/qmakeprojectmanager/qmakestep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKESTEP_H -#define QMAKESTEP_H +#pragma once #include "qmakeprojectmanager_global.h" #include <projectexplorer/abstractprocessstep.h> @@ -224,5 +223,3 @@ private: }; } // namespace QmakeProjectManager - -#endif // QMAKESTEP_H diff --git a/src/plugins/qmakeprojectmanager/qtmodulesinfo.h b/src/plugins/qmakeprojectmanager/qtmodulesinfo.h index b3541c3088..5f3e793d3c 100644 --- a/src/plugins/qmakeprojectmanager/qtmodulesinfo.h +++ b/src/plugins/qmakeprojectmanager/qtmodulesinfo.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTMODULESINFO_H -#define QTMODULESINFO_H +#pragma once #include <QStringList> @@ -42,5 +41,3 @@ public: } // namespace Internal } // namespace QmakeProjectManager - -#endif // QTMODULESINFO_H diff --git a/src/plugins/qmakeprojectmanager/wizards/filespage.h b/src/plugins/qmakeprojectmanager/wizards/filespage.h index 0160d9830a..135eb3d146 100644 --- a/src/plugins/qmakeprojectmanager/wizards/filespage.h +++ b/src/plugins/qmakeprojectmanager/wizards/filespage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FILESPAGE_H -#define FILESPAGE_H +#pragma once #include <QWizard> @@ -83,5 +82,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // FILESPAGE_H diff --git a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.h b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.h index 44286b26a9..82369889e9 100644 --- a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.h +++ b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GUIAPPWIZARD_H -#define GUIAPPWIZARD_H +#pragma once #include "qtwizard.h" @@ -53,5 +52,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // GUIAPPWIZARD_H diff --git a/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.h b/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.h index e688b01042..ab28479700 100644 --- a/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.h +++ b/src/plugins/qmakeprojectmanager/wizards/guiappwizarddialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GUIAPPWIZARDDIALOG_H -#define GUIAPPWIZARDDIALOG_H +#pragma once #include "qtwizard.h" @@ -72,5 +71,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // GUIAPPWIZARDDIALOG_H diff --git a/src/plugins/qmakeprojectmanager/wizards/libraryparameters.h b/src/plugins/qmakeprojectmanager/wizards/libraryparameters.h index 8c9790de89..760bb03365 100644 --- a/src/plugins/qmakeprojectmanager/wizards/libraryparameters.h +++ b/src/plugins/qmakeprojectmanager/wizards/libraryparameters.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LIBRARYPARAMETERS_H -#define LIBRARYPARAMETERS_H +#pragma once #include "qtprojectparameters.h" @@ -61,5 +60,3 @@ struct LibraryParameters { } // namespace Internal } // namespace QmakeProjectManager - -#endif // LIBRARYPARAMETERS_H diff --git a/src/plugins/qmakeprojectmanager/wizards/librarywizard.h b/src/plugins/qmakeprojectmanager/wizards/librarywizard.h index c327d6d2dc..d96df97df6 100644 --- a/src/plugins/qmakeprojectmanager/wizards/librarywizard.h +++ b/src/plugins/qmakeprojectmanager/wizards/librarywizard.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LIBRARYWIZARD_H -#define LIBRARYWIZARD_H +#pragma once #include "qtwizard.h" #include "libraryparameters.h" @@ -47,5 +46,3 @@ protected: } // namespace Internal } // namespace QmakeProjectManager - -#endif // LIBRARYWIZARD_H diff --git a/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.h b/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.h index 28ba6952f6..620ffe7cca 100644 --- a/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.h +++ b/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LIBRARYWIZARDDIALOG_H -#define LIBRARYWIZARDDIALOG_H +#pragma once #include "qtwizard.h" @@ -77,5 +76,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // LIBRARYWIZARDDIALOG_H diff --git a/src/plugins/qmakeprojectmanager/wizards/modulespage.h b/src/plugins/qmakeprojectmanager/wizards/modulespage.h index 7fb8aa9496..394326d1df 100644 --- a/src/plugins/qmakeprojectmanager/wizards/modulespage.h +++ b/src/plugins/qmakeprojectmanager/wizards/modulespage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODULESPAGE_H -#define MODULESPAGE_H +#pragma once #include <QMap> #include <QStringList> @@ -60,5 +59,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // MODULESPAGE_H diff --git a/src/plugins/qmakeprojectmanager/wizards/qtprojectparameters.h b/src/plugins/qmakeprojectmanager/wizards/qtprojectparameters.h index f973d98604..e82e2fb3ed 100644 --- a/src/plugins/qmakeprojectmanager/wizards/qtprojectparameters.h +++ b/src/plugins/qmakeprojectmanager/wizards/qtprojectparameters.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTPROJECTPARAMETERS_H -#define QTPROJECTPARAMETERS_H +#pragma once #include <QStringList> @@ -71,5 +70,3 @@ struct QtProjectParameters { } // namespace Internal } // namespace QmakeProjectManager - -#endif // QTPROJECTPARAMETERS_H diff --git a/src/plugins/qmakeprojectmanager/wizards/qtwizard.h b/src/plugins/qmakeprojectmanager/wizards/qtwizard.h index d14dfe9ce3..813ca9555f 100644 --- a/src/plugins/qmakeprojectmanager/wizards/qtwizard.h +++ b/src/plugins/qmakeprojectmanager/wizards/qtwizard.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTWIZARD_H -#define QTWIZARD_H +#pragma once #include "qtprojectparameters.h" #include <projectexplorer/baseprojectwizarddialog.h> @@ -146,5 +145,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // QTWIZARD_H diff --git a/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.h b/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.h index dbdd54f2f0..8f6cb99b78 100644 --- a/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.h +++ b/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SUBDIRSPROJECTWIZARD_H -#define SUBDIRSPROJECTWIZARD_H +#pragma once #include "qtwizard.h" @@ -49,5 +48,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // SUBDIRSPROJECTWIZARD_H diff --git a/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizarddialog.h b/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizarddialog.h index 9b7160b6e6..7dab8c7273 100644 --- a/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizarddialog.h +++ b/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizarddialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SUBDIRSPROJECTWIZARDDIALOG_H -#define SUBDIRSPROJECTWIZARDDIALOG_H +#pragma once #include "qtwizard.h" @@ -47,5 +46,3 @@ public: } // namespace Internal } // namespace QmakeProjectManager - -#endif // SUBDIRSPROJECTWIZARDDIALOG_H diff --git a/src/plugins/qmakeprojectmanager/wizards/testwizard.h b/src/plugins/qmakeprojectmanager/wizards/testwizard.h index 9f027b9426..421cf95743 100644 --- a/src/plugins/qmakeprojectmanager/wizards/testwizard.h +++ b/src/plugins/qmakeprojectmanager/wizards/testwizard.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTWIZARD_H -#define TESTWIZARD_H +#pragma once #include "qtwizard.h" @@ -46,5 +45,3 @@ protected: } // namespace Internal } // namespace QmakeProjectManager - -#endif // TESTWIZARD_H diff --git a/src/plugins/qmakeprojectmanager/wizards/testwizarddialog.h b/src/plugins/qmakeprojectmanager/wizards/testwizarddialog.h index b92d316867..8efcf0bb47 100644 --- a/src/plugins/qmakeprojectmanager/wizards/testwizarddialog.h +++ b/src/plugins/qmakeprojectmanager/wizards/testwizarddialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTWIZARDDIALOG_H -#define TESTWIZARDDIALOG_H +#pragma once #include "qtwizard.h" @@ -74,5 +73,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // TESTWIZARDDIALOG_H diff --git a/src/plugins/qmakeprojectmanager/wizards/testwizardpage.h b/src/plugins/qmakeprojectmanager/wizards/testwizardpage.h index 7857a598a3..e9076af5bf 100644 --- a/src/plugins/qmakeprojectmanager/wizards/testwizardpage.h +++ b/src/plugins/qmakeprojectmanager/wizards/testwizardpage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TESTWIZARDPAGE_H -#define TESTWIZARDPAGE_H +#pragma once #include <QWizardPage> @@ -68,5 +67,3 @@ private: } // namespace Internal } // namespace QmakeProjectManager - -#endif // TESTWIZARDPAGE_H diff --git a/src/plugins/qmldesigner/components/componentcore/abstractaction.h b/src/plugins/qmldesigner/components/componentcore/abstractaction.h index f6b43e67d1..0c347b5d23 100644 --- a/src/plugins/qmldesigner/components/componentcore/abstractaction.h +++ b/src/plugins/qmldesigner/components/componentcore/abstractaction.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_DEFAULTDESIGNERACTION_H -#define QMLDESIGNER_DEFAULTDESIGNERACTION_H +#pragma once #include "actioninterface.h" @@ -74,5 +73,3 @@ private: }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_DEFAULTDESIGNERACTION_H diff --git a/src/plugins/qmldesigner/components/componentcore/abstractactiongroup.h b/src/plugins/qmldesigner/components/componentcore/abstractactiongroup.h index f6997ab4c9..d13b7782cc 100644 --- a/src/plugins/qmldesigner/components/componentcore/abstractactiongroup.h +++ b/src/plugins/qmldesigner/components/componentcore/abstractactiongroup.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MENUDESIGNERACTION_H -#define MENUDESIGNERACTION_H +#pragma once #include "actioninterface.h" @@ -57,5 +56,3 @@ private: }; } // namespace QmlDesigner - -#endif // MENUDESIGNERACTION_H diff --git a/src/plugins/qmldesigner/components/componentcore/actioninterface.h b/src/plugins/qmldesigner/components/componentcore/actioninterface.h index 9b6afc4edc..d3d23ca43a 100644 --- a/src/plugins/qmldesigner/components/componentcore/actioninterface.h +++ b/src/plugins/qmldesigner/components/componentcore/actioninterface.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ABSTRACTDESIGNERACTION_H -#define ABSTRACTDESIGNERACTION_H +#pragma once #include "componentcore_constants.h" #include "selectioncontext.h" @@ -62,5 +61,3 @@ public: }; } //QmlDesigner - -#endif //ABSTRACTDESIGNERACTION_H diff --git a/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h b/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h index 86f1ccf6de..9da0027c0c 100644 --- a/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h +++ b/src/plugins/qmldesigner/components/componentcore/componentcore_constants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMPONENTCORE_CONSTANTS_H -#define COMPONENTCORE_CONSTANTS_H +#pragma once #include <QtGlobal> @@ -112,5 +111,3 @@ const int priorityLast = 60; } //ComponentCoreConstants } //QmlDesigner - -#endif //COMPONENTCORE_CONSTANTS_H diff --git a/src/plugins/qmldesigner/components/componentcore/crumblebar.h b/src/plugins/qmldesigner/components/componentcore/crumblebar.h index cb19c6ce0f..a09f2e3b4f 100644 --- a/src/plugins/qmldesigner/components/componentcore/crumblebar.h +++ b/src/plugins/qmldesigner/components/componentcore/crumblebar.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_FORMEDITORCRUMBLEBAR_H -#define QMLDESIGNER_FORMEDITORCRUMBLEBAR_H +#pragma once #include <QObject> #include <utils/crumblepath.h> @@ -70,5 +69,3 @@ bool operator !=(const CrumbleBarInfo &first, const CrumbleBarInfo &second); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::CrumbleBarInfo) - -#endif // QMLDESIGNER_FORMEDITORCRUMBLEBAR_H diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h index f0ed41cba1..fca668b679 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DESIGNERACTIONMANAGER_H -#define DESIGNERACTIONMANAGER_H +#pragma once #include <qmldesignercorelib_global.h> #include "actioninterface.h" @@ -51,5 +50,3 @@ private: }; } //QmlDesigner - -#endif //DESIGNERACTIONMANAGER_H diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanagerview.h b/src/plugins/qmldesigner/components/componentcore/designeractionmanagerview.h index 4613cb0332..b33d65f41b 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanagerview.h +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanagerview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_DESIGNERACTIONMANAGERVIEW_H -#define QMLDESIGNER_DESIGNERACTIONMANAGERVIEW_H +#pragma once #include <abstractview.h> @@ -78,5 +77,3 @@ private: } // namespace QmlDesigner - -#endif // QMLDESIGNER_DESIGNERACTIONMANAGERVIEW_H diff --git a/src/plugins/qmldesigner/components/componentcore/findimplementation.h b/src/plugins/qmldesigner/components/componentcore/findimplementation.h index d6f53e1b35..931e0aea94 100644 --- a/src/plugins/qmldesigner/components/componentcore/findimplementation.h +++ b/src/plugins/qmldesigner/components/componentcore/findimplementation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FINDIMPLEMENTATION_H -#define FINDIMPLEMENTATION_H +#pragma once #include <QList> @@ -36,5 +35,3 @@ public: FindImplementation(); static QList<QmlJSEditor::FindReferences::Usage> run(const QString &fileName, const QString &typeName, const QString &itemName); }; - -#endif // FINDIMPLEMENTATION_H diff --git a/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.h b/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.h index ed7b8eece6..4acc4291a6 100644 --- a/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.h +++ b/src/plugins/qmldesigner/components/componentcore/layoutingridlayout.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LAYOUTINGRIDLAYOUT_H -#define LAYOUTINGRIDLAYOUT_H +#pragma once #include "selectioncontext.h" @@ -82,5 +81,3 @@ private: }; } //QmlDesigner - -#endif // LAYOUTINGRIDLAYOUT_H diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.h b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.h index 615ac45128..58a1d1f9cf 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.h +++ b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODELNODECONTEXTMENU_H -#define MODELNODECONTEXTMENU_H +#pragma once #include <QPoint> #include <QCoreApplication> @@ -50,5 +49,3 @@ private: }; } // namespace QmlDesigner - -#endif // MODELNODECONTEXTMENU_H diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h index 11fd6e2dea..233e5c5649 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h +++ b/src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODELNODECONTEXTMENU_HELPER_H -#define MODELNODECONTEXTMENU_HELPER_H +#pragma once #include "modelnodeoperations.h" #include "abstractaction.h" @@ -191,5 +190,3 @@ private: } //QmlDesigner - -#endif // MODELNODECONTEXTMENU_HELPER_H diff --git a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.h b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.h index 74682d7d03..bdc43684ce 100644 --- a/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.h +++ b/src/plugins/qmldesigner/components/componentcore/modelnodeoperations.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODELNODEOPERATIONS_H -#define MODELNODEOPERATIONS_H +#pragma once #include "selectioncontext.h" @@ -71,5 +70,3 @@ void removePositioner(const SelectionContext &selectionContext); } // namespace ModelNodeOperationso } //QmlDesigner - -#endif //MODELNODEOPERATIONS_H diff --git a/src/plugins/qmldesigner/components/componentcore/selectioncontext.h b/src/plugins/qmldesigner/components/componentcore/selectioncontext.h index 662c3b1ae9..17e5981e6d 100644 --- a/src/plugins/qmldesigner/components/componentcore/selectioncontext.h +++ b/src/plugins/qmldesigner/components/componentcore/selectioncontext.h @@ -28,8 +28,7 @@ #include <QPointF> #include <QPointer> -#ifndef SELECTIONCONTEXT_H -#define SELECTIONCONTEXT_H +#pragma once namespace QmlDesigner { @@ -72,5 +71,3 @@ private: }; } //QmlDesigner - -#endif //SELECTIONCONTEXT_H diff --git a/src/plugins/qmldesigner/components/debugview/debugview.h b/src/plugins/qmldesigner/components/debugview/debugview.h index 898a85c748..51344f0696 100644 --- a/src/plugins/qmldesigner/components/debugview/debugview.h +++ b/src/plugins/qmldesigner/components/debugview/debugview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGVIEW_H -#define DEBUGVIEW_H +#pragma once #include <abstractview.h> #include <QPointer> @@ -101,5 +100,3 @@ private: //variables } // namespace Internal } // namespace QmlDesigner - -#endif // DEBUGVIEW_H diff --git a/src/plugins/qmldesigner/components/debugview/debugviewwidget.h b/src/plugins/qmldesigner/components/debugview/debugviewwidget.h index 34329f45c3..ca6cdfb8fa 100644 --- a/src/plugins/qmldesigner/components/debugview/debugviewwidget.h +++ b/src/plugins/qmldesigner/components/debugview/debugviewwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGVIEWWIDGET_H -#define DEBUGVIEWWIDGET_H +#pragma once #include <QWidget> @@ -56,6 +55,3 @@ private: } //namespace Internal } //namespace QmlDesigner - -#endif //DEBUGVIEWWIDGET_H - diff --git a/src/plugins/qmldesigner/components/importmanager/importlabel.h b/src/plugins/qmldesigner/components/importmanager/importlabel.h index 35150ac7c1..6df9e0286c 100644 --- a/src/plugins/qmldesigner/components/importmanager/importlabel.h +++ b/src/plugins/qmldesigner/components/importmanager/importlabel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IMPORTLABEL_H -#define IMPORTLABEL_H +#pragma once #include <QLabel> #include <QPushButton> @@ -56,4 +55,3 @@ private: }; } -#endif // IMPORTLABEL_H diff --git a/src/plugins/qmldesigner/components/importmanager/importmanagercombobox.h b/src/plugins/qmldesigner/components/importmanager/importmanagercombobox.h index 3378621c45..dd566a12bc 100644 --- a/src/plugins/qmldesigner/components/importmanager/importmanagercombobox.h +++ b/src/plugins/qmldesigner/components/importmanager/importmanagercombobox.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IMPORTMANAGERCOMBOBOX_H -#define IMPORTMANAGERCOMBOBOX_H +#pragma once #include <QComboBox> @@ -37,5 +36,3 @@ public: protected: void paintEvent(QPaintEvent *e); }; - -#endif // IMPORTMANAGERCOMBOBOX_H diff --git a/src/plugins/qmldesigner/components/importmanager/importmanagerview.h b/src/plugins/qmldesigner/components/importmanager/importmanagerview.h index e4a2a8630f..340f81fd65 100644 --- a/src/plugins/qmldesigner/components/importmanager/importmanagerview.h +++ b/src/plugins/qmldesigner/components/importmanager/importmanagerview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_IMPORTMANAGERVIEW_H -#define QMLDESIGNER_IMPORTMANAGERVIEW_H +#pragma once #include <abstractview.h> #include <QPointer> @@ -60,5 +59,3 @@ private: }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_IMPORTMANAGERVIEW_H diff --git a/src/plugins/qmldesigner/components/importmanager/importswidget.h b/src/plugins/qmldesigner/components/importmanager/importswidget.h index 647d68e9d3..bfac06f75c 100644 --- a/src/plugins/qmldesigner/components/importmanager/importswidget.h +++ b/src/plugins/qmldesigner/components/importmanager/importswidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_IMPORTSWIDGET_H -#define QMLDESIGNER_IMPORTSWIDGET_H +#pragma once #include <import.h> @@ -69,5 +68,3 @@ private: }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_IMPORTSWIDGET_H diff --git a/src/plugins/qmldesigner/components/integration/componentaction.h b/src/plugins/qmldesigner/components/integration/componentaction.h index a61b3147fc..4d697cc7f4 100644 --- a/src/plugins/qmldesigner/components/integration/componentaction.h +++ b/src/plugins/qmldesigner/components/integration/componentaction.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMPONENTACTION_H -#define COMPONENTACTION_H +#pragma once #include <QWidgetAction> #include <QPointer> @@ -64,5 +63,3 @@ private: }; } // namespace QmlDesigner - -#endif // COMPONENTACTION_H diff --git a/src/plugins/qmldesigner/components/integration/componentview.h b/src/plugins/qmldesigner/components/integration/componentview.h index 865c1cf4f0..4740a7196a 100644 --- a/src/plugins/qmldesigner/components/integration/componentview.h +++ b/src/plugins/qmldesigner/components/integration/componentview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMPONENTVIEW_H -#define COMPONENTVIEW_H +#pragma once #include <abstractview.h> #include <modelnode.h> @@ -94,5 +93,3 @@ private: }; } // namespace QmlDesigner - -#endif // COMPONENTVIEW_H diff --git a/src/plugins/qmldesigner/components/integration/designdocumentview.h b/src/plugins/qmldesigner/components/integration/designdocumentview.h index 45a6f7ae0b..d3fc45c38d 100644 --- a/src/plugins/qmldesigner/components/integration/designdocumentview.h +++ b/src/plugins/qmldesigner/components/integration/designdocumentview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DesignDocumentVIEW_H -#define DesignDocumentVIEW_H +#pragma once #include <abstractview.h> #include <modelmerger.h> @@ -54,5 +53,3 @@ private: }; }// namespace QmlDesigner - -#endif // DesignDocumentVIEW_H diff --git a/src/plugins/qmldesigner/components/integration/xuifiledialog.h b/src/plugins/qmldesigner/components/integration/xuifiledialog.h index cc1d2af48c..1ac647322e 100644 --- a/src/plugins/qmldesigner/components/integration/xuifiledialog.h +++ b/src/plugins/qmldesigner/components/integration/xuifiledialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef XUIFILEDIALOG_H -#define XUIFILEDIALOG_H +#pragma once #include <QString> #include <QStringList> @@ -57,5 +56,3 @@ signals: } // namespace Internal } // namespace QmlDesigner - -#endif // XUIFILEDIALOG_H diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.h index 613520d8d8..54b6424d71 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimageprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ITEMLIBRARYIMAGEPROVIDER_H -#define ITEMLIBRARYIMAGEPROVIDER_H +#pragma once #include <QQuickImageProvider> @@ -43,5 +42,3 @@ public: } } - -#endif // ITEMLIBRARYIMAGEPROVIDER_H diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.h index f411ccbd0f..c5ac7d8d87 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_ITEMLIBRARYITEMMODEL_H -#define QMLDESIGNER_ITEMLIBRARYITEMMODEL_H +#pragma once #include <QObject> #include <QString> @@ -66,5 +65,3 @@ private: }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_ITEMLIBRARYITEMMODEL_H diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h index 78f5fa3e2e..bf1a211248 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ITEMLIBRARYMODEL_H -#define ITEMLIBRARYMODEL_H +#pragma once #include <QMap> #include <QIcon> @@ -96,5 +95,3 @@ private: // variables } // namespace QmlDesigner QML_DECLARE_TYPE(QmlDesigner::ItemLibraryModel) -#endif // ITEMLIBRARYMODEL_H - diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.h index 74e52d9785..d2a1d914b1 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_ITEMLIBRARYSECTION_H -#define QMLDESIGNER_ITEMLIBRARYSECTION_H +#pragma once #include "itemlibrarysectionmodel.h" @@ -68,5 +67,3 @@ private: }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_ITEMLIBRARYSECTION_H diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.h index dc5a11737d..6e5d9ebf4b 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_ITEMLIBRARYSECTIONMODEL_H -#define QMLDESIGNER_ITEMLIBRARYSECTIONMODEL_H +#pragma once #include "itemlibrarymodel.h" @@ -66,5 +65,3 @@ private: // variables } // namespace QmlDesigner QML_DECLARE_TYPE(QmlDesigner::ItemLibrarySectionModel) - -#endif // QMLDESIGNER_ITEMLIBRARYSECTIONMODEL_H diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarytreeview.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarytreeview.h index 2a79a69919..37faaeef68 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarytreeview.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarytreeview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ITEMLIBRARYCOMPONENTS_H -#define ITEMLIBRARYCOMPONENTS_H +#pragma once #include <QTreeView> #include <QStyledItemDelegate> @@ -61,6 +60,3 @@ private: }; } // namespace QmlDesigner - -#endif // ITEMLIBRARYCOMPONENTS_H - diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h index f2d987cab9..6391d7bc4f 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ITEMLIBRARYVIEW_H -#define ITEMLIBRARYVIEW_H +#pragma once #include <abstractview.h> @@ -63,4 +62,3 @@ private: }; } -#endif // ITEMLIBRARYVIEW_H diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h index ecdf6aa171..3665d34a95 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ITEMLIBRARYWIDGET_H -#define ITEMLIBRARYWIDGET_H +#pragma once #include "itemlibraryinfo.h" #include "itemlibrarytreeview.h" @@ -138,6 +137,3 @@ private: }; } - -#endif // ITEMLIBRARYWIDGET_H - diff --git a/src/plugins/qmldesigner/components/itemlibrary/resourceitemdelegate.h b/src/plugins/qmldesigner/components/itemlibrary/resourceitemdelegate.h index 63aa7477fd..f90bb4f4be 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/resourceitemdelegate.h +++ b/src/plugins/qmldesigner/components/itemlibrary/resourceitemdelegate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_RESOURCEITEMDELEGATE_H -#define QMLDESIGNER_RESOURCEITEMDELEGATE_H +#pragma once #include <QStyledItemDelegate> #include <QFileSystemModel> @@ -50,5 +49,3 @@ private: }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_RESOURCEITEMDELEGATE_H diff --git a/src/plugins/qmldesigner/components/logger/logger.h b/src/plugins/qmldesigner/components/logger/logger.h index 3eae0fceb8..64002a8bde 100644 --- a/src/plugins/qmldesigner/components/logger/logger.h +++ b/src/plugins/qmldesigner/components/logger/logger.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QLOGGER_H -#define QLOGGER_H +#pragma once #include <QString> #include <QStringList> @@ -73,5 +72,3 @@ private: QTime *m_timer; }; - -#endif // QLOGGER_H diff --git a/src/plugins/qmldesigner/components/navigator/iconcheckboxitemdelegate.h b/src/plugins/qmldesigner/components/navigator/iconcheckboxitemdelegate.h index fa3ac6f89d..553a7f8c8e 100644 --- a/src/plugins/qmldesigner/components/navigator/iconcheckboxitemdelegate.h +++ b/src/plugins/qmldesigner/components/navigator/iconcheckboxitemdelegate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_ICONCHECKBOXITEMDELEGATE_H -#define QMLDESIGNER_ICONCHECKBOXITEMDELEGATE_H +#pragma once #include <QStyledItemDelegate> @@ -53,5 +52,3 @@ private: NavigatorTreeModel *m_navigatorTreeModel; }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_ICONCHECKBOXITEMDELEGATE_H diff --git a/src/plugins/qmldesigner/components/navigator/nameitemdelegate.h b/src/plugins/qmldesigner/components/navigator/nameitemdelegate.h index 3df50b986d..281a2ea8a4 100644 --- a/src/plugins/qmldesigner/components/navigator/nameitemdelegate.h +++ b/src/plugins/qmldesigner/components/navigator/nameitemdelegate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_NAMEITEMDELEGATE_H -#define QMLDESIGNER_NAMEITEMDELEGATE_H +#pragma once #include <QStyledItemDelegate> @@ -53,5 +52,3 @@ private: }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_NAMEITEMDELEGATE_H diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h index a2b4b33033..f879393e86 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NAVIGATORTREEMODEL_H -#define NAVIGATORTREEMODEL_H +#pragma once #include <modelnode.h> #include <nodemetainfo.h> @@ -147,5 +146,3 @@ private: }; } // namespace QmlDesigner - -#endif // NAVIGATORTREEMODEL_H diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreeview.h b/src/plugins/qmldesigner/components/navigator/navigatortreeview.h index 24f7df7b4b..f5d4caa5ed 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreeview.h +++ b/src/plugins/qmldesigner/components/navigator/navigatortreeview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NAVIGATORTREEVIEW_H -#define NAVIGATORTREEVIEW_H +#pragma once #include <QTreeView> @@ -38,5 +37,3 @@ public: static void drawSelectionBackground(QPainter *painter, const QStyleOption &option); }; } - -#endif // NAVIGATORTREEVIEW_H diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.h b/src/plugins/qmldesigner/components/navigator/navigatorview.h index 537f17ae74..bbef3ec1d0 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.h +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NAVIGATORVIEW_H -#define NAVIGATORVIEW_H +#pragma once #include <abstractview.h> @@ -99,4 +98,3 @@ private: }; } -#endif // NAVIGATORVIEW_H diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.h b/src/plugins/qmldesigner/components/navigator/navigatorwidget.h index 917151dda9..526004cf84 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.h +++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NAVIGATORWIDGET_H -#define NAVIGATORWIDGET_H +#pragma once #include <QFrame> #include <QPointer> @@ -64,5 +63,3 @@ private: // variables }; } - -#endif // NAVIGATORWIDGET_H diff --git a/src/plugins/qmldesigner/components/pluginmanager/iplugin.h b/src/plugins/qmldesigner/components/pluginmanager/iplugin.h index 2ceaab67cb..609cee3f4b 100644 --- a/src/plugins/qmldesigner/components/pluginmanager/iplugin.h +++ b/src/plugins/qmldesigner/components/pluginmanager/iplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IPLUGIN_H -#define IPLUGIN_H +#pragma once #include <QObject> @@ -50,5 +49,3 @@ public: QT_BEGIN_NAMESPACE Q_DECLARE_INTERFACE(QmlDesigner::IPlugin, QMLDESIGNER_PLUGIN_INTERFACE) QT_END_NAMESPACE - -#endif // IPLUGIN_H diff --git a/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.h b/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.h index d971c2d710..819d216e4a 100644 --- a/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.h +++ b/src/plugins/qmldesigner/components/pluginmanager/pluginmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGINMANAGER_H -#define PLUGINMANAGER_H +#pragma once #include "pluginpath.h" @@ -72,4 +71,3 @@ private: // variables }; } // namespace QmlDesigner -#endif // PLUGINMANAGER_H diff --git a/src/plugins/qmldesigner/components/pluginmanager/pluginpath.h b/src/plugins/qmldesigner/components/pluginmanager/pluginpath.h index 7b526e5ca2..c1d7e81c22 100644 --- a/src/plugins/qmldesigner/components/pluginmanager/pluginpath.h +++ b/src/plugins/qmldesigner/components/pluginmanager/pluginpath.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLUGINPATH_H -#define PLUGINPATH_H +#pragma once #include <QObject> #include <QPointer> @@ -91,4 +90,3 @@ private: PluginDataList m_plugins; }; } // namespace QmlDesigner -#endif // PLUGINPATH_H diff --git a/src/plugins/qmldesigner/components/propertyeditor/designerpropertymap.h b/src/plugins/qmldesigner/components/propertyeditor/designerpropertymap.h index 12e8feb7f8..d520cab714 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/designerpropertymap.h +++ b/src/plugins/qmldesigner/components/propertyeditor/designerpropertymap.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DESIGNERPROPERTYMAP_H -#define DESIGNERPROPERTYMAP_H +#pragma once #include <QQmlPropertyMap> #include <QtQml> @@ -44,5 +43,3 @@ public: }; } //QmlDesigner - -#endif // DESIGNERPROPERTYMAP_H diff --git a/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.h b/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.h index 239cda43cc..37faaa9baf 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.h +++ b/src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FILERESOURCESMODEL_H -#define FILERESOURCESMODEL_H +#pragma once #include <qmlitemnode.h> @@ -83,5 +82,3 @@ private: }; QML_DECLARE_TYPE(FileResourcesModel) - -#endif // FILERESOURCESMODEL_H diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.h b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.h index 9271cf17c3..56d8ce914d 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.h +++ b/src/plugins/qmldesigner/components/propertyeditor/gradientmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GRADIENTMODEL_H -#define GRADIENTMODEL_H +#pragma once #include <qmlitemnode.h> @@ -88,5 +87,3 @@ private: }; QML_DECLARE_TYPE(GradientModel) - -#endif // GRADIENTMODEL_H diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.h index 1794926079..785145c09a 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.h +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorcontextobject.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROPERTYEDITORCONTEXTOBJECT_H -#define PROPERTYEDITORCONTEXTOBJECT_H +#pragma once #include <QObject> #include <QUrl> @@ -132,5 +131,3 @@ private: }; } //QmlDesigner { - -#endif // PROPERTYEDITORCONTEXTOBJECT_H diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.h index 1fe09687f5..af4ceefff4 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.h +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROPERTYEDITORQMLBACKEND_H -#define PROPERTYEDITORQMLBACKEND_H +#pragma once #include "qmlanchorbindingproxy.h" #include "designerpropertymap.h" @@ -105,5 +104,3 @@ private: }; } //QmlDesigner - -#endif //PROPERTYEDITORQMLBACKEND_H diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditortransaction.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditortransaction.h index 0854fe8fba..9a1ddca9bd 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditortransaction.h +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditortransaction.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROPERTYEDITORTRANSACTION_H -#define PROPERTYEDITORTRANSACTION_H +#pragma once #include "propertyeditorview.h" @@ -49,5 +48,3 @@ private: }; } //QmlDesigner - -#endif // PROPERTYEDITORTRANSACTION_H diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h index c1f84809ba..26991db90d 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorvalue.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROPERTYEDITORVALUE_H -#define PROPERTYEDITORVALUE_H +#pragma once #include <qmldesignercorelib_global.h> @@ -155,6 +154,3 @@ private: //variables QML_DECLARE_TYPE(PropertyEditorValue) QML_DECLARE_TYPE(PropertyEditorNodeWrapper) QML_DECLARE_TYPE(QQmlPropertyMap) - - -#endif // PROPERTYEDITORVALUE_H diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h index b3bc9d5c22..28af9cce67 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROPERTYEDITORVIEW_H -#define PROPERTYEDITORVIEW_H +#pragma once #include <abstractview.h> #include <QHash> @@ -116,5 +115,3 @@ private: //variables }; } //QmlDesigner - -#endif // PROPERTYEDITORVIEW_H diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorwidget.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorwidget.h index 4ca0b91f17..445a454f5d 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorwidget.h +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROPERTYEDITORWIDGET_H -#define PROPERTYEDITORWIDGET_H +#pragma once #include <QStackedWidget> @@ -46,5 +45,3 @@ protected: }; } //QmlDesigner - -#endif //PROPERTYEDITORWIDGET_H diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h index 0f768d6ed0..e73c55629f 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h +++ b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.h @@ -251,4 +251,3 @@ private: #endif //QmlAnchorBindingProxy - diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.h b/src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.h index 511fb99dbb..f60e4ce024 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.h +++ b/src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLMODELNODEPROXY_H -#define QMLMODELNODEPROXY_H +#pragma once #include <qmlitemnode.h> @@ -64,5 +63,3 @@ private: }; } //QmlDesigner - -#endif // QMLMODELNODEPROXY_H diff --git a/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.h b/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.h index f3f354eb85..0394c72ec3 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.h +++ b/src/plugins/qmldesigner/components/propertyeditor/quick2propertyeditorview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QUICK2PROERTYEDITORVIEW_H -#define QUICK2PROERTYEDITORVIEW_H +#pragma once #include <QQuickWidget> @@ -42,5 +41,3 @@ public: }; } //QmlDesigner - -#endif // QUICK2PROERTYEDITORVIEW_H diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.h index 36e630ece0..9576152009 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.h +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorimageprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef STATESEDITORIMAGEPROVIDER_H -#define STATESEDITORIMAGEPROVIDER_H +#pragma once #include"abstractview.h" @@ -51,6 +50,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // STATESEDITORIMAGEPROVIDER_H - diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.h b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.h index 4bdc1127b5..0dbc8c0925 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.h +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef STATESEDITORMODEL_H -#define STATESEDITORMODEL_H +#pragma once #include <QAbstractListModel> #include <QPointer> @@ -72,5 +71,3 @@ private: }; } // namespace QmlDesigner - -#endif // STATESEDITORMODEL_H diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h index c74b92fe33..c7215874b6 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef STATESEDITORVIEW_H -#define STATESEDITORVIEW_H +#pragma once #include <abstractview.h> @@ -97,5 +96,3 @@ private: }; } // namespace QmlDesigner - -#endif // STATESEDITORVIEW_H diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h index 3af714c182..e82e48fa1f 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef STATESEDITORWIDGET_H -#define STATESEDITORWIDGET_H +#pragma once #include <QQuickWidget> #include <QPointer> @@ -70,5 +69,3 @@ private: }; } - -#endif // STATESEDITORWIDGET_H diff --git a/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.h b/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.h index 3429dc1fb4..66b8a19b82 100644 --- a/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.h +++ b/src/plugins/qmldesigner/componentsplugin/addtabdesigneraction.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_TABVIEWDESIGNERACTION_H -#define QMLDESIGNER_TABVIEWDESIGNERACTION_H +#pragma once #include "abstractaction.h" @@ -50,5 +49,3 @@ private slots: }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_TABVIEWDESIGNERACTION_H diff --git a/src/plugins/qmldesigner/componentsplugin/addtabtotabviewdialog.h b/src/plugins/qmldesigner/componentsplugin/addtabtotabviewdialog.h index 389e28c611..8128985d64 100644 --- a/src/plugins/qmldesigner/componentsplugin/addtabtotabviewdialog.h +++ b/src/plugins/qmldesigner/componentsplugin/addtabtotabviewdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ADDTABTOTABVIEWDIALOG_H -#define ADDTABTOTABVIEWDIALOG_H +#pragma once #include <QDialog> @@ -46,5 +45,3 @@ private: }; } // namespace QmlDesigner - -#endif // ADDTABTOTABVIEWDIALOG_H diff --git a/src/plugins/qmldesigner/componentsplugin/componentsplugin.h b/src/plugins/qmldesigner/componentsplugin/componentsplugin.h index d714fc8b77..1f43ada810 100644 --- a/src/plugins/qmldesigner/componentsplugin/componentsplugin.h +++ b/src/plugins/qmldesigner/componentsplugin/componentsplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMPONENTSPLUGIN_H -#define COMPONENTSPLUGIN_H +#pragma once #include <iwidgetplugin.h> @@ -51,6 +50,3 @@ public: }; } // namespace QmlDesigner - - -#endif //COMPONENTSPLUGIN_H diff --git a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h index 5207aa652b..862790da00 100644 --- a/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h +++ b/src/plugins/qmldesigner/componentsplugin/entertabdesigneraction.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ENTERTABDESIGNERACTION_H -#define ENTERTABDESIGNERACTION_H +#pragma once #include <abstractactiongroup.h> @@ -53,5 +52,3 @@ private: }; } // namespace QmlDesigner - -#endif // ENTERTABDESIGNERACTION_H diff --git a/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.h b/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.h index 2105fe0e5b..e10f46a085 100644 --- a/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.h +++ b/src/plugins/qmldesigner/componentsplugin/tabviewindexmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TABVIEWINDEXMODEL_H -#define TABVIEWINDEXMODEL_H +#pragma once #include <qmlitemnode.h> @@ -59,5 +58,3 @@ private: }; QML_DECLARE_TYPE(TabViewIndexModel) - -#endif // TABVIEWINDEXMODEL_H diff --git a/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.h b/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.h index e178a06ebb..d414e24664 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/addarraymembervisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ADDARRAYMEMBERVISITOR_H -#define ADDARRAYMEMBERVISITOR_H +#pragma once #include "qmlrewriter.h" @@ -64,5 +63,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // ADDARRAYMEMBERVISITOR_H diff --git a/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.h index ae62bdaa90..2b869cbc50 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/addobjectvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ADDOBJECTVISITOR_H -#define ADDOBJECTVISITOR_H +#pragma once #include "qmlrewriter.h" @@ -54,5 +53,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // ADDOBJECTVISITOR_H diff --git a/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.h index ea8a4dd4b0..9da136d82c 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ADDPROPERTYVISITOR_H -#define ADDPROPERTYVISITOR_H +#pragma once #include "qmlrefactoring.h" #include "qmlrewriter.h" @@ -62,5 +61,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // ADDPROPERTYVISITOR_H diff --git a/src/plugins/qmldesigner/designercore/filemanager/astobjecttextextractor.h b/src/plugins/qmldesigner/designercore/filemanager/astobjecttextextractor.h index ee4a2b1bf3..a1dfb7b71a 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/astobjecttextextractor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/astobjecttextextractor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ASTOBJECTTEXTEXTRACTOR_H -#define ASTOBJECTTEXTEXTRACTOR_H +#pragma once #include <qmljs/parser/qmljsastvisitor_p.h> #include <qmljs/qmljsdocument.h> @@ -51,5 +50,3 @@ private: }; } // namespace QmlDesigner - -#endif // ASTOBJECTTEXTEXTRACTOR_H diff --git a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.h index 2fe05cd088..f498d06aaa 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/changeimportsvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CHANGEIMPORTSVISITOR_H -#define CHANGEIMPORTSVISITOR_H +#pragma once #include "import.h" #include "qmlrewriter.h" @@ -48,5 +47,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // CHANGEIMPORTSVISITOR_H diff --git a/src/plugins/qmldesigner/designercore/filemanager/changeobjecttypevisitor.h b/src/plugins/qmldesigner/designercore/filemanager/changeobjecttypevisitor.h index 0f2822a8a2..474f83b944 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/changeobjecttypevisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/changeobjecttypevisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CHANGEOBJECTTYPEVISITOR_H -#define CHANGEOBJECTTYPEVISITOR_H +#pragma once #include "qmlrewriter.h" @@ -52,5 +51,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // CHANGEOBJECTTYPEVISITOR_H diff --git a/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.h index 6b0eeca86a..f97eea0a37 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/changepropertyvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CHANGEPROPERTYVISITOR_H -#define CHANGEPROPERTYVISITOR_H +#pragma once #include "qmlrefactoring.h" #include "qmlrewriter.h" @@ -64,5 +63,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // CHANGEPROPERTYVISITOR_H diff --git a/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.h b/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.h index 7bc48559b2..9aca188a60 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.h +++ b/src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FIRSTDEFINITIONFINDER_H -#define FIRSTDEFINITIONFINDER_H +#pragma once #include <qmljs/parser/qmljsastvisitor_p.h> #include <qmljs/qmljsdocument.h> @@ -54,5 +53,3 @@ private: }; } // namespace QmlDesigner - -#endif // FIRSTDEFINITIONFINDER_H diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h index 6afd688e46..909c77ef70 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectbeforeobjectvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MOVEOBJECTBEFOREOBJECTVISITOR_H -#define MOVEOBJECTBEFOREOBJECTVISITOR_H +#pragma once #include "qmlrewriter.h" @@ -75,5 +74,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // MOVEOBJECTBEFOREOBJECTVISITOR_H diff --git a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.h index 7b499f42ca..cc6d44825d 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/moveobjectvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MOVEOBJECTVISITOR_H -#define MOVEOBJECTVISITOR_H +#pragma once #include "qmlrewriter.h" @@ -64,5 +63,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // MOVEOBJECTVISITOR_H diff --git a/src/plugins/qmldesigner/designercore/filemanager/objectlengthcalculator.h b/src/plugins/qmldesigner/designercore/filemanager/objectlengthcalculator.h index e771ef3bf4..e869bb98b4 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/objectlengthcalculator.h +++ b/src/plugins/qmldesigner/designercore/filemanager/objectlengthcalculator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OBJECTLENGTHCALCULATOR_H -#define OBJECTLENGTHCALCULATOR_H +#pragma once #include <qmljs/parser/qmljsastvisitor_p.h> #include <qmljs/qmljsdocument.h> @@ -51,5 +50,3 @@ private: }; } // namespace QmlDesigner - -#endif // OBJECTLENGTHCALCULATOR_H diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.h b/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.h index 4617569cef..d51ca90379 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.h +++ b/src/plugins/qmldesigner/designercore/filemanager/qmlrefactoring.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLREFACTORING_H -#define QMLREFACTORING_H +#pragma once #include <import.h> #include <textmodifier.h> @@ -75,5 +74,3 @@ private: }; } // namespace QmlDesigner - -#endif // QMLREFACTORING_H diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h index 62380d2dc0..af54ba8c13 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h +++ b/src/plugins/qmldesigner/designercore/filemanager/qmlrewriter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLREWRITER_H -#define QMLREWRITER_H +#pragma once #include "textmodifier.h" @@ -92,5 +91,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // QMLREWRITER_H diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.h b/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.h index 143d40ed77..178c32ca5f 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.h +++ b/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLWARNINGDIALOG_H -#define QMLWARNINGDIALOG_H +#pragma once #include <QDialog> @@ -58,5 +57,3 @@ private: } //Internal } //QmlDesigner - -#endif // QMLWARNINGDIALOG_H diff --git a/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.h b/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.h index 7419d81192..7eb8b53fd9 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOVEPROPERTYVISITOR_H -#define REMOVEPROPERTYVISITOR_H +#pragma once #include <QString> @@ -58,5 +57,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // REMOVEPROPERTYVISITOR_H diff --git a/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.h b/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.h index 0d4d1ee785..6fc4d1d0b3 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.h +++ b/src/plugins/qmldesigner/designercore/filemanager/removeuiobjectmembervisitor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOVEUIOBJECTMEMBERVISITOR_H -#define REMOVEUIOBJECTMEMBERVISITOR_H +#pragma once #include <QStack> @@ -67,5 +66,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // REMOVEUIOBJECTMEMBERVISITOR_H diff --git a/src/plugins/qmldesigner/designercore/include/abstractproperty.h b/src/plugins/qmldesigner/designercore/include/abstractproperty.h index 0c7c23e4fa..ebd286f646 100644 --- a/src/plugins/qmldesigner/designercore/include/abstractproperty.h +++ b/src/plugins/qmldesigner/designercore/include/abstractproperty.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ABSTRACTPROPERTY_H -#define ABSTRACTPROPERTY_H +#pragma once #include <QPointer> #include <QSharedPointer> @@ -122,5 +121,3 @@ QMLDESIGNERCORE_EXPORT uint qHash(const AbstractProperty& property); QMLDESIGNERCORE_EXPORT QTextStream& operator<<(QTextStream &stream, const AbstractProperty &property); QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, const AbstractProperty &AbstractProperty); } - -#endif //ABSTRACTPROPERTY_H diff --git a/src/plugins/qmldesigner/designercore/include/abstractview.h b/src/plugins/qmldesigner/designercore/include/abstractview.h index 0807df0496..aae79fc9ef 100644 --- a/src/plugins/qmldesigner/designercore/include/abstractview.h +++ b/src/plugins/qmldesigner/designercore/include/abstractview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ABSTRACTVIEW_H -#define ABSTRACTVIEW_H +#pragma once #include <qmldesignercorelib_global.h> @@ -269,5 +268,3 @@ QMLDESIGNERCORE_EXPORT QList<Internal::InternalNodePointer> toInternalNodeList(c QMLDESIGNERCORE_EXPORT QList<ModelNode> toModelNodeList(const QList<Internal::InternalNodePointer> &nodeList, AbstractView *view); } - -#endif // ABSTRACTVIEW_H diff --git a/src/plugins/qmldesigner/designercore/include/anchorline.h b/src/plugins/qmldesigner/designercore/include/anchorline.h index 0987611feb..98b6951f77 100644 --- a/src/plugins/qmldesigner/designercore/include/anchorline.h +++ b/src/plugins/qmldesigner/designercore/include/anchorline.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_ANCHORLINE_H -#define QMLDESIGNER_ANCHORLINE_H +#pragma once #include <qmldesignercorelib_global.h> @@ -51,5 +50,3 @@ private: }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_ANCHORLINE_H diff --git a/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h b/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h index 5e31b4e343..58c1950ebd 100644 --- a/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h +++ b/src/plugins/qmldesigner/designercore/include/basetexteditmodifier.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BASETEXTEDITMODIFIER_H -#define BASETEXTEDITMODIFIER_H +#pragma once #include "qmldesignercorelib_global.h" #include "plaintexteditmodifier.h" @@ -50,5 +49,3 @@ public: }; } // namespace QmlDesigner - -#endif // BASETEXTEDITMODIFIER_H diff --git a/src/plugins/qmldesigner/designercore/include/bindingproperty.h b/src/plugins/qmldesigner/designercore/include/bindingproperty.h index 2dbc2d2197..3c4c6f69c5 100644 --- a/src/plugins/qmldesigner/designercore/include/bindingproperty.h +++ b/src/plugins/qmldesigner/designercore/include/bindingproperty.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BINDINGPROPERTY_H -#define BINDINGPROPERTY_H +#pragma once #include "qmldesignercorelib_global.h" #include "abstractproperty.h" @@ -58,5 +57,3 @@ protected: }; } // namespace QmlDesigner - -#endif // BINDINGPROPERTY_H diff --git a/src/plugins/qmldesigner/designercore/include/bytearraymodifier.h b/src/plugins/qmldesigner/designercore/include/bytearraymodifier.h index 45390bd2ab..5552f23ae6 100644 --- a/src/plugins/qmldesigner/designercore/include/bytearraymodifier.h +++ b/src/plugins/qmldesigner/designercore/include/bytearraymodifier.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BYTEARRAYMODIFIER_H -#define BYTEARRAYMODIFIER_H +#pragma once #include <QPlainTextEdit> @@ -50,5 +49,3 @@ private: }; } - -#endif // BYTEARRAYMODIFIER_H diff --git a/src/plugins/qmldesigner/designercore/include/componenttextmodifier.h b/src/plugins/qmldesigner/designercore/include/componenttextmodifier.h index a8dfa6ba82..94b268ada5 100644 --- a/src/plugins/qmldesigner/designercore/include/componenttextmodifier.h +++ b/src/plugins/qmldesigner/designercore/include/componenttextmodifier.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMPONENTTEXTMODIFIER_H -#define COMPONENTTEXTMODIFIER_H +#pragma once #include "textmodifier.h" @@ -68,5 +67,3 @@ private: }; } // namespace QmlDesigner - -#endif // COMPONENTTEXTMODIFIER_H diff --git a/src/plugins/qmldesigner/designercore/include/customnotifications.h b/src/plugins/qmldesigner/designercore/include/customnotifications.h index 90c5a7c8ef..58cc433e7f 100644 --- a/src/plugins/qmldesigner/designercore/include/customnotifications.h +++ b/src/plugins/qmldesigner/designercore/include/customnotifications.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CUSTOMNOTIFICATIONS_H -#define CUSTOMNOTIFICATIONS_H +#pragma once #include <QString> @@ -34,5 +33,3 @@ const QString StartRewriterAmend = QStringLiteral("__start rewriter amend__"); const QString EndRewriterAmend = QStringLiteral("__end rewriter amend__"); } - -#endif //CUSTOMNOTIFICATIONS_H diff --git a/src/plugins/qmldesigner/designercore/include/exception.h b/src/plugins/qmldesigner/designercore/include/exception.h index 31514fc887..ea9a5ac876 100644 --- a/src/plugins/qmldesigner/designercore/include/exception.h +++ b/src/plugins/qmldesigner/designercore/include/exception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EXCEPTION_H -#define EXCEPTION_H +#pragma once #include <qmldesignercorelib_global.h> @@ -67,6 +66,3 @@ private: QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, const Exception &exception); } - - -#endif // EXCEPTION_H diff --git a/src/plugins/qmldesigner/designercore/include/forwardview.h b/src/plugins/qmldesigner/designercore/include/forwardview.h index 5c94ae22d1..b34cd107e9 100644 --- a/src/plugins/qmldesigner/designercore/include/forwardview.h +++ b/src/plugins/qmldesigner/designercore/include/forwardview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FORWARDVIEW_H -#define FORWARDVIEW_H +#pragma once #include <abstractview.h> @@ -286,5 +285,3 @@ ViewType *ForwardView<ViewType>::firstView() const } // namespace QmlDesigner - -#endif // FORWARDVIEW_H diff --git a/src/plugins/qmldesigner/designercore/include/import.h b/src/plugins/qmldesigner/designercore/include/import.h index 6cd6a801ee..573e682c0b 100644 --- a/src/plugins/qmldesigner/designercore/include/import.h +++ b/src/plugins/qmldesigner/designercore/include/import.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IMPORT_H -#define IMPORT_H +#pragma once #include <QString> #include <QStringList> @@ -77,5 +76,3 @@ QMLDESIGNERCORE_EXPORT uint qHash(const Import &import); } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::Import) - -#endif // IMPORT_H diff --git a/src/plugins/qmldesigner/designercore/include/invalidargumentexception.h b/src/plugins/qmldesigner/designercore/include/invalidargumentexception.h index 295282a56b..b3b4b86a29 100644 --- a/src/plugins/qmldesigner/designercore/include/invalidargumentexception.h +++ b/src/plugins/qmldesigner/designercore/include/invalidargumentexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INVALIDARGUMENTEXCEPTION_H -#define INVALIDARGUMENTEXCEPTION_H +#pragma once #include "exception.h" @@ -48,5 +47,3 @@ private: }; } - -#endif // INVALIDARGUMENTEXCEPTION_H diff --git a/src/plugins/qmldesigner/designercore/include/invalididexception.h b/src/plugins/qmldesigner/designercore/include/invalididexception.h index f1a59e69ab..7f74ac7deb 100644 --- a/src/plugins/qmldesigner/designercore/include/invalididexception.h +++ b/src/plugins/qmldesigner/designercore/include/invalididexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INVALIDIDEXCEPTION_H -#define INVALIDIDEXCEPTION_H +#pragma once #include "invalidargumentexception.h" @@ -56,5 +55,3 @@ private: }; } - -#endif // INVALIDIDEXCEPTION_H diff --git a/src/plugins/qmldesigner/designercore/include/invalidmetainfoexception.h b/src/plugins/qmldesigner/designercore/include/invalidmetainfoexception.h index 72f1c1b424..079d3e27d6 100644 --- a/src/plugins/qmldesigner/designercore/include/invalidmetainfoexception.h +++ b/src/plugins/qmldesigner/designercore/include/invalidmetainfoexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INVALIDMETAINFOEXCEPTION_H -#define INVALIDMETAINFOEXCEPTION_H +#pragma once #include "exception.h" @@ -42,5 +41,3 @@ public: }; } - -#endif // INVALIDMETAINFOEXCEPTION_H diff --git a/src/plugins/qmldesigner/designercore/include/invalidmodelnodeexception.h b/src/plugins/qmldesigner/designercore/include/invalidmodelnodeexception.h index a51b41ea90..e1a38d00c8 100644 --- a/src/plugins/qmldesigner/designercore/include/invalidmodelnodeexception.h +++ b/src/plugins/qmldesigner/designercore/include/invalidmodelnodeexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INVALIDMODELNODEEXCEPTION_H -#define INVALIDMODELNODEEXCEPTION_H +#pragma once #include "exception.h" @@ -42,5 +41,3 @@ public: }; } - -#endif // INVALIDMODELNODEEXCEPTION_H diff --git a/src/plugins/qmldesigner/designercore/include/invalidmodelstateexception.h b/src/plugins/qmldesigner/designercore/include/invalidmodelstateexception.h index ebd92aeb11..76d48e880a 100644 --- a/src/plugins/qmldesigner/designercore/include/invalidmodelstateexception.h +++ b/src/plugins/qmldesigner/designercore/include/invalidmodelstateexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INVALIDMODELSTATEEXCEPTION_H -#define INVALIDMODELSTATEEXCEPTION_H +#pragma once #include "exception.h" @@ -42,5 +41,3 @@ public: }; } // namespace QmlDesigner - -#endif // INVALIDMODELSTATEEXCEPTION_H diff --git a/src/plugins/qmldesigner/designercore/include/invalidpropertyexception.h b/src/plugins/qmldesigner/designercore/include/invalidpropertyexception.h index 5bbe02e265..38a9e86290 100644 --- a/src/plugins/qmldesigner/designercore/include/invalidpropertyexception.h +++ b/src/plugins/qmldesigner/designercore/include/invalidpropertyexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INVALIDPROPERTYEXCEPTION_H -#define INVALIDPROPERTYEXCEPTION_H +#pragma once #include "exception.h" @@ -46,5 +45,3 @@ private: }; } // namespace QmlDesigner - -#endif // INVALIDPROPERTYEXCEPTION_H diff --git a/src/plugins/qmldesigner/designercore/include/invalidqmlsourceexception.h b/src/plugins/qmldesigner/designercore/include/invalidqmlsourceexception.h index 63b7c8a580..9793bb4ddb 100644 --- a/src/plugins/qmldesigner/designercore/include/invalidqmlsourceexception.h +++ b/src/plugins/qmldesigner/designercore/include/invalidqmlsourceexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INVALIDQMLSOURCEEXCEPTION_H -#define INVALIDQMLSOURCEEXCEPTION_H +#pragma once #include <exception.h> @@ -46,5 +45,3 @@ private: }; } // namespace QmlDesigner - -#endif // INVALIDQMLSOURCEEXCEPTION_H diff --git a/src/plugins/qmldesigner/designercore/include/invalidreparentingexception.h b/src/plugins/qmldesigner/designercore/include/invalidreparentingexception.h index 316dee31e7..2460ceba1b 100644 --- a/src/plugins/qmldesigner/designercore/include/invalidreparentingexception.h +++ b/src/plugins/qmldesigner/designercore/include/invalidreparentingexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INVALIDREPARENTINGEXCEPTION_H -#define INVALIDREPARENTINGEXCEPTION_H +#pragma once #include "exception.h" @@ -41,5 +40,3 @@ public: }; } // namespace QmlDesigner - -#endif // INVALIDREPARENTINGEXCEPTION_H diff --git a/src/plugins/qmldesigner/designercore/include/invalidslideindexexception.h b/src/plugins/qmldesigner/designercore/include/invalidslideindexexception.h index 82110299b8..7f95604c7b 100644 --- a/src/plugins/qmldesigner/designercore/include/invalidslideindexexception.h +++ b/src/plugins/qmldesigner/designercore/include/invalidslideindexexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INVALIDSLIDEINDEXEXCEPTION_H -#define INVALIDSLIDEINDEXEXCEPTION_H +#pragma once #include "exception.h" @@ -40,5 +39,3 @@ public: }; } // namespace QmlDesigner - -#endif // INVALIDSLIDEINDEXEXCEPTION_H diff --git a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h index ff2e1fb693..68df5eced9 100644 --- a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h +++ b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ITEMLIBRARYINFO_H -#define ITEMLIBRARYINFO_H +#pragma once #include "qmldesignercorelib_global.h" @@ -120,5 +119,3 @@ private: // variables } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::ItemLibraryEntry) - -#endif // ITEMLIBRARYINFO_H diff --git a/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h b/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h index ec59ec1af2..f85ad1e144 100644 --- a/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h +++ b/src/plugins/qmldesigner/designercore/include/iwidgetplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IWIDGETPLUGIN_H -#define IWIDGETPLUGIN_H +#pragma once #include <QObject> @@ -46,5 +45,3 @@ public: QT_BEGIN_NAMESPACE Q_DECLARE_INTERFACE(QmlDesigner::IWidgetPlugin, QMLDESIGNER_WIDGETPLUGIN_INTERFACE) QT_END_NAMESPACE - -#endif // IWIDGETPLUGIN_H diff --git a/src/plugins/qmldesigner/designercore/include/mathutils.h b/src/plugins/qmldesigner/designercore/include/mathutils.h index eec4660dfb..5e35d77111 100644 --- a/src/plugins/qmldesigner/designercore/include/mathutils.h +++ b/src/plugins/qmldesigner/designercore/include/mathutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MATHUTILS_H -#define MATHUTILS_H +#pragma once #include <QtGlobal> @@ -38,5 +37,3 @@ inline double round(double value, int digits) } - -#endif // MATHUTILS_H diff --git a/src/plugins/qmldesigner/designercore/include/metainfo.h b/src/plugins/qmldesigner/designercore/include/metainfo.h index d5d5e406b5..90d94c324a 100644 --- a/src/plugins/qmldesigner/designercore/include/metainfo.h +++ b/src/plugins/qmldesigner/designercore/include/metainfo.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef METAINFO_H -#define METAINFO_H +#pragma once #include "qmldesignercorelib_global.h" @@ -83,5 +82,3 @@ private: }; } //namespace QmlDesigner - -#endif // METAINFO_H diff --git a/src/plugins/qmldesigner/designercore/include/metainforeader.h b/src/plugins/qmldesigner/designercore/include/metainforeader.h index 9f1904e6d7..f2e7c81333 100644 --- a/src/plugins/qmldesigner/designercore/include/metainforeader.h +++ b/src/plugins/qmldesigner/designercore/include/metainforeader.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef METAINFOREADER_H -#define METAINFOREADER_H +#pragma once #include "qmldesignercorelib_global.h" #include <metainfo.h> @@ -117,4 +116,3 @@ private: } } -#endif // METAINFOREADER_H diff --git a/src/plugins/qmldesigner/designercore/include/model.h b/src/plugins/qmldesigner/designercore/include/model.h index c18b63292b..dafc4d2c46 100644 --- a/src/plugins/qmldesigner/designercore/include/model.h +++ b/src/plugins/qmldesigner/designercore/include/model.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DESIGNERMODEL_H -#define DESIGNERMODEL_H +#pragma once #include <qmldesignercorelib_global.h> #include <QObject> @@ -118,5 +117,3 @@ public: }; } - -#endif // DESIGNERMODEL_H diff --git a/src/plugins/qmldesigner/designercore/include/modelmerger.h b/src/plugins/qmldesigner/designercore/include/modelmerger.h index bf680675d9..b49bfeb24b 100644 --- a/src/plugins/qmldesigner/designercore/include/modelmerger.h +++ b/src/plugins/qmldesigner/designercore/include/modelmerger.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODELMERGER_H -#define MODELMERGER_H +#pragma once #include <QPointer> @@ -51,5 +50,3 @@ private: }; } //namespace QmlDesigner - -#endif // MODELMERGER_H diff --git a/src/plugins/qmldesigner/designercore/include/modelnode.h b/src/plugins/qmldesigner/designercore/include/modelnode.h index e1261b8324..3b8b1fcf68 100644 --- a/src/plugins/qmldesigner/designercore/include/modelnode.h +++ b/src/plugins/qmldesigner/designercore/include/modelnode.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODELNODE_H -#define MODELNODE_H +#pragma once #include "qmldesignercorelib_global.h" #include <QPointer> @@ -210,5 +209,3 @@ QMLDESIGNERCORE_EXPORT QTextStream& operator<<(QTextStream &stream, const ModelN } Q_DECLARE_METATYPE(QmlDesigner::ModelNode) - -#endif // MODELNODE_H diff --git a/src/plugins/qmldesigner/designercore/include/modelnodepositionstorage.h b/src/plugins/qmldesigner/designercore/include/modelnodepositionstorage.h index 181fee548a..283c15d1ce 100644 --- a/src/plugins/qmldesigner/designercore/include/modelnodepositionstorage.h +++ b/src/plugins/qmldesigner/designercore/include/modelnodepositionstorage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODELNODEPOSITIONSTORAGE_H -#define MODELNODEPOSITIONSTORAGE_H +#pragma once #include "modelnode.h" @@ -74,5 +73,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // MODELNODEPOSITIONSTORAGE_H diff --git a/src/plugins/qmldesigner/designercore/include/modificationgroupexception.h b/src/plugins/qmldesigner/designercore/include/modificationgroupexception.h index 5a61a37fd8..7397ed3e3f 100644 --- a/src/plugins/qmldesigner/designercore/include/modificationgroupexception.h +++ b/src/plugins/qmldesigner/designercore/include/modificationgroupexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODIFICATIONGROUPEXCEPTION_H -#define MODIFICATIONGROUPEXCEPTION_H +#pragma once #include "exception.h" @@ -39,5 +38,3 @@ public: }; } - -#endif // MODIFICATIONGROUPEXCEPTION_H diff --git a/src/plugins/qmldesigner/designercore/include/modificationgrouptoken.h b/src/plugins/qmldesigner/designercore/include/modificationgrouptoken.h index 62a48242a2..dffa975f9d 100644 --- a/src/plugins/qmldesigner/designercore/include/modificationgrouptoken.h +++ b/src/plugins/qmldesigner/designercore/include/modificationgrouptoken.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODIFICATIONGROUPTOKEN_H -#define MODIFICATIONGROUPTOKEN_H +#pragma once #include <corelib_global.h> @@ -67,5 +66,3 @@ private: }; } - -#endif // MODIFICATIONGROUPTOKEN_H diff --git a/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h b/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h index d5c3209f7f..07f75d07a6 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h +++ b/src/plugins/qmldesigner/designercore/include/nodeabstractproperty.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NODEABSTRACTPROPERTY_H -#define NODEABSTRACTPROPERTY_H +#pragma once #include "abstractproperty.h" @@ -71,5 +70,3 @@ QMLDESIGNERCORE_EXPORT QTextStream& operator<<(QTextStream &stream, const NodeAb QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, const NodeAbstractProperty &property); } // namespace QmlDesigner - -#endif // NODEABSTRACTPROPERTY_H diff --git a/src/plugins/qmldesigner/designercore/include/nodeanchors.h b/src/plugins/qmldesigner/designercore/include/nodeanchors.h index ca1518a297..efa20cc1a3 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeanchors.h +++ b/src/plugins/qmldesigner/designercore/include/nodeanchors.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NODEANCHORS_H -#define NODEANCHORS_H +#pragma once #include <QPointer> @@ -106,5 +105,3 @@ CORESHARED_EXPORT QDebug operator<<(QDebug debug, const NodeAnchors &anchors); CORESHARED_EXPORT QTextStream& operator<<(QTextStream &stream, const NodeAnchors &anchors); } // namespace QmlDesigner - -#endif // NODEANCHORS_H diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstance.h b/src/plugins/qmldesigner/designercore/include/nodeinstance.h index a5f64c92c6..9595396ae9 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeinstance.h +++ b/src/plugins/qmldesigner/designercore/include/nodeinstance.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROXYNODEINSTANCE_H -#define PROXYNODEINSTANCE_H +#pragma once #include <QSharedPointer> #include <QTransform> @@ -131,5 +130,3 @@ private: bool operator ==(const NodeInstance &first, const NodeInstance &second); } - -#endif // PROXYNODEINSTANCE_H diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h index dc11a2296e..4d4ffaa629 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h +++ b/src/plugins/qmldesigner/designercore/include/nodeinstanceview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NODEINSTANCEVIEW_H -#define NODEINSTANCEVIEW_H +#pragma once #include "qmldesignercorelib_global.h" #include "abstractview.h" @@ -205,5 +204,3 @@ private: //variables }; } // namespace ProxyNodeInstanceView - -#endif // NODEINSTANCEVIEW_H diff --git a/src/plugins/qmldesigner/designercore/include/nodelistproperty.h b/src/plugins/qmldesigner/designercore/include/nodelistproperty.h index 065b954f20..94af238bef 100644 --- a/src/plugins/qmldesigner/designercore/include/nodelistproperty.h +++ b/src/plugins/qmldesigner/designercore/include/nodelistproperty.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NODELISTPROPERTY_H -#define NODELISTPROPERTY_H +#pragma once #include "qmldesignercorelib_global.h" @@ -60,5 +59,3 @@ protected: NodeListProperty(const Internal::InternalNodeListPropertyPointer &internalNodeListProperty, Model* model, AbstractView *view); }; } - -#endif //NODELISTROPERTY_H diff --git a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h index c027490aff..d2166b92cc 100644 --- a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h +++ b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NODEMETAINFO_H -#define NODEMETAINFO_H +#pragma once #include <QList> #include <QString> @@ -112,5 +111,3 @@ private: }; } //QmlDesigner - -#endif // NODEMETAINFO_H diff --git a/src/plugins/qmldesigner/designercore/include/nodeproperty.h b/src/plugins/qmldesigner/designercore/include/nodeproperty.h index aaa5cf1b04..6c90488ec6 100644 --- a/src/plugins/qmldesigner/designercore/include/nodeproperty.h +++ b/src/plugins/qmldesigner/designercore/include/nodeproperty.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NODEPROPERTY_H -#define NODEPROPERTY_H +#pragma once #include "qmldesignercorelib_global.h" #include "nodeabstractproperty.h" @@ -51,5 +50,3 @@ protected: }; } // namespace QmlDesigner - -#endif // NODEPROPERTY_H diff --git a/src/plugins/qmldesigner/designercore/include/notimplementedexception.h b/src/plugins/qmldesigner/designercore/include/notimplementedexception.h index d93dc757c0..170d70c89d 100644 --- a/src/plugins/qmldesigner/designercore/include/notimplementedexception.h +++ b/src/plugins/qmldesigner/designercore/include/notimplementedexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NOTIMPLEMENTEDEXCEPTION_H -#define NOTIMPLEMENTEDEXCEPTION_H +#pragma once #include "exception.h" @@ -42,5 +41,3 @@ public: }; } - -#endif // NOTIMPLEMENTEDEXCEPTION_H diff --git a/src/plugins/qmldesigner/designercore/include/objectpropertybinding.h b/src/plugins/qmldesigner/designercore/include/objectpropertybinding.h index a6d948b91c..e2e6f05689 100644 --- a/src/plugins/qmldesigner/designercore/include/objectpropertybinding.h +++ b/src/plugins/qmldesigner/designercore/include/objectpropertybinding.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OBJECTPROPERTYBINDING_H -#define OBJECTPROPERTYBINDING_H +#pragma once #include <modelnode.h> @@ -47,5 +46,3 @@ private: } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::ObjectPropertyBinding); - -#endif // OBJECTPROPERTYBINDING_H diff --git a/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h b/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h index c11180e562..7530be3b40 100644 --- a/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h +++ b/src/plugins/qmldesigner/designercore/include/plaintexteditmodifier.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLAINTEXTEDITMODIFIER_H -#define PLAINTEXTEDITMODIFIER_H +#pragma once #include "qmldesignercorelib_global.h" #include "textmodifier.h" @@ -104,5 +103,3 @@ public: }; } - -#endif // PLAINTEXTEDITMODIFIER_H diff --git a/src/plugins/qmldesigner/designercore/include/propertybinding.h b/src/plugins/qmldesigner/designercore/include/propertybinding.h index 7bb04d3bbd..bb2a835eac 100644 --- a/src/plugins/qmldesigner/designercore/include/propertybinding.h +++ b/src/plugins/qmldesigner/designercore/include/propertybinding.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROPERTYBINDING_H -#define PROPERTYBINDING_H +#pragma once #include <QMetaType> #include <QSharedPointer> @@ -54,5 +53,3 @@ private: } // namespace QmlDesigner Q_DECLARE_METATYPE(QmlDesigner::PropertyBinding); - -#endif // PROPERTYBINDING_H diff --git a/src/plugins/qmldesigner/designercore/include/propertycontainer.h b/src/plugins/qmldesigner/designercore/include/propertycontainer.h index 04ce101921..5eebf01fbd 100644 --- a/src/plugins/qmldesigner/designercore/include/propertycontainer.h +++ b/src/plugins/qmldesigner/designercore/include/propertycontainer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROPERTYCONTAINER_H -#define PROPERTYCONTAINER_H +#pragma once #include "qmldesignercorelib_global.h" @@ -72,7 +71,3 @@ QMLDESIGNERCORE_EXPORT QDataStream &operator>>(QDataStream &stream, QList<Proper QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, QList<PropertyContainer> &propertyContainerList); } //namespace QmlDesigner - - - -#endif //PROPERTYCONTAINER_H diff --git a/src/plugins/qmldesigner/designercore/include/propertynode.h b/src/plugins/qmldesigner/designercore/include/propertynode.h index 26e576c185..1f4c90aedb 100644 --- a/src/plugins/qmldesigner/designercore/include/propertynode.h +++ b/src/plugins/qmldesigner/designercore/include/propertynode.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROPERTYNODE_H -#define PROPERTYNODE_H +#pragma once #include "qmldesignercorelib_global.h" @@ -40,5 +39,3 @@ public: }; } // namespace QmlDesigner - -#endif // PROPERTYNODE_H diff --git a/src/plugins/qmldesigner/designercore/include/propertyparser.h b/src/plugins/qmldesigner/designercore/include/propertyparser.h index 2a447a51b7..d5211ca7d5 100644 --- a/src/plugins/qmldesigner/designercore/include/propertyparser.h +++ b/src/plugins/qmldesigner/designercore/include/propertyparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROPERTYPARSER_H -#define PROPERTYPARSER_H +#pragma once #include <QVariant> @@ -42,5 +41,3 @@ QVariant variantFromString(const QString &s); } // namespace PropertyParser } // namespace Internal } // namespace Designer - -#endif // PROPERTYPARSER_H diff --git a/src/plugins/qmldesigner/designercore/include/qmlanchors.h b/src/plugins/qmldesigner/designercore/include/qmlanchors.h index 8993f3bd87..cd0736a682 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlanchors.h +++ b/src/plugins/qmldesigner/designercore/include/qmlanchors.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QmlAnchors_H -#define QmlAnchors_H +#pragma once #include <qmldesignercorelib_global.h> #include <qmlitemnode.h> @@ -84,5 +83,3 @@ private: }; } //QmlDesigner - -#endif // QmlAnchors_H diff --git a/src/plugins/qmldesigner/designercore/include/qmlchangeset.h b/src/plugins/qmldesigner/designercore/include/qmlchangeset.h index c7e38f0522..8440a6a785 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlchangeset.h +++ b/src/plugins/qmldesigner/designercore/include/qmlchangeset.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLCHANGESET_H -#define QMLCHANGESET_H +#pragma once #include <qmldesignercorelib_global.h> #include <modelnode.h> @@ -55,5 +54,3 @@ public: }; } //QmlDesigner - -#endif // QMLCHANGESET_H diff --git a/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h b/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h index 1e9b41ae86..964625cbc1 100644 --- a/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h +++ b/src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h @@ -23,13 +23,11 @@ ** ****************************************************************************/ -#ifndef CORELIB_GLOBAL_H -#define CORELIB_GLOBAL_H +#pragma once #include <QtGlobal> #include <QList> - // Unnecessary since core isn't a dll any more. #define TEST_CORESHARED_EXPORT @@ -75,5 +73,3 @@ enum AnchorLineType { //#endif #include <qglobal.h> - -#endif // CORELIB_GLOBAL_H diff --git a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h index 0dd601754a..1f1f98ca5c 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlitemnode.h +++ b/src/plugins/qmldesigner/designercore/include/qmlitemnode.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QmlItemNode_H -#define QmlItemNode_H +#pragma once #include <qmldesignercorelib_global.h> #include <modelnode.h> @@ -152,6 +151,3 @@ QMLDESIGNERCORE_EXPORT QList<ModelNode> toModelNodeList(const QList<QmlItemNode> QMLDESIGNERCORE_EXPORT QList<QmlItemNode> toQmlItemNodeList(const QList<ModelNode> &modelNodeList); } //QmlDesigner - - -#endif // QmlItemNode_H diff --git a/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h b/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h index 00f9df6c82..db2c36381b 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h +++ b/src/plugins/qmldesigner/designercore/include/qmlmodelnodefacade.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLMODELNODEFACADE_H -#define QMLMODELNODEFACADE_H +#pragma once #include <qmldesignercorelib_global.h> #include <modelnode.h> @@ -59,5 +58,3 @@ private: }; } //QmlDesigner - -#endif // QMLMODELNODEFACADE_H diff --git a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h index 5ce65e09f5..3e9d5ff7e4 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h +++ b/src/plugins/qmldesigner/designercore/include/qmlobjectnode.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLOBJECTNODE_H -#define QMLOBJECTNODE_H +#pragma once #include <qmldesignercorelib_global.h> #include "qmlmodelnodefacade.h" @@ -126,5 +125,3 @@ QMLDESIGNERCORE_EXPORT uint qHash(const QmlObjectNode &node); QMLDESIGNERCORE_EXPORT QList<ModelNode> toModelNodeList(const QList<QmlObjectNode> &fxObjectNodeList); QMLDESIGNERCORE_EXPORT QList<QmlObjectNode> toQmlObjectNodeList(const QList<ModelNode> &modelNodeList); }// QmlDesigner - -#endif // QMLOBJECTNODE_H diff --git a/src/plugins/qmldesigner/designercore/include/qmlstate.h b/src/plugins/qmldesigner/designercore/include/qmlstate.h index c6a8332c76..4ee216f84f 100644 --- a/src/plugins/qmldesigner/designercore/include/qmlstate.h +++ b/src/plugins/qmldesigner/designercore/include/qmlstate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLSTATE_H -#define QMLSTATE_H +#pragma once #include <qmldesignercorelib_global.h> #include "qmlmodelnodefacade.h" @@ -77,6 +76,3 @@ protected: }; } //QmlDesigner - - -#endif // QMLSTATE_H diff --git a/src/plugins/qmldesigner/designercore/include/removebasestateexception.h b/src/plugins/qmldesigner/designercore/include/removebasestateexception.h index 45ab1c7ff5..f088036da1 100644 --- a/src/plugins/qmldesigner/designercore/include/removebasestateexception.h +++ b/src/plugins/qmldesigner/designercore/include/removebasestateexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOVEBASESTATEEXCEPTION_H -#define REMOVEBASESTATEEXCEPTION_H +#pragma once #include <exception.h> @@ -41,5 +40,3 @@ public: }; } // namespace QmlDesigner - -#endif // REMOVEBASESTATEEXCEPTION_H diff --git a/src/plugins/qmldesigner/designercore/include/rewriterview.h b/src/plugins/qmldesigner/designercore/include/rewriterview.h index b82abef2a7..1bcc4ffccb 100644 --- a/src/plugins/qmldesigner/designercore/include/rewriterview.h +++ b/src/plugins/qmldesigner/designercore/include/rewriterview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REWRITERVIEW_H -#define REWRITERVIEW_H +#pragma once #include "qmldesignercorelib_global.h" #include "abstractview.h" @@ -215,5 +214,3 @@ private: //variables }; } //QmlDesigner - -#endif // REWRITERVIEW_H diff --git a/src/plugins/qmldesigner/designercore/include/rewritingexception.h b/src/plugins/qmldesigner/designercore/include/rewritingexception.h index 067ecd1dc3..b732e9269e 100644 --- a/src/plugins/qmldesigner/designercore/include/rewritingexception.h +++ b/src/plugins/qmldesigner/designercore/include/rewritingexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REWRITINGEXCEPTION_H -#define REWRITINGEXCEPTION_H +#pragma once #include "exception.h" @@ -48,5 +47,3 @@ private: }; } // namespace QmlDesigner - -#endif // REWRITINGEXCEPTION_H diff --git a/src/plugins/qmldesigner/designercore/include/signalhandlerproperty.h b/src/plugins/qmldesigner/designercore/include/signalhandlerproperty.h index 4e76c0fa6b..47763a37f2 100644 --- a/src/plugins/qmldesigner/designercore/include/signalhandlerproperty.h +++ b/src/plugins/qmldesigner/designercore/include/signalhandlerproperty.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SIGNALHANDLERPROPERTY_H -#define SIGNALHANDLERPROPERTY_H +#pragma once #include "qmldesignercorelib_global.h" #include "abstractproperty.h" @@ -49,5 +48,3 @@ protected: }; } // namespace QmlDesigner - -#endif // SIGNALHANDLERPROPERTY_H diff --git a/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h b/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h index b965c02716..15e2c41d01 100644 --- a/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h +++ b/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SUBCOMPONENTMANAGER_H -#define SUBCOMPONENTMANAGER_H +#pragma once #include "qmldesignercorelib_global.h" @@ -77,6 +76,3 @@ private: // variables }; } // namespace QmlDesigner - - -#endif // SUBCOMPONENTMANAGER_H diff --git a/src/plugins/qmldesigner/designercore/include/textmodifier.h b/src/plugins/qmldesigner/designercore/include/textmodifier.h index 6e93e7f07f..863ecabd9f 100644 --- a/src/plugins/qmldesigner/designercore/include/textmodifier.h +++ b/src/plugins/qmldesigner/designercore/include/textmodifier.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTMODIFIER_H -#define TEXTMODIFIER_H +#pragma once #include "qmldesignercorelib_global.h" @@ -91,5 +90,3 @@ signals: }; } - -#endif // TEXTMODIFIER_H diff --git a/src/plugins/qmldesigner/designercore/include/variantproperty.h b/src/plugins/qmldesigner/designercore/include/variantproperty.h index e05697e256..c909958de0 100644 --- a/src/plugins/qmldesigner/designercore/include/variantproperty.h +++ b/src/plugins/qmldesigner/designercore/include/variantproperty.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef VARIANTPROPERTY_H -#define VARIANTPROPERTY_H +#pragma once #include "qmldesignercorelib_global.h" #include "abstractproperty.h" @@ -67,5 +66,3 @@ QMLDESIGNERCORE_EXPORT QTextStream& operator<<(QTextStream &stream, const Varian QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, const VariantProperty &VariantProperty); } - -#endif //VARIANTPROPERTY_H diff --git a/src/plugins/qmldesigner/designercore/include/viewmanager.h b/src/plugins/qmldesigner/designercore/include/viewmanager.h index 7690ff98a1..f6a594f54b 100644 --- a/src/plugins/qmldesigner/designercore/include/viewmanager.h +++ b/src/plugins/qmldesigner/designercore/include/viewmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_VIEWMANAGER_H -#define QMLDESIGNER_VIEWMANAGER_H +#pragma once #include "abstractview.h" @@ -107,5 +106,3 @@ private: // variables }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_VIEWMANAGER_H diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.h b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.h index 56f7d18228..1b770749a8 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.h +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NODEINSTANCESERVERPROXY_H -#define NODEINSTANCESERVERPROXY_H +#pragma once #include "nodeinstanceserverinterface.h" @@ -124,5 +123,3 @@ private: }; } // namespace QmlDesigner - -#endif // NODEINSTANCESERVERPROXY_H diff --git a/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.h b/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.h index 2dc6919d3a..4952335f23 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.h +++ b/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PUPPETBUILDPROGRESSDIALOG_H -#define PUPPETBUILDPROGRESSDIALOG_H +#pragma once #include <QDialog> @@ -59,4 +58,3 @@ private: }; } -#endif // PUPPETBUILDPROGRESSDIALOG_H diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.h b/src/plugins/qmldesigner/designercore/instances/puppetcreator.h index eac79607d3..f39d210a3e 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.h +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_PUPPETCREATOR_H -#define QMLDESIGNER_PUPPETCREATOR_H +#pragma once #include <QString> #include <QProcessEnvironment> @@ -120,5 +119,3 @@ private: }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_PUPPETCREATOR_H diff --git a/src/plugins/qmldesigner/designercore/instances/puppetdialog.h b/src/plugins/qmldesigner/designercore/instances/puppetdialog.h index 91654fb125..c65094042c 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetdialog.h +++ b/src/plugins/qmldesigner/designercore/instances/puppetdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PUPPETDIALOG_H -#define PUPPETDIALOG_H +#pragma once #include <QDialog> @@ -56,5 +55,3 @@ private: }; } //QmlDesigner - -#endif // PUPPETDIALOG_H diff --git a/src/plugins/qmldesigner/designercore/model/internalbindingproperty.h b/src/plugins/qmldesigner/designercore/model/internalbindingproperty.h index 56ab2c5bd8..5cb82205fa 100644 --- a/src/plugins/qmldesigner/designercore/model/internalbindingproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalbindingproperty.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INTERNALBINDINGPROPERTY_H -#define INTERNALBINDINGPROPERTY_H +#pragma once #include "internalproperty.h" @@ -57,5 +56,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // INTERNALBINDINGPROPERTY_H diff --git a/src/plugins/qmldesigner/designercore/model/internalnode_p.h b/src/plugins/qmldesigner/designercore/model/internalnode_p.h index 2e9ff3dcdf..f34cf6c03e 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnode_p.h +++ b/src/plugins/qmldesigner/designercore/model/internalnode_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INTERNALNODE_H -#define INTERNALNODE_H +#pragma once #include <QMap> #include <QHash> @@ -158,5 +157,3 @@ uint qHash(const InternalNodePointer& node); bool operator <(const InternalNodePointer &firstNode, const InternalNodePointer &secondNode); } // Internal } // QtQmlDesigner - -#endif // INTERNALNODE_H diff --git a/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h b/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h index 0be05f5a22..0ea7d49eff 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalnodeabstractproperty.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INTERNALNODEABSTRACTPROPERTY_H -#define INTERNALNODEABSTRACTPROPERTY_H +#pragma once #include "internalproperty.h" @@ -61,5 +60,3 @@ protected: } // namespace Internal } // namespace QmlDesigner - -#endif // INTERNALNODEABSTRACTPROPERTY_H diff --git a/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.h b/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.h index c769219944..d58e44d08c 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalnodelistproperty.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INTERNALNODELISTPROPERTY_H -#define INTERNALNODELISTPROPERTY_H +#pragma once #include "internalnodeabstractproperty.h" @@ -66,5 +65,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // INTERNALNODELISTPROPERTY_H diff --git a/src/plugins/qmldesigner/designercore/model/internalnodeproperty.h b/src/plugins/qmldesigner/designercore/model/internalnodeproperty.h index 9e37ad5d3a..7da520b011 100644 --- a/src/plugins/qmldesigner/designercore/model/internalnodeproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalnodeproperty.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INTERNALNODEPROPERTY_H -#define INTERNALNODEPROPERTY_H +#pragma once #include "internalnodeabstractproperty.h" @@ -61,5 +60,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // INTERNALNODEPROPERTY_H diff --git a/src/plugins/qmldesigner/designercore/model/internalproperty.h b/src/plugins/qmldesigner/designercore/model/internalproperty.h index 9ad33f2b17..df6896bf9a 100644 --- a/src/plugins/qmldesigner/designercore/model/internalproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalproperty.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INTERNALPROPERTY_H -#define INTERNALPROPERTY_H +#pragma once #include "qmldesignercorelib_global.h" @@ -97,5 +96,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // INTERNALPROPERTY_H diff --git a/src/plugins/qmldesigner/designercore/model/internalsignalhandlerproperty.h b/src/plugins/qmldesigner/designercore/model/internalsignalhandlerproperty.h index f3aa86a69f..c0875f7e5b 100644 --- a/src/plugins/qmldesigner/designercore/model/internalsignalhandlerproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalsignalhandlerproperty.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INTERNALSIGNALHANDLERPROPERTY_H -#define INTERNALSIGNALHANDLERPROPERTY_H +#pragma once #include "internalproperty.h" @@ -54,5 +53,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // INTERNALSIGNALHANDLERPROPERTY_H diff --git a/src/plugins/qmldesigner/designercore/model/internalvariantproperty.h b/src/plugins/qmldesigner/designercore/model/internalvariantproperty.h index 40af21e5e9..6edfe7a492 100644 --- a/src/plugins/qmldesigner/designercore/model/internalvariantproperty.h +++ b/src/plugins/qmldesigner/designercore/model/internalvariantproperty.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INTERNALVARIANTPROPERTY_H -#define INTERNALVARIANTPROPERTY_H +#pragma once #include "internalproperty.h" @@ -56,5 +55,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // INTERNALVARIANTPROPERTY_H diff --git a/src/plugins/qmldesigner/designercore/model/model_p.h b/src/plugins/qmldesigner/designercore/model/model_p.h index 17afc1cb97..a8f8eae963 100644 --- a/src/plugins/qmldesigner/designercore/model/model_p.h +++ b/src/plugins/qmldesigner/designercore/model/model_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODEL_P_H -#define MODEL_P_H +#pragma once #include <QList> #include <QPointer> @@ -254,4 +253,3 @@ private: } } -#endif // MODEL_P_H diff --git a/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.h b/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.h index 9828132c4c..d71956df3e 100644 --- a/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.h +++ b/src/plugins/qmldesigner/designercore/model/modelnodepositionrecalculator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODELNODEPOSITIONRECALCULATOR_H -#define MODELNODEPOSITIONRECALCULATOR_H +#pragma once #include <QMap> #include <QObject> @@ -62,5 +61,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // MODELNODEPOSITIONRECALCULATOR_H diff --git a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h index 89abfee724..7405fcbca0 100644 --- a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h +++ b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODELTOTEXTMERGER_H -#define MODELTOTEXTMERGER_H +#pragma once #include "qmldesignercorelib_global.h" #include <modelnode.h> @@ -96,5 +95,3 @@ private: } //Internal } //QmlDesigner - -#endif // MODELTOTEXTMERGER_H diff --git a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.h b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.h index af7deb65d7..5c2823573e 100644 --- a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.h +++ b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLTEXTGENERATOR_H -#define QMLTEXTGENERATOR_H +#pragma once #include <QString> @@ -60,5 +59,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // QMLTEXTGENERATOR_H diff --git a/src/plugins/qmldesigner/designercore/model/rewriteaction.h b/src/plugins/qmldesigner/designercore/model/rewriteaction.h index 58cc56b41e..63cb8db2e7 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriteaction.h +++ b/src/plugins/qmldesigner/designercore/model/rewriteaction.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REWRITEACTION_H -#define REWRITEACTION_H +#pragma once #include "abstractproperty.h" #include "modelnodepositionstorage.h" @@ -301,5 +300,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // REWRITEACTION_H diff --git a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h index 461238230c..2702ab0d60 100644 --- a/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h +++ b/src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REWRITEACTIONCOMPRESSOR_H -#define REWRITEACTIONCOMPRESSOR_H +#pragma once #include "rewriteaction.h" @@ -54,5 +53,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // REWRITEACTIONCOMPRESSOR_H diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h index cd543879ed..45e225b109 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTTOMODELMERGER_H -#define TEXTTOMODELMERGER_H +#pragma once #include "qmldesignercorelib_global.h" #include "import.h" @@ -308,5 +307,3 @@ public: } //Internal } //QmlDesigner - -#endif // TEXTTOMODELMERGER_H diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h index 77108480a0..31d94a17c5 100644 --- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h +++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WIDGETPLUGINMANAGER_H -#define WIDGETPLUGINMANAGER_H +#pragma once #include <QObject> #include <QList> @@ -70,4 +69,3 @@ private: } // namespace Internal } // namespace QmlDesigner -#endif // WIDGETPLUGINMANAGER_H diff --git a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h index 5354ae7217..391fe86fe9 100644 --- a/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h +++ b/src/plugins/qmldesigner/designercore/pluginmanager/widgetpluginpath.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WIDGETPLUGINPATH_H -#define WIDGETPLUGINPATH_H +#pragma once #include <QObject> #include <QPointer> @@ -94,4 +93,3 @@ private: } // namespace Internal } // namespace QmlDesigner -#endif // WIDGETPLUGINPATH_H diff --git a/src/plugins/qmldesigner/designercore/rewritertransaction.h b/src/plugins/qmldesigner/designercore/rewritertransaction.h index b983273258..213b9e5618 100644 --- a/src/plugins/qmldesigner/designercore/rewritertransaction.h +++ b/src/plugins/qmldesigner/designercore/rewritertransaction.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REWRITERTRANSACTION_H -#define REWRITERTRANSACTION_H +#pragma once #include <qmldesignercorelib_global.h> @@ -59,5 +58,3 @@ private: }; } //QmlDesigner - -#endif // REWRITERTRANSACTION_H diff --git a/src/plugins/qmldesigner/designersettings.h b/src/plugins/qmldesigner/designersettings.h index cc93e4be55..b5e0b2fd29 100644 --- a/src/plugins/qmldesigner/designersettings.h +++ b/src/plugins/qmldesigner/designersettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DESIGNERSETTINGS_H -#define DESIGNERSETTINGS_H +#pragma once #include <QtGlobal> #include <QHash> @@ -74,5 +73,3 @@ private: }; } // namespace QmlDesigner - -#endif // DESIGNERSETTINGS_H diff --git a/src/plugins/qmldesigner/designmodecontext.h b/src/plugins/qmldesigner/designmodecontext.h index da8d545b11..aa89c619f3 100644 --- a/src/plugins/qmldesigner/designmodecontext.h +++ b/src/plugins/qmldesigner/designmodecontext.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DESIGNMODECONTEXT_H -#define DESIGNMODECONTEXT_H +#pragma once #include <coreplugin/icontext.h> @@ -57,5 +56,3 @@ public: } } - -#endif // DESIGNMODECONTEXT_H diff --git a/src/plugins/qmldesigner/designmodewidget.h b/src/plugins/qmldesigner/designmodewidget.h index 41d9af758b..f1a68b3a9c 100644 --- a/src/plugins/qmldesigner/designmodewidget.h +++ b/src/plugins/qmldesigner/designmodewidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DESIGNMODEWIDGET_H -#define DESIGNMODEWIDGET_H +#pragma once #include <coreplugin/minisplitter.h> #include <utils/faketooltip.h> @@ -158,5 +157,3 @@ private: // variables } // namespace Internal } // namespace Designer - -#endif // DESIGNMODEWIDGET_H diff --git a/src/plugins/qmldesigner/documentmanager.h b/src/plugins/qmldesigner/documentmanager.h index 21e9f5b62f..83d773d75f 100644 --- a/src/plugins/qmldesigner/documentmanager.h +++ b/src/plugins/qmldesigner/documentmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_DOCUMENTMANAGER_H -#define QMLDESIGNER_DOCUMENTMANAGER_H +#pragma once #include <QObject> #include <QList> @@ -71,5 +70,3 @@ private: }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_DOCUMENTMANAGER_H diff --git a/src/plugins/qmldesigner/qmldesignerconstants.h b/src/plugins/qmldesigner/qmldesignerconstants.h index 0deb1dcaf9..e0e8081d1f 100644 --- a/src/plugins/qmldesigner/qmldesignerconstants.h +++ b/src/plugins/qmldesigner/qmldesignerconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNERCONSTANTS_H -#define QMLDESIGNERCONSTANTS_H +#pragma once namespace QmlDesigner { namespace Constants { @@ -55,5 +54,3 @@ namespace Internal { } // Constants } // QmlDesigner - -#endif //QMLDESIGNERCONSTANTS_H diff --git a/src/plugins/qmldesigner/qmldesignerextension/colortool/colortool.h b/src/plugins/qmldesigner/qmldesignerextension/colortool/colortool.h index 889dfcb928..439971855e 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/colortool/colortool.h +++ b/src/plugins/qmldesigner/qmldesignerextension/colortool/colortool.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COLORTOOL_H -#define COLORTOOL_H +#pragma once #include "abstractcustomtool.h" #include "selectionindicator.h" @@ -88,5 +87,3 @@ private: }; } -#endif // COLORTOOL_H - diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/bindingmodel.h b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/bindingmodel.h index 9f1334c33c..51489a60d6 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/bindingmodel.h +++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/bindingmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BINDINGMODEL_H -#define BINDINGMODEL_H +#pragma once #include <modelnode.h> #include <nodemetainfo.h> @@ -118,5 +117,3 @@ public: } // namespace Internal } // namespace QmlDesigner - -#endif // BINDINGMODEL_H diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionmodel.h b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionmodel.h index a4fb4b8a56..016ff66dd5 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionmodel.h +++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CONNECTIONMODEL_H -#define CONNECTIONMODEL_H +#pragma once #include <modelnode.h> #include <nodemetainfo.h> @@ -119,5 +118,3 @@ public: } // namespace Internal } // namespace QmlDesigner - -#endif // CONNECTIONMODEL_H diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionview.h b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionview.h index 2b6b1d1535..cb122baf0b 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionview.h +++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CONNECTIONVIEW_H -#define CONNECTIONVIEW_H +#pragma once #include <abstractview.h> #include <qmlitemnode.h> @@ -92,5 +91,3 @@ private: //variables } // namespace Internal } // namespace QmlDesigner - -#endif //CONNECTIONVIEW_H diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.h b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.h index 2fbb107e1c..fa5a88bbc4 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.h +++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CONNECTIONVIEWWIDGET_H -#define CONNECTIONVIEWWIDGET_H +#pragma once #include <QFrame> #include <QAbstractItemView> @@ -99,5 +98,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // CONNECTIONVIEWWIDGET_H diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/dynamicpropertiesmodel.h b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/dynamicpropertiesmodel.h index 520985aafd..be0239b4f0 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/dynamicpropertiesmodel.h +++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/dynamicpropertiesmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DYNCAMICPROPERTIESMODEL_H -#define DYNCAMICPROPERTIESMODEL_H +#pragma once #include <modelnode.h> #include <nodemetainfo.h> @@ -130,7 +129,4 @@ public: }; } // namespace Internal - } // namespace QmlDesigner - -#endif // DYNCAMICPROPERTIESMODEL_Hs diff --git a/src/plugins/qmldesigner/qmldesignerextension/pathtool/controlpoint.h b/src/plugins/qmldesigner/qmldesignerextension/pathtool/controlpoint.h index fea74bdb5b..39dc184978 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/pathtool/controlpoint.h +++ b/src/plugins/qmldesigner/qmldesignerextension/pathtool/controlpoint.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_CONTROLPOINT_H -#define QMLDESIGNER_CONTROLPOINT_H +#pragma once #include <modelnode.h> @@ -92,5 +91,3 @@ bool operator ==(const ControlPoint& firstControlPoint, const ControlPoint& seco QDebug operator<<(QDebug debug, const ControlPoint &controlPoint); } // namespace QmlDesigner - -#endif // QMLDESIGNER_CONTROLPOINT_H diff --git a/src/plugins/qmldesigner/qmldesignerextension/pathtool/cubicsegment.h b/src/plugins/qmldesigner/qmldesignerextension/pathtool/cubicsegment.h index 7b8d0e8cd1..260dcd2a6d 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/pathtool/cubicsegment.h +++ b/src/plugins/qmldesigner/qmldesignerextension/pathtool/cubicsegment.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_CUBICSEGMENT_H -#define QMLDESIGNER_CUBICSEGMENT_H +#pragma once #include "controlpoint.h" @@ -126,5 +125,3 @@ bool operator ==(const CubicSegment& firstCubicSegment, const CubicSegment& seco QDebug operator<<(QDebug debug, const CubicSegment &cubicSegment); } // namespace QmlDesigner - -#endif // QMLDESIGNER_CUBICSEGMENT_H diff --git a/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathitem.h b/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathitem.h index f32a0162d7..d431262b39 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathitem.h +++ b/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PATHITEM_H -#define PATHITEM_H +#pragma once #include <QGraphicsObject> #include <QWeakPointer> @@ -139,5 +138,3 @@ inline int PathItem::type() const return Type; } } - -#endif // PATHITEM_H diff --git a/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathselectionmanipulator.h b/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathselectionmanipulator.h index 6be7adb9a5..def0148367 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathselectionmanipulator.h +++ b/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathselectionmanipulator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_PATHSELECTIONMANIPULATOR_H -#define QMLDESIGNER_PATHSELECTIONMANIPULATOR_H +#pragma once #include <QList> #include <QPair> @@ -99,5 +98,3 @@ private: bool operator ==(const SelectionPoint& firstSelectionPoint, const SelectionPoint& secondSelectionPoint); } // namespace QmlDesigner - -#endif // QMLDESIGNER_PATHSELECTIONMANIPULATOR_H diff --git a/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathtool.h b/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathtool.h index 260425282f..281577fff0 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathtool.h +++ b/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathtool.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PATHTOOL_H -#define PATHTOOL_H +#pragma once #include "abstractcustomtool.h" #include "selectionindicator.h" @@ -90,5 +89,3 @@ private: }; } -#endif // PATHTOOL_H - diff --git a/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathtoolview.h b/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathtoolview.h index 860789cd68..46b688923e 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathtoolview.h +++ b/src/plugins/qmldesigner/qmldesignerextension/pathtool/pathtoolview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_PATHTOOLVIEW_H -#define QMLDESIGNER_PATHTOOLVIEW_H +#pragma once #include <abstractview.h> @@ -46,5 +45,3 @@ private: }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_PATHTOOLVIEW_H diff --git a/src/plugins/qmldesigner/qmldesignerextension/qmldesignerextension_global.h b/src/plugins/qmldesigner/qmldesignerextension/qmldesignerextension_global.h index 00d06e2b6a..82ed1b076c 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/qmldesignerextension_global.h +++ b/src/plugins/qmldesigner/qmldesignerextension/qmldesignerextension_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNEREXTENSION_GLOBAL_H -#define QMLDESIGNEREXTENSION_GLOBAL_H +#pragma once #include <QtGlobal> @@ -33,6 +32,3 @@ #else # define QMLDESIGNEREXTENSIONSHARED_EXPORT Q_DECL_IMPORT #endif - -#endif // QMLDESIGNEREXTENSION_GLOBAL_H - diff --git a/src/plugins/qmldesigner/qmldesignerextension/qmldesignerextensionconstants.h b/src/plugins/qmldesigner/qmldesignerextension/qmldesignerextensionconstants.h index 4a32df0bc4..9bf41a2f54 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/qmldesignerextensionconstants.h +++ b/src/plugins/qmldesigner/qmldesignerextension/qmldesignerextensionconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNEREXTENSIONCONSTANTS_H -#define QMLDESIGNEREXTENSIONCONSTANTS_H +#pragma once namespace QmlDesignerExtension { namespace Constants { @@ -34,6 +33,3 @@ const char MENU_ID[] = "QmlDesignerExtension.Menu"; } // namespace QmlDesignerExtension } // namespace Constants - -#endif // QMLDESIGNEREXTENSIONCONSTANTS_H - diff --git a/src/plugins/qmldesigner/qmldesignerextension/sourcetool/sourcetool.h b/src/plugins/qmldesigner/qmldesignerextension/sourcetool/sourcetool.h index 7d6a463a57..0757776d81 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/sourcetool/sourcetool.h +++ b/src/plugins/qmldesigner/qmldesignerextension/sourcetool/sourcetool.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SOURCETOOL_H -#define SOURCETOOL_H +#pragma once #include <abstractcustomtool.h> #include "selectionindicator.h" @@ -89,4 +88,3 @@ private: }; } -#endif // SOURCETOOL_H diff --git a/src/plugins/qmldesigner/qmldesignerextension/texttool/texttool.h b/src/plugins/qmldesigner/qmldesignerextension/texttool/texttool.h index abbfb4444b..ba13cdbcce 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/texttool/texttool.h +++ b/src/plugins/qmldesigner/qmldesignerextension/texttool/texttool.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTTOOL_H -#define TEXTTOOL_H +#pragma once #include "abstractcustomtool.h" #include "selectionindicator.h" @@ -86,5 +85,3 @@ private: }; } -#endif // TEXTTOOL_H - diff --git a/src/plugins/qmldesigner/qmldesignericons.h b/src/plugins/qmldesigner/qmldesignericons.h index 3fb9732c68..ab10dda7e3 100644 --- a/src/plugins/qmldesigner/qmldesignericons.h +++ b/src/plugins/qmldesigner/qmldesignericons.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNERICONS_H -#define QMLDESIGNERICONS_H +#pragma once #include <utils/icon.h> @@ -60,5 +59,3 @@ const Utils::Icon RESET({ } // Icons } // QmlDesigner - -#endif // QMLDESIGNERICONS_H diff --git a/src/plugins/qmldesigner/qmldesignerplugin.h b/src/plugins/qmldesigner/qmldesignerplugin.h index 9717d50203..2190a59642 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.h +++ b/src/plugins/qmldesigner/qmldesignerplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNERPLUGIN_H -#define QMLDESIGNERPLUGIN_H +#pragma once #include <qmldesigner/designersettings.h> #include <qmldesigner/components/pluginmanager/pluginmanager.h> @@ -113,5 +112,3 @@ private: // variables }; } // namespace QmlDesigner - -#endif // QMLDESIGNERPLUGIN_H diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h index 10ed2066f6..08dc48a450 100644 --- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h +++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTQUICKPLUGIN_H -#define QTQUICKPLUGIN_H +#pragma once #include <iwidgetplugin.h> @@ -51,6 +50,3 @@ public: }; } // namespace QmlDesigner - - -#endif // QTQUICKPLUGIN_H diff --git a/src/plugins/qmldesigner/settingspage.h b/src/plugins/qmldesigner/settingspage.h index bcf8c130ab..c33a63b827 100644 --- a/src/plugins/qmldesigner/settingspage.h +++ b/src/plugins/qmldesigner/settingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SETTINGSPAGE_H -#define SETTINGSPAGE_H +#pragma once #include "ui_settingspage.h" @@ -75,5 +74,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // SETTINGSPAGE_H diff --git a/src/plugins/qmldesigner/shortcutmanager.h b/src/plugins/qmldesigner/shortcutmanager.h index fcd723b6ba..226babb987 100644 --- a/src/plugins/qmldesigner/shortcutmanager.h +++ b/src/plugins/qmldesigner/shortcutmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDESIGNER_SHORTCUTMANAGER_H -#define QMLDESIGNER_SHORTCUTMANAGER_H +#pragma once #include <QObject> #include <QAction> @@ -95,5 +94,3 @@ private: }; } // namespace QmlDesigner - -#endif // QMLDESIGNER_SHORTCUTMANAGER_H diff --git a/src/plugins/qmldesigner/styledoutputpaneplaceholder.h b/src/plugins/qmldesigner/styledoutputpaneplaceholder.h index 147b7192be..a8e335c2f1 100644 --- a/src/plugins/qmldesigner/styledoutputpaneplaceholder.h +++ b/src/plugins/qmldesigner/styledoutputpaneplaceholder.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef STYLEDOUTPUTPANEPLACEHOLDER_H -#define STYLEDOUTPUTPANEPLACEHOLDER_H +#pragma once #include <coreplugin/outputpane.h> @@ -45,5 +44,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // STYLEDOUTPUTPANEPLACEHOLDER_H diff --git a/src/plugins/qmljseditor/qmlexpressionundercursor.h b/src/plugins/qmljseditor/qmlexpressionundercursor.h index 5694716f17..7aab34ecdf 100644 --- a/src/plugins/qmljseditor/qmlexpressionundercursor.h +++ b/src/plugins/qmljseditor/qmlexpressionundercursor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLEXPRESSIONUNDERCURSOR_H -#define QMLEXPRESSIONUNDERCURSOR_H +#pragma once #include <qmljs/parser/qmljsastfwd_p.h> #include <qmljs/qmljsdocument.h> @@ -67,5 +66,3 @@ private: } // namespace Internal } // namespace QmlJSEditor - -#endif // QMLEXPRESSIONUNDERCURSOR_H diff --git a/src/plugins/qmljseditor/qmljsautocompleter.h b/src/plugins/qmljseditor/qmljsautocompleter.h index 3d23964d1b..701134dbd6 100644 --- a/src/plugins/qmljseditor/qmljsautocompleter.h +++ b/src/plugins/qmljseditor/qmljsautocompleter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSAUTOCOMPLETER_H -#define QMLJSAUTOCOMPLETER_H +#pragma once #include <texteditor/autocompleter.h> @@ -50,5 +49,3 @@ public: } // Internal } // QmlJSEditor - -#endif // QMLJSAUTOCOMPLETER_H diff --git a/src/plugins/qmljseditor/qmljscompletionassist.h b/src/plugins/qmljseditor/qmljscompletionassist.h index 62df082d7f..42dc8d4dd5 100644 --- a/src/plugins/qmljseditor/qmljscompletionassist.h +++ b/src/plugins/qmljseditor/qmljscompletionassist.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSCOMPLETIONASSIST_H -#define QMLJSCOMPLETIONASSIST_H +#pragma once #include "qmljseditor.h" @@ -136,5 +135,3 @@ private: }; } // QmlJSEditor - -#endif // QMLJSCOMPLETIONASSIST_H diff --git a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.h b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.h index c118de3a7e..f8734612e6 100644 --- a/src/plugins/qmljseditor/qmljscomponentfromobjectdef.h +++ b/src/plugins/qmljseditor/qmljscomponentfromobjectdef.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSCOMPONENTFROMOBJECTDEF_H -#define QMLJSCOMPONENTFROMOBJECTDEF_H +#pragma once #include "qmljsquickfix.h" @@ -39,5 +38,3 @@ public: } // namespace Internal } // namespace QmlJSEditor - -#endif // QMLJSCOMPONENTFROMOBJECTDEF_H diff --git a/src/plugins/qmljseditor/qmljscomponentnamedialog.h b/src/plugins/qmljseditor/qmljscomponentnamedialog.h index 0a52f06a38..b7c5a7335f 100644 --- a/src/plugins/qmljseditor/qmljscomponentnamedialog.h +++ b/src/plugins/qmljseditor/qmljscomponentnamedialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSCOMPONENTNAMEDIALOG_H -#define QMLJSCOMPONENTNAMEDIALOG_H +#pragma once #include <QDialog> @@ -56,5 +55,3 @@ private: } // namespace Internal } // namespace QmlJSEditor - -#endif // QMLJSCOMPONENTNAMEDIALOG_H diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h index 1b7bd68bef..79d86dbb5a 100644 --- a/src/plugins/qmljseditor/qmljseditor.h +++ b/src/plugins/qmljseditor/qmljseditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSEDITOR_H -#define QMLJSEDITOR_H +#pragma once #include "qmljseditor_global.h" @@ -157,5 +156,3 @@ public: } // namespace Internal } // namespace QmlJSEditor - -#endif // QMLJSEDITOR_H diff --git a/src/plugins/qmljseditor/qmljseditor_global.h b/src/plugins/qmljseditor/qmljseditor_global.h index 0bb8f65d94..bd4a5139dc 100644 --- a/src/plugins/qmljseditor/qmljseditor_global.h +++ b/src/plugins/qmljseditor/qmljseditor_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSEDITOR_GLOBAL_H -#define QMLJSEDITOR_GLOBAL_H +#pragma once #include <QtGlobal> @@ -33,5 +32,3 @@ #else # define QMLJSEDITOR_EXPORT Q_DECL_IMPORT #endif - -#endif // QMLJSEDITOR_GLOBAL_H diff --git a/src/plugins/qmljseditor/qmljseditorconstants.h b/src/plugins/qmljseditor/qmljseditorconstants.h index f7fb506df6..3f22b6e1ef 100644 --- a/src/plugins/qmljseditor/qmljseditorconstants.h +++ b/src/plugins/qmljseditor/qmljseditorconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSEDITOR_CONSTANTS_H -#define QMLJSEDITOR_CONSTANTS_H +#pragma once #include <QtGlobal> @@ -60,5 +59,3 @@ const char QML_UI_FILE_WARNING[] = "QmlJSEditor.QmlUiFileWarning"; } // namespace Constants } // namespace QmlJSEditor - -#endif // QMLJSEDITOR_CONSTANTS_H diff --git a/src/plugins/qmljseditor/qmljseditordocument.h b/src/plugins/qmljseditor/qmljseditordocument.h index 8e22b6e402..05d9e09457 100644 --- a/src/plugins/qmljseditor/qmljseditordocument.h +++ b/src/plugins/qmljseditor/qmljseditordocument.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSEDITORDOCUMENT_H -#define QMLJSEDITORDOCUMENT_H +#pragma once #include "qmljseditor_global.h" @@ -67,5 +66,3 @@ private: }; } // QmlJSEditor - -#endif // QMLJSEDITORDOCUMENT_H diff --git a/src/plugins/qmljseditor/qmljseditordocument_p.h b/src/plugins/qmljseditor/qmljseditordocument_p.h index f6185fcc29..46a6a36c65 100644 --- a/src/plugins/qmljseditor/qmljseditordocument_p.h +++ b/src/plugins/qmljseditor/qmljseditordocument_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSEDITORDOCUMENT_P_H -#define QMLJSEDITORDOCUMENT_P_H +#pragma once #include <qmljs/qmljsdocument.h> #include <qmljstools/qmljssemanticinfo.h> @@ -77,5 +76,3 @@ public: } // Internal } // QmlJSEditor - -#endif // QMLJSEDITORDOCUMENT_P_H diff --git a/src/plugins/qmljseditor/qmljseditorplugin.h b/src/plugins/qmljseditor/qmljseditorplugin.h index 3629f9bb21..e96e59163b 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.h +++ b/src/plugins/qmljseditor/qmljseditorplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSEDITORPLUGIN_H -#define QMLJSEDITORPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> #include <coreplugin/icontext.h> @@ -103,5 +102,3 @@ private: } // namespace Internal } // namespace QmlJSEditor - -#endif // QMLJSEDITORPLUGIN_H diff --git a/src/plugins/qmljseditor/qmljsfindreferences.h b/src/plugins/qmljseditor/qmljsfindreferences.h index 4fddc56bef..2d8cb9aaeb 100644 --- a/src/plugins/qmljseditor/qmljsfindreferences.h +++ b/src/plugins/qmljseditor/qmljsfindreferences.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSFINDREFERENCES_H -#define QMLJSFINDREFERENCES_H +#pragma once #include "qmljseditor_global.h" @@ -92,5 +91,3 @@ private: }; } // namespace QmlJSEditor - -#endif // QMLJSFINDREFERENCES_H diff --git a/src/plugins/qmljseditor/qmljshighlighter.h b/src/plugins/qmljseditor/qmljshighlighter.h index fd17751289..1b221aa181 100644 --- a/src/plugins/qmljseditor/qmljshighlighter.h +++ b/src/plugins/qmljseditor/qmljshighlighter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSHIGHLIGHTER_H -#define QMLJSHIGHLIGHTER_H +#pragma once #include "qmljseditor_global.h" @@ -82,5 +81,3 @@ private: }; } // namespace QmlJSEditor - -#endif // QMLJSHIGHLIGHTER_H diff --git a/src/plugins/qmljseditor/qmljshoverhandler.h b/src/plugins/qmljseditor/qmljshoverhandler.h index 4e54ecfde9..bf82bcd30b 100644 --- a/src/plugins/qmljseditor/qmljshoverhandler.h +++ b/src/plugins/qmljseditor/qmljshoverhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSHOVERHANDLER_H -#define QMLJSHOVERHANDLER_H +#pragma once #include <qmljs/qmljsmodelmanagerinterface.h> #include <texteditor/basehoverhandler.h> @@ -86,5 +85,3 @@ private: } // namespace Internal } // namespace QmlJSEditor - -#endif // QMLJSHOVERHANDLER_H diff --git a/src/plugins/qmljseditor/qmljsoutline.h b/src/plugins/qmljseditor/qmljsoutline.h index b0d5bdf185..fc475ed689 100644 --- a/src/plugins/qmljseditor/qmljsoutline.h +++ b/src/plugins/qmljseditor/qmljsoutline.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSOUTLINE_H -#define QMLJSOUTLINE_H +#pragma once #include "qmljseditor.h" @@ -104,5 +103,3 @@ public: } // namespace Internal } // namespace QmlJSEditor - -#endif // QMLJSOUTLINE_H diff --git a/src/plugins/qmljseditor/qmljsoutlinetreeview.h b/src/plugins/qmljseditor/qmljsoutlinetreeview.h index 22a2878b12..7b651f4c24 100644 --- a/src/plugins/qmljseditor/qmljsoutlinetreeview.h +++ b/src/plugins/qmljseditor/qmljsoutlinetreeview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSOUTLINETREEVIEW_H -#define QMLJSOUTLINETREEVIEW_H +#pragma once #include <utils/navigationtreeview.h> @@ -45,5 +44,3 @@ private slots: } // namespace Internal } // namespace QmlJSEditor - -#endif // QMLJSOUTLINETREEVIEW_H diff --git a/src/plugins/qmljseditor/qmljspreviewrunner.h b/src/plugins/qmljseditor/qmljspreviewrunner.h index 3885e9140c..631311cb96 100644 --- a/src/plugins/qmljseditor/qmljspreviewrunner.h +++ b/src/plugins/qmljseditor/qmljspreviewrunner.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSPREVIEWRUNNER_H -#define QMLJSPREVIEWRUNNER_H +#pragma once #include <QObject> @@ -51,6 +50,3 @@ private: } // namespace Internal } // namespace QmlJSEditor - - -#endif // QMLJSPREVIEWRUNNER_H diff --git a/src/plugins/qmljseditor/qmljsquickfix.h b/src/plugins/qmljseditor/qmljsquickfix.h index 5347d3e940..fda4a25a48 100644 --- a/src/plugins/qmljseditor/qmljsquickfix.h +++ b/src/plugins/qmljseditor/qmljsquickfix.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSQUICKFIX_H -#define QMLJSQUICKFIX_H +#pragma once #include "qmljseditor.h" @@ -94,5 +93,3 @@ protected: }; } // namespace QmlJSEditor - -#endif // QMLJSQUICKFIX_H diff --git a/src/plugins/qmljseditor/qmljsquickfixassist.h b/src/plugins/qmljseditor/qmljsquickfixassist.h index 81784c5a74..c606737c55 100644 --- a/src/plugins/qmljseditor/qmljsquickfixassist.h +++ b/src/plugins/qmljseditor/qmljsquickfixassist.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSQUICKFIXASSIST_H -#define QMLJSQUICKFIXASSIST_H +#pragma once #include "qmljseditor.h" @@ -68,5 +67,3 @@ public: } // Internal } // QmlJSEditor - -#endif // QMLJSQUICKFIXASSIST_H diff --git a/src/plugins/qmljseditor/qmljsreuse.h b/src/plugins/qmljseditor/qmljsreuse.h index 3a51f155ce..5c370f8610 100644 --- a/src/plugins/qmljseditor/qmljsreuse.h +++ b/src/plugins/qmljseditor/qmljsreuse.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSREUSE_H -#define QMLJSREUSE_H +#pragma once #include <QtGlobal> #include <QIcon> @@ -46,5 +45,3 @@ QIcon iconForColor(const QColor &color); } // Internal } // QmlJSEditor - -#endif // QMLJSREUSE_H diff --git a/src/plugins/qmljseditor/qmljssemantichighlighter.h b/src/plugins/qmljseditor/qmljssemantichighlighter.h index 2acbc6f9a9..7491e71eed 100644 --- a/src/plugins/qmljseditor/qmljssemantichighlighter.h +++ b/src/plugins/qmljseditor/qmljssemantichighlighter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSSEMANTICHIGHLIGHTER_H -#define QMLJSSEMANTICHIGHLIGHTER_H +#pragma once #include <texteditor/semantichighlighter.h> #include <QFutureWatcher> @@ -98,5 +97,3 @@ private: } // namespace Internal } // namespace QmlJSEditor - -#endif // QMLJSSEMANTICHIGHLIGHTER_H diff --git a/src/plugins/qmljseditor/qmljssemanticinfoupdater.h b/src/plugins/qmljseditor/qmljssemanticinfoupdater.h index 4050145a7b..3d7696f466 100644 --- a/src/plugins/qmljseditor/qmljssemanticinfoupdater.h +++ b/src/plugins/qmljseditor/qmljssemanticinfoupdater.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SEMANTICINFOUPDATER_H -#define SEMANTICINFOUPDATER_H +#pragma once #include "qmljseditor.h" @@ -69,5 +68,3 @@ private: } // namespace Internal } // namespace QmlJSEditor - -#endif // SEMANTICINFOUPDATER_H diff --git a/src/plugins/qmljseditor/qmljssnippetprovider.h b/src/plugins/qmljseditor/qmljssnippetprovider.h index e33c41c0a2..0d0761b928 100644 --- a/src/plugins/qmljseditor/qmljssnippetprovider.h +++ b/src/plugins/qmljseditor/qmljssnippetprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSSNIPPETPROVIDER_H -#define QMLJSSNIPPETPROVIDER_H +#pragma once #include <texteditor/snippets/isnippetprovider.h> @@ -45,5 +44,3 @@ public: } // Internal } // QmlJSEditor - -#endif // QMLJSSNIPPETPROVIDER_H diff --git a/src/plugins/qmljseditor/qmljswrapinloader.h b/src/plugins/qmljseditor/qmljswrapinloader.h index 0cf629e03b..1e792b98fb 100644 --- a/src/plugins/qmljseditor/qmljswrapinloader.h +++ b/src/plugins/qmljseditor/qmljswrapinloader.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSWRAPINLOADER_H -#define QMLJSWRAPINLOADER_H +#pragma once #include "qmljsquickfix.h" @@ -38,5 +37,3 @@ class WrapInLoader: public QmlJSQuickFixFactory } // namespace Internal } // namespace QmlJSEditor - -#endif // QMLJSWRAPINLOADER_H diff --git a/src/plugins/qmljseditor/qmloutlinemodel.h b/src/plugins/qmljseditor/qmloutlinemodel.h index 8c679e6c52..86094c656a 100644 --- a/src/plugins/qmljseditor/qmloutlinemodel.h +++ b/src/plugins/qmljseditor/qmloutlinemodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLOUTLINEMODEL_H -#define QMLOUTLINEMODEL_H +#pragma once #include "qmljseditordocument.h" #include <utils/changeset.h> @@ -165,5 +164,3 @@ private: } // namespace Internal } // namespace QmlJSEditor - -#endif // QMLOUTLINEMODEL_H diff --git a/src/plugins/qmljseditor/qmltaskmanager.h b/src/plugins/qmljseditor/qmltaskmanager.h index 5d6674c0bd..9c56e7a93b 100644 --- a/src/plugins/qmljseditor/qmltaskmanager.h +++ b/src/plugins/qmljseditor/qmltaskmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLTASKMANAGER_H -#define QMLTASKMANAGER_H +#pragma once #include <projectexplorer/task.h> #include <qmljs/qmljsdocument.h> @@ -85,5 +84,3 @@ private: } // Internal } // QmlJSEditor - -#endif // QMLTASKMANAGER_H diff --git a/src/plugins/qmljseditor/quicktoolbar.h b/src/plugins/qmljseditor/quicktoolbar.h index 2a7623bac8..df7a5e6514 100644 --- a/src/plugins/qmljseditor/quicktoolbar.h +++ b/src/plugins/qmljseditor/quicktoolbar.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QUICKTOOLBAR_H -#define QUICKTOOLBAR_H +#pragma once #include <qmljs/qmljsicontextpane.h> @@ -70,5 +69,3 @@ private: }; } //QmlDesigner - -#endif // QUICKTOOLBAR_H diff --git a/src/plugins/qmljseditor/quicktoolbarsettingspage.h b/src/plugins/qmljseditor/quicktoolbarsettingspage.h index 13b434e384..db0c5ee99b 100644 --- a/src/plugins/qmljseditor/quicktoolbarsettingspage.h +++ b/src/plugins/qmljseditor/quicktoolbarsettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QUICKTOOLBARSETTINGSPAGE_H -#define QUICKTOOLBARSETTINGSPAGE_H +#pragma once #include "ui_quicktoolbarsettingspage.h" #include <coreplugin/dialogs/ioptionspage.h> @@ -96,5 +95,3 @@ private: } // namespace Internal } // namespace QmlDesigner - -#endif // QUICKTOOLBARSETTINGSPAGE_H diff --git a/src/plugins/qmljstools/qmljsbundleprovider.h b/src/plugins/qmljstools/qmljsbundleprovider.h index c7303a8893..d3b01bbb22 100644 --- a/src/plugins/qmljstools/qmljsbundleprovider.h +++ b/src/plugins/qmljstools/qmljsbundleprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSBUNDLEPROVIDER_H -#define QMLJSBUNDLEPROVIDER_H +#pragma once #include <QObject> #include <QHash> @@ -75,5 +74,3 @@ public: }; } // end QmlJSTools namespace - -#endif // QMLJSBUNDLEPROVIDER_H diff --git a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.h b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.h index f30d832da8..e88ea1ef49 100644 --- a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.h +++ b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSCODESTYLEPREFERENCESFACTORY_H -#define QMLJSCODESTYLEPREFERENCESFACTORY_H +#pragma once #include <texteditor/icodestylepreferencesfactory.h> @@ -46,5 +45,3 @@ public: }; } // namespace QmlJSTools - -#endif // QMLJSCODESTYLEPREFERENCESFACTORY_H diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.h b/src/plugins/qmljstools/qmljscodestylesettingspage.h index 0ed0e3b81a..cae3a9c2b4 100644 --- a/src/plugins/qmljstools/qmljscodestylesettingspage.h +++ b/src/plugins/qmljstools/qmljscodestylesettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSCODESTYLESETTINGSPAGE_H -#define QMLJSCODESTYLESETTINGSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> #include <QWidget> @@ -86,5 +85,3 @@ private: } // namespace Internal } // namespace CppTools - -#endif // QMLJSCODESTYLESETTINGSPAGE_H diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.h b/src/plugins/qmljstools/qmljsfunctionfilter.h index 39041359fd..503343ea4a 100644 --- a/src/plugins/qmljstools/qmljsfunctionfilter.h +++ b/src/plugins/qmljstools/qmljsfunctionfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSFUNCTIONFILTER_H -#define QMLJSFUNCTIONFILTER_H +#pragma once #include <coreplugin/locator/ilocatorfilter.h> @@ -51,5 +50,3 @@ private: } // namespace Internal } // namespace QmlJSTools - -#endif // QMLJSFUNCTIONFILTER_H diff --git a/src/plugins/qmljstools/qmljsindenter.h b/src/plugins/qmljstools/qmljsindenter.h index 3a7ced9fd0..fb3f30c74f 100644 --- a/src/plugins/qmljstools/qmljsindenter.h +++ b/src/plugins/qmljstools/qmljsindenter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSINDENTER_H -#define QMLJSINDENTER_H +#pragma once #include "qmljstools_global.h" @@ -51,5 +50,3 @@ public: } // Internal } // QmlJSEditor - -#endif // QMLJSINDENTER_H diff --git a/src/plugins/qmljstools/qmljsinterpreter.h b/src/plugins/qmljstools/qmljsinterpreter.h index 2bfccb46ae..b3d1f8c717 100644 --- a/src/plugins/qmljstools/qmljsinterpreter.h +++ b/src/plugins/qmljstools/qmljsinterpreter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSINTERPRETER_H -#define QMLJSINTERPRETER_H +#pragma once #include <qmljs/parser/qmljslexer_p.h> #include <qmljs/parser/qmljsengine_p.h> @@ -55,5 +54,3 @@ private: } // namespace Internal } // namespace QmlJSTools - -#endif // QMLJSINTERPRETER_H diff --git a/src/plugins/qmljstools/qmljslocatordata.h b/src/plugins/qmljstools/qmljslocatordata.h index b24e4536e3..39b728d6f1 100644 --- a/src/plugins/qmljstools/qmljslocatordata.h +++ b/src/plugins/qmljstools/qmljslocatordata.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSLOCATORDATA_H -#define QMLJSLOCATORDATA_H +#pragma once #include <qmljs/qmljsdocument.h> @@ -72,5 +71,3 @@ private: } // namespace Internal } // namespace QmlJSTools - -#endif // QMLJSLOCATORDATA_H diff --git a/src/plugins/qmljstools/qmljsmodelmanager.h b/src/plugins/qmljstools/qmljsmodelmanager.h index 40da3f0c5f..6a0e630c1b 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.h +++ b/src/plugins/qmljstools/qmljsmodelmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSMODELMANAGER_H -#define QMLJSMODELMANAGER_H +#pragma once #include "qmljstools_global.h" @@ -68,5 +67,3 @@ private: QMLJSTOOLS_EXPORT void setupProjectInfoQmlBundles(QmlJS::ModelManagerInterface::ProjectInfo &projectInfo); } // namespace QmlJSTools - -#endif // QMLJSMODELMANAGER_H diff --git a/src/plugins/qmljstools/qmljsqtstylecodeformatter.h b/src/plugins/qmljstools/qmljsqtstylecodeformatter.h index 6f4c79a1a9..905c15bbe8 100644 --- a/src/plugins/qmljstools/qmljsqtstylecodeformatter.h +++ b/src/plugins/qmljstools/qmljsqtstylecodeformatter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSQTSTYLECODEFORMATTER_H -#define QMLJSQTSTYLECODEFORMATTER_H +#pragma once #include "qmljstools_global.h" @@ -57,5 +56,3 @@ private: }; } // namespace QmlJSTools - -#endif // QMLJSQTSTYLECODEFORMATTER_H diff --git a/src/plugins/qmljstools/qmljsrefactoringchanges.h b/src/plugins/qmljstools/qmljsrefactoringchanges.h index 330da42b5c..cce8e2d08f 100644 --- a/src/plugins/qmljstools/qmljsrefactoringchanges.h +++ b/src/plugins/qmljstools/qmljsrefactoringchanges.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSREFACTORINGCHANGES_H -#define QMLJSREFACTORINGCHANGES_H +#pragma once #include "qmljstools_global.h" @@ -86,5 +85,3 @@ private: }; } // namespace QmlJSTools - -#endif // QMLJSREFACTORINGCHANGES_H diff --git a/src/plugins/qmljstools/qmljssemanticinfo.h b/src/plugins/qmljstools/qmljssemanticinfo.h index 72f1b3fda4..3ba52b4b7c 100644 --- a/src/plugins/qmljstools/qmljssemanticinfo.h +++ b/src/plugins/qmljstools/qmljssemanticinfo.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSSEMANTICINFO_H -#define QMLJSSEMANTICINFO_H +#pragma once #include "qmljstools_global.h" @@ -101,5 +100,3 @@ private: } // namespace QmlJSTools Q_DECLARE_METATYPE(QmlJSTools::SemanticInfo) - -#endif // QMLJSSEMANTICINFO_H diff --git a/src/plugins/qmljstools/qmljstools_global.h b/src/plugins/qmljstools/qmljstools_global.h index b87409a5ff..4ea360e5fe 100644 --- a/src/plugins/qmljstools/qmljstools_global.h +++ b/src/plugins/qmljstools/qmljstools_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSTOOLS_GLOBAL_H -#define QMLJSTOOLS_GLOBAL_H +#pragma once #include <QtGlobal> @@ -35,5 +34,3 @@ #else # define QMLJSTOOLS_EXPORT Q_DECL_IMPORT #endif - -#endif // QMLJSTOOLS_GLOBAL_H diff --git a/src/plugins/qmljstools/qmljstoolsconstants.h b/src/plugins/qmljstools/qmljstoolsconstants.h index eecdcd075b..777321e81a 100644 --- a/src/plugins/qmljstools/qmljstoolsconstants.h +++ b/src/plugins/qmljstools/qmljstoolsconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSTOOLS_CONSTANTS_H -#define QMLJSTOOLS_CONSTANTS_H +#pragma once #include <QtGlobal> @@ -52,5 +51,3 @@ const char SETTINGS_CATEGORY_QML_ICON[] = ":/qmljstools/images/category_qml.png" } // namespace Constants } // namespace QmlJSTools - -#endif // QMLJSTOOLS_CONSTANTS_H diff --git a/src/plugins/qmljstools/qmljstoolsplugin.h b/src/plugins/qmljstools/qmljstoolsplugin.h index 6e48c9332d..02faedb505 100644 --- a/src/plugins/qmljstools/qmljstoolsplugin.h +++ b/src/plugins/qmljstools/qmljstoolsplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSTOOLS_H -#define QMLJSTOOLS_H +#pragma once #include <coreplugin/id.h> #include <extensionsystem/iplugin.h> @@ -77,5 +76,3 @@ private: } // namespace Internal } // namespace CppTools - -#endif // QMLJSTOOLS_H diff --git a/src/plugins/qmljstools/qmljstoolssettings.h b/src/plugins/qmljstools/qmljstoolssettings.h index e103dcaa4a..4af12eb909 100644 --- a/src/plugins/qmljstools/qmljstoolssettings.h +++ b/src/plugins/qmljstools/qmljstoolssettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLJSTOOLSSETTINGS_H -#define QMLJSTOOLSSETTINGS_H +#pragma once #include "qmljstools_global.h" @@ -49,5 +48,3 @@ public: }; } // namespace QmlJSTools - -#endif // QMLJSTOOLSSETTINGS_H diff --git a/src/plugins/qmlprofiler/localqmlprofilerrunner.h b/src/plugins/qmlprofiler/localqmlprofilerrunner.h index e156e21812..c634cc62bf 100644 --- a/src/plugins/qmlprofiler/localqmlprofilerrunner.h +++ b/src/plugins/qmlprofiler/localqmlprofilerrunner.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LOCALQMLPROFILERRUNNER_H -#define LOCALQMLPROFILERRUNNER_H +#pragma once #include "qmlprofiler_global.h" #include <utils/environment.h> @@ -66,5 +65,3 @@ private: }; } // namespace QmlProfiler - -#endif // LOCALQMLPROFILERRUNNER_H diff --git a/src/plugins/qmlprofiler/qmlprofiler_global.h b/src/plugins/qmlprofiler/qmlprofiler_global.h index b5621fb19d..2da08c0567 100644 --- a/src/plugins/qmlprofiler/qmlprofiler_global.h +++ b/src/plugins/qmlprofiler/qmlprofiler_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILER_GLOBAL_H -#define QMLPROFILER_GLOBAL_H +#pragma once #include <QtGlobal> @@ -33,6 +32,3 @@ #else # define QMLPROFILER_EXPORT Q_DECL_IMPORT #endif - -#endif // QMLPROFILER_GLOBAL_H - diff --git a/src/plugins/qmlprofiler/qmlprofileranimationsmodel.h b/src/plugins/qmlprofiler/qmlprofileranimationsmodel.h index c07d545692..ba0b0f7ece 100644 --- a/src/plugins/qmlprofiler/qmlprofileranimationsmodel.h +++ b/src/plugins/qmlprofiler/qmlprofileranimationsmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERANIMATIONSMODEL_H -#define QMLPROFILERANIMATIONSMODEL_H +#pragma once #include <QObject> #include "qmlprofilertimelinemodel.h" @@ -83,5 +82,3 @@ private: } } - -#endif // QMLPROFILERANIMATIONSMODEL_H diff --git a/src/plugins/qmlprofiler/qmlprofilerattachdialog.h b/src/plugins/qmlprofiler/qmlprofilerattachdialog.h index 850c029326..c1167d39aa 100644 --- a/src/plugins/qmlprofiler/qmlprofilerattachdialog.h +++ b/src/plugins/qmlprofiler/qmlprofilerattachdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERATTACHDIALOG_H -#define QMLPROFILERATTACHDIALOG_H +#pragma once #include <QDialog> @@ -55,5 +54,3 @@ private: } // namespace Internal } // namespace QmlProfiler - -#endif // QMLPROFILERATTACHDIALOG_H diff --git a/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.h b/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.h index b547c8ed69..6cf3486aa3 100644 --- a/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.h +++ b/src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERBINDINGLOOPSRENDERPASS_H -#define QMLPROFILERBINDINGLOOPSRENDERPASS_H +#pragma once #include "timeline/timelineabstractrenderer.h" #include "timeline/timelinerenderpass.h" @@ -49,6 +48,3 @@ protected: } } - -#endif // QMLPROFILERBINDINGLOOPSRENDERPASS_H - diff --git a/src/plugins/qmlprofiler/qmlprofilerclientmanager.h b/src/plugins/qmlprofiler/qmlprofilerclientmanager.h index 349e1d57ae..d6536eb4b4 100644 --- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.h +++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERCLIENTMANAGER_H -#define QMLPROFILERCLIENTMANAGER_H +#pragma once #include "qmlprofilerstatemanager.h" #include <qmldebug/qmlprofilereventlocation.h> @@ -97,5 +96,3 @@ private: } } - -#endif // QMLPROFILERCLIENTMANAGER_H diff --git a/src/plugins/qmlprofiler/qmlprofilerconfigwidget.h b/src/plugins/qmlprofiler/qmlprofilerconfigwidget.h index 479900a07b..2f3b0022b7 100644 --- a/src/plugins/qmlprofiler/qmlprofilerconfigwidget.h +++ b/src/plugins/qmlprofiler/qmlprofilerconfigwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERCONFIGWIDGET_H -#define QMLPROFILERCONFIGWIDGET_H +#pragma once #include "qmlprofilersettings.h" #include <QWidget> @@ -55,5 +54,3 @@ private: } // Internal } // QmlProfiler - -#endif // QMLPROFILERCONFIGWIDGET_H diff --git a/src/plugins/qmlprofiler/qmlprofilerconstants.h b/src/plugins/qmlprofiler/qmlprofilerconstants.h index a4fa0fa046..4f48437d69 100644 --- a/src/plugins/qmlprofiler/qmlprofilerconstants.h +++ b/src/plugins/qmlprofiler/qmlprofilerconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERCONSTANTS_H -#define QMLPROFILERCONSTANTS_H +#pragma once namespace QmlProfiler { namespace Constants { @@ -53,5 +52,3 @@ const char QmlProfilerSaveActionId[] = } // namespace Constants } // namespace QmlProfiler - -#endif // QMLPROFILERCONSTANTS_H diff --git a/src/plugins/qmlprofiler/qmlprofilerdatamodel.h b/src/plugins/qmlprofiler/qmlprofilerdatamodel.h index 79521e7473..e3ffa78f50 100644 --- a/src/plugins/qmlprofiler/qmlprofilerdatamodel.h +++ b/src/plugins/qmlprofiler/qmlprofilerdatamodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERDATAMODEL_H -#define QMLPROFILERDATAMODEL_H +#pragma once #include "qmlprofilermodelmanager.h" @@ -237,5 +236,3 @@ private: }; } - -#endif diff --git a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.h b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.h index 5269190866..b80c0d8e38 100644 --- a/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.h +++ b/src/plugins/qmlprofiler/qmlprofilerdetailsrewriter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERDETAILSREWRITER_H -#define QMLPROFILERDETAILSREWRITER_H +#pragma once #include <QObject> @@ -62,5 +61,3 @@ private: } // namespace Internal } // namespace QmlProfiler - -#endif // QMLPROFILERDETAILSREWRITER_H diff --git a/src/plugins/qmlprofiler/qmlprofilereventsview.h b/src/plugins/qmlprofiler/qmlprofilereventsview.h index 13c8143d9d..99efcd50d1 100644 --- a/src/plugins/qmlprofiler/qmlprofilereventsview.h +++ b/src/plugins/qmlprofiler/qmlprofilereventsview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILEREVENTSVIEW_H -#define QMLPROFILEREVENTSVIEW_H +#pragma once #include "qmlprofiler_global.h" #include "qmlprofilermodelmanager.h" @@ -63,5 +62,3 @@ public: }; } - -#endif // QMLPROFILEREVENTSVIEW_H diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.h b/src/plugins/qmlprofiler/qmlprofilermodelmanager.h index 0c3574efb9..d0cfd34b24 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.h +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERMODELMANAGER_H -#define QMLPROFILERMODELMANAGER_H +#pragma once #include "qmlprofiler_global.h" @@ -145,5 +144,3 @@ private: }; } - -#endif diff --git a/src/plugins/qmlprofiler/qmlprofilernotesmodel.h b/src/plugins/qmlprofiler/qmlprofilernotesmodel.h index d078c3ca07..c5bc56bb85 100644 --- a/src/plugins/qmlprofiler/qmlprofilernotesmodel.h +++ b/src/plugins/qmlprofiler/qmlprofilernotesmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERNOTESMODEL_H -#define QMLPROFILERNOTESMODEL_H +#pragma once #include "qmlprofilermodelmanager.h" #include "timeline/timelinenotesmodel.h" @@ -47,4 +46,3 @@ protected: int add(int typeId, qint64 startTime, qint64 duration, const QString &text); }; } // namespace QmlProfiler -#endif // QMLPROFILERNOTESMODEL_H diff --git a/src/plugins/qmlprofiler/qmlprofileroptionspage.h b/src/plugins/qmlprofiler/qmlprofileroptionspage.h index 61796c6fe9..62aeb68242 100644 --- a/src/plugins/qmlprofiler/qmlprofileroptionspage.h +++ b/src/plugins/qmlprofiler/qmlprofileroptionspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILEROPTIONSPAGE_H -#define QMLPROFILEROPTIONSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> #include <QPointer> @@ -48,5 +47,3 @@ private: } // Internal } // QmlProfiler - -#endif // QMLPROFILEROPTIONSPAGE_H diff --git a/src/plugins/qmlprofiler/qmlprofilerplugin.h b/src/plugins/qmlprofiler/qmlprofilerplugin.h index b7d29997c6..a3e2e147f7 100644 --- a/src/plugins/qmlprofiler/qmlprofilerplugin.h +++ b/src/plugins/qmlprofiler/qmlprofilerplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERPLUGIN_H -#define QMLPROFILERPLUGIN_H +#pragma once #include "qmlprofiler_global.h" #include "qmlprofilertimelinemodelfactory.h" @@ -60,6 +59,3 @@ private: } // namespace Internal } // namespace QmlProfiler - -#endif // QMLPROFILERPLUGIN_H - diff --git a/src/plugins/qmlprofiler/qmlprofilerrangemodel.h b/src/plugins/qmlprofiler/qmlprofilerrangemodel.h index 118047ad44..043f8773c4 100644 --- a/src/plugins/qmlprofiler/qmlprofilerrangemodel.h +++ b/src/plugins/qmlprofiler/qmlprofilerrangemodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERRANGEMODEL_H -#define QMLPROFILERRANGEMODEL_H +#pragma once #include "qmlprofilertimelinemodel.h" #include <qmldebug/qmlprofilereventtypes.h> @@ -89,5 +88,3 @@ private: } } - -#endif // QMLPROFILERRANGEMODEL_H diff --git a/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.h b/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.h index 9bec1bc5de..ed6a97c488 100644 --- a/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.h +++ b/src/plugins/qmlprofiler/qmlprofilerrunconfigurationaspect.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERRUNCONFIGURATIONASPECT_H -#define QMLPROFILERRUNCONFIGURATIONASPECT_H +#pragma once #include <projectexplorer/runconfiguration.h> @@ -44,5 +43,3 @@ public: } // Internal } // QmlProfiler - -#endif // QMLPROFILERRUNCONFIGURATIONASPECT_H diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.h b/src/plugins/qmlprofiler/qmlprofilerruncontrol.h index a44e6c710a..f012fab224 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.h +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERRUNCONTROL_H -#define QMLPROFILERRUNCONTROL_H +#pragma once #include "qmlprofilerstatemanager.h" @@ -68,5 +67,3 @@ private: }; } // namespace QmlProfiler - -#endif // QMLPROFILERRUNCONTROL_H diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.h b/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.h index af72840db1..5df3936673 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.h +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrolfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERRUNCONTROLFACTORY_H -#define QMLPROFILERRUNCONTROLFACTORY_H +#pragma once #include <projectexplorer/runconfiguration.h> @@ -51,5 +50,3 @@ public: } // namespace Internal } // namespace QmlProfiler - -#endif // QMLPROFILERRUNCONTROLFACTORY_H diff --git a/src/plugins/qmlprofiler/qmlprofilersettings.h b/src/plugins/qmlprofiler/qmlprofilersettings.h index 1c12b37fa6..b452b3e9b7 100644 --- a/src/plugins/qmlprofiler/qmlprofilersettings.h +++ b/src/plugins/qmlprofiler/qmlprofilersettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERSETTINGS_H -#define QMLPROFILERSETTINGS_H +#pragma once #include <projectexplorer/runconfiguration.h> @@ -69,5 +68,3 @@ private: } // Internal } // QmlProfiler - -#endif // QMLPROFILERSETTINGS_H diff --git a/src/plugins/qmlprofiler/qmlprofilerstatemanager.h b/src/plugins/qmlprofiler/qmlprofilerstatemanager.h index 0f577cf9e9..aa860b6b4e 100644 --- a/src/plugins/qmlprofiler/qmlprofilerstatemanager.h +++ b/src/plugins/qmlprofiler/qmlprofilerstatemanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERSTATEMANAGER_H -#define QMLPROFILERSTATEMANAGER_H +#pragma once #include <QObject> @@ -72,5 +71,3 @@ private: }; } - -#endif // QMLPROFILERSTATEMANAGER_H diff --git a/src/plugins/qmlprofiler/qmlprofilerstatewidget.h b/src/plugins/qmlprofiler/qmlprofilerstatewidget.h index 5064c70b0d..2f953a2973 100644 --- a/src/plugins/qmlprofiler/qmlprofilerstatewidget.h +++ b/src/plugins/qmlprofiler/qmlprofilerstatewidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERSTATEWIDGET_H -#define QMLPROFILERSTATEWIDGET_H +#pragma once #include <QWidget> @@ -57,5 +56,3 @@ private: } } - -#endif // QMLPROFILERSTATEWIDGET_H diff --git a/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.h b/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.h index 36c27da9cd..a709553fca 100644 --- a/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.h +++ b/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERSTATISTICSMODEL_H -#define QMLPROFILERSTATISTICSMODEL_H +#pragma once #include "qmlprofilerdatamodel.h" #include "qmlprofilernotesmodel.h" @@ -155,5 +154,3 @@ protected: }; } - -#endif // QMLPROFILERSTATISTICSMODEL_H diff --git a/src/plugins/qmlprofiler/qmlprofilerstatisticsview.h b/src/plugins/qmlprofiler/qmlprofilerstatisticsview.h index 1d205b7dfd..8c5bedcebd 100644 --- a/src/plugins/qmlprofiler/qmlprofilerstatisticsview.h +++ b/src/plugins/qmlprofiler/qmlprofilerstatisticsview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERSTATISTICSVIEW_H -#define QMLPROFILERSTATISTICSVIEW_H +#pragma once #include "qmlprofilermodelmanager.h" #include "qmlprofilerstatisticsmodel.h" @@ -177,5 +176,3 @@ private: } // namespace Internal } // namespace QmlProfiler - -#endif // QMLPROFILERSTATISTICSVIEW_H diff --git a/src/plugins/qmlprofiler/qmlprofilertimelinemodel.h b/src/plugins/qmlprofiler/qmlprofilertimelinemodel.h index 7e2d4a6f2c..8f4efd4429 100644 --- a/src/plugins/qmlprofiler/qmlprofilertimelinemodel.h +++ b/src/plugins/qmlprofiler/qmlprofilertimelinemodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERTIMELINEMODEL_H -#define QMLPROFILERTIMELINEMODEL_H +#pragma once #include "qmlprofiler_global.h" #include "qmlprofilermodelmanager.h" @@ -74,5 +73,3 @@ private: }; } - -#endif // QMLPROFILERTIMELINEMODEL_H diff --git a/src/plugins/qmlprofiler/qmlprofilertimelinemodelfactory.h b/src/plugins/qmlprofiler/qmlprofilertimelinemodelfactory.h index 8d507e95f8..6087c2d389 100644 --- a/src/plugins/qmlprofiler/qmlprofilertimelinemodelfactory.h +++ b/src/plugins/qmlprofiler/qmlprofilertimelinemodelfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERTIMELINEMODELFACTORY_H -#define QMLPROFILERTIMELINEMODELFACTORY_H +#pragma once #include "qmlprofilertimelinemodel.h" #include "qmlprofilermodelmanager.h" @@ -39,5 +38,3 @@ public: }; } - -#endif // QMLPROFILERTIMELINEMODELFACTORY_H diff --git a/src/plugins/qmlprofiler/qmlprofilertool.h b/src/plugins/qmlprofiler/qmlprofilertool.h index 34c7e21505..29ca5beb5f 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.h +++ b/src/plugins/qmlprofiler/qmlprofilertool.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERTOOL_H -#define QMLPROFILERTOOL_H +#pragma once #include "qmlprofiler_global.h" #include "qmlprofilerconstants.h" @@ -111,5 +110,3 @@ private: } // namespace Internal } // namespace QmlProfiler - -#endif // QMLPROFILERTOOL_H diff --git a/src/plugins/qmlprofiler/qmlprofilertracefile.h b/src/plugins/qmlprofiler/qmlprofilertracefile.h index f29b04634d..433224d380 100644 --- a/src/plugins/qmlprofiler/qmlprofilertracefile.h +++ b/src/plugins/qmlprofiler/qmlprofilertracefile.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERTRACEFILE_H -#define QMLPROFILERTRACEFILE_H +#pragma once #include <QFutureInterface> #include <QObject> @@ -113,5 +112,3 @@ private: } // namespace Internal } // namespace QmlProfiler - -#endif // QMLPROFILERTRACEFILE_H diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.h b/src/plugins/qmlprofiler/qmlprofilertraceview.h index b7386ba15a..29e7915c20 100644 --- a/src/plugins/qmlprofiler/qmlprofilertraceview.h +++ b/src/plugins/qmlprofiler/qmlprofilertraceview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERTRACEVIEW_H -#define QMLPROFILERTRACEVIEW_H +#pragma once #include "qmlprofilermodelmanager.h" @@ -107,6 +106,3 @@ private: } // namespace Internal } // namespace QmlProfiler - -#endif // QMLPROFILERTRACEVIEW_H - diff --git a/src/plugins/qmlprofiler/qmlprofilerviewmanager.h b/src/plugins/qmlprofiler/qmlprofilerviewmanager.h index 191938f7f6..e7b5d9ee94 100644 --- a/src/plugins/qmlprofiler/qmlprofilerviewmanager.h +++ b/src/plugins/qmlprofiler/qmlprofilerviewmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILERVIEWMANAGER_H -#define QMLPROFILERVIEWMANAGER_H +#pragma once #include <QObject> @@ -71,5 +70,3 @@ private: } // namespace Internal } // namespace QmlProfiler - -#endif // QMLPROFILERVIEWMANAGER_H diff --git a/src/plugins/qmlprofilerextension/debugmessagesmodel.h b/src/plugins/qmlprofilerextension/debugmessagesmodel.h index e5934e204d..020b8a17b5 100644 --- a/src/plugins/qmlprofilerextension/debugmessagesmodel.h +++ b/src/plugins/qmlprofilerextension/debugmessagesmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEBUGMESSAGESMODEL_H -#define DEBUGMESSAGESMODEL_H +#pragma once #include "qmlprofiler/qmlprofilertimelinemodel.h" @@ -67,5 +66,3 @@ private: } } - -#endif // DEBUGMESSAGESMODEL_H diff --git a/src/plugins/qmlprofilerextension/flamegraph.h b/src/plugins/qmlprofilerextension/flamegraph.h index 832752c3b8..435a233a78 100644 --- a/src/plugins/qmlprofilerextension/flamegraph.h +++ b/src/plugins/qmlprofilerextension/flamegraph.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FLAMEGRAPH_H -#define FLAMEGRAPH_H +#pragma once #include <QQuickItem> #include <QAbstractItemModel> @@ -156,5 +155,3 @@ private: } QML_DECLARE_TYPEINFO(QmlProfilerExtension::Internal::FlameGraph, QML_HAS_ATTACHED_PROPERTIES) - -#endif // FLAMEGRAPH_H diff --git a/src/plugins/qmlprofilerextension/flamegraphmodel.h b/src/plugins/qmlprofilerextension/flamegraphmodel.h index e3e49b77a1..0063db7f43 100644 --- a/src/plugins/qmlprofilerextension/flamegraphmodel.h +++ b/src/plugins/qmlprofilerextension/flamegraphmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILEREVENTSMODEL_H -#define QMLPROFILEREVENTSMODEL_H +#pragma once #include <qmlprofiler/qmlprofilerdatamodel.h> #include <qmlprofiler/qmlprofilernotesmodel.h> @@ -110,5 +109,3 @@ private: } // namespace Internal } // namespace QmlprofilerExtension - -#endif // QMLPROFILEREVENTSMODEL_H diff --git a/src/plugins/qmlprofilerextension/flamegraphview.h b/src/plugins/qmlprofilerextension/flamegraphview.h index b98b673152..cd91775979 100644 --- a/src/plugins/qmlprofilerextension/flamegraphview.h +++ b/src/plugins/qmlprofilerextension/flamegraphview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FLAMEGRAPHVIEW_H -#define FLAMEGRAPHVIEW_H +#pragma once #include "flamegraphmodel.h" @@ -60,5 +59,3 @@ private: } } - -#endif // FLAMEGRAPHVIEW_H diff --git a/src/plugins/qmlprofilerextension/inputeventsmodel.h b/src/plugins/qmlprofilerextension/inputeventsmodel.h index 72a58642dc..4ee69ffbe6 100644 --- a/src/plugins/qmlprofilerextension/inputeventsmodel.h +++ b/src/plugins/qmlprofilerextension/inputeventsmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INPUTEVENTSMODEL_H -#define INPUTEVENTSMODEL_H +#pragma once #include "qmlprofiler/qmlprofilertimelinemodel.h" @@ -68,4 +67,3 @@ private: } } -#endif // INPUTEVENTSMODEL_H diff --git a/src/plugins/qmlprofilerextension/memoryusagemodel.h b/src/plugins/qmlprofilerextension/memoryusagemodel.h index bf7b557afa..bc945c64f8 100644 --- a/src/plugins/qmlprofilerextension/memoryusagemodel.h +++ b/src/plugins/qmlprofilerextension/memoryusagemodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MEMORYUSAGEMODEL_H -#define MEMORYUSAGEMODEL_H +#pragma once #include "qmlprofiler/qmlprofilertimelinemodel.h" #include "qmlprofiler/qmlprofilerdatamodel.h" @@ -81,5 +80,3 @@ private: } // namespace Internal } // namespace QmlProfilerExtension - -#endif // MEMORYUSAGEMODEL_H diff --git a/src/plugins/qmlprofilerextension/pixmapcachemodel.h b/src/plugins/qmlprofilerextension/pixmapcachemodel.h index 4d9fac2763..b5a8dc42c9 100644 --- a/src/plugins/qmlprofilerextension/pixmapcachemodel.h +++ b/src/plugins/qmlprofilerextension/pixmapcachemodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PIXMAPCACHEMODEL_H -#define PIXMAPCACHEMODEL_H +#pragma once #include "qmlprofiler/qmlprofilertimelinemodel.h" #include "qmlprofiler/qmlprofilerdatamodel.h" @@ -126,5 +125,3 @@ private: } // namespace Internal } // namespace QmlProfilerExtension - -#endif // PIXMAPCACHEMODEL_H diff --git a/src/plugins/qmlprofilerextension/qmlprofilerextension_global.h b/src/plugins/qmlprofilerextension/qmlprofilerextension_global.h index a8faba9971..e98fdae737 100644 --- a/src/plugins/qmlprofilerextension/qmlprofilerextension_global.h +++ b/src/plugins/qmlprofilerextension/qmlprofilerextension_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILEREXTENSION_GLOBAL_H -#define QMLPROFILEREXTENSION_GLOBAL_H +#pragma once #include <QtGlobal> @@ -33,6 +32,3 @@ #else # define QMLPROFILEREXTENSIONSHARED_EXPORT Q_DECL_IMPORT #endif - -#endif // QMLPROFILEREXTENSION_GLOBAL_H - diff --git a/src/plugins/qmlprofilerextension/qmlprofilerextensionconstants.h b/src/plugins/qmlprofilerextension/qmlprofilerextensionconstants.h index e7c730c9d5..198e8c737b 100644 --- a/src/plugins/qmlprofilerextension/qmlprofilerextensionconstants.h +++ b/src/plugins/qmlprofilerextension/qmlprofilerextensionconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILEREXTENSIONCONSTANTS_H -#define QMLPROFILEREXTENSIONCONSTANTS_H +#pragma once namespace QmlProfilerExtension { namespace Constants { @@ -34,6 +33,3 @@ const char MENU_ID[] = "QmlProfilerExtension.Menu"; } // namespace QmlProfilerExtension } // namespace Constants - -#endif // QMLPROFILEREXTENSIONCONSTANTS_H - diff --git a/src/plugins/qmlprofilerextension/qmlprofilerextensionplugin.h b/src/plugins/qmlprofilerextension/qmlprofilerextensionplugin.h index 63571cde69..45024e033c 100644 --- a/src/plugins/qmlprofilerextension/qmlprofilerextensionplugin.h +++ b/src/plugins/qmlprofilerextension/qmlprofilerextensionplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROFILEREXTENSION_H -#define QMLPROFILEREXTENSION_H +#pragma once #include "qmlprofilerextension_global.h" @@ -52,6 +51,3 @@ private slots: } // namespace Internal } // namespace QmlProfilerExtension - -#endif // QMLPROFILEREXTENSION_H - diff --git a/src/plugins/qmlprofilerextension/scenegraphtimelinemodel.h b/src/plugins/qmlprofilerextension/scenegraphtimelinemodel.h index 59782769dd..6e8aaf8d8e 100644 --- a/src/plugins/qmlprofilerextension/scenegraphtimelinemodel.h +++ b/src/plugins/qmlprofilerextension/scenegraphtimelinemodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SCENEGRAPHTIMELINEMODEL_H -#define SCENEGRAPHTIMELINEMODEL_H +#pragma once #include "qmlprofiler/qmlprofilertimelinemodel.h" #include "qmlprofiler/qmlprofilermodelmanager.h" @@ -110,5 +109,3 @@ private: } // namespace Internal } // namespace QmlProfilerExtension - -#endif // SCENEGRAPHTIMELINEMODEL_H diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h index 6a5f439d40..89e41b3834 100644 --- a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h +++ b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FILEFILTERITEMS_H -#define FILEFILTERITEMS_H +#pragma once #include "qmlprojectitem.h" @@ -172,5 +171,3 @@ public: }; } // namespace QmlProjectManager - -#endif // FILEFILTERITEMS_HPROJECTITEM_H diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.h b/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.h index f1cf42ba6d..12a152b125 100644 --- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.h +++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectfileformat.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROJECTFILEFORMAT_H -#define QMLPROJECTFILEFORMAT_H +#pragma once #include <utils/fileutils.h> @@ -44,5 +43,3 @@ public: }; } // namespace QmlProjectManager - -#endif // QMLPROJECTFILEFORMAT_H diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h index d114eb75f9..673f4ced48 100644 --- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h +++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROJECTITEM_H -#define QMLPROJECTITEM_H +#pragma once #include <QObject> #include <QSet> @@ -80,5 +79,3 @@ protected: }; } // namespace QmlProjectManager - -#endif // QMLPROJECTITEM_H diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h index 1af818da0d..41fdcff8e0 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.h +++ b/src/plugins/qmlprojectmanager/qmlproject.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROJECT_H -#define QMLPROJECT_H +#pragma once #include "qmlprojectmanager_global.h" @@ -116,5 +115,3 @@ private: } // namespace QmlProjectManager Q_DECLARE_OPERATORS_FOR_FLAGS(QmlProjectManager::QmlProject::RefreshOptions) - -#endif // QMLPROJECT_H diff --git a/src/plugins/qmlprojectmanager/qmlprojectconstants.h b/src/plugins/qmlprojectmanager/qmlprojectconstants.h index 72ba2dcfc8..bc2d63cf64 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectconstants.h +++ b/src/plugins/qmlprojectmanager/qmlprojectconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROJECTCONSTANTS_H -#define QMLPROJECTCONSTANTS_H +#pragma once #include <qmljstools/qmljstoolsconstants.h> @@ -36,5 +35,3 @@ const char * const QMLPROJECT_MIMETYPE = QmlJSTools::Constants::QMLPROJECT_MIMET } // namespace Constants } // namespace QmlProjectManager - -#endif // QMLPROJECTCONSTANTS_H diff --git a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h index 78e34cb789..177d2d89cd 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h +++ b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROJECTENVIRONMENTASPECT_H -#define QMLPROJECTENVIRONMENTASPECT_H +#pragma once #include <projectexplorer/environmentaspect.h> @@ -50,5 +49,3 @@ private: }; } // namespace QmlProjectManager - -#endif // QMLPROJECTENVIRONMENTASPECT_H diff --git a/src/plugins/qmlprojectmanager/qmlprojectfile.h b/src/plugins/qmlprojectmanager/qmlprojectfile.h index d1f4bcd91f..90805fa018 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectfile.h +++ b/src/plugins/qmlprojectmanager/qmlprojectfile.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROJECTFILE_H -#define QMLPROJECTFILE_H +#pragma once #include <coreplugin/idocument.h> @@ -48,5 +47,3 @@ private: } // namespace Internal } // namespace QmlProjectManager - -#endif // QMLPROJECTFILE_H diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.h b/src/plugins/qmlprojectmanager/qmlprojectmanager.h index 24be9c12e5..3e0782c25b 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanager.h +++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROJECTMANAGER_H -#define QMLPROJECTMANAGER_H +#pragma once #include <projectexplorer/iprojectmanager.h> #include <coreplugin/icontext.h> @@ -56,5 +55,3 @@ private: } // namespace Internal } // namespace QmlProjectManager - -#endif // QMLPROJECTMANAGER_H diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager_global.h b/src/plugins/qmlprojectmanager/qmlprojectmanager_global.h index d69d30ea51..0d30f82da9 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanager_global.h +++ b/src/plugins/qmlprojectmanager/qmlprojectmanager_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROJECTMANAGER_GLOBAL_H -#define QMLPROJECTMANAGER_GLOBAL_H +#pragma once #include <qglobal.h> @@ -33,5 +32,3 @@ #else # define QMLPROJECTMANAGER_EXPORT Q_DECL_IMPORT #endif - -#endif // QMLPROJECTMANAGER_GLOBAL_H diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h b/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h index 0b73aaebee..783a067b74 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h +++ b/src/plugins/qmlprojectmanager/qmlprojectmanagerconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROJECTMANAGERCONSTANTS_H -#define QMLPROJECTMANAGERCONSTANTS_H +#pragma once #include <qglobal.h> @@ -40,5 +39,3 @@ const char USER_ENVIRONMENT_CHANGES_KEY[] = "QmlProjectManager.QmlRunConfigurati } // namespace Constants } // namespace QmlProjectManager - -#endif // QMLPROJECTMANAGERCONSTANTS_H diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.h b/src/plugins/qmlprojectmanager/qmlprojectnodes.h index c8239e4d64..6198cd10ea 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectnodes.h +++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROJECTNODES_H -#define QMLPROJECTNODES_H +#pragma once #include <projectexplorer/projectnodes.h> @@ -66,5 +65,3 @@ private: } // namespace Internal } // namespace QmlProjectManager - -#endif // QMLPROJECTNODES_H diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.h b/src/plugins/qmlprojectmanager/qmlprojectplugin.h index 47a94f6cb1..52065a3b86 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectplugin.h +++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROJECTPLUGIN_H -#define QMLPROJECTPLUGIN_H +#pragma once #include "qmlprojectmanager_global.h" @@ -46,5 +45,3 @@ public: }; } // namespace QmlProject - -#endif // QMLPROJECTPLUGIN_H diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h index e271d84fa6..196bdc28e0 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROJECTRUNCONFIGURATION_H -#define QMLPROJECTRUNCONFIGURATION_H +#pragma once #include "qmlprojectmanager_global.h" @@ -113,5 +112,3 @@ private: }; } // namespace QmlProjectManager - -#endif // QMLPROJECTRUNCONFIGURATION_H diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.h index e042060d63..b084341b97 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.h +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROJECTRUNCONFIGURATIONFACTORY_H -#define QMLPROJECTRUNCONFIGURATIONFACTORY_H +#pragma once #include <projectexplorer/runconfiguration.h> @@ -56,6 +55,3 @@ private: } // namespace Internal } // namespace QmlProjectManager - - -#endif // QMLPROJECTRUNCONFIGURATIONFACTORY_H diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.h index 260b1a405b..efa3528764 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.h +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLPROJECTRUNCONFIGURATIONWIDGET_H -#define QMLPROJECTRUNCONFIGURATIONWIDGET_H +#pragma once #include <QWidget> @@ -59,5 +58,3 @@ private: } // namespace Internal } // namespace QmlProjectManager - -#endif // QMLPROJECTRUNCONFIGURATIONWIDGET_H diff --git a/src/plugins/qnx/pathchooserdelegate.h b/src/plugins/qnx/pathchooserdelegate.h index cc2960756b..fca0fe1412 100644 --- a/src/plugins/qnx/pathchooserdelegate.h +++ b/src/plugins/qnx/pathchooserdelegate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_PATHCHOOSERDELEGATE_H -#define QNX_INTERNAL_PATHCHOOSERDELEGATE_H +#pragma once #include <QStyledItemDelegate> @@ -67,5 +66,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_PATHCHOOSERDELEGATE_H diff --git a/src/plugins/qnx/qnx_export.h b/src/plugins/qnx/qnx_export.h index 32c32b8f7e..1fda4c0a29 100644 --- a/src/plugins/qnx/qnx_export.h +++ b/src/plugins/qnx/qnx_export.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_EXPORT_H -#define QNX_EXPORT_H +#pragma once #include <qglobal.h> @@ -33,5 +32,3 @@ #else # define QNX_EXPORT Q_DECL_IMPORT #endif - -#endif // QNX_EXPORT_H diff --git a/src/plugins/qnx/qnxabstractrunsupport.h b/src/plugins/qnx/qnxabstractrunsupport.h index 18658712ff..d28ca70f30 100644 --- a/src/plugins/qnx/qnxabstractrunsupport.h +++ b/src/plugins/qnx/qnxabstractrunsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNXABSTRACTRUNSUPPORT_H -#define QNXABSTRACTRUNSUPPORT_H +#pragma once #include <projectexplorer/devicesupport/idevice.h> #include <utils/environment.h> @@ -90,5 +89,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNXABSTRACTRUNSUPPORT_H diff --git a/src/plugins/qnx/qnxanalyzesupport.h b/src/plugins/qnx/qnxanalyzesupport.h index d1361fff3a..d849b45353 100644 --- a/src/plugins/qnx/qnxanalyzesupport.h +++ b/src/plugins/qnx/qnxanalyzesupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNXANALYZESUPPORT_H -#define QNXANALYZESUPPORT_H +#pragma once #include "qnxabstractrunsupport.h" @@ -75,5 +74,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNXANALYZESUPPORT_H diff --git a/src/plugins/qnx/qnxattachdebugdialog.h b/src/plugins/qnx/qnxattachdebugdialog.h index 4b1bed635a..ef124555ff 100644 --- a/src/plugins/qnx/qnxattachdebugdialog.h +++ b/src/plugins/qnx/qnxattachdebugdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXATTACHDEBUGDIALOG_H -#define QNX_INTERNAL_QNXATTACHDEBUGDIALOG_H +#pragma once #include <projectexplorer/devicesupport/deviceprocessesdialog.h> @@ -50,5 +49,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXATTACHDEBUGDIALOG_H diff --git a/src/plugins/qnx/qnxattachdebugsupport.h b/src/plugins/qnx/qnxattachdebugsupport.h index 2044a2d833..328c9bda1e 100644 --- a/src/plugins/qnx/qnxattachdebugsupport.h +++ b/src/plugins/qnx/qnxattachdebugsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXATTACHDEBUGSUPPORT_H -#define QNX_INTERNAL_QNXATTACHDEBUGSUPPORT_H +#pragma once #include <debugger/debuggerconstants.h> #include <projectexplorer/devicesupport/deviceprocesslist.h> @@ -79,5 +78,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXATTACHDEBUGSUPPORT_H diff --git a/src/plugins/qnx/qnxbaseqtconfigwidget.h b/src/plugins/qnx/qnxbaseqtconfigwidget.h index 7c1788dc0b..1dacb1ad39 100644 --- a/src/plugins/qnx/qnxbaseqtconfigwidget.h +++ b/src/plugins/qnx/qnxbaseqtconfigwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXBASEQTCONFIGWIDGET_H -#define QNX_INTERNAL_QNXBASEQTCONFIGWIDGET_H +#pragma once #include <qtsupport/qtconfigwidget.h> @@ -52,5 +51,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXBASEQTCONFIGWIDGET_H diff --git a/src/plugins/qnx/qnxconfiguration.h b/src/plugins/qnx/qnxconfiguration.h index 22836dfb02..5212560394 100644 --- a/src/plugins/qnx/qnxconfiguration.h +++ b/src/plugins/qnx/qnxconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNXCONFIGURATION_H -#define QNXCONFIGURATION_H +#pragma once #include "qnxconstants.h" #include "qnxutils.h" @@ -108,5 +107,3 @@ private: } // Internal } // Qnx - -#endif // QNXCONFIGURATION_H diff --git a/src/plugins/qnx/qnxconfigurationmanager.h b/src/plugins/qnx/qnxconfigurationmanager.h index 9bbcf774d2..ee8d91624a 100644 --- a/src/plugins/qnx/qnxconfigurationmanager.h +++ b/src/plugins/qnx/qnxconfigurationmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNXCONFIGURATIONMANAGER_H -#define QNXCONFIGURATIONMANAGER_H +#pragma once #include <utils/fileutils.h> @@ -64,5 +63,3 @@ private: } } - -#endif // QNXCONFIGURATIONMANAGER_H diff --git a/src/plugins/qnx/qnxconstants.h b/src/plugins/qnx/qnxconstants.h index 795e4560c2..c77dbc21e5 100644 --- a/src/plugins/qnx/qnxconstants.h +++ b/src/plugins/qnx/qnxconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_QNXCONSTANTS_H -#define QNX_QNXCONSTANTS_H +#pragma once #include <QtGlobal> @@ -67,5 +66,3 @@ const char QNX_DEBUGGING_GROUP[] = "Debugger.Group.Qnx"; } // namespace Constants } // namespace Qnx - -#endif // QNX_QNXCONSTANTS_H diff --git a/src/plugins/qnx/qnxdebugsupport.h b/src/plugins/qnx/qnxdebugsupport.h index ad4196d7ee..743cc14002 100644 --- a/src/plugins/qnx/qnxdebugsupport.h +++ b/src/plugins/qnx/qnxdebugsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEBUGSUPPORT_H -#define QNX_INTERNAL_QNXDEBUGSUPPORT_H +#pragma once #include "qnxabstractrunsupport.h" @@ -83,5 +82,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXDEBUGSUPPORT_H diff --git a/src/plugins/qnx/qnxdeployconfiguration.h b/src/plugins/qnx/qnxdeployconfiguration.h index 8ffedb896c..0af2552c0d 100644 --- a/src/plugins/qnx/qnxdeployconfiguration.h +++ b/src/plugins/qnx/qnxdeployconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEPLOYCONFIGURATION_H -#define QNX_INTERNAL_QNXDEPLOYCONFIGURATION_H +#pragma once #include <remotelinux/remotelinuxdeployconfiguration.h> @@ -47,5 +46,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXDEPLOYCONFIGURATION_H diff --git a/src/plugins/qnx/qnxdeployconfigurationfactory.h b/src/plugins/qnx/qnxdeployconfigurationfactory.h index f6a7edd509..6564470c19 100644 --- a/src/plugins/qnx/qnxdeployconfigurationfactory.h +++ b/src/plugins/qnx/qnxdeployconfigurationfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEPLOYCONFIGURATIONFACTORY_H -#define QNX_INTERNAL_QNXDEPLOYCONFIGURATIONFACTORY_H +#pragma once #include <projectexplorer/deployconfiguration.h> @@ -57,5 +56,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXDEPLOYCONFIGURATIONFACTORY_H diff --git a/src/plugins/qnx/qnxdeployqtlibrariesdialog.h b/src/plugins/qnx/qnxdeployqtlibrariesdialog.h index 29d3496c0b..fa6dc6d6ec 100644 --- a/src/plugins/qnx/qnxdeployqtlibrariesdialog.h +++ b/src/plugins/qnx/qnxdeployqtlibrariesdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEPLOYQTLIBRARIESDIALOG_H -#define QNX_INTERNAL_QNXDEPLOYQTLIBRARIESDIALOG_H +#pragma once #include <QDialog> @@ -100,4 +99,3 @@ private: } // namespace Internal } // namespace Qnx -#endif // QNX_INTERNAL_QNXDEPLOYQTLIBRARIESDIALOG_H diff --git a/src/plugins/qnx/qnxdeploystepfactory.h b/src/plugins/qnx/qnxdeploystepfactory.h index 1e3d2702c6..dc9d6e98a6 100644 --- a/src/plugins/qnx/qnxdeploystepfactory.h +++ b/src/plugins/qnx/qnxdeploystepfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEPLOYSTEPFACTORY_H -#define QNX_INTERNAL_QNXDEPLOYSTEPFACTORY_H +#pragma once #include <projectexplorer/buildstep.h> @@ -55,5 +54,3 @@ public: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXDEPLOYSTEPFACTORY_H diff --git a/src/plugins/qnx/qnxdeviceconfiguration.h b/src/plugins/qnx/qnxdeviceconfiguration.h index e77813fd74..49fc917772 100644 --- a/src/plugins/qnx/qnxdeviceconfiguration.h +++ b/src/plugins/qnx/qnxdeviceconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEVICECONFIGURATION_H -#define QNX_INTERNAL_QNXDEVICECONFIGURATION_H +#pragma once #include "qnx_export.h" @@ -79,5 +78,3 @@ private: }; } // namespace Qnx - -#endif // QNX_INTERNAL_QNXDEVICECONFIGURATION_H diff --git a/src/plugins/qnx/qnxdeviceconfigurationfactory.h b/src/plugins/qnx/qnxdeviceconfigurationfactory.h index a683c18bdd..cfa5b97f15 100644 --- a/src/plugins/qnx/qnxdeviceconfigurationfactory.h +++ b/src/plugins/qnx/qnxdeviceconfigurationfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEVICECONFIGURATIONFACTORY_H -#define QNX_INTERNAL_QNXDEVICECONFIGURATIONFACTORY_H +#pragma once #include <projectexplorer/devicesupport/idevicefactory.h> @@ -51,5 +50,3 @@ public: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXDEVICECONFIGURATIONFACTORY_H diff --git a/src/plugins/qnx/qnxdeviceconfigurationwizard.h b/src/plugins/qnx/qnxdeviceconfigurationwizard.h index a32c15337b..83e8857639 100644 --- a/src/plugins/qnx/qnxdeviceconfigurationwizard.h +++ b/src/plugins/qnx/qnxdeviceconfigurationwizard.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEVICECONFIGURATIONWIZARD_H -#define QNX_INTERNAL_QNXDEVICECONFIGURATIONWIZARD_H +#pragma once #include <projectexplorer/devicesupport/idevice.h> #include <utils/wizard.h> @@ -57,5 +56,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXDEVICECONFIGURATIONWIZARD_H diff --git a/src/plugins/qnx/qnxdeviceconfigurationwizardpages.h b/src/plugins/qnx/qnxdeviceconfigurationwizardpages.h index 2791632ce5..fcd31884f7 100644 --- a/src/plugins/qnx/qnxdeviceconfigurationwizardpages.h +++ b/src/plugins/qnx/qnxdeviceconfigurationwizardpages.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEVICECONFIGURATIONWIZARDPAGES_H -#define QNX_INTERNAL_QNXDEVICECONFIGURATIONWIZARDPAGES_H +#pragma once #include <remotelinux/genericlinuxdeviceconfigurationwizardpages.h> @@ -42,5 +41,3 @@ public: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXDEVICECONFIGURATIONWIZARDPAGES_H diff --git a/src/plugins/qnx/qnxdeviceprocess.h b/src/plugins/qnx/qnxdeviceprocess.h index d425b0600c..6fbb6ac8eb 100644 --- a/src/plugins/qnx/qnxdeviceprocess.h +++ b/src/plugins/qnx/qnxdeviceprocess.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNXDEVICEPROCESS_H -#define QNXDEVICEPROCESS_H +#pragma once #include "qnx_export.h" #include <remotelinux/linuxdevice.h> @@ -50,5 +49,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNXDEVICEPROCESS_H diff --git a/src/plugins/qnx/qnxdeviceprocesslist.h b/src/plugins/qnx/qnxdeviceprocesslist.h index 000d4717ff..47c279e2e9 100644 --- a/src/plugins/qnx/qnxdeviceprocesslist.h +++ b/src/plugins/qnx/qnxdeviceprocesslist.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEVICEPROCESSLIST_H -#define QNX_INTERNAL_QNXDEVICEPROCESSLIST_H +#pragma once #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/devicesupport/sshdeviceprocesslist.h> @@ -47,5 +46,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXDEVICEPROCESSLIST_H diff --git a/src/plugins/qnx/qnxdeviceprocesssignaloperation.h b/src/plugins/qnx/qnxdeviceprocesssignaloperation.h index f161a5167f..9e528a800e 100644 --- a/src/plugins/qnx/qnxdeviceprocesssignaloperation.h +++ b/src/plugins/qnx/qnxdeviceprocesssignaloperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNXDEVICEPROCESSSIGNALOPERATION_H -#define QNXDEVICEPROCESSSIGNALOPERATION_H +#pragma once #include <remotelinux/remotelinuxsignaloperation.h> @@ -48,5 +47,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNXDEVICEPROCESSSIGNALOPERATION_H diff --git a/src/plugins/qnx/qnxdevicetester.h b/src/plugins/qnx/qnxdevicetester.h index 444723e3a1..093eb25a88 100644 --- a/src/plugins/qnx/qnxdevicetester.h +++ b/src/plugins/qnx/qnxdevicetester.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEVICETESTER_H -#define QNX_INTERNAL_QNXDEVICETESTER_H +#pragma once #include <remotelinux/linuxdevicetester.h> @@ -74,5 +73,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXDEVICETESTER_H diff --git a/src/plugins/qnx/qnxplugin.h b/src/plugins/qnx/qnxplugin.h index 9859ddb7dc..1fd1367cb8 100644 --- a/src/plugins/qnx/qnxplugin.h +++ b/src/plugins/qnx/qnxplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXPLUGIN_H -#define QNX_INTERNAL_QNXPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -57,5 +56,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXPLUGIN_H diff --git a/src/plugins/qnx/qnxqtversion.h b/src/plugins/qnx/qnxqtversion.h index 04824849d8..225af67867 100644 --- a/src/plugins/qnx/qnxqtversion.h +++ b/src/plugins/qnx/qnxqtversion.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXQTVERSION_H -#define QNX_INTERNAL_QNXQTVERSION_H +#pragma once #include "qnxconstants.h" #include "qnxqtversion.h" @@ -88,5 +87,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXQTVERSION_H diff --git a/src/plugins/qnx/qnxqtversionfactory.h b/src/plugins/qnx/qnxqtversionfactory.h index 7904859ece..6f565b0184 100644 --- a/src/plugins/qnx/qnxqtversionfactory.h +++ b/src/plugins/qnx/qnxqtversionfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXQTVERSIONFACTORY_H -#define QNX_INTERNAL_QNXQTVERSIONFACTORY_H +#pragma once #include <qtsupport/qtversionfactory.h> @@ -50,5 +49,3 @@ public: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXQTVERSIONFACTORY_H diff --git a/src/plugins/qnx/qnxrunconfiguration.h b/src/plugins/qnx/qnxrunconfiguration.h index 7eadf342fe..f897aefa2a 100644 --- a/src/plugins/qnx/qnxrunconfiguration.h +++ b/src/plugins/qnx/qnxrunconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXRUNCONFIGURATION_H -#define QNX_INTERNAL_QNXRUNCONFIGURATION_H +#pragma once #include <remotelinux/remotelinuxrunconfiguration.h> @@ -55,5 +54,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXRUNCONFIGURATION_H diff --git a/src/plugins/qnx/qnxrunconfigurationfactory.h b/src/plugins/qnx/qnxrunconfigurationfactory.h index 8d1e15d907..5bf5e538be 100644 --- a/src/plugins/qnx/qnxrunconfigurationfactory.h +++ b/src/plugins/qnx/qnxrunconfigurationfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXRUNCONFIGURATIONFACTORY_H -#define QNX_INTERNAL_QNXRUNCONFIGURATIONFACTORY_H +#pragma once #include <projectexplorer/runconfiguration.h> @@ -60,5 +59,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXRUNCONFIGURATIONFACTORY_H diff --git a/src/plugins/qnx/qnxruncontrol.h b/src/plugins/qnx/qnxruncontrol.h index 39b2902091..61985f6daa 100644 --- a/src/plugins/qnx/qnxruncontrol.h +++ b/src/plugins/qnx/qnxruncontrol.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXRUNCONTROL_H -#define QNX_INTERNAL_QNXRUNCONTROL_H +#pragma once #include <remotelinux/remotelinuxruncontrol.h> @@ -50,5 +49,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXRUNCONTROL_H diff --git a/src/plugins/qnx/qnxruncontrolfactory.h b/src/plugins/qnx/qnxruncontrolfactory.h index 003b523e75..af19a7f3dd 100644 --- a/src/plugins/qnx/qnxruncontrolfactory.h +++ b/src/plugins/qnx/qnxruncontrolfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXRUNCONTROLFACTORY_H -#define QNX_INTERNAL_QNXRUNCONTROLFACTORY_H +#pragma once #include <projectexplorer/runconfiguration.h> @@ -46,5 +45,3 @@ public: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXRUNCONTROLFACTORY_H diff --git a/src/plugins/qnx/qnxsettingspage.h b/src/plugins/qnx/qnxsettingspage.h index e23d59ae94..6358f7a25b 100644 --- a/src/plugins/qnx/qnxsettingspage.h +++ b/src/plugins/qnx/qnxsettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNXSETTINGSPAGE_H -#define QNXSETTINGSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> @@ -50,5 +49,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNXSETTINGSPAGE_H diff --git a/src/plugins/qnx/qnxsettingswidget.h b/src/plugins/qnx/qnxsettingswidget.h index 999417a867..879697f688 100644 --- a/src/plugins/qnx/qnxsettingswidget.h +++ b/src/plugins/qnx/qnxsettingswidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNXSETTINGSWIDGET_H -#define QNXSETTINGSWIDGET_H +#pragma once #include <QWidget> @@ -89,5 +88,3 @@ private: } } - -#endif // QNXSETTINGSWIDGET_H diff --git a/src/plugins/qnx/qnxtoolchain.h b/src/plugins/qnx/qnxtoolchain.h index b1bbac7d33..8314b9f62f 100644 --- a/src/plugins/qnx/qnxtoolchain.h +++ b/src/plugins/qnx/qnxtoolchain.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNXTOOLCHAIN_H -#define QNXTOOLCHAIN_H +#pragma once #include <projectexplorer/gcctoolchain.h> #include <projectexplorer/gcctoolchainfactories.h> @@ -102,5 +101,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNXTOOLCHAIN_H diff --git a/src/plugins/qnx/qnxutils.h b/src/plugins/qnx/qnxutils.h index 9169ea8b3a..f62c50ed37 100644 --- a/src/plugins/qnx/qnxutils.h +++ b/src/plugins/qnx/qnxutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXUTILS_H -#define QNX_INTERNAL_QNXUTILS_H +#pragma once #include "qnxconstants.h" @@ -74,5 +73,3 @@ public: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXUTILS_H diff --git a/src/plugins/qnx/qnxversionnumber.h b/src/plugins/qnx/qnxversionnumber.h index 5dfa93c09b..9b619df651 100644 --- a/src/plugins/qnx/qnxversionnumber.h +++ b/src/plugins/qnx/qnxversionnumber.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_VERSION_NUMBER_H -#define QNX_VERSION_NUMBER_H +#pragma once #include <QStringList> @@ -54,5 +53,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_VERSION_NUMBER_H diff --git a/src/plugins/qnx/slog2inforunner.h b/src/plugins/qnx/slog2inforunner.h index 4fbcfaa672..4e08b5f950 100644 --- a/src/plugins/qnx/slog2inforunner.h +++ b/src/plugins/qnx/slog2inforunner.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_SLOG2INFORUNNER_H -#define QNX_INTERNAL_SLOG2INFORUNNER_H +#pragma once #include <QObject> @@ -86,5 +85,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_SLOG2INFORUNNER_H diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index 5bada03e60..c50497601d 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BASEQTVERSION_H -#define BASEQTVERSION_H +#pragma once #include "qtsupport_global.h" @@ -304,4 +303,3 @@ private: } Q_DECLARE_OPERATORS_FOR_FLAGS(QtSupport::BaseQtVersion::QmakeBuildConfigs) -#endif // BASEQTVERSION_H diff --git a/src/plugins/qtsupport/codegenerator.h b/src/plugins/qtsupport/codegenerator.h index d52da62a6d..dd916518cb 100644 --- a/src/plugins/qtsupport/codegenerator.h +++ b/src/plugins/qtsupport/codegenerator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CODEGENERATOR_H -#define CODEGENERATOR_H +#pragma once #include "qtsupport_global.h" @@ -54,5 +53,3 @@ public: }; } // namespace QtSupport - -#endif // CODEGENERATOR_H diff --git a/src/plugins/qtsupport/codegensettings.h b/src/plugins/qtsupport/codegensettings.h index b9d0e78a57..a5973683a2 100644 --- a/src/plugins/qtsupport/codegensettings.h +++ b/src/plugins/qtsupport/codegensettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CODEGENSETTINGS_H -#define CODEGENSETTINGS_H +#pragma once #include "qtsupport_global.h" @@ -59,5 +58,3 @@ inline bool operator==(const CodeGenSettings &p1, const CodeGenSettings &p2) { r inline bool operator!=(const CodeGenSettings &p1, const CodeGenSettings &p2) { return !p1.equals(p2); } } // namespace QtSupport - -#endif // CODEGENSETTINGS_H diff --git a/src/plugins/qtsupport/codegensettingspage.h b/src/plugins/qtsupport/codegensettingspage.h index 83a9c3a584..73a053ca5b 100644 --- a/src/plugins/qtsupport/codegensettingspage.h +++ b/src/plugins/qtsupport/codegensettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CODEGENSETTINGSPAGE_H -#define CODEGENSETTINGSPAGE_H +#pragma once #include "ui_codegensettingspagewidget.h" @@ -69,5 +68,3 @@ private: } // namespace Internal } // namespace QtSupport - -#endif // CODEGENSETTINGSPAGE_H diff --git a/src/plugins/qtsupport/customexecutableconfigurationwidget.h b/src/plugins/qtsupport/customexecutableconfigurationwidget.h index 10e3a031ec..fe247de069 100644 --- a/src/plugins/qtsupport/customexecutableconfigurationwidget.h +++ b/src/plugins/qtsupport/customexecutableconfigurationwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CUSTOMEXECUTABLECONFIGURATIONWIDGET_H -#define CUSTOMEXECUTABLECONFIGURATIONWIDGET_H +#pragma once #include <QWidget> @@ -83,5 +82,3 @@ private: } // namespace Internal } // namespace QtSupport - -#endif // CUSTOMEXECUTABLECONFIGURATIONWIDGET_H diff --git a/src/plugins/qtsupport/customexecutablerunconfiguration.h b/src/plugins/qtsupport/customexecutablerunconfiguration.h index 0b980ded78..b7370a0911 100644 --- a/src/plugins/qtsupport/customexecutablerunconfiguration.h +++ b/src/plugins/qtsupport/customexecutablerunconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CUSTOMEXECUTABLERUNCONFIGURATION_H -#define CUSTOMEXECUTABLERUNCONFIGURATION_H +#pragma once #include "qtsupport_global.h" @@ -123,5 +122,3 @@ private: }; } // namespace QtSupport - -#endif // CUSTOMEXECUTABLERUNCONFIGURATION_H diff --git a/src/plugins/qtsupport/desktopqtversion.h b/src/plugins/qtsupport/desktopqtversion.h index 9aff38fe53..9ce26f74c5 100644 --- a/src/plugins/qtsupport/desktopqtversion.h +++ b/src/plugins/qtsupport/desktopqtversion.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DESKTOPQTVERSION_H -#define DESKTOPQTVERSION_H +#pragma once #include "baseqtversion.h" @@ -52,5 +51,3 @@ public: } // Internal } // QtSupport - -#endif // DESKTOPQTVERSION_H diff --git a/src/plugins/qtsupport/desktopqtversionfactory.h b/src/plugins/qtsupport/desktopqtversionfactory.h index 332498eb4d..6c29ceb886 100644 --- a/src/plugins/qtsupport/desktopqtversionfactory.h +++ b/src/plugins/qtsupport/desktopqtversionfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DESKTOPQTVERSIONFACTORY_H -#define DESKTOPQTVERSIONFACTORY_H +#pragma once #include "qtversionfactory.h" @@ -46,5 +45,3 @@ public: } // Internal } // QtSupport - -#endif // DESKTOPQTVERSIONFACTORY_H diff --git a/src/plugins/qtsupport/exampleslistmodel.h b/src/plugins/qtsupport/exampleslistmodel.h index 228aafc676..1c25b3a642 100644 --- a/src/plugins/qtsupport/exampleslistmodel.h +++ b/src/plugins/qtsupport/exampleslistmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EXAMPLESLISTMODEL_H -#define EXAMPLESLISTMODEL_H +#pragma once #include <QAbstractListModel> #include <QSortFilterProxyModel> @@ -236,7 +235,3 @@ private: } // namespace Internal } // namespace QtSupport - -#endif // EXAMPLESLISTMODEL_H - - diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.h b/src/plugins/qtsupport/gettingstartedwelcomepage.h index 72a75634bf..689e75fb4a 100644 --- a/src/plugins/qtsupport/gettingstartedwelcomepage.h +++ b/src/plugins/qtsupport/gettingstartedwelcomepage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GETTINGSTARTEDWELCOMEPAGE_H -#define GETTINGSTARTEDWELCOMEPAGE_H +#pragma once #include <coreplugin/iwelcomepage.h> @@ -72,5 +71,3 @@ private: } // namespace Internal } // namespace QtSupport - -#endif // GETTINGSTARTEDWELCOMEPAGE_H diff --git a/src/plugins/qtsupport/profilereader.h b/src/plugins/qtsupport/profilereader.h index 890463bd73..9c750c60b9 100644 --- a/src/plugins/qtsupport/profilereader.h +++ b/src/plugins/qtsupport/profilereader.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROFILEREADER_H -#define PROFILEREADER_H +#pragma once #include "qtsupport_global.h" @@ -113,5 +112,3 @@ private: }; } // namespace QtSupport - -#endif // PROFILEREADER_H diff --git a/src/plugins/qtsupport/qmldumptool.h b/src/plugins/qtsupport/qmldumptool.h index 6905563ac9..a3568475cc 100644 --- a/src/plugins/qtsupport/qmldumptool.h +++ b/src/plugins/qtsupport/qmldumptool.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMLDUMPTOOL_H -#define QMLDUMPTOOL_H +#pragma once #include "qtsupport_global.h" @@ -52,5 +51,3 @@ public: }; } // namespace - -#endif // QMLDUMPTOOL_H diff --git a/src/plugins/qtsupport/qtconfigwidget.h b/src/plugins/qtsupport/qtconfigwidget.h index d81f95c35d..1518463829 100644 --- a/src/plugins/qtsupport/qtconfigwidget.h +++ b/src/plugins/qtsupport/qtconfigwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTCONFIGWIDGET_H -#define QTCONFIGWIDGET_H +#pragma once #include "qtsupport_global.h" @@ -41,5 +40,3 @@ signals: void changed(); }; } // namespace QtSupport - -#endif // QTCONFIGWIDGET_H diff --git a/src/plugins/qtsupport/qtkitconfigwidget.h b/src/plugins/qtsupport/qtkitconfigwidget.h index 9035b2b86e..8ab1a950a9 100644 --- a/src/plugins/qtsupport/qtkitconfigwidget.h +++ b/src/plugins/qtsupport/qtkitconfigwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTSUPPORT_QTKITCONFIGWIDGET_H -#define QTSUPPORT_QTKITCONFIGWIDGET_H +#pragma once #include <projectexplorer/kitconfigwidget.h> @@ -67,5 +66,3 @@ private: } // namespace Internal } // namespace Debugger - -#endif // QTSUPPORT_QTYSTEMCONFIGWIDGET_H diff --git a/src/plugins/qtsupport/qtkitinformation.h b/src/plugins/qtsupport/qtkitinformation.h index 2dd7ecc55a..2dd08ca4fd 100644 --- a/src/plugins/qtsupport/qtkitinformation.h +++ b/src/plugins/qtsupport/qtkitinformation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTSUPPORT_QTKITINFORMATION_H -#define QTSUPPORT_QTKITINFORMATION_H +#pragma once #include "qtsupport_global.h" @@ -80,5 +79,3 @@ private slots: }; } // namespace QtSupport - -#endif // QTSUPPORT_QTKITINFORMATION_H diff --git a/src/plugins/qtsupport/qtoptionspage.h b/src/plugins/qtsupport/qtoptionspage.h index 710f5f37ae..99c3804a7e 100644 --- a/src/plugins/qtsupport/qtoptionspage.h +++ b/src/plugins/qtsupport/qtoptionspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTOPTIONSPAGE_H -#define QTOPTIONSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> #include <utils/fileutils.h> @@ -141,6 +140,3 @@ private: } //namespace Internal } //namespace QtSupport - - -#endif // QTOPTIONSPAGE_H diff --git a/src/plugins/qtsupport/qtoutputformatter.h b/src/plugins/qtsupport/qtoutputformatter.h index 3c0daaaef6..0d184ad8d8 100644 --- a/src/plugins/qtsupport/qtoutputformatter.h +++ b/src/plugins/qtsupport/qtoutputformatter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTOUTPUTFORMATTER_H -#define QTOUTPUTFORMATTER_H +#pragma once #include "qtsupport_global.h" @@ -83,5 +82,3 @@ private: } // namespace QtSupport - -#endif // QTOUTPUTFORMATTER_H diff --git a/src/plugins/qtsupport/qtparser.h b/src/plugins/qtsupport/qtparser.h index 20bfff9293..91b74a4aaa 100644 --- a/src/plugins/qtsupport/qtparser.h +++ b/src/plugins/qtsupport/qtparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTPARSER_H -#define QTPARSER_H +#pragma once #include "qtsupport_global.h" #include <projectexplorer/ioutputparser.h> @@ -47,5 +46,3 @@ private: }; } // namespace ProjectExplorer - -#endif // QTPARSER_H diff --git a/src/plugins/qtsupport/qtsupport_global.h b/src/plugins/qtsupport/qtsupport_global.h index fec90a4c85..993bfcdb08 100644 --- a/src/plugins/qtsupport/qtsupport_global.h +++ b/src/plugins/qtsupport/qtsupport_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTSUPPORT_GLOBAL_H -#define QTSUPPORT_GLOBAL_H +#pragma once #include <qglobal.h> @@ -33,5 +32,3 @@ #else # define QTSUPPORT_EXPORT Q_DECL_IMPORT #endif - -#endif diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h index 551e201c2e..e9c0c61005 100644 --- a/src/plugins/qtsupport/qtsupportconstants.h +++ b/src/plugins/qtsupport/qtsupportconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTSUPPORTCONSTANTS_H -#define QTSUPPORTCONSTANTS_H +#pragma once namespace QtSupport { namespace Constants { @@ -64,5 +63,3 @@ const char ICON_QT_PROJECT[] = ":/qtsupport/images/qt_project.png"; } // namepsace Constants } // namepsace QtSupport - -#endif // QTSUPPORTCONSTANTS_H diff --git a/src/plugins/qtsupport/qtsupportplugin.h b/src/plugins/qtsupport/qtsupportplugin.h index d8f9247143..e62791533b 100644 --- a/src/plugins/qtsupport/qtsupportplugin.h +++ b/src/plugins/qtsupport/qtsupportplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTSUPPORTPLUGIN_H -#define QTSUPPORTPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -56,5 +55,3 @@ private slots: } // namespace Internal } // namespace QtSupport - -#endif // QTSUPPORTPLUGIN_H diff --git a/src/plugins/qtsupport/qtversionfactory.h b/src/plugins/qtsupport/qtversionfactory.h index e2c5ebc3c0..d789717408 100644 --- a/src/plugins/qtsupport/qtversionfactory.h +++ b/src/plugins/qtsupport/qtversionfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTVERSIONFACTORY_H -#define QTVERSIONFACTORY_H +#pragma once #include "qtsupport_global.h" @@ -63,5 +62,3 @@ public: }; } // namespace QtSupport - -#endif // QTVERSIONFACTORY_H diff --git a/src/plugins/qtsupport/qtversionmanager.h b/src/plugins/qtsupport/qtversionmanager.h index 6333083878..eedbcc0823 100644 --- a/src/plugins/qtsupport/qtversionmanager.h +++ b/src/plugins/qtsupport/qtversionmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTVERSIONMANAGER_H -#define QTVERSIONMANAGER_H +#pragma once #include "qtsupport_global.h" #include "baseqtversion.h" @@ -86,5 +85,3 @@ private: }; } // namespace QtSupport - -#endif // QTVERSIONMANAGER_H diff --git a/src/plugins/qtsupport/screenshotcropper.h b/src/plugins/qtsupport/screenshotcropper.h index 75508538d9..5fb493bc7d 100644 --- a/src/plugins/qtsupport/screenshotcropper.h +++ b/src/plugins/qtsupport/screenshotcropper.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SCREENSHOTCROPPER_H -#define SCREENSHOTCROPPER_H +#pragma once #include <QMap> #include <QRect> @@ -43,5 +42,3 @@ public: } // namespace Internal } // namespace QtSupport - -#endif // SCREENSHOTCROPPER_H diff --git a/src/plugins/qtsupport/uicgenerator.h b/src/plugins/qtsupport/uicgenerator.h index c7ce3d58c4..b0253eb73c 100644 --- a/src/plugins/qtsupport/uicgenerator.h +++ b/src/plugins/qtsupport/uicgenerator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UICGENERATOR_H -#define UICGENERATOR_H +#pragma once #include <projectexplorer/extracompiler.h> #include <utils/fileutils.h> @@ -62,4 +61,3 @@ public: }; } // QtSupport -#endif // UICGENERATOR_H diff --git a/src/plugins/qtsupport/winceqtversion.h b/src/plugins/qtsupport/winceqtversion.h index 954202c0c7..42ff5bd749 100644 --- a/src/plugins/qtsupport/winceqtversion.h +++ b/src/plugins/qtsupport/winceqtversion.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINCEQTVERSION_H -#define WINCEQTVERSION_H +#pragma once #include "baseqtversion.h" @@ -56,5 +55,3 @@ private: } // Internal } // QtSupport - -#endif // WINCEQTVERSION_H diff --git a/src/plugins/qtsupport/winceqtversionfactory.h b/src/plugins/qtsupport/winceqtversionfactory.h index 93937c36ac..0199f28ab6 100644 --- a/src/plugins/qtsupport/winceqtversionfactory.h +++ b/src/plugins/qtsupport/winceqtversionfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINCEQTVERSIONFACTORY_H -#define WINCEQTVERSIONFACTORY_H +#pragma once #include "qtversionfactory.h" @@ -49,5 +48,3 @@ public: } // Internal } // QtSupport - -#endif // WINCEQTVERSIONFACTORY_H diff --git a/src/plugins/remotelinux/abstractpackagingstep.h b/src/plugins/remotelinux/abstractpackagingstep.h index fbf8575d51..5b3dfb9cc0 100644 --- a/src/plugins/remotelinux/abstractpackagingstep.h +++ b/src/plugins/remotelinux/abstractpackagingstep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ABSTRACTPACKAGINGSTEP_H -#define ABSTRACTPACKAGINGSTEP_H +#pragma once #include "remotelinux_export.h" @@ -77,5 +76,3 @@ private: }; } // namespace RemoteLinux - -#endif // ABSTRACTPACKAGINGSTEP_H diff --git a/src/plugins/remotelinux/abstractremotelinuxdeployservice.h b/src/plugins/remotelinux/abstractremotelinuxdeployservice.h index d21f9e25d7..769d572ac2 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeployservice.h +++ b/src/plugins/remotelinux/abstractremotelinuxdeployservice.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ABSTRACTREMOTELINUXDEPLOYSERVICE_H -#define ABSTRACTREMOTELINUXDEPLOYSERVICE_H +#pragma once #include "remotelinux_export.h" @@ -104,5 +103,3 @@ private: }; } // namespace RemoteLinux - -#endif // ABSTRACTREMOTELINUXDEPLOYSERVICE_H diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h index 65534555d1..12d8fd547c 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h +++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ABSTRACTREMOTELINUXDEPLOYSTEP_H -#define ABSTRACTREMOTELINUXDEPLOYSTEP_H +#pragma once #include "remotelinux_export.h" @@ -74,5 +73,3 @@ private: }; } // namespace RemoteLinux - -#endif // ABSTRACTREMOTELINUXDEPLOYSTEP_H diff --git a/src/plugins/remotelinux/abstractremotelinuxrunsupport.h b/src/plugins/remotelinux/abstractremotelinuxrunsupport.h index 7db1a6f7a1..e2e4611d03 100644 --- a/src/plugins/remotelinux/abstractremotelinuxrunsupport.h +++ b/src/plugins/remotelinux/abstractremotelinuxrunsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ABSTRACTREMOTELINUXRUNSUPPORT_H -#define ABSTRACTREMOTELINUXRUNSUPPORT_H +#pragma once #include "remotelinux_export.h" @@ -94,5 +93,3 @@ private: }; } // namespace RemoteLinux - -#endif // ABSTRACTREMOTELINUXRUNSUPPORT_H diff --git a/src/plugins/remotelinux/abstractuploadandinstallpackageservice.h b/src/plugins/remotelinux/abstractuploadandinstallpackageservice.h index c24349a883..d646323639 100644 --- a/src/plugins/remotelinux/abstractuploadandinstallpackageservice.h +++ b/src/plugins/remotelinux/abstractuploadandinstallpackageservice.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ABSTRACTUPLOADANDINSTALLPACKAGESERVICE_H -#define ABSTRACTUPLOADANDINSTALLPACKAGESERVICE_H +#pragma once #include "abstractremotelinuxdeployservice.h" #include "remotelinux_export.h" @@ -67,5 +66,3 @@ private: }; } // namespace RemoteLinux - -#endif // ABSTRACTUPLOADANDINSTALLPACKAGESERVICE_H diff --git a/src/plugins/remotelinux/embeddedlinuxqtversion.h b/src/plugins/remotelinux/embeddedlinuxqtversion.h index 72520dd712..6bad126f28 100644 --- a/src/plugins/remotelinux/embeddedlinuxqtversion.h +++ b/src/plugins/remotelinux/embeddedlinuxqtversion.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EMBEDDEDLINUXQTVERSION_H -#define EMBEDDEDLINUXQTVERSION_H +#pragma once #include <qtsupport/baseqtversion.h> @@ -50,5 +49,3 @@ public: } // namespace Internal } // namespace RemoteLinux - -#endif // EMBEDDEDLINUXQTVERSION_H diff --git a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h index e6248aecb4..2c48501941 100644 --- a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h +++ b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef EMBEDDEDLINUXQTVERSIONFACTORY_H -#define EMBEDDEDLINUXQTVERSIONFACTORY_H +#pragma once #include <qtsupport/qtversionfactory.h> @@ -48,5 +47,3 @@ public: } // Internal } // RemoteLinux - -#endif // EMBEDDEDLINUXQTVERSIONFACTORY_H diff --git a/src/plugins/remotelinux/genericdirectuploadservice.h b/src/plugins/remotelinux/genericdirectuploadservice.h index 1b9b63c179..a015bc6500 100644 --- a/src/plugins/remotelinux/genericdirectuploadservice.h +++ b/src/plugins/remotelinux/genericdirectuploadservice.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GERNERICDIRECTDEVICEUPLOADSERVICE_H -#define GERNERICDIRECTDEVICEUPLOADSERVICE_H +#pragma once #include "abstractremotelinuxdeployservice.h" #include "remotelinux_export.h" @@ -79,5 +78,3 @@ private: }; } //namespace RemoteLinux - -#endif // GERNERICDIRECTDEVICEUPLOADSERVICE_H diff --git a/src/plugins/remotelinux/genericdirectuploadstep.h b/src/plugins/remotelinux/genericdirectuploadstep.h index 0169ca1136..2ed99b2c18 100644 --- a/src/plugins/remotelinux/genericdirectuploadstep.h +++ b/src/plugins/remotelinux/genericdirectuploadstep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DIRECTUPLOADSTEP_H -#define DIRECTUPLOADSTEP_H +#pragma once #include "abstractremotelinuxdeploystep.h" #include "genericdirectuploadservice.h" @@ -65,5 +64,3 @@ private: }; } //namespace RemoteLinux - -#endif // DIRECTUPLOADSTEP_H diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.h index a82e1de00d..e00bbebf56 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.h +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GENERICLINUXDEVICECONFIGURATIONFACTORY_H -#define GENERICLINUXDEVICECONFIGURATIONFACTORY_H +#pragma once #include "remotelinux_export.h" @@ -49,5 +48,3 @@ public: }; } // namespace RemoteLinux - -#endif // GENERICLINUXDEVICECONFIGURATIONFACTORY_H diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h index a45b8f6b16..5017439cfe 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUX_GENERICLINUXDEVICECONFIGURATIONWIDGET_H -#define REMOTELINUX_GENERICLINUXDEVICECONFIGURATIONWIDGET_H +#pragma once #include <projectexplorer/devicesupport/idevicewidget.h> @@ -68,5 +67,3 @@ private: }; } // namespace RemoteLinux - -#endif // REMOTELINUX_GENERICLINUXDEVICECONFIGURATIONWIDGET_H diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h index 64a3581515..5db089bb6a 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GENERICLINUXDEVICECONFIGURATIONWIZARD_H -#define GENERICLINUXDEVICECONFIGURATIONWIZARD_H +#pragma once #include "remotelinux_export.h" @@ -49,5 +48,3 @@ private: }; } // namespace RemoteLinux - -#endif // GENERICLINUXDEVICECONFIGURATIONWIZARD_H diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h index 93af5921d0..88e5ea315e 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GENERICLINUXDEVICECONFIGURATIONWIZARDPAGES_H -#define GENERICLINUXDEVICECONFIGURATIONWIZARDPAGES_H +#pragma once #include "remotelinux_export.h" @@ -85,5 +84,3 @@ private: }; } // namespace RemoteLinux - -#endif // GENERICLINUXDEVICECONFIGURATIONWIZARDPAGES_H diff --git a/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.h b/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.h index 812a2c9e91..939f071b1f 100644 --- a/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.h +++ b/src/plugins/remotelinux/genericremotelinuxdeploystepfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GENERICREMOTELINUXDEPLOYSTEPFACTORY_H -#define GENERICREMOTELINUXDEPLOYSTEPFACTORY_H +#pragma once #include <projectexplorer/buildstep.h> @@ -52,5 +51,3 @@ public: } // namespace Internal } // namespace RemoteLinux - -#endif // GENERICREMOTELINUXDEPLOYSTEPFACTORY_H diff --git a/src/plugins/remotelinux/linuxdevice.h b/src/plugins/remotelinux/linuxdevice.h index 7a5f752024..c834bfa519 100644 --- a/src/plugins/remotelinux/linuxdevice.h +++ b/src/plugins/remotelinux/linuxdevice.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LINUXDEVICECONFIGURATION_H -#define LINUXDEVICECONFIGURATION_H +#pragma once #include "remotelinux_export.h" @@ -78,5 +77,3 @@ private: }; } // namespace RemoteLinux - -#endif // LINUXDEVICECONFIGURATION_H diff --git a/src/plugins/remotelinux/linuxdeviceprocess.h b/src/plugins/remotelinux/linuxdeviceprocess.h index 8f1e2acfcb..9948d6ad07 100644 --- a/src/plugins/remotelinux/linuxdeviceprocess.h +++ b/src/plugins/remotelinux/linuxdeviceprocess.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTC_LINUXDEVICEPROCESS_H -#define QTC_LINUXDEVICEPROCESS_H +#pragma once #include "remotelinux_export.h" @@ -53,5 +52,3 @@ private: }; } // namespace RemoteLinux - -#endif // Include guard. diff --git a/src/plugins/remotelinux/linuxdevicetester.h b/src/plugins/remotelinux/linuxdevicetester.h index bf055e3127..e06e4d5448 100644 --- a/src/plugins/remotelinux/linuxdevicetester.h +++ b/src/plugins/remotelinux/linuxdevicetester.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LINUXDEVICETESTER_H -#define LINUXDEVICETESTER_H +#pragma once #include "remotelinux_export.h" @@ -65,5 +64,3 @@ private: }; } // namespace RemoteLinux - -#endif // LINUXDEVICETESTER_H diff --git a/src/plugins/remotelinux/packageuploader.h b/src/plugins/remotelinux/packageuploader.h index 74e3b514a6..dce0d864ba 100644 --- a/src/plugins/remotelinux/packageuploader.h +++ b/src/plugins/remotelinux/packageuploader.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PACKAGEUPLOADER_H -#define PACKAGEUPLOADER_H +#pragma once #include <QObject> #include <QSharedPointer> @@ -77,5 +76,3 @@ private: } // namespace Internal } // namespace RemoteLinux - -#endif // PACKAGEUPLOADER_H diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.h b/src/plugins/remotelinux/publickeydeploymentdialog.h index 2c0b7a1278..94e5c4b3f4 100644 --- a/src/plugins/remotelinux/publickeydeploymentdialog.h +++ b/src/plugins/remotelinux/publickeydeploymentdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PUBLICKEYDEPLOYMENTDIALOG_H -#define PUBLICKEYDEPLOYMENTDIALOG_H +#pragma once #include "remotelinux_export.h" @@ -59,5 +58,3 @@ private: }; } // namespace RemoteLinux - -#endif // PUBLICKEYDEPLOYMENTDIALOG_H diff --git a/src/plugins/remotelinux/remotelinux_constants.h b/src/plugins/remotelinux/remotelinux_constants.h index 37914faf30..43bd85fe87 100644 --- a/src/plugins/remotelinux/remotelinux_constants.h +++ b/src/plugins/remotelinux/remotelinux_constants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUX_CONSTANTS_H -#define REMOTELINUX_CONSTANTS_H +#pragma once namespace RemoteLinux { namespace Constants { @@ -37,5 +36,3 @@ const char EMBEDDED_LINUX_QT[] = "RemoteLinux.EmbeddedLinuxQt"; } // Constants } // RemoteLinux - -#endif // REMOTELINUX_CONSTANTS_H diff --git a/src/plugins/remotelinux/remotelinux_export.h b/src/plugins/remotelinux/remotelinux_export.h index 46b3b17c0a..e9df11a1f0 100644 --- a/src/plugins/remotelinux/remotelinux_export.h +++ b/src/plugins/remotelinux/remotelinux_export.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTE_LINUX_EXPORT_H -#define REMOTE_LINUX_EXPORT_H +#pragma once #include <qglobal.h> @@ -33,5 +32,3 @@ #else # define REMOTELINUX_EXPORT Q_DECL_IMPORT #endif - -#endif // REMOTE_LINUX_EXPORT_H diff --git a/src/plugins/remotelinux/remotelinuxanalyzesupport.h b/src/plugins/remotelinux/remotelinuxanalyzesupport.h index de083d38bc..ca93bcdda5 100644 --- a/src/plugins/remotelinux/remotelinuxanalyzesupport.h +++ b/src/plugins/remotelinux/remotelinuxanalyzesupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXANALYZESUPPORT_H -#define REMOTELINUXANALYZESUPPORT_H +#pragma once #include "abstractremotelinuxrunsupport.h" @@ -71,5 +70,3 @@ private: }; } // namespace RemoteLinux - -#endif // REMOTELINUXANALYZESUPPORT_H diff --git a/src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.h b/src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.h index 0c016c0a22..945cf564e5 100644 --- a/src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.h +++ b/src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXCHECKFORFREEDISKSPACESERVICE_H -#define REMOTELINUXCHECKFORFREEDISKSPACESERVICE_H +#pragma once #include "abstractremotelinuxdeployservice.h" @@ -60,5 +59,3 @@ private: }; } // namespace RemoteLinux - -#endif // REMOTELINUXCHECKFORFREEDISKSPACESERVICE_H diff --git a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h b/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h index 1e78f5ba76..102e494be9 100644 --- a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h +++ b/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXCHECKFORFREEDISKSPACESTEP_H -#define REMOTELINUXCHECKFORFREEDISKSPACESTEP_H +#pragma once #include "abstractremotelinuxdeploystep.h" @@ -65,5 +64,3 @@ private: }; } // namespace RemoteLinux - -#endif // REMOTELINUXCHECKFORFREEDISKSPACESTEP_H diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h index 7bfdc70af4..fd2ca29e87 100644 --- a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h +++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXCUSTOMCOMMANDDEPLOYMENTSTEP_H -#define REMOTELINUXCUSTOMCOMMANDDEPLOYMENTSTEP_H +#pragma once #include "abstractremotelinuxdeploystep.h" #include "remotelinuxcustomcommanddeployservice.h" @@ -87,5 +86,3 @@ private: }; } // namespace RemoteLinux - -#endif // REMOTELINUXCUSTOMCOMMANDDEPLOYMENTSTEP_H diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h index 5c17efd5f1..ddb84698d9 100644 --- a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h +++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXCUSTOMCOMMANDDEPLOYSERVICE_H -#define REMOTELINUXCUSTOMCOMMANDDEPLOYSERVICE_H +#pragma once #include "abstractremotelinuxdeployservice.h" @@ -60,5 +59,3 @@ private: }; } // namespace RemoteLinux - -#endif // REMOTELINUXCUSTOMCOMMANDDEPLOYSERVICE_H diff --git a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h index 2bd4ebcbc4..be97dad96c 100644 --- a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h +++ b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXCUSTOMRUNCONFIGURATION_H -#define REMOTELINUXCUSTOMRUNCONFIGURATION_H +#pragma once #include <projectexplorer/runconfiguration.h> @@ -69,5 +68,3 @@ private: } // namespace Internal } // namespace RemoteLinux - -#endif // Include guard. diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.h b/src/plugins/remotelinux/remotelinuxdebugsupport.h index 390cac3379..a9f03f42de 100644 --- a/src/plugins/remotelinux/remotelinuxdebugsupport.h +++ b/src/plugins/remotelinux/remotelinuxdebugsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXDEBUGSUPPORT_H -#define REMOTELINUXDEBUGSUPPORT_H +#pragma once #include "abstractremotelinuxrunsupport.h" @@ -66,5 +65,3 @@ private: }; } // namespace RemoteLinux - -#endif // REMOTELINUXDEBUGSUPPORT_H diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h index eada2371a2..409113ee2a 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h +++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXDEPLOYCONFIGURATION_H -#define REMOTELINUXDEPLOYCONFIGURATION_H +#pragma once #include "remotelinux_export.h" @@ -64,5 +63,3 @@ private: }; } // namespace RemoteLinux - -#endif // REMOTELINUXDEPLOYCONFIGURATION_H diff --git a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.h b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.h index 485d4bd279..762d981f2a 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.h +++ b/src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXDEPLOYCONFIGURATIONFACTORY_H -#define REMOTELINUXDEPLOYCONFIGURATIONFACTORY_H +#pragma once #include <projectexplorer/deployconfiguration.h> @@ -53,5 +52,3 @@ public: } // namespace Internal } // namespace RemoteLinux - -#endif // REMOTELINUXDEPLOYCONFIGURATIONFACTORY_H diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspect.h b/src/plugins/remotelinux/remotelinuxenvironmentaspect.h index 5e431afec6..02a4cbf119 100644 --- a/src/plugins/remotelinux/remotelinuxenvironmentaspect.h +++ b/src/plugins/remotelinux/remotelinuxenvironmentaspect.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXENVIRONMENTASPECT_H -#define REMOTELINUXENVIRONMENTASPECT_H +#pragma once #include "remotelinux_export.h" @@ -61,5 +60,3 @@ private: }; } // namespace RemoteLinux - -#endif // REMOTELINUXENVIRONMENTASPECT_H diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.h b/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.h index f7d6c7e081..92bfe29628 100644 --- a/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.h +++ b/src/plugins/remotelinux/remotelinuxenvironmentaspectwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXENVIRONMENTASPECTWIDGET_H -#define REMOTELINUXENVIRONMENTASPECTWIDGET_H +#pragma once #include "remotelinuxenvironmentaspect.h" @@ -57,5 +56,3 @@ private: }; } // namespace RemoteLinux - -#endif // REMOTELINUXENVIRONMENTASPECTWIDGET_H diff --git a/src/plugins/remotelinux/remotelinuxenvironmentreader.h b/src/plugins/remotelinux/remotelinuxenvironmentreader.h index d1fd34e469..99db24ee08 100644 --- a/src/plugins/remotelinux/remotelinuxenvironmentreader.h +++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXENVIRONMENTREADER_H -#define REMOTELINUXENVIRONMENTREADER_H +#pragma once #include <utils/environment.h> @@ -72,5 +71,3 @@ private: } // namespace Internal } // namespace RemoteLinux - -#endif // REMOTELINUXENVIRONMENTREADER_H diff --git a/src/plugins/remotelinux/remotelinuxpackageinstaller.h b/src/plugins/remotelinux/remotelinuxpackageinstaller.h index 53533247ca..aa4a836df1 100644 --- a/src/plugins/remotelinux/remotelinuxpackageinstaller.h +++ b/src/plugins/remotelinux/remotelinuxpackageinstaller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXPACKAGEINSTALLER_H -#define REMOTELINUXPACKAGEINSTALLER_H +#pragma once #include "remotelinux_export.h" @@ -85,5 +84,3 @@ private: } // namespace RemoteLinux - -#endif // REMOTELINUXPACKAGEINSTALLER_H diff --git a/src/plugins/remotelinux/remotelinuxplugin.h b/src/plugins/remotelinux/remotelinuxplugin.h index 83b1161129..aa35482d2f 100644 --- a/src/plugins/remotelinux/remotelinuxplugin.h +++ b/src/plugins/remotelinux/remotelinuxplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXPLUGIN_H -#define REMOTELINUXPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -46,5 +45,3 @@ public: } // namespace Internal } // namespace RemoteLinux - -#endif // REMOTELINUXPLUGIN_H diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.h b/src/plugins/remotelinux/remotelinuxrunconfiguration.h index 2b16107527..ab23002b8f 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfiguration.h +++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXRUNCONFIGURATION_H -#define REMOTELINUXRUNCONFIGURATION_H +#pragma once #include "remotelinux_export.h" @@ -103,5 +102,3 @@ private: }; } // namespace RemoteLinux - -#endif // REMOTELINUXRUNCONFIGURATION_H diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h index a6ed022327..88cbee3d28 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXRUNCONFIGURATIONFACTORY_H -#define REMOTELINUXRUNCONFIGURATIONFACTORY_H +#pragma once #include <projectexplorer/runconfiguration.h> @@ -59,5 +58,3 @@ private: } // namespace Internal } // namespace RemoteLinux - -#endif // REMOTELINUXRUNCONFIGURATIONFACTORY_H diff --git a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h index e8544bad76..18ae8ef2b3 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h +++ b/src/plugins/remotelinux/remotelinuxrunconfigurationwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXRUNCONFIGURATIONWIDGET_H -#define REMOTELINUXRUNCONFIGURATIONWIDGET_H +#pragma once #include "remotelinux_export.h" @@ -69,5 +68,3 @@ private: }; } // namespace RemoteLinux - -#endif // REMOTELINUXRUNCONFIGURATIONWIDGET_H diff --git a/src/plugins/remotelinux/remotelinuxruncontrol.h b/src/plugins/remotelinux/remotelinuxruncontrol.h index 2f5fe92551..b8b680b628 100644 --- a/src/plugins/remotelinux/remotelinuxruncontrol.h +++ b/src/plugins/remotelinux/remotelinuxruncontrol.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXRUNCONTROL_H -#define REMOTELINUXRUNCONTROL_H +#pragma once #include "remotelinux_export.h" @@ -58,5 +57,3 @@ private: }; } // namespace RemoteLinux - -#endif // REMOTELINUXRUNCONTROL_H diff --git a/src/plugins/remotelinux/remotelinuxruncontrolfactory.h b/src/plugins/remotelinux/remotelinuxruncontrolfactory.h index effffcc235..6256fa80a8 100644 --- a/src/plugins/remotelinux/remotelinuxruncontrolfactory.h +++ b/src/plugins/remotelinux/remotelinuxruncontrolfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXRUNCONTROLFACTORY_H -#define REMOTELINUXRUNCONTROLFACTORY_H +#pragma once #include <projectexplorer/runconfiguration.h> @@ -45,5 +44,3 @@ public: } // namespace Internal } // namespace RemoteLinux - -#endif // REMOTELINUXRUNCONTROLFACTORY_H diff --git a/src/plugins/remotelinux/remotelinuxsignaloperation.h b/src/plugins/remotelinux/remotelinuxsignaloperation.h index 5bd32df836..e52c15cf41 100644 --- a/src/plugins/remotelinux/remotelinuxsignaloperation.h +++ b/src/plugins/remotelinux/remotelinuxsignaloperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXSIGNALOPERATION_H -#define REMOTELINUXSIGNALOPERATION_H +#pragma once #include "remotelinux_export.h" @@ -68,5 +67,3 @@ private: }; } - -#endif // REMOTELINUXSIGNALOPERATION_H diff --git a/src/plugins/remotelinux/remotelinuxutils.h b/src/plugins/remotelinux/remotelinuxutils.h index 69332d8162..57aec1d442 100644 --- a/src/plugins/remotelinux/remotelinuxutils.h +++ b/src/plugins/remotelinux/remotelinuxutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REMOTELINUXUTILS_H -#define REMOTELINUXUTILS_H +#pragma once #include "remotelinux_export.h" @@ -36,5 +35,3 @@ public: }; } // namespace RemoteLinux - -#endif // REMOTELINUXUTILS_H diff --git a/src/plugins/remotelinux/sshkeydeployer.h b/src/plugins/remotelinux/sshkeydeployer.h index d671e94d87..8da128006a 100644 --- a/src/plugins/remotelinux/sshkeydeployer.h +++ b/src/plugins/remotelinux/sshkeydeployer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SSHKEYDEPLOYER_H -#define SSHKEYDEPLOYER_H +#pragma once #include "remotelinux_export.h" @@ -62,5 +61,3 @@ private: }; } // namespace RemoteLinux - -#endif // SSHKEYDEPLOYER_H diff --git a/src/plugins/remotelinux/tarpackagecreationstep.h b/src/plugins/remotelinux/tarpackagecreationstep.h index d0d313100f..cef63817b1 100644 --- a/src/plugins/remotelinux/tarpackagecreationstep.h +++ b/src/plugins/remotelinux/tarpackagecreationstep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TARPACKAGECREATIONSTEP_H -#define TARPACKAGECREATIONSTEP_H +#pragma once #include "abstractpackagingstep.h" #include "remotelinux_export.h" @@ -74,5 +73,3 @@ private: }; } // namespace RemoteLinux - -#endif // TARPACKAGECREATIONSTEP_H diff --git a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h index 74f445378d..69ded3a6d6 100644 --- a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h +++ b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TYPESPECIFICDEVICECONFIGURATIONLISTMODEL_H -#define TYPESPECIFICDEVICECONFIGURATIONLISTMODEL_H +#pragma once #include <projectexplorer/devicesupport/idevice.h> @@ -56,5 +55,3 @@ private: } // namespace Internal } // namespace RemoteLinux - -#endif // TYPESPECIFICDEVICECONFIGURATIONLISTMODEL_H diff --git a/src/plugins/remotelinux/uploadandinstalltarpackagestep.h b/src/plugins/remotelinux/uploadandinstalltarpackagestep.h index 846bbf21bc..5ac669de4a 100644 --- a/src/plugins/remotelinux/uploadandinstalltarpackagestep.h +++ b/src/plugins/remotelinux/uploadandinstalltarpackagestep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UPLOADANDINSTALLTARPACKAGESTEP_H -#define UPLOADANDINSTALLTARPACKAGESTEP_H +#pragma once #include "abstractuploadandinstallpackageservice.h" #include "abstractremotelinuxdeploystep.h" @@ -74,5 +73,3 @@ private: }; } //namespace RemoteLinux - -#endif // UPLOADANDINSTALLTARPACKAGESTEP_H diff --git a/src/plugins/resourceeditor/qrceditor/qrceditor.h b/src/plugins/resourceeditor/qrceditor/qrceditor.h index 235758368b..512d35a2ac 100644 --- a/src/plugins/resourceeditor/qrceditor/qrceditor.h +++ b/src/plugins/resourceeditor/qrceditor/qrceditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QRCEDITOR_H -#define QRCEDITOR_H +#pragma once #include "ui_qrceditor.h" #include "resourceview.h" @@ -95,5 +94,3 @@ private: } // namespace Internal } // namespace ResourceEditor - -#endif diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile_p.h b/src/plugins/resourceeditor/qrceditor/resourcefile_p.h index d4b2b2827a..3e58cb4133 100644 --- a/src/plugins/resourceeditor/qrceditor/resourcefile_p.h +++ b/src/plugins/resourceeditor/qrceditor/resourcefile_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RESOURCEFILE_P_H -#define RESOURCEFILE_P_H +#pragma once #include <QAbstractItemModel> #include <QCoreApplication> @@ -328,5 +327,3 @@ private: } // namespace Internal } // namespace ResourceEditor - -#endif // RESOURCEFILE_P_H diff --git a/src/plugins/resourceeditor/qrceditor/resourceview.h b/src/plugins/resourceeditor/qrceditor/resourceview.h index ba0f0c61a3..59e4d43418 100644 --- a/src/plugins/resourceeditor/qrceditor/resourceview.h +++ b/src/plugins/resourceeditor/qrceditor/resourceview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RESOURCEVIEW_H -#define RESOURCEVIEW_H +#pragma once #include "resourcefile_p.h" @@ -116,5 +115,3 @@ private: } // namespace Internal } // namespace ResourceEditor - -#endif // RESOURCEVIEW_H diff --git a/src/plugins/resourceeditor/qrceditor/test/mainwindow.h b/src/plugins/resourceeditor/qrceditor/test/mainwindow.h index 3ffff967b8..a6e619c7e0 100644 --- a/src/plugins/resourceeditor/qrceditor/test/mainwindow.h +++ b/src/plugins/resourceeditor/qrceditor/test/mainwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MAINWINDOW_H -#define MAINWINDOW_H +#pragma once #include <QMainWindow> @@ -44,5 +43,3 @@ private slots: private: SharedTools::QrcEditor *m_qrcEditor; }; - -#endif // MAINWINDOW_H diff --git a/src/plugins/resourceeditor/qrceditor/undocommands_p.h b/src/plugins/resourceeditor/qrceditor/undocommands_p.h index ea85282da4..fac2a2d05d 100644 --- a/src/plugins/resourceeditor/qrceditor/undocommands_p.h +++ b/src/plugins/resourceeditor/qrceditor/undocommands_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UNDO_COMMANDS_H -#define UNDO_COMMANDS_H +#pragma once #include "resourceview.h" @@ -173,5 +172,3 @@ private: } // namespace Internal } // namespace ResourceEditor - -#endif // UNDO_COMMANDS_H diff --git a/src/plugins/resourceeditor/resource_global.h b/src/plugins/resourceeditor/resource_global.h index ac19f427fb..7fffa85432 100644 --- a/src/plugins/resourceeditor/resource_global.h +++ b/src/plugins/resourceeditor/resource_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RESOUCE_GLOBAL_H -#define RESOUCE_GLOBAL_H +#pragma once #include <qglobal.h> @@ -33,5 +32,3 @@ #else # define RESOURCE_EXPORT Q_DECL_IMPORT #endif - -#endif // RESOUCE_GLOBAL_H diff --git a/src/plugins/resourceeditor/resourceeditorconstants.h b/src/plugins/resourceeditor/resourceeditorconstants.h index 2713320c73..b0f9b3ebf5 100644 --- a/src/plugins/resourceeditor/resourceeditorconstants.h +++ b/src/plugins/resourceeditor/resourceeditorconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RESOURCEEDITOR_CONSTANTS_H -#define RESOURCEEDITOR_CONSTANTS_H +#pragma once namespace ResourceEditor { namespace Constants { @@ -50,8 +49,5 @@ const char C_OPEN_EDITOR[] = "ResourceEditor.OpenEditor"; const char C_COPY_PATH[] = "ResourceEditor.CopyPath"; const char C_COPY_URL[] = "ResourceEditor.CopyUrl"; - } // namespace Constants } // namespace ResourceEditor - -#endif // RESOURCEEDITOR_CONSTANTS_H diff --git a/src/plugins/resourceeditor/resourceeditorfactory.h b/src/plugins/resourceeditor/resourceeditorfactory.h index 7ea0c587e4..3b954df68f 100644 --- a/src/plugins/resourceeditor/resourceeditorfactory.h +++ b/src/plugins/resourceeditor/resourceeditorfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RRESOURCEEDITORFACTORY_H -#define RRESOURCEEDITORFACTORY_H +#pragma once #include <coreplugin/editormanager/ieditorfactory.h> #include <coreplugin/icontext.h> @@ -51,5 +50,3 @@ private: } // namespace Internal } // namespace ResourceEditor - -#endif // RRESOURCEEDITORFACTORY_H diff --git a/src/plugins/resourceeditor/resourceeditorplugin.h b/src/plugins/resourceeditor/resourceeditorplugin.h index 4f8202f6dd..d8cb020654 100644 --- a/src/plugins/resourceeditor/resourceeditorplugin.h +++ b/src/plugins/resourceeditor/resourceeditorplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RESOURCEEDITORPLUGIN_H -#define RESOURCEEDITORPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -108,5 +107,3 @@ private: } // namespace Internal } // namespace ResourceEditor - -#endif // RESOURCEEDITORPLUGIN_H diff --git a/src/plugins/resourceeditor/resourceeditorw.h b/src/plugins/resourceeditor/resourceeditorw.h index 0ba85ca38e..3d8d139e3c 100644 --- a/src/plugins/resourceeditor/resourceeditorw.h +++ b/src/plugins/resourceeditor/resourceeditorw.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RESOURCEEDITORW_H -#define RESOURCEEDITORW_H +#pragma once #include <coreplugin/idocument.h> #include <coreplugin/editormanager/ieditor.h> @@ -127,5 +126,3 @@ public: } // namespace Internal } // namespace ResourceEditor - -#endif // RESOURCEEDITORW_H diff --git a/src/plugins/resourceeditor/resourcenode.h b/src/plugins/resourceeditor/resourcenode.h index b6bed770bf..528f1879f5 100644 --- a/src/plugins/resourceeditor/resourcenode.h +++ b/src/plugins/resourceeditor/resourcenode.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RESOURCENODE_H -#define RESOURCENODE_H +#pragma once #include "resource_global.h" #include <projectexplorer/projectnodes.h> @@ -175,5 +174,3 @@ private: }; } // namespace Internal } // namespace ResourceEditor - -#endif // RESOUCENODE_H diff --git a/src/plugins/subversion/annotationhighlighter.h b/src/plugins/subversion/annotationhighlighter.h index f9c471367c..44cbeff72f 100644 --- a/src/plugins/subversion/annotationhighlighter.h +++ b/src/plugins/subversion/annotationhighlighter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ANNOTATIONHIGHLIGHTER_H -#define ANNOTATIONHIGHLIGHTER_H +#pragma once #include <vcsbase/baseannotationhighlighter.h> @@ -47,5 +46,3 @@ private: } // namespace Internal } // namespace Subversion - -#endif // ANNOTATIONHIGHLIGHTER_H diff --git a/src/plugins/subversion/settingspage.h b/src/plugins/subversion/settingspage.h index bd81e3c9ef..afb0c6a879 100644 --- a/src/plugins/subversion/settingspage.h +++ b/src/plugins/subversion/settingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SETTINGSPAGE_H -#define SETTINGSPAGE_H +#pragma once #include "ui_settingspage.h" @@ -66,5 +65,3 @@ public: } // namespace Subversion } // namespace Internal - -#endif // SETTINGSPAGE_H diff --git a/src/plugins/subversion/subversionclient.h b/src/plugins/subversion/subversionclient.h index 604de6d415..a5e3d98277 100644 --- a/src/plugins/subversion/subversionclient.h +++ b/src/plugins/subversion/subversionclient.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SUBVERSIONCLIENT_H -#define SUBVERSIONCLIENT_H +#pragma once #include "subversionsettings.h" #include <vcsbase/vcsbaseclient.h> @@ -85,5 +84,3 @@ private: } // namespace Internal } // namespace Subversion - -#endif // SUBVERSIONCLIENT_H diff --git a/src/plugins/subversion/subversionconstants.h b/src/plugins/subversion/subversionconstants.h index 60afd37a2b..5b52cbbb90 100644 --- a/src/plugins/subversion/subversionconstants.h +++ b/src/plugins/subversion/subversionconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SUBVERSION_CONSTANTS_H -#define SUBVERSION_CONSTANTS_H +#pragma once #include <QtGlobal> @@ -53,5 +52,3 @@ const char DIFF_SELECTED[] = "Subversion.DiffSelectedFilesInLog"; } // namespace Constants } // namespace Subversion - -#endif // SUBVERSION_CONSTANTS_H diff --git a/src/plugins/subversion/subversioncontrol.h b/src/plugins/subversion/subversioncontrol.h index 73c62bad28..9f244fd529 100644 --- a/src/plugins/subversion/subversioncontrol.h +++ b/src/plugins/subversion/subversioncontrol.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SUBVERSIONCONTROL_H -#define SUBVERSIONCONTROL_H +#pragma once #include <coreplugin/iversioncontrol.h> @@ -69,5 +68,3 @@ private: } // namespace Internal } // namespace Subversion - -#endif // SUBVERSIONCONTROL_H diff --git a/src/plugins/subversion/subversioneditor.h b/src/plugins/subversion/subversioneditor.h index 119cdb2c0f..6b2446ffde 100644 --- a/src/plugins/subversion/subversioneditor.h +++ b/src/plugins/subversion/subversioneditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SUBVERSIONEDITOR_H -#define SUBVERSIONEDITOR_H +#pragma once #include <vcsbase/vcsbaseeditor.h> @@ -53,5 +52,3 @@ private: } // namespace Internal } // namespace Subversion - -#endif // SUBVERSIONEDITOR_H diff --git a/src/plugins/subversion/subversionplugin.h b/src/plugins/subversion/subversionplugin.h index 9c537d77d1..f06a1a9201 100644 --- a/src/plugins/subversion/subversionplugin.h +++ b/src/plugins/subversion/subversionplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SUBVERSIONPLUGIN_H -#define SUBVERSIONPLUGIN_H +#pragma once #include "subversionsettings.h" @@ -181,5 +180,3 @@ private: } // namespace Subversion } // namespace Internal - -#endif // SUBVERSIONPLUGIN_H diff --git a/src/plugins/subversion/subversionsettings.h b/src/plugins/subversion/subversionsettings.h index f2f94ef7fb..81dbeb15f8 100644 --- a/src/plugins/subversion/subversionsettings.h +++ b/src/plugins/subversion/subversionsettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SUBVERSIONSETTINGS_H -#define SUBVERSIONSETTINGS_H +#pragma once #include <vcsbase/vcsbaseclientsettings.h> @@ -50,5 +49,3 @@ protected: } // namespace Internal } // namespace Subversion - -#endif // SUBVERSIONSETTINGS_H diff --git a/src/plugins/subversion/subversionsubmiteditor.h b/src/plugins/subversion/subversionsubmiteditor.h index 860af1a843..27b0918cef 100644 --- a/src/plugins/subversion/subversionsubmiteditor.h +++ b/src/plugins/subversion/subversionsubmiteditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SUBVERSIONSUBMITEDITOR_H -#define SUBVERSIONSUBMITEDITOR_H +#pragma once #include <vcsbase/vcsbasesubmiteditor.h> @@ -52,5 +51,3 @@ public: } // namespace Internal } // namespace Subversion - -#endif // SUBVERSIONSUBMITEDITOR_H diff --git a/src/plugins/tasklist/stopmonitoringhandler.h b/src/plugins/tasklist/stopmonitoringhandler.h index af9be37ee4..b257c330c0 100644 --- a/src/plugins/tasklist/stopmonitoringhandler.h +++ b/src/plugins/tasklist/stopmonitoringhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef STOPMONITORINGHANDLER_H -#define STOPMONITORINGHANDLER_H +#pragma once #include <projectexplorer/itaskhandler.h> @@ -43,5 +42,3 @@ public: } // namespace Internal } // namespace TaskList - -#endif // STOPMONITORINGHANDLER_H diff --git a/src/plugins/tasklist/taskfile.h b/src/plugins/tasklist/taskfile.h index 11bfce115b..eaaf638829 100644 --- a/src/plugins/tasklist/taskfile.h +++ b/src/plugins/tasklist/taskfile.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TASKFILE_H -#define TASKFILE_H +#pragma once #include <coreplugin/idocument.h> @@ -46,5 +45,3 @@ public: } // namespace Internal } // namespace TaskList - -#endif // TASKFILE_H diff --git a/src/plugins/tasklist/tasklistconstants.h b/src/plugins/tasklist/tasklistconstants.h index 0b6a1c2174..77b44f7766 100644 --- a/src/plugins/tasklist/tasklistconstants.h +++ b/src/plugins/tasklist/tasklistconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TASKLIST_TASKLISTCONSTANTS_H -#define TASKLIST_TASKLISTCONSTANTS_H +#pragma once namespace TaskList { namespace Constants { @@ -33,5 +32,3 @@ const char TASKLISTTASK_ID[] = "TaskList.TaskListTaskId"; } // namespace Constants } // namespace TaskList - -#endif // TASKLIST_TASKLISTCONSTANTS_H diff --git a/src/plugins/tasklist/tasklistplugin.h b/src/plugins/tasklist/tasklistplugin.h index ef79914ac5..ec6bbd2af8 100644 --- a/src/plugins/tasklist/tasklistplugin.h +++ b/src/plugins/tasklist/tasklistplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TASKLISTPLUGIN_H -#define TASKLISTPLUGIN_H +#pragma once #include <coreplugin/idocumentfactory.h> #include <extensionsystem/iplugin.h> @@ -64,5 +63,3 @@ private: } // namespace Internal } // namespace TaskList - -#endif // TASKLISTPLUGIN_H diff --git a/src/plugins/texteditor/autocompleter.h b/src/plugins/texteditor/autocompleter.h index 6122b4d8e3..49c6586abe 100644 --- a/src/plugins/texteditor/autocompleter.h +++ b/src/plugins/texteditor/autocompleter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef AUTOCOMPLETER_H -#define AUTOCOMPLETER_H +#pragma once #include "texteditor_global.h" @@ -90,5 +89,3 @@ private: }; } // TextEditor - -#endif // AUTOCOMPLETER_H diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h index a39d1f3643..428296c3ec 100644 --- a/src/plugins/texteditor/basefilefind.h +++ b/src/plugins/texteditor/basefilefind.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BASEFILEFIND_H -#define BASEFILEFIND_H +#pragma once #include "texteditor_global.h" #include "utils/filesearch.h" @@ -139,5 +138,3 @@ private: } // namespace TextEditor Q_DECLARE_METATYPE(TextEditor::FileFindParameters) - -#endif // BASEFILEFIND_H diff --git a/src/plugins/texteditor/basehoverhandler.h b/src/plugins/texteditor/basehoverhandler.h index 91e5e4e38d..7a5334e3a8 100644 --- a/src/plugins/texteditor/basehoverhandler.h +++ b/src/plugins/texteditor/basehoverhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BASEHOVERHANDLER_H -#define BASEHOVERHANDLER_H +#pragma once #include "texteditor_global.h" #include "helpitem.h" @@ -86,5 +85,3 @@ private: }; } // namespace TextEditor - -#endif // BASEHOVERHANDLER_H diff --git a/src/plugins/texteditor/behaviorsettings.h b/src/plugins/texteditor/behaviorsettings.h index f45fd4a9c0..a6818d0479 100644 --- a/src/plugins/texteditor/behaviorsettings.h +++ b/src/plugins/texteditor/behaviorsettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEHAVIORSETTINGS_H -#define BEHAVIORSETTINGS_H +#pragma once #include "texteditor_global.h" @@ -66,5 +65,3 @@ inline bool operator==(const BehaviorSettings &t1, const BehaviorSettings &t2) { inline bool operator!=(const BehaviorSettings &t1, const BehaviorSettings &t2) { return !t1.equals(t2); } } // namespace TextEditor - -#endif // BEHAVIORSETTINGS_H diff --git a/src/plugins/texteditor/behaviorsettingspage.h b/src/plugins/texteditor/behaviorsettingspage.h index fe7cdae09b..42e70f6972 100644 --- a/src/plugins/texteditor/behaviorsettingspage.h +++ b/src/plugins/texteditor/behaviorsettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEHAVIORSETTINGSPAGE_H -#define BEHAVIORSETTINGSPAGE_H +#pragma once #include "texteditor_global.h" @@ -90,5 +89,3 @@ private: }; } // namespace TextEditor - -#endif // BEHAVIORSETTINGSPAGE_H diff --git a/src/plugins/texteditor/behaviorsettingswidget.h b/src/plugins/texteditor/behaviorsettingswidget.h index 6e8f33fd0b..12c4b7eedd 100644 --- a/src/plugins/texteditor/behaviorsettingswidget.h +++ b/src/plugins/texteditor/behaviorsettingswidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BEHAVIORSETTINGSWIDGET_H -#define BEHAVIORSETTINGSWIDGET_H +#pragma once #include "texteditor_global.h" @@ -93,5 +92,3 @@ private: }; } // TextEditor - -#endif // BEHAVIORSETTINGSWIDGET_H diff --git a/src/plugins/texteditor/blockrange.h b/src/plugins/texteditor/blockrange.h index 9f821031f3..43449cdc6c 100644 --- a/src/plugins/texteditor/blockrange.h +++ b/src/plugins/texteditor/blockrange.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BLOCKRANGE_H -#define BLOCKRANGE_H +#pragma once namespace TextEditor { @@ -58,5 +57,3 @@ private: }; } // namespace TextEditor - -#endif // BLOCKRANGE_H diff --git a/src/plugins/texteditor/circularclipboard.h b/src/plugins/texteditor/circularclipboard.h index 23178ac5a1..e888f32c2f 100644 --- a/src/plugins/texteditor/circularclipboard.h +++ b/src/plugins/texteditor/circularclipboard.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CIRCULARCLIPBOARD_H -#define CIRCULARCLIPBOARD_H +#pragma once #include <QList> #include <QMimeData> @@ -55,5 +54,3 @@ private: } // namespace Internal } // namespace TextEditor - -#endif // CIRCULARCLIPBOARD_H diff --git a/src/plugins/texteditor/circularclipboardassist.h b/src/plugins/texteditor/circularclipboardassist.h index 4064cd4a45..d8d37c72cc 100644 --- a/src/plugins/texteditor/circularclipboardassist.h +++ b/src/plugins/texteditor/circularclipboardassist.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CIRCULARCLIPBOARDASSIST_H -#define CIRCULARCLIPBOARDASSIST_H +#pragma once #include "codeassist/iassistprovider.h" @@ -42,5 +41,3 @@ public: } // namespace Internal } // namespace TextEditor - -#endif // CIRCULARCLIPBOARDASSIST_H diff --git a/src/plugins/texteditor/codeassist/assistenums.h b/src/plugins/texteditor/codeassist/assistenums.h index d1e068c7f3..2a5995526d 100644 --- a/src/plugins/texteditor/codeassist/assistenums.h +++ b/src/plugins/texteditor/codeassist/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/src/plugins/texteditor/codeassist/assistinterface.h b/src/plugins/texteditor/codeassist/assistinterface.h index 0431ff7363..5daa611dee 100644 --- a/src/plugins/texteditor/codeassist/assistinterface.h +++ b/src/plugins/texteditor/codeassist/assistinterface.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IASSISTINTERFACE_H -#define IASSISTINTERFACE_H +#pragma once #include "assistenums.h" @@ -67,5 +66,3 @@ private: }; } // namespace TextEditor - -#endif // IASSISTINTERFACE_H diff --git a/src/plugins/texteditor/codeassist/assistproposalitem.h b/src/plugins/texteditor/codeassist/assistproposalitem.h index 914115bd21..8d957a2f81 100644 --- a/src/plugins/texteditor/codeassist/assistproposalitem.h +++ b/src/plugins/texteditor/codeassist/assistproposalitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IASSISTPROPOSALITEM_H -#define IASSISTPROPOSALITEM_H +#pragma once #include <texteditor/texteditor_global.h> @@ -74,5 +73,3 @@ private: }; } // namespace TextEditor - -#endif // BASICPROPOSALITEM_H diff --git a/src/plugins/texteditor/codeassist/assistproposaliteminterface.h b/src/plugins/texteditor/codeassist/assistproposaliteminterface.h index a195cd9585..d85c7a2ccc 100644 --- a/src/plugins/texteditor/codeassist/assistproposaliteminterface.h +++ b/src/plugins/texteditor/codeassist/assistproposaliteminterface.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTEDITOR_ASSISTPROPOSALITEMINTERFACE_H -#define TEXTEDITOR_ASSISTPROPOSALITEMINTERFACE_H +#pragma once #include "textdocumentmanipulatorinterface.h" @@ -68,5 +67,3 @@ private: }; } // namespace TextEditor - -#endif // TEXTEDITOR_ASSISTPROPOSALITEMINTERFACE_H diff --git a/src/plugins/texteditor/codeassist/codeassistant.h b/src/plugins/texteditor/codeassist/codeassistant.h index c6f327617c..f1babd4582 100644 --- a/src/plugins/texteditor/codeassist/codeassistant.h +++ b/src/plugins/texteditor/codeassist/codeassistant.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CODEASSISTANT_H -#define CODEASSISTANT_H +#pragma once #include "assistenums.h" @@ -65,5 +64,3 @@ private: }; } //TextEditor - -#endif // CODEASSISTANT_H diff --git a/src/plugins/texteditor/codeassist/completionassistprovider.h b/src/plugins/texteditor/codeassist/completionassistprovider.h index 29061312b2..c0c150b3ea 100644 --- a/src/plugins/texteditor/codeassist/completionassistprovider.h +++ b/src/plugins/texteditor/codeassist/completionassistprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMPLETIONASSISTPROVIDER_H -#define COMPLETIONASSISTPROVIDER_H +#pragma once #include "iassistprovider.h" @@ -46,5 +45,3 @@ public: }; } // TextEditor - -#endif // COMPLETIONASSISTPROVIDER_H diff --git a/src/plugins/texteditor/codeassist/functionhintproposal.h b/src/plugins/texteditor/codeassist/functionhintproposal.h index 87b77e771a..fc3fd2dad7 100644 --- a/src/plugins/texteditor/codeassist/functionhintproposal.h +++ b/src/plugins/texteditor/codeassist/functionhintproposal.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FUNCTIONHINTPROPOSAL_H -#define FUNCTIONHINTPROPOSAL_H +#pragma once #include "iassistproposal.h" @@ -52,5 +51,3 @@ private: }; } // TextEditor - -#endif // FUNCTIONHINTPROPOSAL_H diff --git a/src/plugins/texteditor/codeassist/functionhintproposalwidget.h b/src/plugins/texteditor/codeassist/functionhintproposalwidget.h index cb9e284b4c..d42d1e3e69 100644 --- a/src/plugins/texteditor/codeassist/functionhintproposalwidget.h +++ b/src/plugins/texteditor/codeassist/functionhintproposalwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FUNCTIONHINTPROPOSALWIDGET_H -#define FUNCTIONHINTPROPOSALWIDGET_H +#pragma once #include "iassistproposalwidget.h" @@ -69,5 +68,3 @@ private: }; } // TextEditor - -#endif // FUNCTIONHINTPROPOSALWIDGET_H diff --git a/src/plugins/texteditor/codeassist/genericproposal.h b/src/plugins/texteditor/codeassist/genericproposal.h index 87da2ec56b..50b6a8e594 100644 --- a/src/plugins/texteditor/codeassist/genericproposal.h +++ b/src/plugins/texteditor/codeassist/genericproposal.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GENERICPROPOSAL_H -#define GENERICPROPOSAL_H +#pragma once #include "iassistproposal.h" @@ -57,5 +56,3 @@ private: }; } // TextEditor - -#endif // GENERICPROPOSAL_H diff --git a/src/plugins/texteditor/codeassist/genericproposalmodel.h b/src/plugins/texteditor/codeassist/genericproposalmodel.h index 0f27ca4659..07f04209fe 100644 --- a/src/plugins/texteditor/codeassist/genericproposalmodel.h +++ b/src/plugins/texteditor/codeassist/genericproposalmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IGENERICPROPOSALMODEL_H -#define IGENERICPROPOSALMODEL_H +#pragma once #include "iassistproposalmodel.h" #include "assistenums.h" @@ -75,5 +74,3 @@ private: QList<AssistProposalItemInterface *> m_originalItems; }; } // TextEditor - -#endif // IGENERICPROPOSALMODEL_H diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.h b/src/plugins/texteditor/codeassist/genericproposalwidget.h index d160627bb1..016a3b952b 100644 --- a/src/plugins/texteditor/codeassist/genericproposalwidget.h +++ b/src/plugins/texteditor/codeassist/genericproposalwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GENERICPROPOSALWIDGET_H -#define GENERICPROPOSALWIDGET_H +#pragma once #include "iassistproposalwidget.h" @@ -75,5 +74,3 @@ private: }; } // TextEditor - -#endif // GENERICPROPOSALWIDGET_H diff --git a/src/plugins/texteditor/codeassist/iassistprocessor.h b/src/plugins/texteditor/codeassist/iassistprocessor.h index 95ac3371d3..d2c618ac4b 100644 --- a/src/plugins/texteditor/codeassist/iassistprocessor.h +++ b/src/plugins/texteditor/codeassist/iassistprocessor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IASSISTPROCESSOR_H -#define IASSISTPROCESSOR_H +#pragma once #include <texteditor/texteditor_global.h> @@ -60,5 +59,3 @@ private: }; } // TextEditor - -#endif // IASSISTPROCESSOR_H diff --git a/src/plugins/texteditor/codeassist/iassistproposal.h b/src/plugins/texteditor/codeassist/iassistproposal.h index c74710b122..c4ce1299a5 100644 --- a/src/plugins/texteditor/codeassist/iassistproposal.h +++ b/src/plugins/texteditor/codeassist/iassistproposal.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IASSISTPROPOSAL_H -#define IASSISTPROPOSAL_H +#pragma once #include <texteditor/texteditor_global.h> @@ -49,5 +48,3 @@ public: }; } // TextEditor - -#endif // IASSISTPROPOSAL_H diff --git a/src/plugins/texteditor/codeassist/iassistproposalmodel.h b/src/plugins/texteditor/codeassist/iassistproposalmodel.h index 32f4d2bee2..7519636393 100644 --- a/src/plugins/texteditor/codeassist/iassistproposalmodel.h +++ b/src/plugins/texteditor/codeassist/iassistproposalmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IASSISTPROPOSALMODEL_H -#define IASSISTPROPOSALMODEL_H +#pragma once #include <texteditor/texteditor_global.h> @@ -46,5 +45,3 @@ public: }; } // TextEditor - -#endif // IASSISTPROPOSALMODEL_H diff --git a/src/plugins/texteditor/codeassist/iassistproposalwidget.h b/src/plugins/texteditor/codeassist/iassistproposalwidget.h index c64147d78d..2f2f6e8bf6 100644 --- a/src/plugins/texteditor/codeassist/iassistproposalwidget.h +++ b/src/plugins/texteditor/codeassist/iassistproposalwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IASSISTPROPOSALWIDGET_H -#define IASSISTPROPOSALWIDGET_H +#pragma once #include "assistenums.h" @@ -65,5 +64,3 @@ signals: }; } // TextEditor - -#endif // IASSISTPROPOSALWIDGET_H diff --git a/src/plugins/texteditor/codeassist/iassistprovider.h b/src/plugins/texteditor/codeassist/iassistprovider.h index eef1fded0f..3be7a77cd0 100644 --- a/src/plugins/texteditor/codeassist/iassistprovider.h +++ b/src/plugins/texteditor/codeassist/iassistprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IASSISTPROVIDER_H -#define IASSISTPROVIDER_H +#pragma once #include <texteditor/texteditor_global.h> @@ -54,5 +53,3 @@ public: }; } // TextEditor - -#endif // IASSISTPROVIDER_H diff --git a/src/plugins/texteditor/codeassist/ifunctionhintproposalmodel.h b/src/plugins/texteditor/codeassist/ifunctionhintproposalmodel.h index 6a9b9b3ac0..1af6bf1219 100644 --- a/src/plugins/texteditor/codeassist/ifunctionhintproposalmodel.h +++ b/src/plugins/texteditor/codeassist/ifunctionhintproposalmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IFUNCTIONHINTPROPOSALMODEL_H -#define IFUNCTIONHINTPROPOSALMODEL_H +#pragma once #include "iassistproposalmodel.h" @@ -42,5 +41,3 @@ public: }; } // TextEditor - -#endif // IFUNCTIONHINTPROPOSALMODEL_H diff --git a/src/plugins/texteditor/codeassist/keywordscompletionassist.h b/src/plugins/texteditor/codeassist/keywordscompletionassist.h index 68e7246e68..30a22336e3 100644 --- a/src/plugins/texteditor/codeassist/keywordscompletionassist.h +++ b/src/plugins/texteditor/codeassist/keywordscompletionassist.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef KEYWORDSCOMPLETIONASSIST_H -#define KEYWORDSCOMPLETIONASSIST_H +#pragma once #include "iassistprocessor.h" #include "assistproposalitem.h" @@ -105,5 +104,3 @@ private: }; } // TextEditor - -#endif // KEYWORDSCOMPLETIONASSISTPROCESSOR_H diff --git a/src/plugins/texteditor/codeassist/quickfixassistprocessor.h b/src/plugins/texteditor/codeassist/quickfixassistprocessor.h index 0ff320c9da..c418cfb02c 100644 --- a/src/plugins/texteditor/codeassist/quickfixassistprocessor.h +++ b/src/plugins/texteditor/codeassist/quickfixassistprocessor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QUICKFIXASSISTPROCESSOR_H -#define QUICKFIXASSISTPROCESSOR_H +#pragma once #include "iassistprocessor.h" @@ -45,5 +44,3 @@ private: }; } // TextEditor - -#endif // QUICKFIXASSISTPROCESSOR_H diff --git a/src/plugins/texteditor/codeassist/quickfixassistprovider.h b/src/plugins/texteditor/codeassist/quickfixassistprovider.h index 01214d2d90..6a480ca2c9 100644 --- a/src/plugins/texteditor/codeassist/quickfixassistprovider.h +++ b/src/plugins/texteditor/codeassist/quickfixassistprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QUICKFIXASSISTPROVIDER_H -#define QUICKFIXASSISTPROVIDER_H +#pragma once #include "iassistprovider.h" @@ -46,5 +45,3 @@ public: }; } // TextEditor - -#endif // QUICKFIXASSISTPROVIDER_H diff --git a/src/plugins/texteditor/codeassist/runner.h b/src/plugins/texteditor/codeassist/runner.h index 05aebaf929..2c33eeed6c 100644 --- a/src/plugins/texteditor/codeassist/runner.h +++ b/src/plugins/texteditor/codeassist/runner.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROCESSORRUNNER_H -#define PROCESSORRUNNER_H +#pragma once #include "iassistproposalwidget.h" @@ -68,5 +67,3 @@ private: } // Internal } // TextEditor - -#endif // PROCESSORRUNNER_H diff --git a/src/plugins/texteditor/codeassist/textdocumentmanipulator.h b/src/plugins/texteditor/codeassist/textdocumentmanipulator.h index 9ca59576aa..8b4547f113 100644 --- a/src/plugins/texteditor/codeassist/textdocumentmanipulator.h +++ b/src/plugins/texteditor/codeassist/textdocumentmanipulator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTDOCUMENTMANIPULATOR_H -#define TEXTDOCUMENTMANIPULATOR_H +#pragma once #include "textdocumentmanipulatorinterface.h" @@ -59,5 +58,3 @@ private: }; } // namespace TextEditor - -#endif // TEXTDOCUMENTMANIPULATOR_H diff --git a/src/plugins/texteditor/codeassist/textdocumentmanipulatorinterface.h b/src/plugins/texteditor/codeassist/textdocumentmanipulatorinterface.h index 400214c1f6..62c6489fb5 100644 --- a/src/plugins/texteditor/codeassist/textdocumentmanipulatorinterface.h +++ b/src/plugins/texteditor/codeassist/textdocumentmanipulatorinterface.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTDOCUMENTMANIPULATORINTERFACE_H -#define TEXTDOCUMENTMANIPULATORINTERFACE_H +#pragma once #include <texteditor/texteditor_global.h> @@ -56,5 +55,3 @@ public: }; } // namespace TextEditor - -#endif // TEXTDOCUMENTMANIPULATORINTERFACE_H diff --git a/src/plugins/texteditor/codecselector.h b/src/plugins/texteditor/codecselector.h index a7e28be9e6..4bd84eb4c4 100644 --- a/src/plugins/texteditor/codecselector.h +++ b/src/plugins/texteditor/codecselector.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CODECSELECTOR_H -#define CODECSELECTOR_H +#pragma once #include <QDialog> #include <QLabel> @@ -70,5 +69,3 @@ private: } // namespace Internal } // namespace TextEditor - -#endif // CODECSELECTOR_H diff --git a/src/plugins/texteditor/codestyleeditor.h b/src/plugins/texteditor/codestyleeditor.h index a2473c29f7..e76e343953 100644 --- a/src/plugins/texteditor/codestyleeditor.h +++ b/src/plugins/texteditor/codestyleeditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CODESTYLEEDITOR_H -#define CODESTYLEEDITOR_H +#pragma once #include "texteditor_global.h" @@ -59,5 +58,3 @@ private: }; } // namespace TextEditor - -#endif // CODESTYLEEDITOR_H diff --git a/src/plugins/texteditor/codestylepool.h b/src/plugins/texteditor/codestylepool.h index b131b0ea1e..4c8727ab05 100644 --- a/src/plugins/texteditor/codestylepool.h +++ b/src/plugins/texteditor/codestylepool.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CODESTYLEPOOL_H -#define CODESTYLEPOOL_H +#pragma once #include "texteditor_global.h" @@ -81,5 +80,3 @@ private: }; } // namespace TextEditor - -#endif // CODESTYLEPOOL_H diff --git a/src/plugins/texteditor/codestyleselectorwidget.h b/src/plugins/texteditor/codestyleselectorwidget.h index 4bae78938a..05ae0c41d8 100644 --- a/src/plugins/texteditor/codestyleselectorwidget.h +++ b/src/plugins/texteditor/codestyleselectorwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CODESTYLESELECTORWIDGET_H -#define CODESTYLESELECTORWIDGET_H +#pragma once #include "texteditor_global.h" @@ -78,5 +77,3 @@ private: }; } // namespace TextEditor - -#endif // CODESTYLESELECTORWIDGET_H diff --git a/src/plugins/texteditor/colorpreviewhoverhandler.h b/src/plugins/texteditor/colorpreviewhoverhandler.h index 2ab4e83f1d..eaa701c287 100644 --- a/src/plugins/texteditor/colorpreviewhoverhandler.h +++ b/src/plugins/texteditor/colorpreviewhoverhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COLORPREVIEWHOVERHANDLER_H -#define COLORPREVIEWHOVERHANDLER_H +#pragma once #include "texteditor_global.h" #include "basehoverhandler.h" @@ -50,5 +49,3 @@ private: }; } // namespace TextEditor - -#endif // COLORPREVIEWHOVERHANDLER_H diff --git a/src/plugins/texteditor/colorscheme.h b/src/plugins/texteditor/colorscheme.h index 3325f300e0..f065b18648 100644 --- a/src/plugins/texteditor/colorscheme.h +++ b/src/plugins/texteditor/colorscheme.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COLORSCHEME_H -#define COLORSCHEME_H +#pragma once #include "texteditor_global.h" #include "texteditorconstants.h" @@ -127,5 +126,3 @@ inline bool operator==(const ColorScheme &cs1, const ColorScheme &cs2) { return inline bool operator!=(const ColorScheme &cs1, const ColorScheme &cs2) { return !cs1.equals(cs2); } } // namespace TextEditor - -#endif // COLORSCHEME_H diff --git a/src/plugins/texteditor/colorschemeedit.h b/src/plugins/texteditor/colorschemeedit.h index b97470cd3d..eb2f50fd3f 100644 --- a/src/plugins/texteditor/colorschemeedit.h +++ b/src/plugins/texteditor/colorschemeedit.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COLORSCHEMEEDIT_H -#define COLORSCHEMEEDIT_H +#pragma once #include "colorscheme.h" #include "fontsettingspage.h" @@ -91,5 +90,3 @@ private: } // namespace Internal } // namespace TextEditor - -#endif // COLORSCHEMEEDIT_H diff --git a/src/plugins/texteditor/completionsettings.h b/src/plugins/texteditor/completionsettings.h index 5d9ebe3ddb..0b948baf56 100644 --- a/src/plugins/texteditor/completionsettings.h +++ b/src/plugins/texteditor/completionsettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef COMPLETIONSETTINGS_H -#define COMPLETIONSETTINGS_H +#pragma once #include "texteditor_global.h" @@ -73,5 +72,3 @@ inline bool operator==(const CompletionSettings &t1, const CompletionSettings &t inline bool operator!=(const CompletionSettings &t1, const CompletionSettings &t2) { return !t1.equals(t2); } } // namespace TextEditor - -#endif // COMPLETIONSETTINGS_H diff --git a/src/plugins/texteditor/convenience.h b/src/plugins/texteditor/convenience.h index 49a4f58130..65dcd6be46 100644 --- a/src/plugins/texteditor/convenience.h +++ b/src/plugins/texteditor/convenience.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CONVENIENCE_H -#define CONVENIENCE_H +#pragma once #include "texteditor_global.h" @@ -48,5 +47,3 @@ TEXTEDITOR_EXPORT QTextCursor flippedCursor(const QTextCursor &cursor); } // Util } // TextEditor - -#endif // CONVENIENCE_H diff --git a/src/plugins/texteditor/displaysettings.h b/src/plugins/texteditor/displaysettings.h index d93312bc71..1bb2bd8273 100644 --- a/src/plugins/texteditor/displaysettings.h +++ b/src/plugins/texteditor/displaysettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DISPLAYSETTINGS_H -#define DISPLAYSETTINGS_H +#pragma once #include "texteditor_global.h" @@ -65,5 +64,3 @@ inline bool operator==(const DisplaySettings &t1, const DisplaySettings &t2) { r inline bool operator!=(const DisplaySettings &t1, const DisplaySettings &t2) { return !t1.equals(t2); } } // namespace TextEditor - -#endif // DISPLAYSETTINGS_H diff --git a/src/plugins/texteditor/displaysettingspage.h b/src/plugins/texteditor/displaysettingspage.h index 26f5d9375f..8370f840cc 100644 --- a/src/plugins/texteditor/displaysettingspage.h +++ b/src/plugins/texteditor/displaysettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DISPLAYSETTINGSPAGE_H -#define DISPLAYSETTINGSPAGE_H +#pragma once #include "texteditor_global.h" @@ -73,5 +72,3 @@ private: }; } // namespace TextEditor - -#endif // DISPLAYSETTINGSPAGE_H diff --git a/src/plugins/texteditor/extraencodingsettings.h b/src/plugins/texteditor/extraencodingsettings.h index ffbb26f5ba..1361760b05 100644 --- a/src/plugins/texteditor/extraencodingsettings.h +++ b/src/plugins/texteditor/extraencodingsettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ENCODINGSETTINGS_H -#define ENCODINGSETTINGS_H +#pragma once #include "texteditor_global.h" @@ -65,5 +64,3 @@ inline bool operator!=(const ExtraEncodingSettings &a, const ExtraEncodingSettin { return !a.equals(b); } } // TextEditor - -#endif // ENCODINGSETTINGS_H diff --git a/src/plugins/texteditor/findincurrentfile.h b/src/plugins/texteditor/findincurrentfile.h index e7cf3c0122..354680d63d 100644 --- a/src/plugins/texteditor/findincurrentfile.h +++ b/src/plugins/texteditor/findincurrentfile.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FINDINCURRENTFILE_H -#define FINDINCURRENTFILE_H +#pragma once #include "basefilefind.h" @@ -66,5 +65,3 @@ private: } // namespace Internal } // namespace TextEditor - -#endif // FINDINCURRENTFILE_H diff --git a/src/plugins/texteditor/findinfiles.h b/src/plugins/texteditor/findinfiles.h index c049820311..71416aba22 100644 --- a/src/plugins/texteditor/findinfiles.h +++ b/src/plugins/texteditor/findinfiles.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FINDINFILES_H -#define FINDINFILES_H +#pragma once #include "basefilefind.h" @@ -77,5 +76,3 @@ private: }; } // namespace TextEditor - -#endif // FINDINFILES_H diff --git a/src/plugins/texteditor/findinopenfiles.h b/src/plugins/texteditor/findinopenfiles.h index ecd792f822..759636c1ae 100644 --- a/src/plugins/texteditor/findinopenfiles.h +++ b/src/plugins/texteditor/findinopenfiles.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FINDINOPENFILES_H -#define FINDINOPENFILES_H +#pragma once #include "basefilefind.h" @@ -57,5 +56,3 @@ private: } // namespace Internal } // namespace TextEditor - -#endif // FINDINOPENFILES_H diff --git a/src/plugins/texteditor/fontsettings.h b/src/plugins/texteditor/fontsettings.h index 68fb62d241..dbecc31a3e 100644 --- a/src/plugins/texteditor/fontsettings.h +++ b/src/plugins/texteditor/fontsettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FONTSETTINGS_H -#define FONTSETTINGS_H +#pragma once #include "texteditor_global.h" @@ -119,5 +118,3 @@ inline bool operator==(const FontSettings &f1, const FontSettings &f2) { return inline bool operator!=(const FontSettings &f1, const FontSettings &f2) { return !f1.equals(f2); } } // namespace TextEditor - -#endif // FONTSETTINGS_H diff --git a/src/plugins/texteditor/fontsettingspage.h b/src/plugins/texteditor/fontsettingspage.h index 16365a4514..fccc072e48 100644 --- a/src/plugins/texteditor/fontsettingspage.h +++ b/src/plugins/texteditor/fontsettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FONTSETTINGSPAGE_H -#define FONTSETTINGSPAGE_H +#pragma once #include "texteditor_global.h" @@ -152,5 +151,3 @@ private: }; } // namespace TextEditor - -#endif // FONTSETTINGSPAGE_H diff --git a/src/plugins/texteditor/generichighlighter/context.h b/src/plugins/texteditor/generichighlighter/context.h index 93bd1f4775..79b0b280cb 100644 --- a/src/plugins/texteditor/generichighlighter/context.h +++ b/src/plugins/texteditor/generichighlighter/context.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CONTEXT_H -#define CONTEXT_H +#pragma once #include "includerulesinstruction.h" @@ -102,5 +101,3 @@ private: } // namespace Internal } // namespace TextEditor - -#endif // CONTEXT_H diff --git a/src/plugins/texteditor/generichighlighter/definitiondownloader.h b/src/plugins/texteditor/generichighlighter/definitiondownloader.h index 069675aa25..f9010fd873 100644 --- a/src/plugins/texteditor/generichighlighter/definitiondownloader.h +++ b/src/plugins/texteditor/generichighlighter/definitiondownloader.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DEFINITIONDOWNLOADER_H -#define DEFINITIONDOWNLOADER_H +#pragma once #include <QObject> #include <QString> @@ -77,5 +76,3 @@ struct DownloaderStarter } // namespace Internal } // namespace TextEditor - -#endif // DEFINITIONDOWNLOADER_H diff --git a/src/plugins/texteditor/generichighlighter/dynamicrule.h b/src/plugins/texteditor/generichighlighter/dynamicrule.h index 2014112eeb..c78b06f544 100644 --- a/src/plugins/texteditor/generichighlighter/dynamicrule.h +++ b/src/plugins/texteditor/generichighlighter/dynamicrule.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DYNAMICRULE_H -#define DYNAMICRULE_H +#pragma once #include "rule.h" @@ -56,5 +55,3 @@ void updateDynamicRules(const QList<QSharedPointer<Rule> > &rules, const QString } // namespace Internal } // namespace TextEditor - -#endif // DYNAMICRULE_H diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinition.h b/src/plugins/texteditor/generichighlighter/highlightdefinition.h index c795f3900e..f39373df18 100644 --- a/src/plugins/texteditor/generichighlighter/highlightdefinition.h +++ b/src/plugins/texteditor/generichighlighter/highlightdefinition.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HIGHLIGHTDEFINITION_H -#define HIGHLIGHTDEFINITION_H +#pragma once #include <QString> #include <QHash> @@ -107,5 +106,3 @@ private: } // namespace Internal } // namespace TextEditor - -#endif // HIGHLIGHTDEFINITION_H diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h index 6f1ffb1ebc..44f5b3004e 100644 --- a/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h +++ b/src/plugins/texteditor/generichighlighter/highlightdefinitionhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HIGHLIGHTDEFINITIONHANDLER_H -#define HIGHLIGHTDEFINITIONHANDLER_H +#pragma once #include <QString> #include <QSharedPointer> @@ -98,5 +97,3 @@ private: } // namespace Internal } // namespace TextEditor - -#endif // HIGHLIGHTDEFINITIONHANDLER_H diff --git a/src/plugins/texteditor/generichighlighter/highlightdefinitionmetadata.h b/src/plugins/texteditor/generichighlighter/highlightdefinitionmetadata.h index 030bdb9418..d6baff3d39 100644 --- a/src/plugins/texteditor/generichighlighter/highlightdefinitionmetadata.h +++ b/src/plugins/texteditor/generichighlighter/highlightdefinitionmetadata.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HIGHLIGHTDEFINITIONMETADATA_H -#define HIGHLIGHTDEFINITIONMETADATA_H +#pragma once #include <QSharedPointer> #include <QStringList> @@ -53,5 +52,3 @@ typedef QSharedPointer<HighlightDefinitionMetaData> DefinitionMetaDataPtr; } // namespace Internal } // namespace TextEditor - -#endif // HIGHLIGHTDEFINITIONMETADATA_H diff --git a/src/plugins/texteditor/generichighlighter/highlighter.h b/src/plugins/texteditor/generichighlighter/highlighter.h index c3eab63439..af921cdccd 100644 --- a/src/plugins/texteditor/generichighlighter/highlighter.h +++ b/src/plugins/texteditor/generichighlighter/highlighter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HIGHLIGHTER_H -#define HIGHLIGHTER_H +#pragma once #include "context.h" @@ -192,5 +191,3 @@ private: }; } // namespace TextEditor - -#endif // HIGHLIGHTER_H diff --git a/src/plugins/texteditor/generichighlighter/highlighterexception.h b/src/plugins/texteditor/generichighlighter/highlighterexception.h index a0287b6957..0850656966 100644 --- a/src/plugins/texteditor/generichighlighter/highlighterexception.h +++ b/src/plugins/texteditor/generichighlighter/highlighterexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HIGHLIGHTEREXCEPTION_H -#define HIGHLIGHTEREXCEPTION_H +#pragma once #include <QString> @@ -41,5 +40,3 @@ private: }; } } // namespace TextEditor - -#endif // HIGHLIGHTEREXCEPTION_H diff --git a/src/plugins/texteditor/generichighlighter/highlightersettings.h b/src/plugins/texteditor/generichighlighter/highlightersettings.h index e06bd2a8c6..3323b5bd39 100644 --- a/src/plugins/texteditor/generichighlighter/highlightersettings.h +++ b/src/plugins/texteditor/generichighlighter/highlightersettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HIGHLIGHTERSETTINGS_H -#define HIGHLIGHTERSETTINGS_H +#pragma once #include <QString> #include <QStringList> @@ -84,5 +83,3 @@ QString findFallbackDefinitionsLocation(); } } // namespace TextEditor - -#endif // HIGHLIGHTERSETTINGS_H diff --git a/src/plugins/texteditor/generichighlighter/highlightersettingspage.h b/src/plugins/texteditor/generichighlighter/highlightersettingspage.h index d1d407fc20..ca7b62aaf2 100644 --- a/src/plugins/texteditor/generichighlighter/highlightersettingspage.h +++ b/src/plugins/texteditor/generichighlighter/highlightersettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HIGHLIGHTERSETTINGSPAGE_H -#define HIGHLIGHTERSETTINGSPAGE_H +#pragma once #include "highlightdefinitionmetadata.h" #include "../texteditoroptionspage.h" @@ -72,5 +71,3 @@ private: }; } // namespace TextEditor - -#endif // HIGHLIGHTERSETTINGSPAGE_H diff --git a/src/plugins/texteditor/generichighlighter/includerulesinstruction.h b/src/plugins/texteditor/generichighlighter/includerulesinstruction.h index 0a019555ac..aefdc42bb7 100644 --- a/src/plugins/texteditor/generichighlighter/includerulesinstruction.h +++ b/src/plugins/texteditor/generichighlighter/includerulesinstruction.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INCLUDERULESINSTRUCTION_H -#define INCLUDERULESINSTRUCTION_H +#pragma once #include <QString> @@ -48,5 +47,3 @@ private: } // namespace Internal } // namespace TextEditor - -#endif // INCLUDERULESINSTRUCTION_H diff --git a/src/plugins/texteditor/generichighlighter/itemdata.h b/src/plugins/texteditor/generichighlighter/itemdata.h index cbc5c8ae35..538d61ebde 100644 --- a/src/plugins/texteditor/generichighlighter/itemdata.h +++ b/src/plugins/texteditor/generichighlighter/itemdata.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ITEMDATA_H -#define ITEMDATA_H +#pragma once #include <QString> #include <QColor> @@ -81,5 +80,3 @@ private: } // namespace Internal } // namespace TextEditor - -#endif // ITEMDATA_H diff --git a/src/plugins/texteditor/generichighlighter/keywordlist.h b/src/plugins/texteditor/generichighlighter/keywordlist.h index a6fc0d652f..f111afa4e0 100644 --- a/src/plugins/texteditor/generichighlighter/keywordlist.h +++ b/src/plugins/texteditor/generichighlighter/keywordlist.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef KEYWORDLIST_H -#define KEYWORDLIST_H +#pragma once #include <QString> #include <QSet> @@ -45,5 +44,3 @@ private: } // namespace Internal } // namespace TextEditor - -#endif // KEYWORDLIST_H diff --git a/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.h b/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.h index 7afd0aed5c..2a6d1c0308 100644 --- a/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.h +++ b/src/plugins/texteditor/generichighlighter/managedefinitionsdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MANAGEDEFINITIONSDIALOG_H -#define MANAGEDEFINITIONSDIALOG_H +#pragma once #include "ui_managedefinitionsdialog.h" #include "highlightdefinitionmetadata.h" @@ -54,5 +53,3 @@ private: } // namespace Internal } // namespace TextEditor - -#endif // MANAGEDEFINITIONSDIALOG_H diff --git a/src/plugins/texteditor/generichighlighter/manager.h b/src/plugins/texteditor/generichighlighter/manager.h index 41fa1d79f5..c6d9038ead 100644 --- a/src/plugins/texteditor/generichighlighter/manager.h +++ b/src/plugins/texteditor/generichighlighter/manager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MANAGER_H -#define MANAGER_H +#pragma once #include "highlightdefinitionmetadata.h" @@ -118,5 +117,3 @@ signals: } // namespace Internal } // namespace TextEditor - -#endif // MANAGER_H diff --git a/src/plugins/texteditor/generichighlighter/progressdata.h b/src/plugins/texteditor/generichighlighter/progressdata.h index 947507b282..9563a1601e 100644 --- a/src/plugins/texteditor/generichighlighter/progressdata.h +++ b/src/plugins/texteditor/generichighlighter/progressdata.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROGRESSDATA_H -#define PROGRESSDATA_H +#pragma once #include <QStringList> @@ -80,5 +79,3 @@ private: } // namespace Internal } // namespace TextEditor - -#endif // PROGRESSDATA_H diff --git a/src/plugins/texteditor/generichighlighter/reuse.h b/src/plugins/texteditor/generichighlighter/reuse.h index 4ce6236f11..d8d21f35c6 100644 --- a/src/plugins/texteditor/generichighlighter/reuse.h +++ b/src/plugins/texteditor/generichighlighter/reuse.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REUSE_H -#define REUSE_H +#pragma once #include <Qt> #include <QString> @@ -92,5 +91,3 @@ inline void setStartCharacter(QChar *c, const QString &character) } // namespace Internal } // namespace TextEditor - -#endif // REUSE_H diff --git a/src/plugins/texteditor/generichighlighter/rule.h b/src/plugins/texteditor/generichighlighter/rule.h index 8d87c491e8..4e25bef11a 100644 --- a/src/plugins/texteditor/generichighlighter/rule.h +++ b/src/plugins/texteditor/generichighlighter/rule.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RULE_H -#define RULE_H +#pragma once #include <QString> #include <QList> @@ -156,5 +155,3 @@ private: } // namespace Internal } // namespace TextEditor - -#endif // RULE_H diff --git a/src/plugins/texteditor/generichighlighter/specificrules.h b/src/plugins/texteditor/generichighlighter/specificrules.h index 0507128a05..674c3fbd7b 100644 --- a/src/plugins/texteditor/generichighlighter/specificrules.h +++ b/src/plugins/texteditor/generichighlighter/specificrules.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SPECIFICRULES_H -#define SPECIFICRULES_H +#pragma once #include "rule.h" #include "dynamicrule.h" @@ -289,5 +288,3 @@ private: } // namespace Internal } // namespace TextEditor - -#endif // SPECIFICRULES_H diff --git a/src/plugins/texteditor/helpitem.h b/src/plugins/texteditor/helpitem.h index db40390c12..f7ea8ee4f3 100644 --- a/src/plugins/texteditor/helpitem.h +++ b/src/plugins/texteditor/helpitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTEDITORHELPITEM_H -#define TEXTEDITORHELPITEM_H +#pragma once #include "texteditor_global.h" @@ -81,5 +80,3 @@ private: }; } // namespace TextEditor - -#endif // TEXTEDITORHELPITEM_H diff --git a/src/plugins/texteditor/highlighterutils.h b/src/plugins/texteditor/highlighterutils.h index 2d07ffbbaf..cab592cacf 100644 --- a/src/plugins/texteditor/highlighterutils.h +++ b/src/plugins/texteditor/highlighterutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HIGHLIGHTERUTILS_H -#define HIGHLIGHTERUTILS_H +#pragma once #include <QString> #include "texteditor_global.h" @@ -44,5 +43,3 @@ void setMimeTypeForHighlighter(Highlighter *highlighter, const Utils::MimeType & QString *foundDefinitionId = 0); } // namespace TextEditor - -#endif // HIGHLIGHTERUTILS_H diff --git a/src/plugins/texteditor/icodestylepreferences.h b/src/plugins/texteditor/icodestylepreferences.h index 2da03c7dfb..91dd72d9e3 100644 --- a/src/plugins/texteditor/icodestylepreferences.h +++ b/src/plugins/texteditor/icodestylepreferences.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ICODESTYLEPREFERENCES_H -#define ICODESTYLEPREFERENCES_H +#pragma once #include "texteditor_global.h" @@ -107,5 +106,3 @@ private: } // namespace TextEditor - -#endif // ICODESTYLEPREFERENCES_H diff --git a/src/plugins/texteditor/icodestylepreferencesfactory.h b/src/plugins/texteditor/icodestylepreferencesfactory.h index bc00f1aa7e..de4dc8de17 100644 --- a/src/plugins/texteditor/icodestylepreferencesfactory.h +++ b/src/plugins/texteditor/icodestylepreferencesfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ICODESTYLEPREFERENCESFACTORY_H -#define ICODESTYLEPREFERENCESFACTORY_H +#pragma once #include "texteditor_global.h" @@ -54,5 +53,3 @@ public: }; } // namespace TextEditor - -#endif // ICODESTYLEPREFERENCESFACTORY_H diff --git a/src/plugins/texteditor/indenter.h b/src/plugins/texteditor/indenter.h index 8f5093c9dd..08286b33f5 100644 --- a/src/plugins/texteditor/indenter.h +++ b/src/plugins/texteditor/indenter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INDENTER_H -#define INDENTER_H +#pragma once #include "texteditor_global.h" @@ -73,5 +72,3 @@ public: }; } // namespace TextEditor - -#endif // INDENTER_H diff --git a/src/plugins/texteditor/ioutlinewidget.h b/src/plugins/texteditor/ioutlinewidget.h index 1306227b5f..d6aa32fa03 100644 --- a/src/plugins/texteditor/ioutlinewidget.h +++ b/src/plugins/texteditor/ioutlinewidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOUTLINEWIDGET_H -#define IOUTLINEWIDGET_H +#pragma once #include <texteditor/texteditor_global.h> #include <QWidget> @@ -55,5 +54,3 @@ public: }; } // namespace TextEditor - -#endif // IOUTLINEWIDGET_H diff --git a/src/plugins/texteditor/linenumberfilter.h b/src/plugins/texteditor/linenumberfilter.h index b482b086c9..8a8954cadf 100644 --- a/src/plugins/texteditor/linenumberfilter.h +++ b/src/plugins/texteditor/linenumberfilter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LINENUMBERFILTER_H -#define LINENUMBERFILTER_H +#pragma once #include <coreplugin/locator/ilocatorfilter.h> @@ -55,5 +54,3 @@ private: } // namespace Internal } // namespace TextEditor - -#endif // LINENUMBERFILTER_H diff --git a/src/plugins/texteditor/marginsettings.h b/src/plugins/texteditor/marginsettings.h index 087d0f3b9e..ff8be7bcde 100644 --- a/src/plugins/texteditor/marginsettings.h +++ b/src/plugins/texteditor/marginsettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTEDITOR_MARGINSETTINGS_H -#define TEXTEDITOR_MARGINSETTINGS_H +#pragma once #include "texteditor_global.h" @@ -59,5 +58,3 @@ inline bool operator!=(const MarginSettings &one, const MarginSettings &two) { return !one.equals(two); } } // namespace TextEditor - -#endif // TEXTEDITOR_MARGINSETTINGS_H diff --git a/src/plugins/texteditor/normalindenter.h b/src/plugins/texteditor/normalindenter.h index 3cbbb6fd98..ca2a52c1d9 100644 --- a/src/plugins/texteditor/normalindenter.h +++ b/src/plugins/texteditor/normalindenter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef NORMALINDENTER_H -#define NORMALINDENTER_H +#pragma once #include "indenter.h" @@ -40,5 +39,3 @@ public: }; } // namespace TextEditor - -#endif // NORMALINDENTER_H diff --git a/src/plugins/texteditor/outlinefactory.h b/src/plugins/texteditor/outlinefactory.h index 09421f1253..05f60a7859 100644 --- a/src/plugins/texteditor/outlinefactory.h +++ b/src/plugins/texteditor/outlinefactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OUTLINE_H -#define OUTLINE_H +#pragma once #include <texteditor/ioutlinewidget.h> #include <coreplugin/inavigationwidgetfactory.h> @@ -86,5 +85,3 @@ private: } // namespace Internal } // namespace TextEditor - -#endif // OUTLINE_H diff --git a/src/plugins/texteditor/plaintexteditorfactory.h b/src/plugins/texteditor/plaintexteditorfactory.h index b060b1ca9f..38b0194895 100644 --- a/src/plugins/texteditor/plaintexteditorfactory.h +++ b/src/plugins/texteditor/plaintexteditorfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLAINTEXTEDITORFACTORY_H -#define PLAINTEXTEDITORFACTORY_H +#pragma once #include <texteditor/texteditor.h> @@ -41,5 +40,3 @@ public: }; } // namespace TextEditor - -#endif // PLAINTEXTEDITORFACTORY_H diff --git a/src/plugins/texteditor/quickfix.h b/src/plugins/texteditor/quickfix.h index 56a1cb80b1..efb9f10619 100644 --- a/src/plugins/texteditor/quickfix.h +++ b/src/plugins/texteditor/quickfix.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTEDITORQUICKFIX_H -#define TEXTEDITORQUICKFIX_H +#pragma once #include "texteditor_global.h" @@ -120,5 +119,3 @@ public: } // namespace TextEditor Q_DECLARE_METATYPE(TextEditor::QuickFixOperation::Ptr) - -#endif // TEXTEDITORQUICKFIX_H diff --git a/src/plugins/texteditor/refactoringchanges.h b/src/plugins/texteditor/refactoringchanges.h index aa842b34bd..737728a931 100644 --- a/src/plugins/texteditor/refactoringchanges.h +++ b/src/plugins/texteditor/refactoringchanges.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REFACTORINGCHANGES_H -#define REFACTORINGCHANGES_H +#pragma once #include <utils/changeset.h> #include <utils/textfileformat.h> @@ -163,5 +162,3 @@ public: }; } // namespace TextEditor - -#endif // REFACTORINGCHANGES_H diff --git a/src/plugins/texteditor/refactoroverlay.h b/src/plugins/texteditor/refactoroverlay.h index d6eb3f2641..aceb55bb54 100644 --- a/src/plugins/texteditor/refactoroverlay.h +++ b/src/plugins/texteditor/refactoroverlay.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REFACTOROVERLAY_H -#define REFACTOROVERLAY_H +#pragma once #include "texteditor_global.h" @@ -70,5 +69,3 @@ private: }; } // namespace TextEditor - -#endif // REFACTOROVERLAY_H diff --git a/src/plugins/texteditor/semantichighlighter.h b/src/plugins/texteditor/semantichighlighter.h index 6e1d71ed8b..d0e0b97a71 100644 --- a/src/plugins/texteditor/semantichighlighter.h +++ b/src/plugins/texteditor/semantichighlighter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTEDITOR_SEMANTICHIGHLIGHTER_H -#define TEXTEDITOR_SEMANTICHIGHLIGHTER_H +#pragma once #include "texteditor_global.h" @@ -103,5 +102,3 @@ void TEXTEDITOR_EXPORT clearExtraAdditionalFormatsUntilEnd( } // namespace SemanticHighlighter } // namespace TextEditor - -#endif // TEXTEDITOR_SEMANTICHIGHLIGHTER_H diff --git a/src/plugins/texteditor/simplecodestylepreferences.h b/src/plugins/texteditor/simplecodestylepreferences.h index 1f974f0ed9..2f4c5680d0 100644 --- a/src/plugins/texteditor/simplecodestylepreferences.h +++ b/src/plugins/texteditor/simplecodestylepreferences.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SIMPLECODESTYLEPREFERENCES_H -#define SIMPLECODESTYLEPREFERENCES_H +#pragma once #include "icodestylepreferences.h" @@ -45,5 +44,3 @@ protected: }; } // namespace TextEditor - -#endif // SIMPLECODESTYLEPREFERENCES_H diff --git a/src/plugins/texteditor/simplecodestylepreferenceswidget.h b/src/plugins/texteditor/simplecodestylepreferenceswidget.h index 79f0135cee..9d4571fd33 100644 --- a/src/plugins/texteditor/simplecodestylepreferenceswidget.h +++ b/src/plugins/texteditor/simplecodestylepreferenceswidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SIMPLECODESTYLEPREFERENCESWIDGET_H -#define SIMPLECODESTYLEPREFERENCESWIDGET_H +#pragma once #include "texteditor_global.h" @@ -59,4 +58,3 @@ private: }; } // namespace TextEditor -#endif // SIMPLECODESTYLEPREFERENCESWIDGET_H diff --git a/src/plugins/texteditor/snippets/isnippetprovider.h b/src/plugins/texteditor/snippets/isnippetprovider.h index 23461c6c2b..0001b0089c 100644 --- a/src/plugins/texteditor/snippets/isnippetprovider.h +++ b/src/plugins/texteditor/snippets/isnippetprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ISNIPPETPROVIDER_H -#define ISNIPPETPROVIDER_H +#pragma once #include <texteditor/texteditor_global.h> @@ -49,5 +48,3 @@ protected: }; } // TextEditor - -#endif // ISNIPPETPROVIDER_H diff --git a/src/plugins/texteditor/snippets/plaintextsnippetprovider.h b/src/plugins/texteditor/snippets/plaintextsnippetprovider.h index e7a647755f..a3a3d949da 100644 --- a/src/plugins/texteditor/snippets/plaintextsnippetprovider.h +++ b/src/plugins/texteditor/snippets/plaintextsnippetprovider.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PLAINTEXTSNIPPETPROVIDER_H -#define PLAINTEXTSNIPPETPROVIDER_H +#pragma once #include "isnippetprovider.h" @@ -45,5 +44,3 @@ public: } // Internal } // TextEditor - -#endif // PLAINTEXTSNIPPETPROVIDER_H diff --git a/src/plugins/texteditor/snippets/reuse.h b/src/plugins/texteditor/snippets/reuse.h index 77832e1628..60ab7d6f17 100644 --- a/src/plugins/texteditor/snippets/reuse.h +++ b/src/plugins/texteditor/snippets/reuse.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef REUSE_H -#define REUSE_H +#pragma once #include <QString> #include <QLatin1String> @@ -51,5 +50,3 @@ inline QString fromBool(bool b) } // Internal } // TextEditor - -#endif // REUSE_H diff --git a/src/plugins/texteditor/snippets/snippet.h b/src/plugins/texteditor/snippets/snippet.h index ef802de519..7b95169a1f 100644 --- a/src/plugins/texteditor/snippets/snippet.h +++ b/src/plugins/texteditor/snippets/snippet.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SNIPPET_H -#define SNIPPET_H +#pragma once #include <texteditor/texteditor_global.h> @@ -103,5 +102,3 @@ private: }; } // TextEditor - -#endif // SNIPPET_H diff --git a/src/plugins/texteditor/snippets/snippetassistcollector.h b/src/plugins/texteditor/snippets/snippetassistcollector.h index 59f4df8e91..9cd2320435 100644 --- a/src/plugins/texteditor/snippets/snippetassistcollector.h +++ b/src/plugins/texteditor/snippets/snippetassistcollector.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SNIPPETASSISTCOLLECTOR_H -#define SNIPPETASSISTCOLLECTOR_H +#pragma once #include <texteditor/texteditor_global.h> @@ -51,5 +50,3 @@ private: }; } // TextEditor - -#endif // SNIPPETASSISTCOLLECTOR_H diff --git a/src/plugins/texteditor/snippets/snippeteditor.h b/src/plugins/texteditor/snippets/snippeteditor.h index bb18c13bc9..d27a38baa1 100644 --- a/src/plugins/texteditor/snippets/snippeteditor.h +++ b/src/plugins/texteditor/snippets/snippeteditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SNIPPETEDITOR_H -#define SNIPPETEDITOR_H +#pragma once #include <texteditor/texteditor_global.h> #include <texteditor/texteditor.h> @@ -48,5 +47,3 @@ protected: }; } // namespace TextEditor - -#endif // SNIPPETEDITOR_H diff --git a/src/plugins/texteditor/snippets/snippetscollection.h b/src/plugins/texteditor/snippets/snippetscollection.h index c0450ff66d..98e9d80f24 100644 --- a/src/plugins/texteditor/snippets/snippetscollection.h +++ b/src/plugins/texteditor/snippets/snippetscollection.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SNIPPETSCOLLECTION_H -#define SNIPPETSCOLLECTION_H +#pragma once #include "snippet.h" @@ -137,5 +136,3 @@ private: } // Internal } // TextEditor - -#endif // SNIPPETSCOLLECTION_H diff --git a/src/plugins/texteditor/snippets/snippetssettings.h b/src/plugins/texteditor/snippets/snippetssettings.h index 5aa778f31d..d193478440 100644 --- a/src/plugins/texteditor/snippets/snippetssettings.h +++ b/src/plugins/texteditor/snippets/snippetssettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SNIPPETSSETTINGS_H -#define SNIPPETSSETTINGS_H +#pragma once #include <QString> @@ -58,5 +57,3 @@ inline bool operator!=(const SnippetsSettings &a, const SnippetsSettings &b) { return !a.equals(b); } } // TextEditor - -#endif // SNIPPETSSETTINGS_H diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.h b/src/plugins/texteditor/snippets/snippetssettingspage.h index d50184e3c3..10e480bdad 100644 --- a/src/plugins/texteditor/snippets/snippetssettingspage.h +++ b/src/plugins/texteditor/snippets/snippetssettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SNIPPETSSETTINGSPAGE_H -#define SNIPPETSSETTINGSPAGE_H +#pragma once #include "../texteditoroptionspage.h" @@ -51,5 +50,3 @@ private: } // Internal } // TextEditor - -#endif // SNIPPETSSETTINGSPAGE_H diff --git a/src/plugins/texteditor/storagesettings.h b/src/plugins/texteditor/storagesettings.h index b8684e7dfc..ffe7823f0f 100644 --- a/src/plugins/texteditor/storagesettings.h +++ b/src/plugins/texteditor/storagesettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef STORAGESETTINGS_H -#define STORAGESETTINGS_H +#pragma once #include "texteditor_global.h" @@ -59,5 +58,3 @@ inline bool operator==(const StorageSettings &t1, const StorageSettings &t2) { r inline bool operator!=(const StorageSettings &t1, const StorageSettings &t2) { return !t1.equals(t2); } } // namespace TextEditor - -#endif // STORAGESETTINGS_H diff --git a/src/plugins/texteditor/syntaxhighlighter.h b/src/plugins/texteditor/syntaxhighlighter.h index 32480f0ee5..8da2a908c7 100644 --- a/src/plugins/texteditor/syntaxhighlighter.h +++ b/src/plugins/texteditor/syntaxhighlighter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTEDITOR_SYNTAXHIGHLIGHTER_H -#define TEXTEDITOR_SYNTAXHIGHLIGHTER_H +#pragma once #include "texteditor_global.h" #include <texteditor/texteditorconstants.h> @@ -98,5 +97,3 @@ private: }; } // namespace TextEditor - -#endif // TEXTEDITOR_SYNTAXHIGHLIGHTER_H diff --git a/src/plugins/texteditor/tabsettings.h b/src/plugins/texteditor/tabsettings.h index f0b60584b7..01ea77c5bb 100644 --- a/src/plugins/texteditor/tabsettings.h +++ b/src/plugins/texteditor/tabsettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TABSETTINGS_H -#define TABSETTINGS_H +#pragma once #include "texteditor_global.h" @@ -104,5 +103,3 @@ inline bool operator!=(const TabSettings &t1, const TabSettings &t2) { return !t Q_DECLARE_METATYPE(TextEditor::TabSettings) Q_DECLARE_METATYPE(TextEditor::TabSettings::TabPolicy) Q_DECLARE_METATYPE(TextEditor::TabSettings::ContinuationAlignBehavior) - -#endif // TABSETTINGS_H diff --git a/src/plugins/texteditor/tabsettingswidget.h b/src/plugins/texteditor/tabsettingswidget.h index 942d4d872e..99ed5f0cc2 100644 --- a/src/plugins/texteditor/tabsettingswidget.h +++ b/src/plugins/texteditor/tabsettingswidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTEDITOR_TABSETTINGSWIDGET_H -#define TEXTEDITOR_TABSETTINGSWIDGET_H +#pragma once #include "texteditor_global.h" @@ -67,4 +66,3 @@ private: }; } // namespace TextEditor -#endif // TEXTEDITOR_TABSETTINGSWIDGET_H diff --git a/src/plugins/texteditor/textdocument.h b/src/plugins/texteditor/textdocument.h index f4eebcc46e..87a7d6ac2a 100644 --- a/src/plugins/texteditor/textdocument.h +++ b/src/plugins/texteditor/textdocument.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BASETEXTDOCUMENT_H -#define BASETEXTDOCUMENT_H +#pragma once #include "texteditor_global.h" @@ -157,5 +156,3 @@ private: typedef QSharedPointer<TextDocument> TextDocumentPtr; } // namespace TextEditor - -#endif // BASETEXTDOCUMENT_H diff --git a/src/plugins/texteditor/textdocumentlayout.h b/src/plugins/texteditor/textdocumentlayout.h index e746aa8461..928ed7dbb6 100644 --- a/src/plugins/texteditor/textdocumentlayout.h +++ b/src/plugins/texteditor/textdocumentlayout.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTDOCUMENTLAYOUT_H -#define TEXTDOCUMENTLAYOUT_H +#pragma once #include "texteditor_global.h" @@ -223,5 +222,3 @@ signals: }; } // namespace TextEditor - -#endif // TEXTDOCUMENTLAYOUT_H diff --git a/src/plugins/texteditor/texteditor.h b/src/plugins/texteditor/texteditor.h index d29c325014..4e97b6396d 100644 --- a/src/plugins/texteditor/texteditor.h +++ b/src/plugins/texteditor/texteditor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTEDITOR_H -#define TEXTEDITOR_H +#pragma once #include "texteditor_global.h" #include "blockrange.h" @@ -666,5 +665,3 @@ private: } // namespace TextEditor Q_DECLARE_METATYPE(TextEditor::TextEditorWidget::Link) - -#endif // TEXTEDITOR_H diff --git a/src/plugins/texteditor/texteditor_global.h b/src/plugins/texteditor/texteditor_global.h index baceabf108..08f7adc5eb 100644 --- a/src/plugins/texteditor/texteditor_global.h +++ b/src/plugins/texteditor/texteditor_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTEDITOR_GLOBAL_H -#define TEXTEDITOR_GLOBAL_H +#pragma once #include <qglobal.h> @@ -46,5 +45,3 @@ enum TextPositionOperation }; } // namespace TextEditor - -#endif // TEXTEDITOR_GLOBAL_H diff --git a/src/plugins/texteditor/texteditor_p.h b/src/plugins/texteditor/texteditor_p.h index 6d7a2955db..ec2ad4ab7f 100644 --- a/src/plugins/texteditor/texteditor_p.h +++ b/src/plugins/texteditor/texteditor_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTEDITOR_P_H -#define TEXTEDITOR_P_H +#pragma once #include "texteditor_global.h" @@ -91,5 +90,3 @@ struct TextEditorPrivateHighlightBlocks } // namespace Internal } // namespace TextEditor - -#endif // TEXTEDITOR_P_H diff --git a/src/plugins/texteditor/texteditoractionhandler.h b/src/plugins/texteditor/texteditoractionhandler.h index 710206734d..02067ae12d 100644 --- a/src/plugins/texteditor/texteditoractionhandler.h +++ b/src/plugins/texteditor/texteditoractionhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTEDITORACTIONHANDLER_H -#define TEXTEDITORACTIONHANDLER_H +#pragma once #include "texteditor_global.h" @@ -68,5 +67,3 @@ private: }; } // namespace TextEditor - -#endif // TEXTEDITORACTIONHANDLER_H diff --git a/src/plugins/texteditor/texteditorconstants.h b/src/plugins/texteditor/texteditorconstants.h index 354ff5f252..0be947fc9a 100644 --- a/src/plugins/texteditor/texteditorconstants.h +++ b/src/plugins/texteditor/texteditorconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTEDITORCONSTANTS_H -#define TEXTEDITORCONSTANTS_H +#pragma once #include <QtGlobal> @@ -208,5 +207,3 @@ const unsigned COMPLETION_ASSIST_TOOLTIP_DELAY = 100; } // namespace Constants } // namespace TextEditor - -#endif // TEXTEDITORCONSTANTS_H diff --git a/src/plugins/texteditor/texteditoroptionspage.h b/src/plugins/texteditor/texteditoroptionspage.h index 51b623545f..9bd8a1aaa0 100644 --- a/src/plugins/texteditor/texteditoroptionspage.h +++ b/src/plugins/texteditor/texteditoroptionspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTEDITOROPTIONSPAGE_H -#define TEXTEDITOROPTIONSPAGE_H +#pragma once #include "texteditor_global.h" @@ -44,5 +43,3 @@ public: }; } // namespace TextEditor - -#endif // TEXTEDITOROPTIONSPAGE_H diff --git a/src/plugins/texteditor/texteditoroverlay.h b/src/plugins/texteditor/texteditoroverlay.h index 5ee122690a..08a508f1da 100644 --- a/src/plugins/texteditor/texteditoroverlay.h +++ b/src/plugins/texteditor/texteditoroverlay.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTEDITOROVERLAY_H -#define TEXTEDITOROVERLAY_H +#pragma once #include <QObject> #include <QList> @@ -124,5 +123,3 @@ private: } // namespace Internal } // namespace TextEditor - -#endif // TEXTEDITOROVERLAY_H diff --git a/src/plugins/texteditor/texteditorplugin.h b/src/plugins/texteditor/texteditorplugin.h index f8486caa67..5cabb2fc95 100644 --- a/src/plugins/texteditor/texteditorplugin.h +++ b/src/plugins/texteditor/texteditorplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTEDITORPLUGIN_H -#define TEXTEDITORPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -88,5 +87,3 @@ private slots: } // namespace Internal } // namespace TextEditor - -#endif // TEXTEDITORPLUGIN_H diff --git a/src/plugins/texteditor/texteditorsettings.h b/src/plugins/texteditor/texteditorsettings.h index dd810de9d2..abbba3d314 100644 --- a/src/plugins/texteditor/texteditorsettings.h +++ b/src/plugins/texteditor/texteditorsettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TEXTEDITORSETTINGS_H -#define TEXTEDITORSETTINGS_H +#pragma once #include "texteditor_global.h" @@ -113,5 +112,3 @@ signals: }; } // namespace TextEditor - -#endif // TEXTEDITORSETTINGS_H diff --git a/src/plugins/texteditor/textmark.h b/src/plugins/texteditor/textmark.h index 115f6c3cb3..8387de8c71 100644 --- a/src/plugins/texteditor/textmark.h +++ b/src/plugins/texteditor/textmark.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TextMark_H -#define TextMark_H +#pragma once #include "texteditor_global.h" @@ -110,5 +109,3 @@ private: }; } // namespace TextEditor - -#endif // TextMark_H diff --git a/src/plugins/texteditor/textmarkregistry.h b/src/plugins/texteditor/textmarkregistry.h index aa0acbbec1..33aa5edc40 100644 --- a/src/plugins/texteditor/textmarkregistry.h +++ b/src/plugins/texteditor/textmarkregistry.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BASETEXTMARKREGISTRY_H -#define BASETEXTMARKREGISTRY_H +#pragma once #include <utils/fileutils.h> @@ -67,5 +66,3 @@ private: } // namespace Internal } // namespace TextEditor - -#endif // BASETEXTMARKREGISTRY_H diff --git a/src/plugins/texteditor/typingsettings.h b/src/plugins/texteditor/typingsettings.h index 50dfaf9389..f71fb3c6cc 100644 --- a/src/plugins/texteditor/typingsettings.h +++ b/src/plugins/texteditor/typingsettings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TYPINGSETTINGS_H -#define TYPINGSETTINGS_H +#pragma once #include "texteditor_global.h" @@ -78,5 +77,3 @@ inline bool operator!=(const TypingSettings &t1, const TypingSettings &t2) { ret } // namespace TextEditor Q_DECLARE_METATYPE(TextEditor::TypingSettings) - -#endif // TYPINGSETTINGS_H diff --git a/src/plugins/todo/constants.h b/src/plugins/todo/constants.h index 4a4ab5ac00..b4598dd0b9 100644 --- a/src/plugins/todo/constants.h +++ b/src/plugins/todo/constants.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef CONSTANTS_H -#define CONSTANTS_H +#pragma once #include <QtGlobal> @@ -71,5 +70,3 @@ const char OUTPUT_PANE_TITLE[] = QT_TRANSLATE_NOOP("Todo::Internal::TodoOutputPa } // namespace Constants } // namespace Todo - -#endif // CONSTANTS_H diff --git a/src/plugins/todo/cpptodoitemsscanner.h b/src/plugins/todo/cpptodoitemsscanner.h index 8d02420b14..966976d054 100644 --- a/src/plugins/todo/cpptodoitemsscanner.h +++ b/src/plugins/todo/cpptodoitemsscanner.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef CPPTODOITEMSSCANNER_H -#define CPPTODOITEMSSCANNER_H +#pragma once #include "todoitemsscanner.h" @@ -53,5 +52,3 @@ private: } } - -#endif // CPPTODOITEMSSCANNER_H diff --git a/src/plugins/todo/keyword.h b/src/plugins/todo/keyword.h index f763f38a35..170cbfa5f2 100644 --- a/src/plugins/todo/keyword.h +++ b/src/plugins/todo/keyword.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef KEYWORD_H -#define KEYWORD_H +#pragma once #include "todoicons.h" @@ -55,5 +54,3 @@ bool operator !=(Keyword &k1, Keyword &k2); } // namespace Internal } // namespace Todo - -#endif // KEYWORD_H diff --git a/src/plugins/todo/keyworddialog.h b/src/plugins/todo/keyworddialog.h index a0e5005a92..b6e8a775d0 100644 --- a/src/plugins/todo/keyworddialog.h +++ b/src/plugins/todo/keyworddialog.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef KEYWORDDIALOG_H -#define KEYWORDDIALOG_H +#pragma once #include <QDialog> #include <QSet> @@ -67,5 +66,3 @@ private: } // namespace Internal } // namespace Todo - -#endif // KEYWORDDIALOG_H diff --git a/src/plugins/todo/lineparser.h b/src/plugins/todo/lineparser.h index 12c20ba52f..8d5c3bed1e 100644 --- a/src/plugins/todo/lineparser.h +++ b/src/plugins/todo/lineparser.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef LINEPARSER_H -#define LINEPARSER_H +#pragma once #include "keyword.h" #include "todoitem.h" @@ -71,5 +70,3 @@ private: } // namespace Internal } // namespace Todo - -#endif // LINEPARSER_H diff --git a/src/plugins/todo/optionsdialog.h b/src/plugins/todo/optionsdialog.h index 41f774a303..7754caae8d 100644 --- a/src/plugins/todo/optionsdialog.h +++ b/src/plugins/todo/optionsdialog.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef OPTIONSDIALOG_H -#define OPTIONSDIALOG_H +#pragma once #include <QWidget> @@ -71,5 +70,3 @@ private: } // namespace Internal } // namespace Todo - -#endif // OPTIONSDIALOG_H diff --git a/src/plugins/todo/optionspage.h b/src/plugins/todo/optionspage.h index d1afe9eeba..f38f778787 100644 --- a/src/plugins/todo/optionspage.h +++ b/src/plugins/todo/optionspage.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef OPTIONSPAGE_H -#define OPTIONSPAGE_H +#pragma once #include "settings.h" @@ -61,5 +60,3 @@ private: } // namespace Internal } // namespace Todo - -#endif // OPTIONSPAGE_H diff --git a/src/plugins/todo/qmljstodoitemsscanner.h b/src/plugins/todo/qmljstodoitemsscanner.h index c8d9e10e0e..91b4aed678 100644 --- a/src/plugins/todo/qmljstodoitemsscanner.h +++ b/src/plugins/todo/qmljstodoitemsscanner.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef QMLJSTODOITEMSSCANNER_H -#define QMLJSTODOITEMSSCANNER_H +#pragma once #include "todoitemsscanner.h" @@ -54,4 +53,3 @@ private: } } -#endif // QMLJSTODOITEMSSCANNER_H diff --git a/src/plugins/todo/settings.h b/src/plugins/todo/settings.h index 8b8e11e236..2966206633 100644 --- a/src/plugins/todo/settings.h +++ b/src/plugins/todo/settings.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef SETTINGS_H -#define SETTINGS_H +#pragma once #include "keyword.h" @@ -57,5 +56,3 @@ bool operator !=(Settings &s1, Settings &s2); } // namespace Todo Q_DECLARE_METATYPE(Todo::Internal::ScanningScope) - -#endif // SETTINGS_H diff --git a/src/plugins/todo/todoicons.h b/src/plugins/todo/todoicons.h index 8889de45c9..721c81df82 100644 --- a/src/plugins/todo/todoicons.h +++ b/src/plugins/todo/todoicons.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef TODOICONS_H -#define TODOICONS_H +#pragma once #include <QIcon> @@ -42,5 +41,3 @@ QIcon icon(IconType type); } // namespace Internal } // namespace Todo - -#endif // TODOICONS_H diff --git a/src/plugins/todo/todoitem.h b/src/plugins/todo/todoitem.h index 67ce251720..0d17e1068e 100644 --- a/src/plugins/todo/todoitem.h +++ b/src/plugins/todo/todoitem.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef TODOITEM_H -#define TODOITEM_H +#pragma once #include "constants.h" #include "todoicons.h" @@ -94,5 +93,3 @@ private: } // namespace Todo Q_DECLARE_METATYPE(Todo::Internal::TodoItem) - -#endif // TODOITEM_H diff --git a/src/plugins/todo/todoitemsmodel.h b/src/plugins/todo/todoitemsmodel.h index 10abbf5a28..e16422ee3a 100644 --- a/src/plugins/todo/todoitemsmodel.h +++ b/src/plugins/todo/todoitemsmodel.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef TODOITEMSMODEL_H -#define TODOITEMSMODEL_H +#pragma once #include "todoitem.h" @@ -62,5 +61,3 @@ private: } } - -#endif // TODOITEMSMODEL_H diff --git a/src/plugins/todo/todoitemsprovider.h b/src/plugins/todo/todoitemsprovider.h index 4525df9262..2e946a7512 100644 --- a/src/plugins/todo/todoitemsprovider.h +++ b/src/plugins/todo/todoitemsprovider.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef TODOITEMSPROVIDER_H -#define TODOITEMSPROVIDER_H +#pragma once #include "todoitem.h" #include "settings.h" @@ -93,5 +92,3 @@ private slots: } } - -#endif // TODOITEMSPROVIDER_H diff --git a/src/plugins/todo/todoitemsscanner.h b/src/plugins/todo/todoitemsscanner.h index b56d401bf7..75f1c6ac4c 100644 --- a/src/plugins/todo/todoitemsscanner.h +++ b/src/plugins/todo/todoitemsscanner.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef TODOITEMSSCANNER_H -#define TODOITEMSSCANNER_H +#pragma once #include "todoitem.h" #include "keyword.h" @@ -60,5 +59,3 @@ protected: } } - -#endif // TODOITEMSSCANNER_H diff --git a/src/plugins/todo/todooutputpane.h b/src/plugins/todo/todooutputpane.h index c8e5d88439..91a05eea31 100644 --- a/src/plugins/todo/todooutputpane.h +++ b/src/plugins/todo/todooutputpane.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef TODOOUTPUTPANE_H -#define TODOOUTPUTPANE_H +#pragma once #include "settings.h" @@ -101,5 +100,3 @@ private: } // namespace Internal } // namespace Todo - -#endif // TODOOUTPUTPANE_H diff --git a/src/plugins/todo/todooutputtreeview.h b/src/plugins/todo/todooutputtreeview.h index 4e47f2f411..50329c5e57 100644 --- a/src/plugins/todo/todooutputtreeview.h +++ b/src/plugins/todo/todooutputtreeview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TODO_INTERNAL_TODOOUTPUTTREEVIEW_H -#define TODO_INTERNAL_TODOOUTPUTTREEVIEW_H +#pragma once #include <utils/itemviews.h> @@ -53,5 +52,3 @@ private: } // namespace Internal } // namespace Todo - -#endif // TODO_INTERNAL_TODOOUTPUTTREEVIEW_H diff --git a/src/plugins/todo/todooutputtreeviewdelegate.h b/src/plugins/todo/todooutputtreeviewdelegate.h index 605745dca7..28f1fa8db6 100644 --- a/src/plugins/todo/todooutputtreeviewdelegate.h +++ b/src/plugins/todo/todooutputtreeviewdelegate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TODO_INTERNAL_TODOOUTPUTTREEVIEWDELEGATE_H -#define TODO_INTERNAL_TODOOUTPUTTREEVIEWDELEGATE_H +#pragma once #include <QStyledItemDelegate> @@ -41,5 +40,3 @@ public: } // namespace Internal } // namespace Todo - -#endif // TODO_INTERNAL_TODOOUTPUTTREEVIEWDELEGATE_H diff --git a/src/plugins/todo/todoplugin.h b/src/plugins/todo/todoplugin.h index 9a61487121..8733f3bfc9 100644 --- a/src/plugins/todo/todoplugin.h +++ b/src/plugins/todo/todoplugin.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef TODOPLUGIN_H -#define TODOPLUGIN_H +#pragma once #include "settings.h" @@ -69,6 +68,3 @@ private: } // namespace Internal } // namespace Todo - -#endif // TODOPLUGIN_H - diff --git a/src/plugins/todo/todoprojectsettingswidget.h b/src/plugins/todo/todoprojectsettingswidget.h index fbf5c89b87..c6e7204df6 100644 --- a/src/plugins/todo/todoprojectsettingswidget.h +++ b/src/plugins/todo/todoprojectsettingswidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TODO_INTERNAL_TODOPROJECTSETTINGSWIDGET_H -#define TODO_INTERNAL_TODOPROJECTSETTINGSWIDGET_H +#pragma once #include <QWidget> @@ -73,4 +72,3 @@ private: } // namespace Internal } // namespace Todo -#endif // TODO_INTERNAL_TODOPROJECTSETTINGSWIDGET_H diff --git a/src/plugins/updateinfo/settingspage.h b/src/plugins/updateinfo/settingspage.h index 927cd3659d..bb2c7adaa9 100644 --- a/src/plugins/updateinfo/settingspage.h +++ b/src/plugins/updateinfo/settingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SETTINGSPAGE_H -#define SETTINGSPAGE_H +#pragma once #include "ui_settingspage.h" #include "updateinfoplugin.h" @@ -66,5 +65,3 @@ private: } // namespace Internal } // namespace UpdateInfo - -#endif // SETTINGSPAGE_H diff --git a/src/plugins/updateinfo/updateinfoplugin.h b/src/plugins/updateinfo/updateinfoplugin.h index 0c0e3af7ae..689d1baecf 100644 --- a/src/plugins/updateinfo/updateinfoplugin.h +++ b/src/plugins/updateinfo/updateinfoplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UPDATEINFOPLUGIN_H -#define UPDATEINFOPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -97,5 +96,3 @@ private: } // namespace Internal } // namespace UpdateInfo - -#endif // UPDATEINFOPLUGIN_H diff --git a/src/plugins/valgrind/callgrind/callgrindabstractmodel.h b/src/plugins/valgrind/callgrind/callgrindabstractmodel.h index 8aa8866af6..4730308c08 100644 --- a/src/plugins/valgrind/callgrind/callgrindabstractmodel.h +++ b/src/plugins/valgrind/callgrind/callgrindabstractmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LIBVALGRIND_CALLGRINDABSTRACTMODEL_H -#define LIBVALGRIND_CALLGRINDABSTRACTMODEL_H +#pragma once #include <QAbstractItemView> @@ -43,5 +42,3 @@ enum AbstractModelRoles } // Callgrind } // Valgrind - -#endif // LIBVALGRIND_CALLGRINDABSTRACTMODEL_H diff --git a/src/plugins/valgrind/callgrind/callgrindcallmodel.h b/src/plugins/valgrind/callgrind/callgrindcallmodel.h index a297f7f9de..d420abb33b 100644 --- a/src/plugins/valgrind/callgrind/callgrindcallmodel.h +++ b/src/plugins/valgrind/callgrind/callgrindcallmodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef VALGRIND_CALLGRIND_CALLGRINDCALLMODEL_H -#define VALGRIND_CALLGRIND_CALLGRINDCALLMODEL_H +#pragma once #include <QAbstractItemModel> @@ -86,5 +85,3 @@ private: } // namespace Callgrind } // namespace Valgrind - -#endif // VALGRIND_CALLGRIND_CALLGRINDCALLMODEL_H diff --git a/src/plugins/valgrind/callgrind/callgrindcontroller.h b/src/plugins/valgrind/callgrind/callgrindcontroller.h index 4e73c12f1c..373b4c87a0 100644 --- a/src/plugins/valgrind/callgrind/callgrindcontroller.h +++ b/src/plugins/valgrind/callgrind/callgrindcontroller.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CALLGRINDCONTROLLER_H -#define CALLGRINDCONTROLLER_H +#pragma once #include <QObject> @@ -105,5 +104,3 @@ private: } // namespace Callgrind } // namespace Valgrind - -#endif // CALLGRINDCONTROLLER_H diff --git a/src/plugins/valgrind/callgrind/callgrindcostitem.h b/src/plugins/valgrind/callgrind/callgrindcostitem.h index d50d861b25..68843f44b7 100644 --- a/src/plugins/valgrind/callgrind/callgrindcostitem.h +++ b/src/plugins/valgrind/callgrind/callgrindcostitem.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LIBVALGRIND_CALLGRIND_COSTITEM_H -#define LIBVALGRIND_CALLGRIND_COSTITEM_H +#pragma once #include <QtGlobal> @@ -92,5 +91,3 @@ private: } // namespace Callgrind } // namespace Valgrind - -#endif // LIBVALGRIND_CALLGRIND_COSTITEM_H diff --git a/src/plugins/valgrind/callgrind/callgrindcycledetection.h b/src/plugins/valgrind/callgrind/callgrindcycledetection.h index 07b0281384..4894e7227f 100644 --- a/src/plugins/valgrind/callgrind/callgrindcycledetection.h +++ b/src/plugins/valgrind/callgrind/callgrindcycledetection.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LIBVALGRIND_CALLGRINDCYCLEDETECTION_H -#define LIBVALGRIND_CALLGRINDCYCLEDETECTION_H +#pragma once #include <QHash> #include <QStack> @@ -75,5 +74,3 @@ private: } // namespace Callgrind } // namespace Valgrind - -#endif // LIBVALGRIND_CALLGRINDCYCLEDETECTION_H diff --git a/src/plugins/valgrind/callgrind/callgrinddatamodel.h b/src/plugins/valgrind/callgrind/callgrinddatamodel.h index 43b8dbef23..3daaf77d39 100644 --- a/src/plugins/valgrind/callgrind/callgrinddatamodel.h +++ b/src/plugins/valgrind/callgrind/callgrinddatamodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef VALGRIND_CALLGRIND_CALLGRINDDATAMODEL_H -#define VALGRIND_CALLGRIND_CALLGRINDDATAMODEL_H +#pragma once #include "callgrindabstractmodel.h" @@ -95,5 +94,3 @@ private: } // namespace Callgrind } // namespace Valgrind - -#endif // VALGRIND_CALLGRIND_CALLGRINDDATAMODEL_H diff --git a/src/plugins/valgrind/callgrind/callgrindfunction.h b/src/plugins/valgrind/callgrind/callgrindfunction.h index 5d0e9faefe..fd35b5b7e7 100644 --- a/src/plugins/valgrind/callgrind/callgrindfunction.h +++ b/src/plugins/valgrind/callgrind/callgrindfunction.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LIBVALGRIND_CALLGRIND_FUNCTION_H -#define LIBVALGRIND_CALLGRIND_FUNCTION_H +#pragma once #include <QMetaType> #include <QVector> @@ -145,5 +144,3 @@ private: } // namespace Valgrind Q_DECLARE_METATYPE(const Valgrind::Callgrind::Function *) - -#endif // LIBVALGRIND_CALLGRIND_FUNCTION_H diff --git a/src/plugins/valgrind/callgrind/callgrindfunction_p.h b/src/plugins/valgrind/callgrind/callgrindfunction_p.h index 9563d42650..8bcc2d246c 100644 --- a/src/plugins/valgrind/callgrind/callgrindfunction_p.h +++ b/src/plugins/valgrind/callgrind/callgrindfunction_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LIBVALGRIND_CALLGRINDFUNCTION_P_H -#define LIBVALGRIND_CALLGRINDFUNCTION_P_H +#pragma once #include "callgrindfunction.h" #include "callgrindparsedata.h" @@ -71,5 +70,3 @@ public: } // namespace Callgrind } // namespace Valgrind - -#endif // LIBVALGRIND_CALLGRINDFUNCTION_P_H diff --git a/src/plugins/valgrind/callgrind/callgrindfunctioncall.h b/src/plugins/valgrind/callgrind/callgrindfunctioncall.h index 2f45cb1a26..0c860308aa 100644 --- a/src/plugins/valgrind/callgrind/callgrindfunctioncall.h +++ b/src/plugins/valgrind/callgrind/callgrindfunctioncall.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CALLGRINDFUNCTIONCALL_H -#define CALLGRINDFUNCTIONCALL_H +#pragma once #include <QMetaType> @@ -85,5 +84,3 @@ private: } // namespace Valgrind Q_DECLARE_METATYPE(const Valgrind::Callgrind::FunctionCall *) - -#endif // CALLGRINDFUNCTIONCALL_H diff --git a/src/plugins/valgrind/callgrind/callgrindfunctioncycle.h b/src/plugins/valgrind/callgrind/callgrindfunctioncycle.h index 4a0218cc9a..38221b998d 100644 --- a/src/plugins/valgrind/callgrind/callgrindfunctioncycle.h +++ b/src/plugins/valgrind/callgrind/callgrindfunctioncycle.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LIBVALGRIND_CALLGRINDFUNCTIONCYCLE_H -#define LIBVALGRIND_CALLGRINDFUNCTIONCYCLE_H +#pragma once #include "callgrindfunction.h" @@ -57,5 +56,3 @@ private: } // namespace Callgrind } // namespace Valgrind - -#endif // LIBVALGRIND_CALLGRINDFUNCTIONCYCLE_H diff --git a/src/plugins/valgrind/callgrind/callgrindparsedata.h b/src/plugins/valgrind/callgrind/callgrindparsedata.h index 8943a231d7..4c1ba186f9 100644 --- a/src/plugins/valgrind/callgrind/callgrindparsedata.h +++ b/src/plugins/valgrind/callgrind/callgrindparsedata.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LIBVALGRIND_CALLGRIND_PARSEDATA_P_H -#define LIBVALGRIND_CALLGRIND_PARSEDATA_P_H +#pragma once #include <QtGlobal> @@ -135,5 +134,3 @@ private: } // namespace Callgrind } // namespace Valgrind - -#endif // LIBVALGRIND_CALLGRIND_PARSEDATA_P_H diff --git a/src/plugins/valgrind/callgrind/callgrindparser.h b/src/plugins/valgrind/callgrind/callgrindparser.h index a5c8072563..2b36da5e4c 100644 --- a/src/plugins/valgrind/callgrind/callgrindparser.h +++ b/src/plugins/valgrind/callgrind/callgrindparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef LIBVALGRIND_CALLGRIND_PARSER_H -#define LIBVALGRIND_CALLGRIND_PARSER_H +#pragma once #include <QObject> @@ -71,5 +70,3 @@ private: } // Callgrind } // Valgrind - -#endif // LIBVALGRIND_CALLGRIND_PARSER_H diff --git a/src/plugins/valgrind/callgrind/callgrindproxymodel.h b/src/plugins/valgrind/callgrind/callgrindproxymodel.h index 2dceeb1497..d8f17d883f 100644 --- a/src/plugins/valgrind/callgrind/callgrindproxymodel.h +++ b/src/plugins/valgrind/callgrind/callgrindproxymodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef VALGRIND_CALLGRIND_CALLGRINDPROXYMODEL_H -#define VALGRIND_CALLGRIND_CALLGRINDPROXYMODEL_H +#pragma once #include <QSortFilterProxyModel> @@ -78,5 +77,3 @@ private: } // namespace Callgrind } // namespace Valgrind - -#endif // VALGRIND_CALLGRIND_CALLGRINDPROXYMODEL_H diff --git a/src/plugins/valgrind/callgrind/callgrindrunner.h b/src/plugins/valgrind/callgrind/callgrindrunner.h index b8299c5485..81c3e76da3 100644 --- a/src/plugins/valgrind/callgrind/callgrindrunner.h +++ b/src/plugins/valgrind/callgrind/callgrindrunner.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef VALGRIND_CALLGRIND_CALLGRINDRUNNER_H -#define VALGRIND_CALLGRIND_CALLGRINDRUNNER_H +#pragma once #include "../valgrindrunner.h" @@ -68,5 +67,3 @@ private: } // namespace Callgrind } // namespace Valgrind - -#endif // VALGRIND_CALLGRIND_CALLGRINDRUNNER_H diff --git a/src/plugins/valgrind/callgrind/callgrindstackbrowser.h b/src/plugins/valgrind/callgrind/callgrindstackbrowser.h index a61a522920..35f91bc5ca 100644 --- a/src/plugins/valgrind/callgrind/callgrindstackbrowser.h +++ b/src/plugins/valgrind/callgrind/callgrindstackbrowser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CALLGRINDSTACKBROWSER_H -#define CALLGRINDSTACKBROWSER_H +#pragma once #include <QObject> #include <QStack> @@ -61,5 +60,3 @@ private: } // namespace Callgrind } // namespace Valgrind - -#endif // CALLGRINDSTACKBROWSER_H diff --git a/src/plugins/valgrind/callgrindcostdelegate.h b/src/plugins/valgrind/callgrindcostdelegate.h index 851e5ac08f..3c0e453b92 100644 --- a/src/plugins/valgrind/callgrindcostdelegate.h +++ b/src/plugins/valgrind/callgrindcostdelegate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CALLGRINDCOSTDELEGATE_H -#define CALLGRINDCOSTDELEGATE_H +#pragma once #include <QStyledItemDelegate> @@ -64,5 +63,3 @@ private: } // namespace Valgrind Q_DECLARE_METATYPE(Valgrind::Internal::CostDelegate::CostFormat) - -#endif // CALLGRINDCOSTDELEGATE_H diff --git a/src/plugins/valgrind/callgrindcostview.h b/src/plugins/valgrind/callgrindcostview.h index 963a2b15d3..fb4b2a72ae 100644 --- a/src/plugins/valgrind/callgrindcostview.h +++ b/src/plugins/valgrind/callgrindcostview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CALLGRINDCOSTVIEW_H -#define CALLGRINDCOSTVIEW_H +#pragma once #include "callgrindcostdelegate.h" @@ -63,5 +62,3 @@ private: } // namespace Internal } // namespace Valgrind - -#endif // CALLGRINDCOSTVIEW_H diff --git a/src/plugins/valgrind/callgrindengine.h b/src/plugins/valgrind/callgrindengine.h index 19e91a95b4..ae5696e157 100644 --- a/src/plugins/valgrind/callgrindengine.h +++ b/src/plugins/valgrind/callgrindengine.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CALLGRINDENGINE_H -#define CALLGRINDENGINE_H +#pragma once #include <valgrind/valgrindengine.h> @@ -79,5 +78,3 @@ private: } // namespace Internal } // namespace Valgrind - -#endif // CALLGRINDENGINE_H diff --git a/src/plugins/valgrind/callgrindhelper.h b/src/plugins/valgrind/callgrindhelper.h index 92fa9a81ff..8d5898a2c5 100644 --- a/src/plugins/valgrind/callgrindhelper.h +++ b/src/plugins/valgrind/callgrindhelper.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CALLGRINDHELPER_H -#define CALLGRINDHELPER_H +#pragma once #include <QLocale> @@ -57,5 +56,3 @@ namespace CallgrindHelper } // namespace Internal } // namespace Valgrind - -#endif // CALLGRINDHELPER_H diff --git a/src/plugins/valgrind/callgrindnamedelegate.h b/src/plugins/valgrind/callgrindnamedelegate.h index 4e168fb8cf..2533e46a94 100644 --- a/src/plugins/valgrind/callgrindnamedelegate.h +++ b/src/plugins/valgrind/callgrindnamedelegate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CALLGRINDNAMEDELEGATE_H -#define CALLGRINDNAMEDELEGATE_H +#pragma once #include <QStyledItemDelegate> @@ -42,5 +41,3 @@ public: } // namespace Internal } // namespace Valgrind - -#endif // CALLGRINDNAMEDELEGATE_H diff --git a/src/plugins/valgrind/callgrindtextmark.h b/src/plugins/valgrind/callgrindtextmark.h index 495ab5fc82..f5f1699a25 100644 --- a/src/plugins/valgrind/callgrindtextmark.h +++ b/src/plugins/valgrind/callgrindtextmark.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CALLGRINDTEXTMARK_H -#define CALLGRINDTEXTMARK_H +#pragma once #include <texteditor/textmark.h> @@ -58,5 +57,3 @@ private: } // namespace Internal } // namespace Valgrind - -#endif // CALLGRINDTEXTMARK_H diff --git a/src/plugins/valgrind/callgrindtool.h b/src/plugins/valgrind/callgrindtool.h index e7df17db86..c0618366c7 100644 --- a/src/plugins/valgrind/callgrindtool.h +++ b/src/plugins/valgrind/callgrindtool.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CALLGRINDTOOL_H -#define CALLGRINDTOOL_H +#pragma once #include <QObject> @@ -46,5 +45,3 @@ void destroyCallgrindTool(); } // namespace Internal } // namespace Valgrind - -#endif // CALLGRINDTOOL_H diff --git a/src/plugins/valgrind/callgrindvisualisation.h b/src/plugins/valgrind/callgrindvisualisation.h index a1763c8259..ee920b7470 100644 --- a/src/plugins/valgrind/callgrindvisualisation.h +++ b/src/plugins/valgrind/callgrindvisualisation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CALLGRINDVISUALISATION_H -#define CALLGRINDVISUALISATION_H +#pragma once #include <QGraphicsView> @@ -80,5 +79,3 @@ private: } // namespace Internal } // namespace Valgrind - -#endif // VALGRIND_CALLGRIND_CALLGRINDVISUALISATION_H diff --git a/src/plugins/valgrind/memcheck/memcheckrunner.h b/src/plugins/valgrind/memcheck/memcheckrunner.h index 7bdef65d3e..ec092ffc13 100644 --- a/src/plugins/valgrind/memcheck/memcheckrunner.h +++ b/src/plugins/valgrind/memcheck/memcheckrunner.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef VALGRIND_PROTOCOL_MEMCHECKRUNNER_H -#define VALGRIND_PROTOCOL_MEMCHECKRUNNER_H +#pragma once #include "../valgrindrunner.h" @@ -69,5 +68,3 @@ private: } // namespace Memcheck } // namespace Valgrind - -#endif // VALGRIND_PROTOCOL_MEMCHECKRUNNER_H diff --git a/src/plugins/valgrind/memcheckengine.h b/src/plugins/valgrind/memcheckengine.h index b619aa9669..6455065d35 100644 --- a/src/plugins/valgrind/memcheckengine.h +++ b/src/plugins/valgrind/memcheckengine.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef MEMCHECKENGINE_H -#define MEMCHECKENGINE_H +#pragma once #include "valgrindengine.h" @@ -78,5 +77,3 @@ protected: } // namespace Internal } // namespace Valgrind - -#endif // MEMCHECKENGINE_H diff --git a/src/plugins/valgrind/memcheckerrorview.h b/src/plugins/valgrind/memcheckerrorview.h index 205c723841..244f7df157 100644 --- a/src/plugins/valgrind/memcheckerrorview.h +++ b/src/plugins/valgrind/memcheckerrorview.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef MEMCHECKERRORVIEW_H -#define MEMCHECKERRORVIEW_H +#pragma once #include <debugger/analyzer/detailederrorview.h> @@ -64,5 +63,3 @@ private: } // namespace Internal } // namespace Valgrind - -#endif // MEMCHECKERRORVIEW_H diff --git a/src/plugins/valgrind/memchecktool.h b/src/plugins/valgrind/memchecktool.h index 1ea57b9778..8a6bdd95f3 100644 --- a/src/plugins/valgrind/memchecktool.h +++ b/src/plugins/valgrind/memchecktool.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef MEMCHECKTOOL_H -#define MEMCHECKTOOL_H +#pragma once #include <QObject> @@ -44,5 +43,3 @@ void destroyMemcheckTool(); } // namespace Internal } // namespace Valgrind - -#endif // MEMCHECKTOOL_H diff --git a/src/plugins/valgrind/suppressiondialog.h b/src/plugins/valgrind/suppressiondialog.h index b4effe3324..70a5ee7ff2 100644 --- a/src/plugins/valgrind/suppressiondialog.h +++ b/src/plugins/valgrind/suppressiondialog.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef ANALYZER_VALGRIND_SUPPRESSIONDIALOG_H -#define ANALYZER_VALGRIND_SUPPRESSIONDIALOG_H +#pragma once #include "xmlprotocol/error.h" @@ -72,5 +71,3 @@ private: } // namespace Internal } // namespace Valgrind - -#endif // ANALYZER_VALGRIND_SUPPRESSIONDIALOG_H diff --git a/src/plugins/valgrind/valgrindconfigwidget.h b/src/plugins/valgrind/valgrindconfigwidget.h index 7352bc22bd..5f31a28d4e 100644 --- a/src/plugins/valgrind/valgrindconfigwidget.h +++ b/src/plugins/valgrind/valgrindconfigwidget.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef ANALYZER_VALGRINDCONFIGWIDGET_H -#define ANALYZER_VALGRINDCONFIGWIDGET_H +#pragma once #include <QWidget> @@ -69,5 +68,3 @@ private: } // namespace Internal } // namespace Valgrind - -#endif // ANALYZER_VALGRINDCONFIGWIDGET_H diff --git a/src/plugins/valgrind/valgrindengine.h b/src/plugins/valgrind/valgrindengine.h index fa9ffcc91a..28eab84efb 100644 --- a/src/plugins/valgrind/valgrindengine.h +++ b/src/plugins/valgrind/valgrindengine.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef VALGRINDENGINE_H -#define VALGRINDENGINE_H +#pragma once #include <debugger/analyzer/analyzerruncontrol.h> #include <utils/environment.h> @@ -77,5 +76,3 @@ private: } // namespace Internal } // namespace Valgrind - -#endif // VALGRINDENGINE_H diff --git a/src/plugins/valgrind/valgrindplugin.h b/src/plugins/valgrind/valgrindplugin.h index f402e4c2ba..b3f8cd2bd6 100644 --- a/src/plugins/valgrind/valgrindplugin.h +++ b/src/plugins/valgrind/valgrindplugin.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef VALGRINDPLUGIN_H -#define VALGRINDPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> #include <projectexplorer/projectexplorer.h> @@ -53,5 +52,3 @@ public: } // namespace Internal } // namespace Valgrind - -#endif // VALGRINDPLUGIN_H diff --git a/src/plugins/valgrind/valgrindprocess.h b/src/plugins/valgrind/valgrindprocess.h index 0d04a4093e..44da14afa2 100644 --- a/src/plugins/valgrind/valgrindprocess.h +++ b/src/plugins/valgrind/valgrindprocess.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef VALGRINDPROCESS_H -#define VALGRINDPROCESS_H +#pragma once #include <projectexplorer/applicationlauncher.h> #include <projectexplorer/devicesupport/idevice.h> @@ -108,5 +107,3 @@ private: }; } // namespace Valgrind - -#endif // VALGRINDPROCESS_H diff --git a/src/plugins/valgrind/valgrindruncontrolfactory.h b/src/plugins/valgrind/valgrindruncontrolfactory.h index 65d618dae0..b3e74646d1 100644 --- a/src/plugins/valgrind/valgrindruncontrolfactory.h +++ b/src/plugins/valgrind/valgrindruncontrolfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef VALGRINDRUNCONTROLFACTORY_H -#define VALGRINDRUNCONTROLFACTORY_H +#pragma once #include <projectexplorer/runconfiguration.h> @@ -49,5 +48,3 @@ public: } // namespace Internal } // namespace Valgrind - -#endif // VALGRINDRUNCONTROLFACTORY_H diff --git a/src/plugins/valgrind/valgrindrunner.h b/src/plugins/valgrind/valgrindrunner.h index 637f436ad0..6446209219 100644 --- a/src/plugins/valgrind/valgrindrunner.h +++ b/src/plugins/valgrind/valgrindrunner.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef VALGRIND_RUNNER_H -#define VALGRIND_RUNNER_H +#pragma once #include <debugger/analyzer/analyzerconstants.h> @@ -87,5 +86,3 @@ private: }; } // namespace Valgrind - -#endif // VALGRIND_RUNNER_H diff --git a/src/plugins/valgrind/valgrindsettings.h b/src/plugins/valgrind/valgrindsettings.h index c66a28c51f..252b819134 100644 --- a/src/plugins/valgrind/valgrindsettings.h +++ b/src/plugins/valgrind/valgrindsettings.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef ANALYZER_INTERNAL_VALGRINDSETTINGS_H -#define ANALYZER_INTERNAL_VALGRINDSETTINGS_H +#pragma once #include "callgrindcostdelegate.h" #include <projectexplorer/runconfiguration.h> @@ -275,5 +274,3 @@ private: } // namespace Internal } // namespace Valgrind - -#endif // VALGRIND_INTERNAL_ANALZYZERSETTINGS_H diff --git a/src/plugins/valgrind/workarounds.h b/src/plugins/valgrind/workarounds.h index ff2c4cff3b..e65c8cca69 100644 --- a/src/plugins/valgrind/workarounds.h +++ b/src/plugins/valgrind/workarounds.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WORKAROUNDS_H -#define WORKAROUNDS_H +#pragma once #include <qglobal.h> @@ -34,5 +33,3 @@ QT_END_NAMESPACE ///FIXME: remove this once https://bugreports.qt.io/browse/QTCREATORBUG-3247 gets fixed QPalette panelPalette(const QPalette &oldPalette, bool lightColored = false); - -#endif // WORKAROUNDS_H diff --git a/src/plugins/valgrind/xmlprotocol/announcethread.h b/src/plugins/valgrind/xmlprotocol/announcethread.h index 7be6ca5f05..6219c98a48 100644 --- a/src/plugins/valgrind/xmlprotocol/announcethread.h +++ b/src/plugins/valgrind/xmlprotocol/announcethread.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef LIBVALGRIND_PROTOCOL_ANNOUNCETHREAD_H -#define LIBVALGRIND_PROTOCOL_ANNOUNCETHREAD_H +#pragma once #include <QSharedDataPointer> @@ -60,5 +59,3 @@ private: } // namespace XmlProtocol } // namespace Valgrind - -#endif // LIBVALGRIND_PROTOCOL_ANNOUNCETHREAD_H diff --git a/src/plugins/valgrind/xmlprotocol/error.h b/src/plugins/valgrind/xmlprotocol/error.h index 67fbca5953..f7b56f301f 100644 --- a/src/plugins/valgrind/xmlprotocol/error.h +++ b/src/plugins/valgrind/xmlprotocol/error.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef LIBVALGRIND_PROTOCOL_ERROR_H -#define LIBVALGRIND_PROTOCOL_ERROR_H +#pragma once #include <QMetaType> #include <QSharedDataPointer> @@ -138,5 +137,3 @@ private: } // namespace Valgrind Q_DECLARE_METATYPE(Valgrind::XmlProtocol::Error) - -#endif // LIBVALGRIND_PROTOCOL_ERROR_H diff --git a/src/plugins/valgrind/xmlprotocol/errorlistmodel.h b/src/plugins/valgrind/xmlprotocol/errorlistmodel.h index ec7f5de61c..020c08dd4b 100644 --- a/src/plugins/valgrind/xmlprotocol/errorlistmodel.h +++ b/src/plugins/valgrind/xmlprotocol/errorlistmodel.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef LIBVALGRIND_PROTOCOL_ERRORLISTMODEL_H -#define LIBVALGRIND_PROTOCOL_ERRORLISTMODEL_H +#pragma once #include <debugger/analyzer/detailederrorview.h> #include <utils/treemodel.h> @@ -70,5 +69,3 @@ private: } // namespace XmlProtocol } // namespace Valgrind - -#endif // LIBVALGRIND_PROTOCOL_ERRORLISTMODEL_H diff --git a/src/plugins/valgrind/xmlprotocol/frame.h b/src/plugins/valgrind/xmlprotocol/frame.h index 4cd9836ce6..151c815898 100644 --- a/src/plugins/valgrind/xmlprotocol/frame.h +++ b/src/plugins/valgrind/xmlprotocol/frame.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef LIBVALGRIND_PROTOCOL_FRAME_H -#define LIBVALGRIND_PROTOCOL_FRAME_H +#pragma once #include <QSharedDataPointer> @@ -72,5 +71,3 @@ private: } // namespace XmlProtocol } // namespace Valgrind - -#endif diff --git a/src/plugins/valgrind/xmlprotocol/modelhelpers.h b/src/plugins/valgrind/xmlprotocol/modelhelpers.h index 2c1bdba79c..7f0bef922a 100644 --- a/src/plugins/valgrind/xmlprotocol/modelhelpers.h +++ b/src/plugins/valgrind/xmlprotocol/modelhelpers.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef LIBVALGRIND_PROTOCOL_MODELHELPERS_H -#define LIBVALGRIND_PROTOCOL_MODELHELPERS_H +#pragma once #include <QtGlobal> @@ -42,5 +41,3 @@ QString toolTipForFrame(const Frame &frame); } // namespace XmlProtocol } // namespace Valgrind - -#endif // LIBVALGRIND_PROTOCOL_MODELHELPERS_H diff --git a/src/plugins/valgrind/xmlprotocol/parser.h b/src/plugins/valgrind/xmlprotocol/parser.h index 76eea29135..4ed7d82028 100644 --- a/src/plugins/valgrind/xmlprotocol/parser.h +++ b/src/plugins/valgrind/xmlprotocol/parser.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef LIBVALGRIND_PROTOCOL_PARSER_H -#define LIBVALGRIND_PROTOCOL_PARSER_H +#pragma once #include <QObject> @@ -79,5 +78,3 @@ private: } // XmlProtocol } // Valgrind - -#endif //LIBVALGRIND_PROTOCOL_PARSER_H diff --git a/src/plugins/valgrind/xmlprotocol/stack.h b/src/plugins/valgrind/xmlprotocol/stack.h index daec25b94a..5fd5d3c070 100644 --- a/src/plugins/valgrind/xmlprotocol/stack.h +++ b/src/plugins/valgrind/xmlprotocol/stack.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef VALGRIND_PROTOCOL_STACK_H -#define VALGRIND_PROTOCOL_STACK_H +#pragma once #include <QSharedDataPointer> @@ -75,5 +74,3 @@ private: } // namespace XmlProtocol } // namespace Stack - -#endif // VALGRIND_PROTOCOL_STACK_H diff --git a/src/plugins/valgrind/xmlprotocol/stackmodel.h b/src/plugins/valgrind/xmlprotocol/stackmodel.h index 425a8468e0..a948b13bdc 100644 --- a/src/plugins/valgrind/xmlprotocol/stackmodel.h +++ b/src/plugins/valgrind/xmlprotocol/stackmodel.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef LIBVALGRIND_PROTOCOL_STACKMODEL_H -#define LIBVALGRIND_PROTOCOL_STACKMODEL_H +#pragma once #include <QAbstractItemModel> @@ -79,5 +78,3 @@ private: } // namespace XmlProtocol } // namespace Valgrind - -#endif // LIBVALGRIND_PROTOCOL_STACKMODEL_H diff --git a/src/plugins/valgrind/xmlprotocol/status.h b/src/plugins/valgrind/xmlprotocol/status.h index 9721a0ea79..b0ea47de09 100644 --- a/src/plugins/valgrind/xmlprotocol/status.h +++ b/src/plugins/valgrind/xmlprotocol/status.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef LIBVALGRIND_PROTOCOL_STATUS_H -#define LIBVALGRIND_PROTOCOL_STATUS_H +#pragma once #include <QMetaType> #include <QSharedDataPointer> @@ -63,5 +62,3 @@ private: } // namespace Valgrind Q_DECLARE_METATYPE(Valgrind::XmlProtocol::Status) - -#endif // LIBVALGRIND_PROTOCOL_STATUS_H diff --git a/src/plugins/valgrind/xmlprotocol/suppression.h b/src/plugins/valgrind/xmlprotocol/suppression.h index 7712c71bb1..3536db1a94 100644 --- a/src/plugins/valgrind/xmlprotocol/suppression.h +++ b/src/plugins/valgrind/xmlprotocol/suppression.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef LIBVALGRIND_PROTOCOL_SUPPRESSION_H -#define LIBVALGRIND_PROTOCOL_SUPPRESSION_H +#pragma once #include <QSharedDataPointer> @@ -103,5 +102,3 @@ private: } // namespace XmlProtocol } // namespace Valgrind - -#endif // LIBVALGRIND_PROTOCOL_SUPPRESSION_H diff --git a/src/plugins/valgrind/xmlprotocol/threadedparser.h b/src/plugins/valgrind/xmlprotocol/threadedparser.h index 3bd6817c8a..5e74949474 100644 --- a/src/plugins/valgrind/xmlprotocol/threadedparser.h +++ b/src/plugins/valgrind/xmlprotocol/threadedparser.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef LIBVALGRIND_PROTOCOL_THREADEDPARSER_H -#define LIBVALGRIND_PROTOCOL_THREADEDPARSER_H +#pragma once #include <QObject> @@ -79,5 +78,3 @@ private: } // XmlProtocol } // Valgrind - -#endif //LIBVALGRIND_PROTOCOL_THREADEDPARSER_H diff --git a/src/plugins/vcsbase/submitfilemodel.h b/src/plugins/vcsbase/submitfilemodel.h index 31ef8cf267..d32345d5df 100644 --- a/src/plugins/vcsbase/submitfilemodel.h +++ b/src/plugins/vcsbase/submitfilemodel.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SUBMITFILEMODEL_H -#define SUBMITFILEMODEL_H +#pragma once #include "vcsbase_global.h" @@ -94,5 +93,3 @@ private: }; } // namespace VcsBase - -#endif // SUBMITFILEMODEL_H diff --git a/src/plugins/welcome/welcomeplugin.h b/src/plugins/welcome/welcomeplugin.h index 4d75a43bee..fe05ee8a04 100644 --- a/src/plugins/welcome/welcomeplugin.h +++ b/src/plugins/welcome/welcomeplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WELCOMEPLUGIN_H -#define WELCOMEPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -54,5 +53,3 @@ private: } // namespace Welcome } // namespace Internal - -#endif // WELCOMEPLUGIN_H diff --git a/src/plugins/winrt/winrtconstants.h b/src/plugins/winrt/winrtconstants.h index 15898aee33..c36dc8d70d 100644 --- a/src/plugins/winrt/winrtconstants.h +++ b/src/plugins/winrt/winrtconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINRTCONSTANTS_H -#define WINRTCONSTANTS_H +#pragma once namespace WinRt { namespace Internal { @@ -45,5 +44,3 @@ const char WINRT_RC_PREFIX[] = "WinRt.WinRtRunConfiguration:"; } // Constants } // Internal } // WinRt - -#endif // WINRTCONSTANTS_H diff --git a/src/plugins/winrt/winrtdebugsupport.h b/src/plugins/winrt/winrtdebugsupport.h index df8460ffa6..08a21dbf99 100644 --- a/src/plugins/winrt/winrtdebugsupport.h +++ b/src/plugins/winrt/winrtdebugsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINRT_INTERNAL_WINRTDEBUGSUPPORT_H -#define WINRT_INTERNAL_WINRTDEBUGSUPPORT_H +#pragma once #include <projectexplorer/runconfiguration.h> @@ -60,5 +59,3 @@ private slots: } // namespace Internal } // namespace WinRt - -#endif // WINRT_INTERNAL_WINRTDEBUGSUPPORT_H diff --git a/src/plugins/winrt/winrtdeployconfiguration.h b/src/plugins/winrt/winrtdeployconfiguration.h index 00a6d67ae6..96ac069dfe 100644 --- a/src/plugins/winrt/winrtdeployconfiguration.h +++ b/src/plugins/winrt/winrtdeployconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINRTDEPLOYCONFIGURATION_H -#define WINRTDEPLOYCONFIGURATION_H +#pragma once #include <projectexplorer/deployconfiguration.h> #include <projectexplorer/buildstep.h> @@ -72,5 +71,3 @@ private: } // namespace Internal } // namespace WinRt - -#endif // WINRTDEPLOYCONFIGURATION_H diff --git a/src/plugins/winrt/winrtdevice.h b/src/plugins/winrt/winrtdevice.h index 5807223da1..1279cbcbe2 100644 --- a/src/plugins/winrt/winrtdevice.h +++ b/src/plugins/winrt/winrtdevice.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINRTDEVICE_H -#define WINRTDEVICE_H +#pragma once #include <QList> #include <QUuid> @@ -70,5 +69,3 @@ private: } // Internal } // WinRt - -#endif // WINRTDEVICE_H diff --git a/src/plugins/winrt/winrtdevicefactory.h b/src/plugins/winrt/winrtdevicefactory.h index a10a0c3240..edb938e806 100644 --- a/src/plugins/winrt/winrtdevicefactory.h +++ b/src/plugins/winrt/winrtdevicefactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINRTDEVICEFACTORY_H -#define WINRTDEVICEFACTORY_H +#pragma once #include <projectexplorer/devicesupport/idevicefactory.h> #include <utils/qtcprocess.h> @@ -63,5 +62,3 @@ private: } // Internal } // WinRt - -#endif // WINRTDEVICEFACTORY_H diff --git a/src/plugins/winrt/winrtpackagedeploymentstep.h b/src/plugins/winrt/winrtpackagedeploymentstep.h index 950d7a1217..f7a2cecfbf 100644 --- a/src/plugins/winrt/winrtpackagedeploymentstep.h +++ b/src/plugins/winrt/winrtpackagedeploymentstep.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINRTPACKAGEDEPLOYMENTSTEP_H -#define WINRTPACKAGEDEPLOYMENTSTEP_H +#pragma once #include <projectexplorer/abstractprocessstep.h> @@ -66,5 +65,3 @@ private: } // namespace Internal } // namespace WinRt - -#endif // WINRTPACKAGEDEPLOYMENTSTEP_H diff --git a/src/plugins/winrt/winrtpackagedeploymentstepwidget.h b/src/plugins/winrt/winrtpackagedeploymentstepwidget.h index 0473b54c50..14be99b2dc 100644 --- a/src/plugins/winrt/winrtpackagedeploymentstepwidget.h +++ b/src/plugins/winrt/winrtpackagedeploymentstepwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINRTPACKAGEDEPLOYMENTSTEPWIDGET_H -#define WINRTPACKAGEDEPLOYMENTSTEPWIDGET_H +#pragma once #include "winrtpackagedeploymentstep.h" @@ -56,5 +55,3 @@ private: } // namespace Internal } // namespace WinRt - -#endif // WINRTPACKAGEDEPLOYMENTSTEPWIDGET_H diff --git a/src/plugins/winrt/winrtphoneqtversion.h b/src/plugins/winrt/winrtphoneqtversion.h index ed28e3c225..bbb8bd9764 100644 --- a/src/plugins/winrt/winrtphoneqtversion.h +++ b/src/plugins/winrt/winrtphoneqtversion.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINRTPHONEQTVERSION_H -#define WINRTPHONEQTVERSION_H +#pragma once #include "winrtqtversion.h" @@ -47,5 +46,3 @@ public: } // Internal } // WinRt - -#endif // WINRTPHONEQTVERSION_H diff --git a/src/plugins/winrt/winrtplugin.h b/src/plugins/winrt/winrtplugin.h index acd4ecd43d..949eb3ba9a 100644 --- a/src/plugins/winrt/winrtplugin.h +++ b/src/plugins/winrt/winrtplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINRTPLUGIN_H -#define WINRTPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -47,5 +46,3 @@ public: } // namespace Internal } // namespace WinRt - -#endif // WINRTPLUGIN_H diff --git a/src/plugins/winrt/winrtqtversion.h b/src/plugins/winrt/winrtqtversion.h index 7fdb3a5399..f3a4fc9d3b 100644 --- a/src/plugins/winrt/winrtqtversion.h +++ b/src/plugins/winrt/winrtqtversion.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINRTQTVERSION_H -#define WINRTQTVERSION_H +#pragma once #include <qtsupport/baseqtversion.h> @@ -50,5 +49,3 @@ public: } // Internal } // WinRt - -#endif // WINRTQTVERSION_H diff --git a/src/plugins/winrt/winrtqtversionfactory.h b/src/plugins/winrt/winrtqtversionfactory.h index 67280ee29c..bc099372c9 100644 --- a/src/plugins/winrt/winrtqtversionfactory.h +++ b/src/plugins/winrt/winrtqtversionfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINRTQTVERSIONFACTORY_H -#define WINRTQTVERSIONFACTORY_H +#pragma once #include <qtsupport/qtversionfactory.h> @@ -47,5 +46,3 @@ public: } // Internal } // WinRt - -#endif // WINRTQTVERSIONFACTORY_H diff --git a/src/plugins/winrt/winrtrunconfiguration.h b/src/plugins/winrt/winrtrunconfiguration.h index 593cc79dcc..bfff934ffb 100644 --- a/src/plugins/winrt/winrtrunconfiguration.h +++ b/src/plugins/winrt/winrtrunconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINRTRUNCONFIGURATION_H -#define WINRTRUNCONFIGURATION_H +#pragma once #include <projectexplorer/runconfiguration.h> @@ -61,5 +60,3 @@ private: } // namespace Internal } // namespace WinRt - -#endif // WINRTRUNCONFIGURATION_H diff --git a/src/plugins/winrt/winrtrunconfigurationwidget.h b/src/plugins/winrt/winrtrunconfigurationwidget.h index 7f8b3cbecb..9f68d0bb5b 100644 --- a/src/plugins/winrt/winrtrunconfigurationwidget.h +++ b/src/plugins/winrt/winrtrunconfigurationwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINRTRUNCONFIGURATIONWIDGET_H -#define WINRTRUNCONFIGURATIONWIDGET_H +#pragma once #include <utils/detailswidget.h> @@ -48,5 +47,3 @@ private: } // namespace Internal } // namespace WinRt - -#endif // WINRTRUNCONFIGURATIONWIDGET_H diff --git a/src/plugins/winrt/winrtruncontrol.h b/src/plugins/winrt/winrtruncontrol.h index d1ff61804f..e7238d7cad 100644 --- a/src/plugins/winrt/winrtruncontrol.h +++ b/src/plugins/winrt/winrtruncontrol.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINRTRUNCONTROL_H -#define WINRTRUNCONTROL_H +#pragma once #include "winrtdevice.h" @@ -72,5 +71,3 @@ private: } // namespace Internal } // namespace WinRt - -#endif // WINRTRUNCONTROL_H diff --git a/src/plugins/winrt/winrtrunfactories.h b/src/plugins/winrt/winrtrunfactories.h index 09b8986828..59a35ff3a6 100644 --- a/src/plugins/winrt/winrtrunfactories.h +++ b/src/plugins/winrt/winrtrunfactories.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINRTRUNCONFIGURATIONFACTORY_H -#define WINRTRUNCONFIGURATIONFACTORY_H +#pragma once #include <projectexplorer/runconfiguration.h> #include <projectexplorer/devicesupport/idevicefactory.h> @@ -67,5 +66,3 @@ public: } // namespace Internal } // namespace WinRt - -#endif // WINRTRUNCONFIGURATIONFACTORY_H diff --git a/src/plugins/winrt/winrtrunnerhelper.h b/src/plugins/winrt/winrtrunnerhelper.h index 0ecfd0f76e..0963ff0b1b 100644 --- a/src/plugins/winrt/winrtrunnerhelper.h +++ b/src/plugins/winrt/winrtrunnerhelper.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WINRTRUNNERHELPER_H -#define WINRTRUNNERHELPER_H +#pragma once #include "winrtdevice.h" @@ -92,5 +91,3 @@ private: } // namespace WinRt } // namespace Internal - -#endif // WINRTRUNNERHELPER_H diff --git a/src/shared/cpaster/cgi.h b/src/shared/cpaster/cgi.h index 0422468e6c..688ec50288 100644 --- a/src/shared/cpaster/cgi.h +++ b/src/shared/cpaster/cgi.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CGI_H -#define CGI_H +#pragma once #include <QString> @@ -47,5 +46,3 @@ private: inline short charToHex(const QChar &ch); inline QChar hexToChar(const QString &hx); }; - -#endif // CGI_H diff --git a/src/shared/cpaster/splitter.h b/src/shared/cpaster/splitter.h index a4d14bbbc9..ae03a19514 100644 --- a/src/shared/cpaster/splitter.h +++ b/src/shared/cpaster/splitter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SPLITTER_H -#define SPLITTER_H +#pragma once #include <QByteArray> #include <QList> @@ -42,5 +41,3 @@ struct FileData typedef QList<FileData> FileDataList; FileDataList splitDiffToFiles(const QString &data); - -#endif // SPLITTER_H diff --git a/src/shared/designerintegrationv2/formresizer.h b/src/shared/designerintegrationv2/formresizer.h index 80dbf0e1a0..aad1a57b0f 100644 --- a/src/shared/designerintegrationv2/formresizer.h +++ b/src/shared/designerintegrationv2/formresizer.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FORMRESIZER_H -#define FORMRESIZER_H +#pragma once #include "widgethostconstants.h" @@ -90,5 +89,3 @@ private: } } // namespace SharedTools - -#endif // FORMRESIZER_H diff --git a/src/shared/designerintegrationv2/sizehandlerect.h b/src/shared/designerintegrationv2/sizehandlerect.h index 36ebb4c579..df4912abe5 100644 --- a/src/shared/designerintegrationv2/sizehandlerect.h +++ b/src/shared/designerintegrationv2/sizehandlerect.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SIZEHANDLERECT_H -#define SIZEHANDLERECT_H +#pragma once #include "widgethostconstants.h" @@ -71,7 +70,3 @@ private: } } // namespace SharedTools - - -#endif // SIZEHANDLERECT_H - diff --git a/src/shared/designerintegrationv2/widgethost.h b/src/shared/designerintegrationv2/widgethost.h index 00f3ab6b30..ccf8590e91 100644 --- a/src/shared/designerintegrationv2/widgethost.h +++ b/src/shared/designerintegrationv2/widgethost.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WIDGETHOST_H -#define WIDGETHOST_H +#pragma once #include <QScrollArea> @@ -67,5 +66,3 @@ private: }; } // namespace SharedTools - -#endif // WIDGETHOST_H diff --git a/src/shared/designerintegrationv2/widgethostconstants.h b/src/shared/designerintegrationv2/widgethostconstants.h index f05b0c3598..76bbb3950b 100644 --- a/src/shared/designerintegrationv2/widgethostconstants.h +++ b/src/shared/designerintegrationv2/widgethostconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef WIDGETHOST_CONSTANTS_H -#define WIDGETHOST_CONSTANTS_H +#pragma once namespace SharedTools { namespace Internal { @@ -32,6 +31,3 @@ namespace SharedTools { enum SelectionHandleState { SelectionHandleOff, SelectionHandleInactive, SelectionHandleActive }; } } - -#endif // WIDGETHOST_CONSTANTS_H - diff --git a/src/shared/help/bookmarkmanager.h b/src/shared/help/bookmarkmanager.h index 7bb4c71e7f..2526d8bc43 100644 --- a/src/shared/help/bookmarkmanager.h +++ b/src/shared/help/bookmarkmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BOOKMARKMANAGER_H -#define BOOKMARKMANAGER_H +#pragma once #include "ui_bookmarkdialog.h" @@ -188,5 +187,3 @@ private: BookmarkModel *listModel; QStandardItem *renameItem; }; - -#endif diff --git a/src/shared/help/contentwindow.h b/src/shared/help/contentwindow.h index 345769b258..99ec3cbca5 100644 --- a/src/shared/help/contentwindow.h +++ b/src/shared/help/contentwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CONTENTWINDOW_H -#define CONTENTWINDOW_H +#pragma once #include <QUrl> #include <QModelIndex> @@ -66,5 +65,3 @@ private: int m_expandDepth; bool m_isOpenInNewPageActionVisible; }; - -#endif // CONTENTWINDOW_H diff --git a/src/shared/help/filternamedialog.h b/src/shared/help/filternamedialog.h index a32df1c8f7..23f62e9528 100644 --- a/src/shared/help/filternamedialog.h +++ b/src/shared/help/filternamedialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FILTERNAMEDIALOG_H -#define FILTERNAMEDIALOG_H +#pragma once #include <QDialog> #include "ui_filternamedialog.h" @@ -43,5 +42,3 @@ private slots: private: Ui::FilterNameDialogClass m_ui; }; - -#endif // FILTERNAMEDIALOG_H diff --git a/src/shared/help/helpicons.h b/src/shared/help/helpicons.h index af55edb552..cc9ea64df1 100644 --- a/src/shared/help/helpicons.h +++ b/src/shared/help/helpicons.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef HELPICONS_H -#define HELPICONS_H +#pragma once #include <utils/icon.h> @@ -44,5 +43,3 @@ const Utils::Icon MODE_HELP_FLAT_ACTIVE({ } // namespace Icons } // namespace Help - -#endif // HELPICONS_H diff --git a/src/shared/help/indexwindow.h b/src/shared/help/indexwindow.h index 14a0983124..d041ba399f 100644 --- a/src/shared/help/indexwindow.h +++ b/src/shared/help/indexwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef INDEXWINDOW_H -#define INDEXWINDOW_H +#pragma once #include <QAbstractProxyModel> #include <QList> @@ -108,5 +107,3 @@ private: } // Internal } // Help - -#endif // INDEXWINDOW_H diff --git a/src/shared/help/topicchooser.h b/src/shared/help/topicchooser.h index 304551412a..a886b2b929 100644 --- a/src/shared/help/topicchooser.h +++ b/src/shared/help/topicchooser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef TOPICCHOOSER_H -#define TOPICCHOOSER_H +#pragma once #include "ui_topicchooser.h" @@ -62,5 +61,3 @@ private: QModelIndex m_activedIndex; QSortFilterProxyModel *m_filterModel; }; - -#endif // TOPICCHOOSER_H diff --git a/src/shared/modeltest/modeltest.h b/src/shared/modeltest/modeltest.h index ecebfeae00..e3f3c8aa34 100644 --- a/src/shared/modeltest/modeltest.h +++ b/src/shared/modeltest/modeltest.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef MODELTEST_H -#define MODELTEST_H +#pragma once #include <QAbstractItemModel> #include <QObject> @@ -74,5 +73,3 @@ private: QList<QPersistentModelIndex> changing; }; - -#endif // MODELTEST_H diff --git a/src/shared/proparser/ioutils.h b/src/shared/proparser/ioutils.h index 3bade494df..f4fd79f32d 100644 --- a/src/shared/proparser/ioutils.h +++ b/src/shared/proparser/ioutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOUTILS_H -#define IOUTILS_H +#pragma once #include <qstring.h> @@ -64,5 +63,3 @@ public: } // namespace ProFileEvaluatorInternal QT_END_NAMESPACE - -#endif // IOUTILS_H diff --git a/src/shared/proparser/profileevaluator.h b/src/shared/proparser/profileevaluator.h index f49097e670..27b26081b0 100644 --- a/src/shared/proparser/profileevaluator.h +++ b/src/shared/proparser/profileevaluator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROFILEEVALUATOR_H -#define PROFILEEVALUATOR_H +#pragma once #include "qmake_global.h" #include "qmakeglobals.h" @@ -96,5 +95,3 @@ private: }; QT_END_NAMESPACE - -#endif // PROFILEEVALUATOR_H diff --git a/src/shared/proparser/proitems.h b/src/shared/proparser/proitems.h index 4515eafc7b..d6bc4fe1cb 100644 --- a/src/shared/proparser/proitems.h +++ b/src/shared/proparser/proitems.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROITEMS_H -#define PROITEMS_H +#pragma once #include "qmake_global.h" @@ -387,5 +386,3 @@ struct ProFunctionDefs { }; QT_END_NAMESPACE - -#endif // PROITEMS_H diff --git a/src/shared/proparser/prowriter.h b/src/shared/proparser/prowriter.h index cd100ffc98..808884837b 100644 --- a/src/shared/proparser/prowriter.h +++ b/src/shared/proparser/prowriter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef PROWRITER_H -#define PROWRITER_H +#pragma once #include "qmake_global.h" #include <QStringList> @@ -70,5 +69,3 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(ProWriter::PutFlags) } // namespace Internal } // namespace QmakeProjectManager - -#endif // PROWRITER_H diff --git a/src/shared/proparser/qmake_global.h b/src/shared/proparser/qmake_global.h index af422118b6..8dd3844309 100644 --- a/src/shared/proparser/qmake_global.h +++ b/src/shared/proparser/qmake_global.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKE_GLOBAL_H -#define QMAKE_GLOBAL_H +#pragma once #include <qglobal.h> @@ -51,5 +50,3 @@ #ifdef PROEVALUATOR_FULL # define PROEVALUATOR_DEBUG #endif - -#endif diff --git a/src/shared/proparser/qmakeevaluator.h b/src/shared/proparser/qmakeevaluator.h index 9394686283..7bb673cb89 100644 --- a/src/shared/proparser/qmakeevaluator.h +++ b/src/shared/proparser/qmakeevaluator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEEVALUATOR_H -#define QMAKEEVALUATOR_H +#pragma once #if defined(PROEVALUATOR_FULL) && defined(PROEVALUATOR_THREAD_SAFE) # error PROEVALUATOR_FULL is incompatible with PROEVALUATOR_THREAD_SAFE due to cache() implementation @@ -310,5 +309,3 @@ Q_DECLARE_TYPEINFO(QMakeEvaluator::Location, Q_PRIMITIVE_TYPE); Q_DECLARE_OPERATORS_FOR_FLAGS(QMakeEvaluator::LoadFlags) QT_END_NAMESPACE - -#endif // QMAKEEVALUATOR_H diff --git a/src/shared/proparser/qmakeevaluator_p.h b/src/shared/proparser/qmakeevaluator_p.h index 66f6f138df..91c3922106 100644 --- a/src/shared/proparser/qmakeevaluator_p.h +++ b/src/shared/proparser/qmakeevaluator_p.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEEVALUATOR_P_H -#define QMAKEEVALUATOR_P_H +#pragma once #include "proitems.h" @@ -90,5 +89,3 @@ extern QMakeStatics statics; } QT_END_NAMESPACE - -#endif // QMAKEEVALUATOR_P_H diff --git a/src/shared/proparser/qmakeglobals.h b/src/shared/proparser/qmakeglobals.h index bd6fe2ead3..33a5bdb831 100644 --- a/src/shared/proparser/qmakeglobals.h +++ b/src/shared/proparser/qmakeglobals.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEGLOBALS_H -#define QMAKEGLOBALS_H +#pragma once #include "qmake_global.h" #include "proitems.h" @@ -159,5 +158,3 @@ private: }; QT_END_NAMESPACE - -#endif // QMAKEGLOBALS_H diff --git a/src/shared/proparser/qmakeparser.h b/src/shared/proparser/qmakeparser.h index 1da0271625..d44523d024 100644 --- a/src/shared/proparser/qmakeparser.h +++ b/src/shared/proparser/qmakeparser.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEPARSER_H -#define QMAKEPARSER_H +#pragma once #include "qmake_global.h" #include "proitems.h" @@ -226,5 +225,3 @@ Q_DECLARE_TYPEINFO(QMakeParser::Context, Q_PRIMITIVE_TYPE); #endif QT_END_NAMESPACE - -#endif // PROFILEPARSER_H diff --git a/src/shared/proparser/qmakevfs.h b/src/shared/proparser/qmakevfs.h index 18762d836c..8c387fe29d 100644 --- a/src/shared/proparser/qmakevfs.h +++ b/src/shared/proparser/qmakevfs.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QMAKEVFS_H -#define QMAKEVFS_H +#pragma once #include "qmake_global.h" @@ -65,5 +64,3 @@ private: }; QT_END_NAMESPACE - -#endif // QMAKEVFS_H diff --git a/src/shared/qtlockedfile/qtlockedfile.h b/src/shared/qtlockedfile/qtlockedfile.h index 44dbbaafab..52dfef64d0 100644 --- a/src/shared/qtlockedfile/qtlockedfile.h +++ b/src/shared/qtlockedfile/qtlockedfile.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QTLOCKEDFILE_H -#define QTLOCKEDFILE_H +#pragma once #include <QFile> @@ -69,5 +68,3 @@ private: }; } // namespace SharedTools - -#endif // QTLOCKEDFILE_H diff --git a/src/shared/registryaccess/registryaccess.h b/src/shared/registryaccess/registryaccess.h index 7b65160d60..f8620614c7 100644 --- a/src/shared/registryaccess/registryaccess.h +++ b/src/shared/registryaccess/registryaccess.h @@ -27,8 +27,7 @@ // qtcdebugger is currently registered for post-mortem debugging. // This is only needed on Windows. -#ifndef REGISTRYACCESS_H -#define REGISTRYACCESS_H +#pragma once #include <QString> #include <QLatin1String> @@ -75,5 +74,3 @@ QString debuggerCall(const QString &additionalOption = QString()); bool isRegistered(HKEY handle, const QString &call, QString *errorMessage, QString *oldDebugger = 0); } // namespace RegistryAccess - -#endif // REGISTRYACCESS_H diff --git a/src/tools/3rdparty/iossim/coresimulator/coresimulator.h b/src/tools/3rdparty/iossim/coresimulator/coresimulator.h index d38805ace4..6f0e57486e 100644 --- a/src/tools/3rdparty/iossim/coresimulator/coresimulator.h +++ b/src/tools/3rdparty/iossim/coresimulator/coresimulator.h @@ -448,4 +448,3 @@ typedef void (^CDUnknownBlockType)(void); // return type and parameters are unkn - (id)init; @end - diff --git a/src/tools/clangbackend/ipcsource/clangcodecompleteresults.h b/src/tools/clangbackend/ipcsource/clangcodecompleteresults.h index 63e164c402..157fcf1224 100644 --- a/src/tools/clangbackend/ipcsource/clangcodecompleteresults.h +++ b/src/tools/clangbackend/ipcsource/clangcodecompleteresults.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_CLANGCODECOMPLETERESULTS_H -#define CLANGBACKEND_CLANGCODECOMPLETERESULTS_H +#pragma once #include <clang-c/Index.h> @@ -61,5 +60,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_CLANGCODECOMPLETERESULTS_H diff --git a/src/tools/clangbackend/ipcsource/clangfilesystemwatcher.h b/src/tools/clangbackend/ipcsource/clangfilesystemwatcher.h index 4f7a9461a2..4d6be96a21 100644 --- a/src/tools/clangbackend/ipcsource/clangfilesystemwatcher.h +++ b/src/tools/clangbackend/ipcsource/clangfilesystemwatcher.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGFILESYSTEMWATCHER_H -#define CLANGFILESYSTEMWATCHER_H +#pragma once #include <QFileSystemWatcher> #include <QSet> @@ -56,5 +55,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGFILESYSTEMWATCHER_H diff --git a/src/tools/clangbackend/ipcsource/clangipcserver.h b/src/tools/clangbackend/ipcsource/clangipcserver.h index a75801f828..a8d4a735d0 100644 --- a/src/tools/clangbackend/ipcsource/clangipcserver.h +++ b/src/tools/clangbackend/ipcsource/clangipcserver.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGIPCSERVER_H -#define CLANGIPCSERVER_H +#pragma once #include "ipcserverinterface.h" @@ -74,4 +73,3 @@ private: }; } // namespace ClangBackEnd -#endif // CLANGIPCSERVER_H diff --git a/src/tools/clangbackend/ipcsource/clangstring.h b/src/tools/clangbackend/ipcsource/clangstring.h index 3fb15f5d72..9f49cc7971 100644 --- a/src/tools/clangbackend/ipcsource/clangstring.h +++ b/src/tools/clangbackend/ipcsource/clangstring.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_CLANGSTRING_H -#define CLANGBACKEND_CLANGSTRING_H +#pragma once #include <clang-c/CXString.h> @@ -55,5 +54,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_CLANGSTRING_H diff --git a/src/tools/clangbackend/ipcsource/clangtranslationunit.h b/src/tools/clangbackend/ipcsource/clangtranslationunit.h index 6943664aae..893e469f09 100644 --- a/src/tools/clangbackend/ipcsource/clangtranslationunit.h +++ b/src/tools/clangbackend/ipcsource/clangtranslationunit.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_TRANSLATIONUNIT_H -#define CLANGBACKEND_TRANSLATIONUNIT_H +#pragma once #include <utf8stringvector.h> @@ -166,5 +165,3 @@ private: bool operator==(const TranslationUnit &first, const TranslationUnit &second); void PrintTo(const TranslationUnit &translationUnit, ::std::ostream *os); } // namespace ClangBackEnd - -#endif // CLANGBACKEND_TRANSLATIONUNIT_H diff --git a/src/tools/clangbackend/ipcsource/clangtype.h b/src/tools/clangbackend/ipcsource/clangtype.h index 348019fad5..e9a19e92db 100644 --- a/src/tools/clangbackend/ipcsource/clangtype.h +++ b/src/tools/clangbackend/ipcsource/clangtype.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_TYPE_H -#define CLANGBACKEND_TYPE_H +#pragma once #include <clang-c/Index.h> @@ -78,5 +77,3 @@ bool operator==(Type first, Type second); void PrintTo(CXTypeKind typeKind, ::std::ostream* os); void PrintTo(const Type &type, ::std::ostream* os); } // namespace ClangBackEnd - -#endif // CLANGBACKEND_TYPE_H diff --git a/src/tools/clangbackend/ipcsource/codecompletefailedexception.h b/src/tools/clangbackend/ipcsource/codecompletefailedexception.h index c722fd4f88..d2ee10b2ed 100644 --- a/src/tools/clangbackend/ipcsource/codecompletefailedexception.h +++ b/src/tools/clangbackend/ipcsource/codecompletefailedexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CODECOMPLETEFAILEDEXCEPTION_H -#define CODECOMPLETEFAILEDEXCEPTION_H +#pragma once class CodeCompleteFailedException @@ -32,5 +31,3 @@ class CodeCompleteFailedException public: CodeCompleteFailedException(); }; - -#endif // CODECOMPLETEFAILEDEXCEPTION_H diff --git a/src/tools/clangbackend/ipcsource/codecompleter.h b/src/tools/clangbackend/ipcsource/codecompleter.h index 99749414f4..2139da926d 100644 --- a/src/tools/clangbackend/ipcsource/codecompleter.h +++ b/src/tools/clangbackend/ipcsource/codecompleter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_CODECOMPLETER_H -#define CLANGBACKEND_CODECOMPLETER_H +#pragma once #include "clangtranslationunit.h" @@ -66,5 +65,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_CODECOMPLETER_H diff --git a/src/tools/clangbackend/ipcsource/codecompletionchunkconverter.h b/src/tools/clangbackend/ipcsource/codecompletionchunkconverter.h index a912c4b481..0bfb1a19c1 100644 --- a/src/tools/clangbackend/ipcsource/codecompletionchunkconverter.h +++ b/src/tools/clangbackend/ipcsource/codecompletionchunkconverter.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_CODECOMPLETIONCHUNKCONVERTER_H -#define CLANGBACKEND_CODECOMPLETIONCHUNKCONVERTER_H +#pragma once #include <codecompletionchunk.h> @@ -51,5 +50,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_CODECOMPLETIONCHUNKCONVERTER_H diff --git a/src/tools/clangbackend/ipcsource/codecompletionsextractor.h b/src/tools/clangbackend/ipcsource/codecompletionsextractor.h index bc7015dcad..8a4c7c03ab 100644 --- a/src/tools/clangbackend/ipcsource/codecompletionsextractor.h +++ b/src/tools/clangbackend/ipcsource/codecompletionsextractor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_CODECOMPLETIONSEXTRACTOR_H -#define CLANGBACKEND_CODECOMPLETIONSEXTRACTOR_H +#pragma once #include <codecompletion.h> @@ -83,5 +82,3 @@ private: void PrintTo(const CodeCompletionsExtractor &extractor, ::std::ostream* os); #endif } // namespace ClangBackEnd - -#endif // CLANGBACKEND_CODECOMPLETIONSEXTRACTOR_H diff --git a/src/tools/clangbackend/ipcsource/commandlinearguments.h b/src/tools/clangbackend/ipcsource/commandlinearguments.h index 860e4f2f71..8e6f59191d 100644 --- a/src/tools/clangbackend/ipcsource/commandlinearguments.h +++ b/src/tools/clangbackend/ipcsource/commandlinearguments.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_COMMANDLINEARGUMENTS_H -#define CLANGBACKEND_COMMANDLINEARGUMENTS_H +#pragma once #include <utf8stringvector.h> @@ -51,5 +50,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_COMMANDLINEARGUMENTS_H diff --git a/src/tools/clangbackend/ipcsource/cursor.h b/src/tools/clangbackend/ipcsource/cursor.h index 426563255b..6711ab98d5 100644 --- a/src/tools/clangbackend/ipcsource/cursor.h +++ b/src/tools/clangbackend/ipcsource/cursor.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_CURSOR_H -#define CLANGBACKEND_CURSOR_H +#pragma once #include "clangtype.h" @@ -119,6 +118,3 @@ bool operator==(const Cursor &first, const Cursor &second); void PrintTo(CXCursorKind cursorKind, ::std::ostream *os); void PrintTo(const Cursor &cursor, ::std::ostream* os); } // namespace ClangBackEnd - - -#endif // CLANGBACKEND_CURSOR_H diff --git a/src/tools/clangbackend/ipcsource/diagnostic.h b/src/tools/clangbackend/ipcsource/diagnostic.h index 76de4a3b81..64d4eff9b7 100644 --- a/src/tools/clangbackend/ipcsource/diagnostic.h +++ b/src/tools/clangbackend/ipcsource/diagnostic.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_DIAGNOSTIC_H -#define CLANGBACKEND_DIAGNOSTIC_H +#pragma once #include <clangbackendipc_global.h> @@ -88,5 +87,3 @@ inline bool operator==(Diagnostic first, Diagnostic second) } } // namespace ClangBackEnd - -#endif // CLANGBACKEND_DIAGNOSTIC_H diff --git a/src/tools/clangbackend/ipcsource/diagnosticset.h b/src/tools/clangbackend/ipcsource/diagnosticset.h index 2a66fa7eb5..e715ad2627 100644 --- a/src/tools/clangbackend/ipcsource/diagnosticset.h +++ b/src/tools/clangbackend/ipcsource/diagnosticset.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_DIAGNOSTICSET_H -#define CLANGBACKEND_DIAGNOSTICSET_H +#pragma once #include "diagnostic.h" #include "diagnosticsetiterator.h" @@ -80,5 +79,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_DIAGNOSTICSET_H diff --git a/src/tools/clangbackend/ipcsource/diagnosticsetiterator.h b/src/tools/clangbackend/ipcsource/diagnosticsetiterator.h index 0442cd0e43..7739dfd365 100644 --- a/src/tools/clangbackend/ipcsource/diagnosticsetiterator.h +++ b/src/tools/clangbackend/ipcsource/diagnosticsetiterator.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef DIAGNOSTICSETITERATOR_H -#define DIAGNOSTICSETITERATOR_H +#pragma once #include <iterator> @@ -83,6 +82,3 @@ private: }; } - -#endif // DIAGNOSTICSETITERATOR_H - diff --git a/src/tools/clangbackend/ipcsource/fixit.h b/src/tools/clangbackend/ipcsource/fixit.h index 68e5d05a26..f866bc8c18 100644 --- a/src/tools/clangbackend/ipcsource/fixit.h +++ b/src/tools/clangbackend/ipcsource/fixit.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_FIXIT_H -#define CLANGBACKEND_FIXIT_H +#pragma once #include "sourcerange.h" @@ -56,5 +55,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_FIXIT_H diff --git a/src/tools/clangbackend/ipcsource/projectpart.h b/src/tools/clangbackend/ipcsource/projectpart.h index d6856f5c99..13cbbae248 100644 --- a/src/tools/clangbackend/ipcsource/projectpart.h +++ b/src/tools/clangbackend/ipcsource/projectpart.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_PROJECT_H -#define CLANGBACKEND_PROJECT_H +#pragma once #include <utf8string.h> @@ -79,5 +78,3 @@ private: bool operator==(const ProjectPart &first, const ProjectPart &second); } // namespace ClangBackEnd - -#endif // CLANGBACKEND_PROJECT_H diff --git a/src/tools/clangbackend/ipcsource/projectpartsdonotexistexception.h b/src/tools/clangbackend/ipcsource/projectpartsdonotexistexception.h index 76de2310ab..2b5b108828 100644 --- a/src/tools/clangbackend/ipcsource/projectpartsdonotexistexception.h +++ b/src/tools/clangbackend/ipcsource/projectpartsdonotexistexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_PROJECTDONOTEXISTSEXCEPTION_H -#define CLANGBACKEND_PROJECTDONOTEXISTSEXCEPTION_H +#pragma once #include <utf8stringvector.h> @@ -53,5 +52,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_PROJECTDONOTEXISTSEXCEPTION_H diff --git a/src/tools/clangbackend/ipcsource/projects.h b/src/tools/clangbackend/ipcsource/projects.h index 29667c89c0..4354aebbeb 100644 --- a/src/tools/clangbackend/ipcsource/projects.h +++ b/src/tools/clangbackend/ipcsource/projects.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_PROJECTS_H -#define CLANGBACKEND_PROJECTS_H +#pragma once #include "projectpart.h" @@ -57,5 +56,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_PROJECTS_H diff --git a/src/tools/clangbackend/ipcsource/skippedsourceranges.h b/src/tools/clangbackend/ipcsource/skippedsourceranges.h index 222c2b9202..ddbf3e62b5 100644 --- a/src/tools/clangbackend/ipcsource/skippedsourceranges.h +++ b/src/tools/clangbackend/ipcsource/skippedsourceranges.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_SKIPPEDSOURCERANGES_H -#define CLANGBACKEND_SKIPPEDSOURCERANGES_H +#pragma once #include "sourcerange.h" @@ -55,5 +54,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_SKIPPEDSOURCERANGES_H diff --git a/src/tools/clangbackend/ipcsource/sourcelocation.h b/src/tools/clangbackend/ipcsource/sourcelocation.h index 0ce40f6c5f..2f278e8566 100644 --- a/src/tools/clangbackend/ipcsource/sourcelocation.h +++ b/src/tools/clangbackend/ipcsource/sourcelocation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_SOURCELOCATION_H -#define CLANGBACKEND_SOURCELOCATION_H +#pragma once #include <clang-c/Index.h> @@ -75,5 +74,3 @@ bool operator==(const SourceLocation &first, const SourceLocation &second); void PrintTo(const SourceLocation &sourceLocation, ::std::ostream* os); } // namespace ClangBackEnd - -#endif // CLANGBACKEND_SOURCELOCATION_H diff --git a/src/tools/clangbackend/ipcsource/sourcerange.h b/src/tools/clangbackend/ipcsource/sourcerange.h index 9fe25aa94a..df5612004e 100644 --- a/src/tools/clangbackend/ipcsource/sourcerange.h +++ b/src/tools/clangbackend/ipcsource/sourcerange.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_SOURCERANGE_H -#define CLANGBACKEND_SOURCERANGE_H +#pragma once #include "sourcelocation.h" @@ -62,5 +61,3 @@ private: bool operator==(const SourceRange &first, const SourceRange &second); void PrintTo(const SourceRange &sourceRange, ::std::ostream* os); } // namespace ClangBackEnd - -#endif // CLANGBACKEND_SOURCERANGE_H diff --git a/src/tools/clangbackend/ipcsource/translationunitalreadyexistsexception.h b/src/tools/clangbackend/ipcsource/translationunitalreadyexistsexception.h index 81055b8810..0db693dc0e 100644 --- a/src/tools/clangbackend/ipcsource/translationunitalreadyexistsexception.h +++ b/src/tools/clangbackend/ipcsource/translationunitalreadyexistsexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_TRANSLATIONUNITALREADYEXISTS_H -#define CLANGBACKEND_TRANSLATIONUNITALREADYEXISTS_H +#pragma once #include <filecontainer.h> @@ -52,5 +51,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_TRANSLATIONUNITALREADYEXISTS_H diff --git a/src/tools/clangbackend/ipcsource/translationunitdoesnotexistexception.h b/src/tools/clangbackend/ipcsource/translationunitdoesnotexistexception.h index 77f87dea93..f4943d9a1c 100644 --- a/src/tools/clangbackend/ipcsource/translationunitdoesnotexistexception.h +++ b/src/tools/clangbackend/ipcsource/translationunitdoesnotexistexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_TRANSLATIONUNITDONOTEXISTS_H -#define CLANGBACKEND_TRANSLATIONUNITDONOTEXISTS_H +#pragma once #include <filecontainer.h> @@ -52,5 +51,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_TRANSLATIONUNITDONOTEXISTS_H diff --git a/src/tools/clangbackend/ipcsource/translationunitfilenotexitexception.h b/src/tools/clangbackend/ipcsource/translationunitfilenotexitexception.h index a351b5b512..9081f3757e 100644 --- a/src/tools/clangbackend/ipcsource/translationunitfilenotexitexception.h +++ b/src/tools/clangbackend/ipcsource/translationunitfilenotexitexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_TRANSLATIONUNITFILENOTEXITS_H -#define CLANGBACKEND_TRANSLATIONUNITFILENOTEXITS_H +#pragma once #include <utf8string.h> @@ -53,5 +52,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_TRANSLATIONUNITFILENOTEXITS_H diff --git a/src/tools/clangbackend/ipcsource/translationunitisnullexception.h b/src/tools/clangbackend/ipcsource/translationunitisnullexception.h index 6e68db62b6..c64c53369e 100644 --- a/src/tools/clangbackend/ipcsource/translationunitisnullexception.h +++ b/src/tools/clangbackend/ipcsource/translationunitisnullexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_TRANSLATIONUNITISNULLEXCEPTION_H -#define CLANGBACKEND_TRANSLATIONUNITISNULLEXCEPTION_H +#pragma once #include <QtGlobal> @@ -45,5 +44,3 @@ public: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_TRANSLATIONUNITISNULLEXCEPTION_H diff --git a/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.h b/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.h index 8175fa7454..13b31e9c7d 100644 --- a/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.h +++ b/src/tools/clangbackend/ipcsource/translationunitparseerrorexception.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_TRANSLATIONUNITPARSEERROREXCEPTION_H -#define CLANGBACKEND_TRANSLATIONUNITPARSEERROREXCEPTION_H +#pragma once #include <utf8string.h> @@ -55,5 +54,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_TRANSLATIONUNITPARSEERROREXCEPTION_H diff --git a/src/tools/clangbackend/ipcsource/translationunits.h b/src/tools/clangbackend/ipcsource/translationunits.h index ef80e05371..d30ca98250 100644 --- a/src/tools/clangbackend/ipcsource/translationunits.h +++ b/src/tools/clangbackend/ipcsource/translationunits.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_TRANSLATIONUNITS_H -#define CLANGBACKEND_TRANSLATIONUNITS_H +#pragma once #include "clangfilesystemwatcher.h" #include "clangtranslationunit.h" @@ -119,5 +118,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_TRANSLATIONUNITS_H diff --git a/src/tools/clangbackend/ipcsource/unsavedfiles.h b/src/tools/clangbackend/ipcsource/unsavedfiles.h index f5617df9b8..270f4aa386 100644 --- a/src/tools/clangbackend/ipcsource/unsavedfiles.h +++ b/src/tools/clangbackend/ipcsource/unsavedfiles.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CLANGBACKEND_UNSAVEDFILES_H -#define CLANGBACKEND_UNSAVEDFILES_H +#pragma once #include <filecontainer.h> @@ -76,5 +75,3 @@ private: }; } // namespace ClangBackEnd - -#endif // CLANGBACKEND_UNSAVEDFILES_H diff --git a/src/tools/cplusplus-shared/utils.h b/src/tools/cplusplus-shared/utils.h index 21dee5d53d..48131cf5c6 100644 --- a/src/tools/cplusplus-shared/utils.h +++ b/src/tools/cplusplus-shared/utils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CPLUSPLUSTOOLSUTILS_H -#define CPLUSPLUSTOOLSUTILS_H +#pragma once #include <QString> #include <QStringList> @@ -53,5 +52,3 @@ private: }; } // namespace - -#endif // CPLUSPLUSTOOLSUTILS_H diff --git a/src/tools/iostool/iosdevicemanager.h b/src/tools/iostool/iosdevicemanager.h index ddf6b01db1..214415adc4 100644 --- a/src/tools/iostool/iosdevicemanager.h +++ b/src/tools/iostool/iosdevicemanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef IOSMANAGER_H -#define IOSMANAGER_H +#pragma once #include <QObject> #include <QString> @@ -105,5 +104,3 @@ public: }; } // namespace Ios - -#endif // IOSMANAGER_H diff --git a/src/tools/qtcreatorcrashhandler/backtracecollector.h b/src/tools/qtcreatorcrashhandler/backtracecollector.h index bf6a42f051..1fdb1eb2df 100644 --- a/src/tools/qtcreatorcrashhandler/backtracecollector.h +++ b/src/tools/qtcreatorcrashhandler/backtracecollector.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef BACKTRACECOLLECTOR_H -#define BACKTRACECOLLECTOR_H +#pragma once #include <QProcess> @@ -56,5 +55,3 @@ private: BacktraceCollectorPrivate *d; }; - -#endif // BACKTRACECOLLECTOR_H diff --git a/src/tools/qtcreatorcrashhandler/crashhandler.h b/src/tools/qtcreatorcrashhandler/crashhandler.h index 8fc3a7ae3b..b46468451f 100644 --- a/src/tools/qtcreatorcrashhandler/crashhandler.h +++ b/src/tools/qtcreatorcrashhandler/crashhandler.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CRASHHANDLER_H -#define CRASHHANDLER_H +#pragma once #include <QObject> @@ -61,5 +60,3 @@ private: CrashHandlerPrivate *d; }; - -#endif // CRASHHANDLER_H diff --git a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.h b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.h index 2307c8a5e9..3bcc2672c5 100644 --- a/src/tools/qtcreatorcrashhandler/crashhandlerdialog.h +++ b/src/tools/qtcreatorcrashhandler/crashhandlerdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CRASHHANDLERDIALOG_H -#define CRASHHANDLERDIALOG_H +#pragma once #include <QDialog> @@ -61,5 +60,3 @@ private: CrashHandler *m_crashHandler; Ui::CrashHandlerDialog *m_ui; }; - -#endif // CRASHHANDLERDIALOG_H diff --git a/src/tools/qtcreatorcrashhandler/crashhandlersetup.h b/src/tools/qtcreatorcrashhandler/crashhandlersetup.h index b37ba599f5..4236bb534d 100644 --- a/src/tools/qtcreatorcrashhandler/crashhandlersetup.h +++ b/src/tools/qtcreatorcrashhandler/crashhandlersetup.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CRASHHANDLERSETUP_H -#define CRASHHANDLERSETUP_H +#pragma once class CrashHandlerSetup { @@ -32,5 +31,3 @@ public: CrashHandlerSetup(); ~CrashHandlerSetup(); }; - -#endif // CRASHHANDLERSETUP_H diff --git a/src/tools/qtcreatorcrashhandler/utils.h b/src/tools/qtcreatorcrashhandler/utils.h index 5defc09b2e..60c2a39f91 100644 --- a/src/tools/qtcreatorcrashhandler/utils.h +++ b/src/tools/qtcreatorcrashhandler/utils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef UTILS_H -#define UTILS_H +#pragma once #include <QByteArray> #include <QString> @@ -33,5 +32,3 @@ const char APPLICATION_NAME[] = "Qt Creator Crash Handler"; const char URL_BUGTRACKER[] = "https://bugreports.qt.io/"; QByteArray fileContents(const QString &filePath); - -#endif // UTILS_H diff --git a/src/tools/qtcreatorwidgets/customwidgets.h b/src/tools/qtcreatorwidgets/customwidgets.h index d6d2f5d8b8..496e8cbc54 100644 --- a/src/tools/qtcreatorwidgets/customwidgets.h +++ b/src/tools/qtcreatorwidgets/customwidgets.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CUSTOMWIDGETS_H -#define CUSTOMWIDGETS_H +#pragma once #include "customwidget.h" @@ -289,5 +288,3 @@ public: private: QList<QDesignerCustomWidgetInterface*> m_plugins; }; - -#endif // CUSTOMWIDGETS_H diff --git a/src/tools/screenshotcropper/cropimageview.h b/src/tools/screenshotcropper/cropimageview.h index f0da57e8d8..c95bc5bc77 100644 --- a/src/tools/screenshotcropper/cropimageview.h +++ b/src/tools/screenshotcropper/cropimageview.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef CROPIMAGEVIEW_H -#define CROPIMAGEVIEW_H +#pragma once #include <QWidget> @@ -51,5 +50,3 @@ private: QImage m_image; QRect m_area; }; - -#endif // CROPIMAGEVIEW_H diff --git a/src/tools/screenshotcropper/screenshotcropperwindow.h b/src/tools/screenshotcropper/screenshotcropperwindow.h index 715adac49f..98813a77c3 100644 --- a/src/tools/screenshotcropper/screenshotcropperwindow.h +++ b/src/tools/screenshotcropper/screenshotcropperwindow.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SCREENSHOTCROPPERWINDOW_H -#define SCREENSHOTCROPPERWINDOW_H +#pragma once #include <QMainWindow> #include "screenshotcropper.h" @@ -54,5 +53,3 @@ private: QString m_imagesFolder; Ui::ScreenShotCropperWindow *ui; }; - -#endif // SCREENSHOTCROPPERWINDOW_H diff --git a/src/tools/sdktool/adddebuggeroperation.h b/src/tools/sdktool/adddebuggeroperation.h index b1c6313482..32e8369d64 100644 --- a/src/tools/sdktool/adddebuggeroperation.h +++ b/src/tools/sdktool/adddebuggeroperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ADDDEBUGGEROPERATION_H -#define ADDDEBUGGEROPERATION_H +#pragma once #include "operation.h" @@ -62,5 +61,3 @@ private: QStringList m_abis; KeyValuePairList m_extra; }; - -#endif // ADDDEBUGGEROPERATION_H diff --git a/src/tools/sdktool/adddeviceoperation.h b/src/tools/sdktool/adddeviceoperation.h index e32dd7feb5..207407aed2 100644 --- a/src/tools/sdktool/adddeviceoperation.h +++ b/src/tools/sdktool/adddeviceoperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ADDDEVICEOPERATION_H -#define ADDDEVICEOPERATION_H +#pragma once #include "operation.h" @@ -95,5 +94,3 @@ private: int m_version; KeyValuePairList m_extra; }; - -#endif // ADDDEVICEOPERATION_H diff --git a/src/tools/sdktool/addkeysoperation.h b/src/tools/sdktool/addkeysoperation.h index 46f7760d16..40483befd1 100644 --- a/src/tools/sdktool/addkeysoperation.h +++ b/src/tools/sdktool/addkeysoperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ADDKEYSOPERATION_H -#define ADDKEYSOPERATION_H +#pragma once #include "operation.h" @@ -50,5 +49,3 @@ private: QList<KeyValuePair> m_data; }; - -#endif // ADDKEYSOPERATION_H diff --git a/src/tools/sdktool/addkitoperation.h b/src/tools/sdktool/addkitoperation.h index 4a90cc6f03..1c14c11e0c 100644 --- a/src/tools/sdktool/addkitoperation.h +++ b/src/tools/sdktool/addkitoperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ADDKITOPERATION_H -#define ADDKITOPERATION_H +#pragma once #include "operation.h" @@ -82,5 +81,3 @@ private: QStringList m_env; KeyValuePairList m_extra; }; - -#endif // ADDKITOPERATION_H diff --git a/src/tools/sdktool/addqtoperation.h b/src/tools/sdktool/addqtoperation.h index f07a1ecaba..2712556767 100644 --- a/src/tools/sdktool/addqtoperation.h +++ b/src/tools/sdktool/addqtoperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ADDQTOPERATION_H -#define ADDQTOPERATION_H +#pragma once #include "operation.h" @@ -61,5 +60,3 @@ private: QString m_qmake; KeyValuePairList m_extra; }; - -#endif // ADDQTOPERATION_H diff --git a/src/tools/sdktool/addtoolchainoperation.h b/src/tools/sdktool/addtoolchainoperation.h index 588a186413..2f642c87f6 100644 --- a/src/tools/sdktool/addtoolchainoperation.h +++ b/src/tools/sdktool/addtoolchainoperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef ADDTOOLCHAINOPERATION_H -#define ADDTOOLCHAINOPERATION_H +#pragma once #include "operation.h" @@ -63,5 +62,3 @@ private: QString m_supportedAbis; KeyValuePairList m_extra; }; - -#endif // ADDTOOLCHAINOPERATION_H diff --git a/src/tools/sdktool/findkeyoperation.h b/src/tools/sdktool/findkeyoperation.h index be656cf452..f6365c7ebd 100644 --- a/src/tools/sdktool/findkeyoperation.h +++ b/src/tools/sdktool/findkeyoperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FINDKEYOPERATION_H -#define FINDKEYOPERATION_H +#pragma once #include "operation.h" @@ -50,5 +49,3 @@ private: QString m_file; QStringList m_keys; }; - -#endif // FINDKEYOPERATION_H diff --git a/src/tools/sdktool/findvalueoperation.h b/src/tools/sdktool/findvalueoperation.h index ae02a6580f..2d49678b66 100644 --- a/src/tools/sdktool/findvalueoperation.h +++ b/src/tools/sdktool/findvalueoperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef FINDVALUEOPERATION_H -#define FINDVALUEOPERATION_H +#pragma once #include "operation.h" @@ -50,5 +49,3 @@ private: QString m_file; QVariantList m_values; }; - -#endif // FINDVALUEOPERATION_H diff --git a/src/tools/sdktool/getoperation.h b/src/tools/sdktool/getoperation.h index 4fe475e455..6d9b018ad0 100644 --- a/src/tools/sdktool/getoperation.h +++ b/src/tools/sdktool/getoperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef GETOPERATION_H -#define GETOPERATION_H +#pragma once #include "operation.h" @@ -49,5 +48,3 @@ private: QStringList m_keys; QString m_file; }; - -#endif // GETOPERATION_H diff --git a/src/tools/sdktool/operation.h b/src/tools/sdktool/operation.h index 7f51f08978..ad2062cf8f 100644 --- a/src/tools/sdktool/operation.h +++ b/src/tools/sdktool/operation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef OPERATION_H -#define OPERATION_H +#pragma once #include <utils/fileutils.h> @@ -66,5 +65,3 @@ public: static QVariant valueFromString(const QString &v); static QString makeUnique(const QString &name, const QStringList &inUse); }; - -#endif // OPERATION_H diff --git a/src/tools/sdktool/rmdebuggeroperation.h b/src/tools/sdktool/rmdebuggeroperation.h index 6d7d108f95..58c086849b 100644 --- a/src/tools/sdktool/rmdebuggeroperation.h +++ b/src/tools/sdktool/rmdebuggeroperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RMDEBUGGEROPERATION_H -#define RMDEBUGGEROPERATION_H +#pragma once #include "operation.h" @@ -50,5 +49,3 @@ public: private: QString m_id; }; - -#endif // RMDEBUGGEROPERATION_H diff --git a/src/tools/sdktool/rmdeviceoperation.h b/src/tools/sdktool/rmdeviceoperation.h index 7aa76b1214..f5f711b5f5 100644 --- a/src/tools/sdktool/rmdeviceoperation.h +++ b/src/tools/sdktool/rmdeviceoperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RMDEVICEOPERATION_H -#define RMDEVICEOPERATION_H +#pragma once #include "operation.h" @@ -50,5 +49,3 @@ public: private: QString m_id; }; - -#endif // RMDEVICEOPERATION_H diff --git a/src/tools/sdktool/rmkeysoperation.h b/src/tools/sdktool/rmkeysoperation.h index dd6eda6a3b..d83c1860d5 100644 --- a/src/tools/sdktool/rmkeysoperation.h +++ b/src/tools/sdktool/rmkeysoperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RMKEYSOPERATION_H -#define RMKEYSOPERATION_H +#pragma once #include "operation.h" @@ -49,5 +48,3 @@ private: QStringList m_keys; QString m_file; }; - -#endif // RMKEYSOPERATION_H diff --git a/src/tools/sdktool/rmkitoperation.h b/src/tools/sdktool/rmkitoperation.h index 5d08cffe8a..75fb4cf527 100644 --- a/src/tools/sdktool/rmkitoperation.h +++ b/src/tools/sdktool/rmkitoperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RMKITOPERATION_H -#define RMKITOPERATION_H +#pragma once #include "operation.h" @@ -50,5 +49,3 @@ public: private: QString m_id; }; - -#endif // RMKITOPERATION_H diff --git a/src/tools/sdktool/rmqtoperation.h b/src/tools/sdktool/rmqtoperation.h index a4625be1ba..36ff9cee96 100644 --- a/src/tools/sdktool/rmqtoperation.h +++ b/src/tools/sdktool/rmqtoperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RMQTOPERATION_H -#define RMQTOPERATION_H +#pragma once #include "operation.h" @@ -50,5 +49,3 @@ public: private: QString m_id; }; - -#endif // RMQTOPERATION_H diff --git a/src/tools/sdktool/rmtoolchainoperation.h b/src/tools/sdktool/rmtoolchainoperation.h index 302d7deaf4..3755320710 100644 --- a/src/tools/sdktool/rmtoolchainoperation.h +++ b/src/tools/sdktool/rmtoolchainoperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef RMTOOLCHAINOPERATION_H -#define RMTOOLCHAINOPERATION_H +#pragma once #include "operation.h" @@ -50,5 +49,3 @@ public: private: QString m_id; }; - -#endif // RMTOOLCHAINOPERATION_H diff --git a/src/tools/sdktool/settings.h b/src/tools/sdktool/settings.h index 1da043817d..dbf3481c26 100644 --- a/src/tools/sdktool/settings.h +++ b/src/tools/sdktool/settings.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef SETTINGS_H -#define SETTINGS_H +#pragma once #include <utils/fileutils.h> @@ -47,5 +46,3 @@ public: private: static Settings *m_instance; }; - -#endif // SETTINGS_H diff --git a/src/tools/valgrindfake/outputgenerator.h b/src/tools/valgrindfake/outputgenerator.h index 1f5fd034e8..f4cba94289 100644 --- a/src/tools/valgrindfake/outputgenerator.h +++ b/src/tools/valgrindfake/outputgenerator.h @@ -24,8 +24,7 @@ ** ****************************************************************************/ -#ifndef LIBVALGRIND_FAKE_OUTPUTGENERATOR_H -#define LIBVALGRIND_FAKE_OUTPUTGENERATOR_H +#pragma once #include <QObject> #include <QTimer> @@ -71,5 +70,3 @@ private: } // namespace Fake } // namespace Valgrind - -#endif // LIBVALGRIND_FAKE_OUTPUTGENERATOR_H diff --git a/tests/auto/cplusplus/cplusplus_global.h b/tests/auto/cplusplus/cplusplus_global.h index 5d911fe132..42a0bef1ad 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 82e515b946..556fc0ba6f 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 04c3644900..e5e38e3300 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 36e743d87b..c1ba2d3c93 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 e911f3d420..6a0d4c7f09 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 2068170b6a..1a5ff1eb5c 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 4739ebb997..a8bfb4e7b6 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 9a5913edba..cc88e8a8d0 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 0bd78078b6..c693b51975 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 b84dec4c69..11c3916a8b 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 9cc35226a6..09cfcef5bb 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 e6c6950595..45122612c8 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 69496e6891..968946be54 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 a9a7c3f599..c53dd72ede 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 2292c3efbe..fcb9557efe 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 9778b59083..74b5fa384a 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 4175fc18f1..c405d630cd 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 41efe550ca..07c9281299 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 1353de785e..c3644104db 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 bdcf0e32be..89f86bfaac 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 a215564125..8f5b8c999f 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 7e0f44a736..de95a6c743 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 bea78cbada..cb65dd8557 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 8312df0186..79eccf675a 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 689ec03871..6f70f09bee 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 6dae9639b6..7930d5f5f8 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 b427107633..ea1cfa542a 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 abb6e59877..45702c5d0a 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 4f35262bea..363d990bb0 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 3f5ddba574..0d0b51665d 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 13fdfa5b23..0017646284 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 b027afa78d..f84cc000de 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 dd39049add..08570566f9 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 689ec03871..6f70f09bee 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 ebc2cf627a..f2acb3bef7 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 7670772308..bc6d2f36c8 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 87fe29cccf..fef4787180 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 b6227c1455..ab47ada3f3 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 bf2d86041f..a902a926a1 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 8f4116a251..30c90c9ef6 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 053f8bdf15..fd741b8d3c 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 8f4116a251..30c90c9ef6 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 9e88c54cde..3f5f0bfda5 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 c01dfdff5b..6dfe387400 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 efac8af84b..5f195cf1f0 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 0e626f26a5..44c02169e7 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 d3f14be9d8..67b69a7f47 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 86bc4ba6f6..d947fa9d7d 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 87eaac3def..1b984c4154 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 479635321b..3fae9bf18b 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 efac8af84b..5f195cf1f0 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 b2bc7b470c..c01b478c40 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 0fc49694e4..dbb0bf9d05 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 debc156038..74d1bd5331 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 9228e1348a..9596a19e13 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 d1e068c7f3..2a5995526d 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 9791e71a28..3b3b670471 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 b4eb7b1a80..09fd747578 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 1299fccaf3..9911bab3cd 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 dcb792e5f0..ab4f9fa378 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 4f082a8bbc..01058492fc 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 4905abf3e8..ebd822c41b 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 dd0c3bc291..ebd822c41b 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 7d0ba1c845..67bc13701d 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 d631afd91b..be7ac4e532 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 904a861870..7007f9b5fe 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 151a9f28e1..67bc13701d 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 8f0d7d14f9..0e5de633ad 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 e57c177ee3..447de2c9bd 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 1589a10157..9f024d4076 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 124ff1e8e1..1ab5206ec6 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 175956772c..0a9f2f5a8b 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 |