From d93f1870c643eeaa05f65a857802001dc40cfc6f Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 28 Jul 2014 09:27:06 +0000
Subject: [PATCH] ide: Fixed to compile with GCC

git-svn-id: svn://ultimatepp.org/upp/trunk@7547 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CppBase/CppBase.h     | 4 ++--
 uppsrc/CppBase/Qualify.cpp   | 2 --
 uppsrc/ide/Browser/Browser.h | 2 +-
 uppsrc/ide/Browser/init      | 2 +-
 uppsrc/ide/Navigator.cpp     | 4 ++--
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/uppsrc/CppBase/CppBase.h b/uppsrc/CppBase/CppBase.h
index 4926fce4e..5dec400d6 100644
--- a/uppsrc/CppBase/CppBase.h
+++ b/uppsrc/CppBase/CppBase.h
@@ -205,13 +205,13 @@ inline bool IsCppTemplate(int i) {
 	return i == STRUCTTEMPLATE || i >= FUNCTIONTEMPLATE && i <= CLASSFUNCTIONTEMPLATE;
 }
 
-enum {
+enum AccessEnum {
 	PUBLIC,
 	PROTECTED,
 	PRIVATE,
 };
 
-enum {
+enum FileTypeEnum {
 	FILE_H,
 	FILE_HPP,
 	FILE_CPP,
diff --git a/uppsrc/CppBase/Qualify.cpp b/uppsrc/CppBase/Qualify.cpp
index e25c28776..010091fb0 100644
--- a/uppsrc/CppBase/Qualify.cpp
+++ b/uppsrc/CppBase/Qualify.cpp
@@ -178,14 +178,12 @@ String QualifyIds(Scopefo& nf, const String& k, bool all)
 String Qualify(const CppBase& base, const String& scope, const String& type)
 {
 	Scopefo nf(base, scope);
-	byte dummy = 2;
 	return QualifyIds(nf, type, true);
 }
 
 String QualifyKey(const CppBase& base, const String& scope, const String& type)
 {
 	Scopefo nf(base, scope);
-	byte dummy = 2;
 	return QualifyIds(nf, type, false);
 }
 
diff --git a/uppsrc/ide/Browser/Browser.h b/uppsrc/ide/Browser/Browser.h
index ea2ddcc63..8a3688b81 100644
--- a/uppsrc/ide/Browser/Browser.h
+++ b/uppsrc/ide/Browser/Browser.h
@@ -42,7 +42,7 @@ const CppItem *GetCodeRefItem(const String& ref);
 int            GetMatchLen(const char *s, const char *t);
 
 
-enum { WITHBODY = 33 };
+enum WithBodyEnum { WITHBODY = 33 };
 
 inline Font BrowserFont()
 #ifdef PLATFORM_WIN32
diff --git a/uppsrc/ide/Browser/init b/uppsrc/ide/Browser/init
index 7a2c8bd86..e30879745 100644
--- a/uppsrc/ide/Browser/init
+++ b/uppsrc/ide/Browser/init
@@ -4,7 +4,7 @@
 #include "ide\Common/init"
 #include "PdfDraw/init"
 #include "RichEdit/init"
-#define BLITZ_INDEX__ F09f1bfac1925f12219a612fc7165f5a9
+#define BLITZ_INDEX__ F93222d80ec8e06ccbdf5f9e1c0bd4535
 #include "TopicI.icpp"
 #undef BLITZ_INDEX__
 #endif
diff --git a/uppsrc/ide/Navigator.cpp b/uppsrc/ide/Navigator.cpp
index 7438da501..ce001e4b1 100644
--- a/uppsrc/ide/Navigator.cpp
+++ b/uppsrc/ide/Navigator.cpp
@@ -198,8 +198,8 @@ void AssistEditor::NavigatorDisplay::Paint(Draw& w, const Rect& r, const Value&
 
 Size AssistEditor::NavigatorDisplay::GetStdSize(const Value& q) const
 {
-	return Size(DoPaint(NilDraw(), Size(999999, 999999), q, White(), White(), 0),
-	            2 * Draw::GetStdFontCy());
+	NilDraw w;
+	return Size(DoPaint(w, Size(999999, 999999), q, White(), White(), 0), 2 * Draw::GetStdFontCy());
 }
 
 void AssistEditor::Search()