Fixed header protection.

src/libs/cplusplus/ASTParent.h

@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef ASTPARENT_H
-#define ASTPARENT_H
+#ifndef CPLUSPLUS_ASTPARENT_H
+#define CPLUSPLUS_ASTPARENT_H
 
 #include <ASTVisitor.h>
 #include <QtCore/QHash>
@@ -60,4 +60,4 @@ private:
 
 } // namespace CPlusPlus
 
-#endif // ASTPARENT_H
+#endif // CPLUSPLUS_ASTPARENT_H

src/libs/cplusplus/ASTPath.h

@@ -27,13 +27,13 @@
 **
 **************************************************************************/
 
-#ifndef ASTPATH_H
-#define ASTPATH_H
+#ifndef CPLUSPLUS_ASTPATH_H
+#define CPLUSPLUS_ASTPATH_H
 
 #include <ASTfwd.h>
 #include <ASTVisitor.h>
 
-#include <cplusplus/CppDocument.h>
+#include "CppDocument.h"
 
 #include <QtCore/QList>
 #include <QtGui/QTextCursor>
@@ -72,4 +72,4 @@ private:
 
 } // namespace CppTools
 
-#endif // ASTPATH_H
+#endif // CPLUSPLUS_ASTPATH_H

src/libs/cplusplus/BackwardsScanner.h

@@ -26,8 +26,8 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 **
 **************************************************************************/
-#ifndef BACKWARDSSCANNER_H
-#define BACKWARDSSCANNER_H
+#ifndef CPLUSPLUS_BACKWARDSSCANNER_H
+#define CPLUSPLUS_BACKWARDSSCANNER_H
 
 #include "SimpleLexer.h"
 
@@ -87,4 +87,4 @@ private:
 
 } // end of namespace CPlusPlus
 
-#endif // BACKWARDSSCANNER_H
+#endif // CPLUSPLUS_BACKWARDSSCANNER_H

src/libs/cplusplus/CheckUndefinedSymbols.h

@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef CHECKUNDEFINEDSYMBOLS_H
-#define CHECKUNDEFINEDSYMBOLS_H
+#ifndef CPLUSPLUS_CHECKUNDEFINEDSYMBOLS_H
+#define CPLUSPLUS_CHECKUNDEFINEDSYMBOLS_H
 
 #include "CppDocument.h"
 #include "LookupContext.h"
@@ -88,4 +88,4 @@ private:
 
 } // end of namespace CPlusPlus
 
-#endif // CHECKUNDEFINEDSYMBOLS_H
+#endif // CPLUSPLUS_CHECKUNDEFINEDSYMBOLS_H

src/libs/cplusplus/CppDocument.h

@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef CPPDOCUMENT_H
-#define CPPDOCUMENT_H
+#ifndef CPLUSPLUS_CPPDOCUMENT_H
+#define CPLUSPLUS_CPPDOCUMENT_H
 
 #include <CPlusPlusForwardDeclarations.h>
 #include "Macro.h"
@@ -382,4 +382,4 @@ private:
 
 } // end of namespace CPlusPlus
 
-#endif // CPPDOCUMENT_H
+#endif // CPLUSPLUS_CPPDOCUMENT_H

src/libs/cplusplus/DependencyTable.h

@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef DEPENDENCYTABLE_H
-#define DEPENDENCYTABLE_H
+#ifndef CPLUSPLUS_DEPENDENCYTABLE_H
+#define CPLUSPLUS_DEPENDENCYTABLE_H
 
 #include <CPlusPlusForwardDeclarations.h>
 
@@ -62,4 +62,4 @@ private:
 
 } // namespace CPlusPlus
 
-#endif // DEPENDENCYTABLE_H
+#endif // CPLUSPLUS_DEPENDENCYTABLE_H

src/libs/cplusplus/ExpressionUnderCursor.h

@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef EXPRESSIONUNDERCURSOR_H
-#define EXPRESSIONUNDERCURSOR_H
+#ifndef CPLUSPLUS_EXPRESSIONUNDERCURSOR_H
+#define CPLUSPLUS_EXPRESSIONUNDERCURSOR_H
 
 #include "CPlusPlusForwardDeclarations.h"
 #include <QList>
@@ -64,4 +64,4 @@ private:
 
 } // namespace CPlusPlus
 
-#endif // EXPRESSIONUNDERCURSOR_H
+#endif // CPLUSPLUS_EXPRESSIONUNDERCURSOR_H

src/libs/cplusplus/FastPreprocessor.h

@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef FASTPREPROCESSOR_H
-#define FASTPREPROCESSOR_H
+#ifndef CPLUSPLUS_FASTPREPROCESSOR_H
+#define CPLUSPLUS_FASTPREPROCESSOR_H
 
 #include "PreprocessorClient.h"
 #include "CppDocument.h"
@@ -77,4 +77,4 @@ public:
 
 } // end of namespace CPlusPlus
 
