From 8c97b21e2aa32cb8097e0b0abc3a9a77e570f136 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Tue, 12 Mar 2013 12:25:16 +0100
Subject: [PATCH]  Fix Krazy warnings about includes/header guards in various
 plugins.

Change-Id: Iafd1b3be1ad43bb7519e14059ac2d33eb859c625
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 src/plugins/classview/classviewmanager.cpp                 | 2 +-
 src/plugins/cpaster/cpasterplugin.h                        | 6 +++---
 src/plugins/cpaster/urlopenprotocol.h                      | 6 +++---
 src/plugins/diffeditor/diffeditorplugin.cpp                | 1 -
 src/plugins/find/treeviewfind.h                            | 6 +++---
 src/plugins/locator/locatorwidget.cpp                      | 3 ---
 src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h    | 6 +++---
 src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer.cpp | 4 ++--
 src/plugins/resourceeditor/resourceeditorw.h               | 6 +++---
 src/plugins/todo/optionspage.h                             | 6 +++---
 src/plugins/updateinfo/updateinfoplugin.cpp                | 1 -
 11 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/plugins/classview/classviewmanager.cpp b/src/plugins/classview/classviewmanager.cpp
index a5fb7920e5a..ee469691be9 100644
--- a/src/plugins/classview/classviewmanager.cpp
+++ b/src/plugins/classview/classviewmanager.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "classviewsymbollocation.h"
 #include "classviewmanager.h"
+#include "classviewsymbollocation.h"
 #include "classviewnavigationwidgetfactory.h"
 #include "classviewparser.h"
 #include "classviewutils.h"
diff --git a/src/plugins/cpaster/cpasterplugin.h b/src/plugins/cpaster/cpasterplugin.h
index cbba8a7791e..4156749c7fd 100644
--- a/src/plugins/cpaster/cpasterplugin.h
+++ b/src/plugins/cpaster/cpasterplugin.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CODEPASTERPLUGIN_H
-#define CODEPASTERPLUGIN_H
+#ifndef CPASTERPLUGIN_H
+#define CPASTERPLUGIN_H
 
 #include <extensionsystem/iplugin.h>
 
@@ -98,4 +98,4 @@ private:
 
 } // namespace CodePaster
 
-#endif // CODEPASTERPLUGIN_H
+#endif // CPASTERPLUGIN_H
diff --git a/src/plugins/cpaster/urlopenprotocol.h b/src/plugins/cpaster/urlopenprotocol.h
index 4c120f60098..dbd00674caf 100644
--- a/src/plugins/cpaster/urlopenprotocol.h
+++ b/src/plugins/cpaster/urlopenprotocol.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef SIMPLENETWORKPROTOCOL_H
-#define SIMPLENETWORKPROTOCOL_H
+#ifndef URLOPENPROTOCOL_H
+#define URLOPENPROTOCOL_H
 
 #include "protocol.h"
 
@@ -54,4 +54,4 @@ private:
 
 }
 
