Commit 68b7e8c1263a576fad0737096022141eb5ee2722
2001-12-10T21:53:19
Tidied up includes
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129
diff --git a/include/FTBitmapGlyph.h b/include/FTBitmapGlyph.h
index 2e44198..924f0b3 100755
--- a/include/FTBitmapGlyph.h
+++ b/include/FTBitmapGlyph.h
@@ -1,12 +1,12 @@
#ifndef __FTBitmapGlyph__
#define __FTBitmapGlyph__
-#include "FTGL.h"
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
+#include "FTGL.h"
#include "FTGlyph.h"
diff --git a/include/FTCharmap.h b/include/FTCharmap.h
index 816704b..b39368b 100644
--- a/include/FTCharmap.h
+++ b/include/FTCharmap.h
@@ -1,15 +1,13 @@
#ifndef __FTCharmap__
#define __FTCharmap__
-#include "FTGL.h"
-
#include <map>
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
-//#include "FTGL.h"
+#include "FTGL.h"
using namespace std;
diff --git a/include/FTGlyph.h b/include/FTGlyph.h
index ddaf125..5b52b7b 100755
--- a/include/FTGlyph.h
+++ b/include/FTGlyph.h
@@ -1,12 +1,12 @@
#ifndef __FTGlyph__
#define __FTGlyph__
-#include "FTGL.h"
-
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
+#include "FTGL.h"
+
class FTGL_EXPORT FTBBox
{
diff --git a/include/FTGlyphContainer.h b/include/FTGlyphContainer.h
index 5ce5d48..09e8af2 100755
--- a/include/FTGlyphContainer.h
+++ b/include/FTGlyphContainer.h
@@ -8,11 +8,9 @@
#include FT_GLYPH_H
#include "FTGL.h"
-
-#include "FTGlyph.h"
+#include "FTGlyph.h" // for FTBBox
class FTFace;
-//class FTGlyph;
using namespace std;
diff --git a/include/FTPixmapGlyph.h b/include/FTPixmapGlyph.h
index 7b3e315..6bd55e2 100755
--- a/include/FTPixmapGlyph.h
+++ b/include/FTPixmapGlyph.h
@@ -1,12 +1,12 @@
#ifndef __FTPixmapGlyph__
#define __FTPixmapGlyph__
-#include "FTGL.h"
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
+#include "FTGL.h"
#include "FTGlyph.h"
diff --git a/include/FTSize.h b/include/FTSize.h
index e586092..85d77ed 100755
--- a/include/FTSize.h
+++ b/include/FTSize.h
@@ -1,11 +1,12 @@
#ifndef __FTSize__
#define __FTSize__
-#include "FTGL.h"
#include <ft2build.h>
#include FT_FREETYPE_H
+#include "FTGL.h"
+
/**
diff --git a/include/FTTextureGlyph.h b/include/FTTextureGlyph.h
index f0f4862..1b3893b 100755
--- a/include/FTTextureGlyph.h
+++ b/include/FTTextureGlyph.h
@@ -1,12 +1,12 @@
#ifndef __FTTextureGlyph__
#define __FTTextureGlyph__
-#include "FTGL.h"
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
+#include "FTGL.h"
#include "FTGlyph.h"