-#endif // FASTPREPROCESSOR_H
+#endif // CPLUSPLUS_FASTPREPROCESSOR_H

src/libs/cplusplus/FindUsages.h

@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef FINDUSAGES_H
-#define FINDUSAGES_H
+#ifndef CPLUSPLUS_FINDUSAGES_H
+#define CPLUSPLUS_FINDUSAGES_H
 
 #include "LookupContext.h"
 #include "CppDocument.h"
@@ -119,4 +119,4 @@ private:
 
 } // end of namespace CPlusPlus
 
-#endif // FINDUSAGES_H
+#endif // CPLUSPLUS_FINDUSAGES_H

src/libs/cplusplus/Macro.h

@@ -46,8 +46,8 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#ifndef PP_MACRO_H
-#define PP_MACRO_H
+#ifndef CPLUSPLUS_PP_MACRO_H
+#define CPLUSPLUS_PP_MACRO_H
 
 #include <CPlusPlusForwardDeclarations.h>
 
@@ -153,4 +153,4 @@ private:
 
 } // namespace CPlusPlus
 
-#endif // PP_MACRO_H
+#endif // CPLUSPLUS_PP_MACRO_H

src/libs/cplusplus/MatchingText.h

@@ -26,8 +26,8 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 **
 **************************************************************************/
-#ifndef MATCHINGTEXT_H
-#define MATCHINGTEXT_H
+#ifndef CPLUSPLUS_MATCHINGTEXT_H
+#define CPLUSPLUS_MATCHINGTEXT_H
 
 #include <CPlusPlusForwardDeclarations.h>
 #include <QtGui/QTextCursor>

src/libs/cplusplus/Overview.h

@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef OVERVIEW_H
-#define OVERVIEW_H
+#ifndef CPLUSPLUS_OVERVIEW_H
+#define CPLUSPLUS_OVERVIEW_H
 
 #include <CPlusPlusForwardDeclarations.h>
 #include <QString>
@@ -92,4 +92,4 @@ private:
 
 } // end of namespace CPlusPlus
 
-#endif // OVERVIEW_H
+#endif // CPLUSPLUS_OVERVIEW_H

src/libs/cplusplus/SimpleLexer.h

@@ -26,8 +26,8 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 **
 **************************************************************************/
-#ifndef SIMPLELEXER_H
-#define SIMPLELEXER_H
+#ifndef CPLUSPLUS_SIMPLELEXER_H
+#define CPLUSPLUS_SIMPLELEXER_H
 
 #include <CPlusPlusForwardDeclarations.h>
 
@@ -143,4 +143,4 @@ private:
 
 } // end of namespace CPlusPlus
 
-#endif // SIMPLELEXER_H
+#endif // CPLUSPLUS_SIMPLELEXER_H

src/libs/cplusplus/TokenUnderCursor.h

@@ -26,8 +26,8 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 **
 **************************************************************************/
-#ifndef TOKENUNDERCURSOR_H
-#define TOKENUNDERCURSOR_H
+#ifndef CPLUSPLUS_TOKENUNDERCURSOR_H
+#define CPLUSPLUS_TOKENUNDERCURSOR_H
 
 #include "SimpleLexer.h"
 #include <QList>
@@ -58,4 +58,4 @@ private:
 
 } // end of namespace CPlusPlus
 
-#endif // TOKENUNDERCURSOR_H
+#endif // CPLUSPLUS_TOKENUNDERCURSOR_H

src/libs/cplusplus/TypePrettyPrinter.h

@@ -26,8 +26,8 @@
 ** contact the sales department at http://qt.nokia.com/contact.
 **
 **************************************************************************/
-#ifndef TYPEPRETTYPRINTER_H
-#define TYPEPRETTYPRINTER_H
+#ifndef CPLUSPLUS_TYPEPRETTYPRINTER_H
+#define CPLUSPLUS_TYPEPRETTYPRINTER_H
 
 #include <TypeVisitor.h>
 #include <FullySpecifiedType.h>
@@ -86,4 +86,4 @@ private:
 
 } // end of namespace CPlusPlus
 
-#endif // TYPEPRETTYPRINTER_H
+#endif // CPLUSPLUS_TYPEPRETTYPRINTER_H

src/libs/cplusplus/pp-macro-expander.h

@@ -46,8 +46,8 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#ifndef PP_MACRO_EXPANDER_H
-#define PP_MACRO_EXPANDER_H
+#ifndef CPLUSPLUS_PP_MACRO_EXPANDER_H
+#define CPLUSPLUS_PP_MACRO_EXPANDER_H
 
 #include "Macro.h"
 #include "pp-scanner.h"
@@ -102,5 +102,5 @@ public: // attributes
 
 } // namespace CPlusPlus
 
-#endif // PP_MACRO_EXPANDER_H
+#endif // CPLUSPLUS_PP_MACRO_EXPANDER_H