-#endif // SIMPLENETWORKPROTOCOL_H
+#endif // URLOPENPROTOCOL_H
diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp
index 7f843a95ff3..d4552c845e4 100644
--- a/src/plugins/diffeditor/diffeditorplugin.cpp
+++ b/src/plugins/diffeditor/diffeditorplugin.cpp
@@ -44,7 +44,6 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/coreconstants.h>
 
 namespace DiffEditor {
 namespace Internal {
diff --git a/src/plugins/find/treeviewfind.h b/src/plugins/find/treeviewfind.h
index cad663dd557..7fa9ba36d62 100644
--- a/src/plugins/find/treeviewfind.h
+++ b/src/plugins/find/treeviewfind.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef ITEMMODELFIND_H
-#define ITEMMODELFIND_H
+#ifndef TREEVIEWFIND_H
+#define TREEVIEWFIND_H
 
 #include "ifindsupport.h"
 
@@ -73,4 +73,4 @@ private:
 
 } // namespace Find
 
-#endif // ITEMMODELFIND_H
+#endif // TREEVIEWFIND_H
diff --git a/src/plugins/locator/locatorwidget.cpp b/src/plugins/locator/locatorwidget.cpp
index cee7a8588ee..02552e2602a 100644
--- a/src/plugins/locator/locatorwidget.cpp
+++ b/src/plugins/locator/locatorwidget.cpp
@@ -27,8 +27,6 @@
 **
 ****************************************************************************/
 
-#include <qglobal.h>
-
 #include "locatorwidget.h"
 #include "locatorplugin.h"
 #include "locatorconstants.h"
@@ -41,7 +39,6 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/coreconstants.h>
 #include <coreplugin/fileiconprovider.h>
 #include <utils/filterlineedit.h>
 #include <utils/hostosinfo.h>
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h
index 3455b8f5dc7..967826ec832 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef QBSPROJECTPLUGIN_H
-#define QBSPROJECTPLUGIN_H
+#ifndef QBSPROJECTMANAGERPLUGIN_H
+#define QBSPROJECTMANAGERPLUGIN_H
 
 #include <extensionsystem/iplugin.h>
 
@@ -90,4 +90,4 @@ private:
 } // namespace Internal
 } // namespace QbsProject
 
-#endif // QBSPROJECTPLUGIN_H
+#endif // QBSPROJECTMANAGERPLUGIN_H
diff --git a/src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer.cpp b/src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer.cpp
index f1b836721b7..4d41aec983b 100644
--- a/src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer.cpp
+++ b/src/plugins/qmlprofiler/canvas/qdeclarativecanvastimer.cpp
@@ -27,12 +27,12 @@
 **
 ****************************************************************************/
 
+#include "qdeclarativecanvastimer_p.h"
+
 #include <qscriptengine.h>
 #include <qscriptvalue.h>
 #include <qtimer.h>
 
-#include "qdeclarativecanvastimer_p.h"
-
 QT_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC(QList<CanvasTimer*> , activeTimers);
diff --git a/src/plugins/resourceeditor/resourceeditorw.h b/src/plugins/resourceeditor/resourceeditorw.h
index 539cbd174f2..4d7026286fe 100644
--- a/src/plugins/resourceeditor/resourceeditorw.h
+++ b/src/plugins/resourceeditor/resourceeditorw.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef RESOURCEDITORW_H
-#define RESOURCEDITORW_H
+#ifndef RESOURCEEDITORW_H
+#define RESOURCEEDITORW_H
 
 #include <coreplugin/idocument.h>
 #include <coreplugin/editormanager/ieditor.h>
@@ -136,4 +136,4 @@ public:
 } // namespace Internal
 } // namespace ResourceEditor
 
-#endif // RESOURCEDITORW_H
+#endif // RESOURCEEDITORW_H
diff --git a/src/plugins/todo/optionspage.h b/src/plugins/todo/optionspage.h
index 5b6a5aa5d69..601a15642ad 100644
--- a/src/plugins/todo/optionspage.h
+++ b/src/plugins/todo/optionspage.h
@@ -28,8 +28,8 @@
 **
 ****************************************************************************/
 
-#ifndef SETTINGSPAGE_H
-#define SETTINGSPAGE_H
+#ifndef OPTIONSPAGE_H
+#define OPTIONSPAGE_H
 
 #include "settings.h"
 
@@ -65,4 +65,4 @@ private:
 } // namespace Internal
 } // namespace Todo
 
-#endif // SETTINGSPAGE_H
+#endif // OPTIONSPAGE_H
diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp
index 699bfef42b4..78f5d06ff70 100644
--- a/src/plugins/updateinfo/updateinfoplugin.cpp
+++ b/src/plugins/updateinfo/updateinfoplugin.cpp
@@ -48,7 +48,6 @@
 #include <QFile>
 #include <QThread>
 #include <QCoreApplication>
-#include <QProcess>
 #include <QDomDocument>
 #include <QMessageBox>
 #include <QMenu>
-- 
GitLab