From d535fddae3d9090ff3017b8e12d80364fa332a0f Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Fri, 15 Mar 2013 12:41:32 +0100
Subject: [PATCH] Fix Krazy warnings about improper include guard in Debugger.

Change-Id: I0d539070676c8a94d097d744e9b066f86a664cf5
Reviewed-by: David Schulz <david.schulz@digia.com>
---
 share/qtcreator/dumper/dumper.h           | 6 +++---
 share/qtcreator/dumper/dumper_p.h         | 6 +++---
 src/libs/qtcreatorcdbext/eventcallback.h  | 6 +++---
 src/libs/qtcreatorcdbext/gdbmihelpers.h   | 6 +++---
 src/libs/qtcreatorcdbext/outputcallback.h | 6 +++---
 src/libs/qtcreatorcdbext/stringutils.h    | 6 +++---
 src/plugins/debugger/cdb/cdboptionspage.h | 6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/share/qtcreator/dumper/dumper.h b/share/qtcreator/dumper/dumper.h
index 3f3c6c6f559..0f2b2545899 100644
--- a/share/qtcreator/dumper/dumper.h
+++ b/share/qtcreator/dumper/dumper.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef GDBMACROS_H
-#define GDBMACROS_H
+#ifndef DUMPER_H
+#define DUMPER_H
 
 #ifdef MACROSDEBUG
 Q_DECL_EXPORT extern char xDumpInBuffer[];
@@ -43,4 +43,4 @@ void *qDumpObjectData440(int protocolVersion, int token, const void *data,
   int dumpChildren, int extraInt0, int extraInt1, int extraInt2, int extraInt3);
 
 
-#endif // GDBMACROS_H
+#endif // DUMPER_H
diff --git a/share/qtcreator/dumper/dumper_p.h b/share/qtcreator/dumper/dumper_p.h
index a5ea3d6c66d..bff736c329d 100644
--- a/share/qtcreator/dumper/dumper_p.h
+++ b/share/qtcreator/dumper/dumper_p.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef GDBMACROS_P_H
-#define GDBMACROS_P_H
+#ifndef DUMPER_P_H
+#define DUMPER_P_H
 
 #include <QObject>
 #include <QPointer>
@@ -201,4 +201,4 @@ public:
 QT_END_NAMESPACE
 #endif
 
-#endif // GDBMACROS_P_H
+#endif // DUMPER_P_H
diff --git a/src/libs/qtcreatorcdbext/eventcallback.h b/src/libs/qtcreatorcdbext/eventcallback.h
index a9855a7a2a3..59e8b1f48cd 100644
--- a/src/libs/qtcreatorcdbext/eventcallback.h
+++ b/src/libs/qtcreatorcdbext/eventcallback.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef DEBUGEVENTHANDLER_H
-#define DEBUGEVENTHANDLER_H
+#ifndef EVENTCALLBACK_H
+#define EVENTCALLBACK_H
 
 #include "common.h"
 #include "extensioncontext.h"
@@ -152,4 +152,4 @@ public:
     private:
         IDebugEventCallbacks *m_wrapped;
 };
-#endif // DEBUGEVENTHANDLER_H
+#endif // EVENTCALLBACK_H
diff --git a/src/libs/qtcreatorcdbext/gdbmihelpers.h b/src/libs/qtcreatorcdbext/gdbmihelpers.h
index 34313b03b79..ad589e9a64e 100644
--- a/src/libs/qtcreatorcdbext/gdbmihelpers.h
+++ b/src/libs/qtcreatorcdbext/gdbmihelpers.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef THREADLIST_H
-#define THREADLIST_H
+#ifndef GDBMIHELPERS_H
+#define GDBMIHELPERS_H
 
 #include "common.h"
 #include <vector>
@@ -182,4 +182,4 @@ bool evaluateExpression(CIDebugControl *control, const std::string expression,
 bool evaluateInt64Expression(CIDebugControl *control, const std::string expression,
                              LONG64 *, std::string *errorMessage);
 
-#endif // THREADLIST_H
+#endif // GDBMIHELPERS_H
diff --git a/src/libs/qtcreatorcdbext/outputcallback.h b/src/libs/qtcreatorcdbext/outputcallback.h
index f3bcc4af2b0..2a4e214c956 100644
--- a/src/libs/qtcreatorcdbext/outputcallback.h
+++ b/src/libs/qtcreatorcdbext/outputcallback.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef DEBUGEVENTOUTPUT_H
-#define DEBUGEVENTOUTPUT_H
+#ifndef OUTPUTCALLBACK_H
+#define OUTPUTCALLBACK_H
 
 #include "common.h"
 
@@ -68,4 +68,4 @@ private:
     std::wstring m_recorded;
 };
 
-#endif // DEBUGEVENTOUTPUT_H
+#endif // OUTPUTCALLBACK_H
diff --git a/src/libs/qtcreatorcdbext/stringutils.h b/src/libs/qtcreatorcdbext/stringutils.h
index 7a7afb2468e..5142f776ef2 100644
--- a/src/libs/qtcreatorcdbext/stringutils.h
+++ b/src/libs/qtcreatorcdbext/stringutils.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef SPLIT_H
-#define SPLIT_H
+#ifndef STRINGUTILS_H
+#define STRINGUTILS_H
 
 #include <string>
 #include <sstream>
@@ -226,4 +226,4 @@ private:
 // Format a map as a GDBMI hash {key="value",..}
 void formatGdbmiHash(std::ostream &os, const std::map<std::string, std::string> &, bool closeHash = true);
 
-#endif // SPLIT_H
+#endif // STRINGUTILS_H
diff --git a/src/plugins/debugger/cdb/cdboptionspage.h b/src/plugins/debugger/cdb/cdboptionspage.h
index 7e27e5a0601..d234ed9091c 100644
--- a/src/plugins/debugger/cdb/cdboptionspage.h
+++ b/src/plugins/debugger/cdb/cdboptionspage.h
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef CDBOPTIONSSPAGE_H
-#define CDBOPTIONSSPAGE_H
+#ifndef CDBOPTIONSPAGE_H
+#define CDBOPTIONSPAGE_H
 
 #include "cdboptions.h"
 
@@ -147,4 +147,4 @@ private:
 } // namespace Internal
 } // namespace Debugger
 
-#endif // CDBOPTIONSSPAGE_H
+#endif // CDBOPTIONSPAGE_H