Fix Krazy warnings about includes/header guards in Text Editor.

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

src/plugins/texteditor/basetexteditor.cpp

@@ -27,11 +27,12 @@
 **
 ****************************************************************************/
 
+#include "basetexteditor.h"
+#include "basetexteditor_p.h"
 #include "texteditor_global.h"
 
 #include "basetextdocument.h"
 #include "basetextdocumentlayout.h"
-#include "basetexteditor_p.h"
 #include "behaviorsettings.h"
 #include "codecselector.h"
 #include "completionsettings.h"

src/plugins/texteditor/basetexteditor_p.h

@@ -43,6 +43,7 @@
 #include <QSharedPointer>
 #include <QPointer>
 #include <QScopedPointer>
+#include <QTextBlock>
 
 namespace TextEditor {
 

src/plugins/texteditor/codeassist/iassistproposalmodel.h

@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef IASSISTMODEL_H
+#ifndef IASSISTPROPOSALMODEL_H
-#define IASSISTMODEL_H
+#define IASSISTPROPOSALMODEL_H
 
 #include <texteditor/texteditor_global.h>
 
@@ -51,4 +51,4 @@ public:
 
 } // TextEditor
 
-#endif // IASSISTMODEL_H
+#endif // IASSISTPROPOSALMODEL_H

src/plugins/texteditor/convenience.h

@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef BASETEXTEDITORUTIL_H
+#ifndef CONCENIENCE_H
-#define BASETEXTEDITORUTIL_H
+#define CONCENIENCE_H
 
 #include "texteditor_global.h"
 
@@ -51,4 +51,4 @@ TEXTEDITOR_EXPORT QString textAt(QTextCursor tc, int pos, int length);
 } // Util
 } // TextEditor
 
-#endif // BASETEXTEDITORUTIL_H
+#endif // CONCENIENCE_H

src/plugins/texteditor/generichighlighter/manager.cpp

@@ -66,7 +66,6 @@
 #include <QXmlInputSource>
 #include <QNetworkRequest>
 #include <QNetworkReply>
-#include <QtAlgorithms>
 
 using namespace TextEditor;
 using namespace Internal;

src/plugins/texteditor/plaintexteditorfactory.cpp

@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "plaintexteditor.h"
 #include "plaintexteditorfactory.h"
+#include "plaintexteditor.h"
 #include "basetextdocument.h"
 #include "texteditorconstants.h"
 #include "texteditorplugin.h"

src/plugins/texteditor/snippets/isnippetprovider.h

@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef ISNIPPETEDITORDECORATOR_H
+#ifndef ISNIPPETPROVIDER_H
-#define ISNIPPETEDITORDECORATOR_H
+#define ISNIPPETPROVIDER_H
 
 #include <texteditor/texteditor_global.h>
 
@@ -54,4 +54,4 @@ protected:
 
 } // TextEditor
 
-#endif // ISNIPPETEDITORDECORATOR_H
+#endif // ISNIPPETPROVIDER_H