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/qmljseditor | |
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/qmljseditor')
28 files changed, 28 insertions, 113 deletions
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 |