Fix Krazy warnings about includes/header guards in Cpp-Editor.

Change-Id: I00a68d7f2b509e3934c3248765a78e9b47749127
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

src/plugins/cppeditor/cppeditorconstants.h

@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CPPPLUGIN_GLOBAL_H
+#ifndef CPPEDITORCONSTANTS_H
-#define CPPPLUGIN_GLOBAL_H
+#define CPPEDITORCONSTANTS_H
 
 namespace CppEditor {
 namespace Constants {
@@ -61,4 +61,4 @@ const char CPP_SNIPPETS_GROUP_ID[] = "C++";
 } // namespace Constants
 } // namespace CppEditor
 
-#endif // CPPPLUGIN_GLOBAL_H
+#endif // CPPEDITORCONSTANTS_H

src/plugins/cppeditor/cppeditorenums.h

@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CPPPLUGIN_ENUMS_H
+#ifndef CPPEDITORENUMS_H
-#define CPPPLUGIN_ENUMS_H
+#define CPPEDITORENUMS_H
 
 namespace CppEditor {
 namespace Internal {
@@ -56,4 +56,4 @@ enum CppFormats {
 } // namespace Internal
 } // namespace CppEditor
 
-#endif // CPPPLUGIN_ENUMS_H
+#endif // CPPEDITORENUMS_H

src/plugins/cppeditor/cppelementevaluator.h

@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CPPHIGHLEVELMODEL_H
+#ifndef CPPELEMENTEVALUATOR_H
-#define CPPHIGHLEVELMODEL_H
+#define CPPELEMENTEVALUATOR_H
 
 #include "cppeditor.h"
 
@@ -199,4 +199,4 @@ public:
 } // namespace Internal
 } // namespace CppEditor
 
-#endif // CPPHIGHLEVELMODEL_H
+#endif // CPPELEMENTEVALUATOR_H

src/plugins/cppeditor/cppsnippetprovider.h

@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CPPSNIPPETEDITORDECORATOR_H
+#ifndef CPPSNIPPETPROVIDER_H
-#define CPPSNIPPETEDITORDECORATOR_H
+#define CPPSNIPPETPROVIDER_H
 
 #include <texteditor/snippets/isnippetprovider.h>
 
@@ -50,4 +50,4 @@ public:
 } // Internal
 } // CppEditor
 
-#endif // CPPSNIPPETEDITORDECORATOR_H
+#endif // CPPSNIPPETPROVIDER_H

src/plugins/cpptools/TypeHierarchyBuilder.h

@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef FINDDERIVEDCLASSES_H
+#ifndef TYPEHIERARCHYBUILDER_H
-#define FINDDERIVEDCLASSES_H
+#define TYPEHIERARCHYBUILDER_H
 
 #include "CppDocument.h"
 #include "ModelManagerInterface.h"
@@ -78,4 +78,4 @@ private:
 
 } // CPlusPlus
 
-#endif // FINDDERIVEDCLASSES_H
+#endif // TYPEHIERARCHYBUILDER_H

src/plugins/cpptools/cppchecksymbols.h

@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CPLUSPLUS_CHECKSYMBOLS_H
+#ifndef CPLUSPLUSCHECKSYMBOLS_H
-#define CPLUSPLUS_CHECKSYMBOLS_H
+#define CPLUSPLUSCHECKSYMBOLS_H
 
 #include "cpptools_global.h"
 
@@ -182,4 +182,4 @@ private:
 
 } // namespace CPlusPlus
 
-#endif // CPLUSPLUS_CHECKSYMBOLS_H
+#endif // CPLUSPLUSCHECKSYMBOLS_H

src/plugins/cpptools/cppcodestylesettings.cpp

@@ -31,7 +31,6 @@
 #include "cppcodestylepreferencesfactory.h"
 
 #include <cpptools/cppcodestylepreferences.h>
-#include <cpptools/cppcodestylesettings.h>
 #include <cpptools/cpptoolsconstants.h>
 #include <cpptools/cpptoolssettings.h>
 

src/plugins/cpptools/cppcodestylesettingspage.cpp

@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "cppcodestylepreferences.h"
 #include "cppcodestylesettingspage.h"
+#include "cppcodestylepreferences.h"
 #include "cpppointerdeclarationformatter.h"
 #include "cppqtstyleindenter.h"
 #include "cpptoolsconstants.h"

src/plugins/cpptools/cppcompletionassist.cpp

@@ -27,10 +27,9 @@
 **
 ****************************************************************************/
 
-#include "cppmodelmanager.h"
 #include "cppcompletionassist.h"
