diff options
author | hjk <hjk@theqtcompany.com> | 2016-03-18 07:55:01 +0100 |
---|---|---|
committer | hjk <hjk@theqtcompany.com> | 2016-03-30 15:20:19 +0000 |
commit | 39a38d5679084b515276285c044d8a27e671adb1 (patch) | |
tree | 8f72b00aa4a7db53eb8e193119033edf1ae9b0e4 /src/plugins/modeleditor | |
parent | 6b805c217273b9d169aa7e8a78949e17179016bf (diff) | |
download | qt-creator-39a38d5679084b515276285c044d8a27e671adb1.tar.gz |
Wholesale conversion to #pragma once
Kudos to cgmb and https://github.com/cgmb/guardonce
Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/modeleditor')
23 files changed, 23 insertions, 92 deletions
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 |