diff options
| -rw-r--r-- | src/libs/qmljs/qmljsbind.cpp | 2 | ||||
| -rw-r--r-- | src/libs/qmljs/qmljsbind.h | 6 | ||||
| -rw-r--r-- | src/libs/qmljs/qmljsdocument.h | 6 | ||||
| -rw-r--r-- | src/libs/qmljs/qmljsevaluate.h | 6 | ||||
| -rw-r--r-- | src/plugins/qmljseditor/jsfilewizard.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/qmljseditor/qmljseditoractionhandler.h | 6 | ||||
| -rw-r--r-- | src/plugins/qmljseditor/qmljshighlighter.h | 6 | ||||
| -rw-r--r-- | src/plugins/qmljseditor/qmljshoverhandler.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qmljseditor/qmljssnippetprovider.h | 6 | ||||
| -rw-r--r-- | src/plugins/qmljstools/qmljsbundleprovider.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/qmljstools/qmljsrefactoringchanges.h | 6 |
11 files changed, 23 insertions, 25 deletions
diff --git a/src/libs/qmljs/qmljsbind.cpp b/src/libs/qmljs/qmljsbind.cpp index b26b169395..dd8ee8443a 100644 --- a/src/libs/qmljs/qmljsbind.cpp +++ b/src/libs/qmljs/qmljsbind.cpp @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#include "parser/qmljsast_p.h" #include "qmljsbind.h" +#include "parser/qmljsast_p.h" #include "qmljsutils.h" #include "qmljsdocument.h" #include "qmljsmodelmanagerinterface.h" diff --git a/src/libs/qmljs/qmljsbind.h b/src/libs/qmljs/qmljsbind.h index 15c7ac1d4a..5e13f3752d 100644 --- a/src/libs/qmljs/qmljsbind.h +++ b/src/libs/qmljs/qmljsbind.h @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#ifndef QMLBIND_H -#define QMLBIND_H +#ifndef QMLJSBIND_H +#define QMLJSBIND_H #include <qmljs/parser/qmljsastvisitor_p.h> #include <qmljs/qmljsinterpreter.h> @@ -111,4 +111,4 @@ private: } // namespace Qml -#endif // QMLBIND_H +#endif // QMLJSBIND_H diff --git a/src/libs/qmljs/qmljsdocument.h b/src/libs/qmljs/qmljsdocument.h index 461a5a6fd1..3be442f996 100644 --- a/src/libs/qmljs/qmljsdocument.h +++ b/src/libs/qmljs/qmljsdocument.h @@ -26,8 +26,8 @@ ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ****************************************************************************/ -#ifndef QMLDOCUMENT_H -#define QMLDOCUMENT_H +#ifndef QMLJSDOCUMENT_H +#define QMLJSDOCUMENT_H #include <QList> #include <QPair> @@ -242,4 +242,4 @@ public: } // namespace QmlJS -#endif // QMLDOCUMENT_H +#endif // QMLJSDOCUMENT_H diff --git a/src/libs/qmljs/qmljsevaluate.h b/src/libs/qmljs/qmljsevaluate.h index e3929be4dd..18b43f3d8f 100644 --- a/src/libs/qmljs/qmljsevaluate.h +++ b/src/libs/qmljs/qmljsevaluate.h @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#ifndef QMLCHECK_H -#define QMLCHECK_H +#ifndef QMLJSEVALUATE_H +#define QMLJSEVALUATE_H #include "parser/qmljsastvisitor_p.h" #include "qmljsdocument.h" @@ -164,4 +164,4 @@ private: } // namespace Qml -#endif // QMLCheck_H +#endif // QMLJSEVALUATE_H diff --git a/src/plugins/qmljseditor/jsfilewizard.cpp b/src/plugins/qmljseditor/jsfilewizard.cpp index 8a4427dc0a..19243618eb 100644 --- a/src/plugins/qmljseditor/jsfilewizard.cpp +++ b/src/plugins/qmljseditor/jsfilewizard.cpp @@ -33,7 +33,6 @@ #include <utils/filewizarddialog.h> #include <utils/qtcassert.h> -#include <utils/filewizarddialog.h> #include <QFileInfo> #include <QTextStream> diff --git a/src/plugins/qmljseditor/qmljseditoractionhandler.h b/src/plugins/qmljseditor/qmljseditoractionhandler.h index 45856d01a2..b38a033f25 100644 --- a/src/plugins/qmljseditor/qmljseditoractionhandler.h +++ b/src/plugins/qmljseditor/qmljseditoractionhandler.h @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#ifndef QMLDITORACTIONHANDLER_H -#define QMLDITORACTIONHANDLER_H +#ifndef QMLJSEDITORACTIONHANDLER_H +#define QMLJSEDITORACTIONHANDLER_H #include <texteditor/texteditoractionhandler.h> @@ -48,4 +48,4 @@ public: } // namespace Internal } // namespace QmlJSEditor -#endif // QMLDITORACTIONHANDLER_H +#endif // QMLJSEDITORACTIONHANDLER_H diff --git a/src/plugins/qmljseditor/qmljshighlighter.h b/src/plugins/qmljseditor/qmljshighlighter.h index 75715d6ff9..badcfc05f4 100644 --- a/src/plugins/qmljseditor/qmljshighlighter.h +++ b/src/plugins/qmljseditor/qmljshighlighter.h @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#ifndef QSCRIPTSYNTAXHIGHLIGHTER_H -#define QSCRIPTSYNTAXHIGHLIGHTER_H +#ifndef QMLJSHIGHLIGHTER_H +#define QMLJSHIGHLIGHTER_H #include "qmljseditor_global.h" @@ -98,4 +98,4 @@ private: } // namespace QmlJSEditor -#endif // QSCRIPTSYNTAXHIGHLIGHTER_H +#endif // QMLJSHIGHLIGHTER_H diff --git a/src/plugins/qmljseditor/qmljshoverhandler.cpp b/src/plugins/qmljseditor/qmljshoverhandler.cpp index 4f0f94c32a..408c93e93d 100644 --- a/src/plugins/qmljseditor/qmljshoverhandler.cpp +++ b/src/plugins/qmljseditor/qmljshoverhandler.cpp @@ -27,10 +27,10 @@ ** ****************************************************************************/ +#include "qmljshoverhandler.h" #include "qmljseditor.h" #include "qmljseditoreditable.h" #include "qmlexpressionundercursor.h" -#include "qmljshoverhandler.h" #include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/editormanager.h> diff --git a/src/plugins/qmljseditor/qmljssnippetprovider.h b/src/plugins/qmljseditor/qmljssnippetprovider.h index 53f4be61ba..8799bc331e 100644 --- a/src/plugins/qmljseditor/qmljssnippetprovider.h +++ b/src/plugins/qmljseditor/qmljssnippetprovider.h @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#ifndef QMLJSSNIPPETEDITORDECORATOR_H -#define QMLJSSNIPPETEDITORDECORATOR_H +#ifndef QMLJSSNIPPETEDITORPROVIDER_H +#define QMLJSSNIPPETEDITORPROVIDER_H #include <texteditor/snippets/isnippetprovider.h> @@ -50,4 +50,4 @@ public: } // Internal } // QmlJSEditor -#endif // QMLJSSNIPPETEDITORDECORATOR_H +#endif // QMLJSSNIPPETEDITORPROVIDER_H diff --git a/src/plugins/qmljstools/qmljsbundleprovider.cpp b/src/plugins/qmljstools/qmljsbundleprovider.cpp index fa3933a0c4..7ce93758aa 100644 --- a/src/plugins/qmljstools/qmljsbundleprovider.cpp +++ b/src/plugins/qmljstools/qmljsbundleprovider.cpp @@ -32,7 +32,6 @@ #include <coreplugin/icore.h> #include <extensionsystem/pluginmanager.h> #include <projectexplorer/kit.h> -#include <projectexplorer/kit.h> #include <projectexplorer/kitmanager.h> #include <projectexplorer/project.h> #include <projectexplorer/projectexplorer.h> diff --git a/src/plugins/qmljstools/qmljsrefactoringchanges.h b/src/plugins/qmljstools/qmljsrefactoringchanges.h index cebc8ee1f4..2fd7f73d4d 100644 --- a/src/plugins/qmljstools/qmljsrefactoringchanges.h +++ b/src/plugins/qmljstools/qmljsrefactoringchanges.h @@ -27,8 +27,8 @@ ** ****************************************************************************/ -#ifndef QMLREFACTORINGCHANGES_H -#define QMLREFACTORINGCHANGES_H +#ifndef QMLJSREFACTORINGCHANGES_H +#define QMLJSREFACTORINGCHANGES_H #include "qmljstools_global.h" @@ -93,4 +93,4 @@ private: } // namespace QmlJSTools -#endif // QMLREFACTORINGCHANGES_H +#endif // QMLJSREFACTORINGCHANGES_H |