-#include "cppdoxygen.h"
 #include "cppmodelmanager.h"
+#include "cppdoxygen.h"
 #include "cpptoolsconstants.h"
 
 #include <Control.h>

src/plugins/cpptools/cppdoxygen.h

@@ -27,6 +27,9 @@
 **
 ****************************************************************************/
 
+#ifndef CPPDOXYGEN_H
+#define CPPDOXYGEN_H
+
 #include "cpptools_global.h"
 
 QT_FORWARD_DECLARE_CLASS(QChar)
@@ -260,3 +263,4 @@ CPPTOOLS_EXPORT const char *doxygenTagSpell(int index);
 
 } // namespace ::CppTools
 
+#endif // CPPDOXYGEN_H

src/plugins/cpptools/cppfilesettingspage.h

@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CPPSETTINGSPAGE_H
+#ifndef CPPFILESETTINGSPAGE_H
-#define CPPSETTINGSPAGE_H
+#define CPPFILESETTINGSPAGE_H
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
@@ -110,4 +110,4 @@ private:
 } // namespace Internal
 } // namespace CppTools
 
-#endif // CPPSETTINGSPAGE_H
+#endif // CPPFILESETTINGSPAGE_H

src/plugins/cpptools/cpphighlightingsupportinternal.cpp

@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "cppchecksymbols.h"
 #include "cpphighlightingsupportinternal.h"
+#include "cppchecksymbols.h"
 
 #include <cplusplus/LookupContext.h>
 #include <cplusplus/SimpleLexer.h>

src/plugins/cpptools/cppmodelmanager.cpp

@@ -27,11 +27,8 @@
 **
 ****************************************************************************/
 
-#include <cplusplus/pp.h>
-#include <cplusplus/Overview.h>
-
-#include "builtinindexingsupport.h"
 #include "cppmodelmanager.h"
+#include "builtinindexingsupport.h"
 #include "cppcompletionassist.h"
 #include "cpphighlightingsupport.h"
 #include "cpphighlightingsupportinternal.h"
@@ -41,6 +38,9 @@
 #include "cpptoolseditorsupport.h"
 #include "cppfindreferences.h"
 
+#include <cplusplus/pp.h>
+#include <cplusplus/Overview.h>
+
 #include <functional>
 #include <QtConcurrentRun>
 #include <QFutureSynchronizer>

src/plugins/cpptools/cpppointerdeclarationformatter.h

@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CPPPOINTERFORMATTER_H
+#ifndef CPPPOINTERDECLARATIONFORMATTER_H
-#define CPPPOINTERFORMATTER_H
+#define CPPPOINTERDECLARATIONFORMATTER_H
 
 #include "cpptools_global.h"
 
@@ -128,4 +128,4 @@ private:
 
 } // namespace CppTools
 
-#endif // CPPPOINTERFORMATTER_H
+#endif // CPPPOINTERDECLARATIONFORMATTER_H

src/plugins/cpptools/cpptoolseditorsupport.cpp

@@ -27,9 +27,9 @@
 **
 ****************************************************************************/
 
+#include "cpptoolseditorsupport.h"
 #include "cppcompletionsupport.h"
 #include "cpphighlightingsupport.h"
-#include "cpptoolseditorsupport.h"
 #include "cppmodelmanager.h"
 
 #include <coreplugin/idocument.h>

src/plugins/cpptools/cpptoolssettings.cpp

@@ -34,7 +34,6 @@
 #include "commentssettings.h"
 #include "completionsettingspage.h"
 
-#include <texteditor/texteditorsettings.h>
 #include <texteditor/texteditorsettings.h>
 #include <texteditor/tabsettings.h>
 #include <texteditor/codestylepool.h>

src/plugins/cpptools/doxygengenerator.h

@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef DOXYGEGENERATOR_H
+#ifndef DOXYGENGENERATOR_H
-#define DOXYGEGENERATOR_H
+#define DOXYGENGENERATOR_H
 
 #include "cpptools_global.h"
 
@@ -99,4 +99,4 @@ private:
 
 } // CppTools
 
-#endif // DOXYGEGENERATOR_H
+#endif // DOXYGENGENERATOR_H

src/plugins/cpptools/insertionpointlocator.cpp

@@ -27,9 +27,9 @@
 **
 ****************************************************************************/
 
+#include "insertionpointlocator.h"
 #include "cpptoolsreuse.h"
 #include "cpprefactoringchanges.h"
-#include "insertionpointlocator.h"
 #include "symbolfinder.h"
 
 #include <AST.h>