From 45e08ccde95c84932557701235558e72cdc95f1b Mon Sep 17 00:00:00 2001 From: pixel Date: Sat, 28 Oct 2006 16:50:46 +0000 Subject: Fixing caps in class names. --- include/shape.h | 64 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'include/shape.h') diff --git a/include/shape.h b/include/shape.h index b5c3d91..74422a1 100644 --- a/include/shape.h +++ b/include/shape.h @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: shape.h,v 1.17 2005-12-01 13:48:12 pixel Exp $ */ +/* $Id: shape.h,v 1.18 2006-10-28 16:50:46 pixel Exp $ */ #ifndef __SHAPE_H__ #define __SHAPE_H__ @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include +#include namespace mogltk { typedef enum { @@ -47,10 +47,10 @@ namespace mogltk { virtual ~segwalker(); virtual void step(int x1, int y1, int x2, int y2); }; - class fill : public Base { + class Fill : public Base { public: - fill(); - virtual ~fill(); + Fill(); + virtual ~Fill(); void walk(fillwalker *); void swalk(segwalker *); void insert(int, int, int, int); @@ -59,10 +59,10 @@ namespace mogltk { int GetMinY() const; int GetMaxX() const; int GetMaxY() const; - texture * GetTexture(); - texture * Talloc(); - texture * GetSTexture(); - texture * STalloc(); + Texture * GetTexture(); + Texture * Talloc(); + Texture * GetSTexture(); + Texture * STalloc(); Color last; private: void insert(int, int); @@ -71,7 +71,7 @@ namespace mogltk { }; class sline : public Base { public: - sline(int, fill *); + sline(int, Fill *); virtual ~sline(); int GetY() const; void insert(int, int); @@ -93,7 +93,7 @@ namespace mogltk { }; int y; sline * next; - fill * header; + Fill * header; sline * look(int); protected: point * pheader; @@ -102,22 +102,22 @@ namespace mogltk { int count() const; }; int minX, minY, maxX, maxY; - texture * cached; - texture * scached; + Texture * cached; + Texture * scached; std::vector segments; protected: sline * header; friend class sline; }; - class shape : public Base { + class Shape : public Base { public: - shape(SDL_Surface * = 0); + Shape(SDL_Surface * = 0); virtual void pixel(int x, int y, ColorP = WHITE); virtual void circle(int x, int y, int r, ColorP = WHITE); virtual void pcircle(int x, int y, int r, ColorP = WHITE); - virtual fill * fcircle(int x, int y, int r); - virtual void fdraw(fill *, ColorP = WHITE, int sx = 0, int sy = 0); - virtual void sdraw(fill *, ColorP = WHITE, int sx = 0, int sy = 0); + virtual Fill * fcircle(int x, int y, int r); + virtual void fdraw(Fill *, ColorP = WHITE, int sx = 0, int sy = 0); + virtual void sdraw(Fill *, ColorP = WHITE, int sx = 0, int sy = 0); virtual void box(int x1, int y1, int x2, int y2, ColorP = DOS_WHITE); virtual void box3d(int x1, int y1, int x2, int y2, ColorP = DOS_WHITE, ColorP = DOS_HIGH_WHITE, ColorP = DOS_GRAY, int = 2, bool = false); virtual void box(int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP); @@ -131,10 +131,10 @@ namespace mogltk { virtual void vline3d(int x, int y1, int y2, ColorP = DOS_HIGH_WHITE, ColorP = DOS_GRAY, bool = false); virtual void vline(int x, int y1, int y2, ColorP, ColorP); virtual void line(int x1, int y1, int x2, int y2, ColorP = WHITE); - virtual void tbox(texture *, int x1, int y1, int x2, int y2, int tx = 0, int ty = 0, double = 1.0, ColorP = WHITE); - virtual void tbox(texture *, int x1, int y1, int x2, int y2, int tx1, int ty1, int tx2, int ty2, ColorP = WHITE); - virtual void tbox(texture *, int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP, int tx = 0, int ty = 0, double = 1.0); - virtual void tbox(texture *, int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP, int tx1, int ty1, int tx2, int ty2); + virtual void tbox(Texture *, int x1, int y1, int x2, int y2, int tx = 0, int ty = 0, double = 1.0, ColorP = WHITE); + virtual void tbox(Texture *, int x1, int y1, int x2, int y2, int tx1, int ty1, int tx2, int ty2, ColorP = WHITE); + virtual void tbox(Texture *, int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP, int tx = 0, int ty = 0, double = 1.0); + virtual void tbox(Texture *, int x1, int y1, int x2, int y2, ColorP, ColorP, ColorP, ColorP, int tx1, int ty1, int tx2, int ty2); virtual void window(int x1, int y1, int x2, int y2, const String & title = "", ColorP titlecolor = DOS_HIGH_WHITE, @@ -144,13 +144,13 @@ namespace mogltk { ColorP shade2 = DOS_GRAY); virtual void text(int x, int y, const String &, ColorP textcolor = DOS_HIGH_WHITE, - align_t align = LEFT, mogltk::font * = mogltk::SystemFont); + align_t align = LEFT, mogltk::Font * = mogltk::SystemFont); virtual void text3d(int x, int y, const String &, ColorP textcolor = DOS_BLACK, ColorP shade1 = DOS_HIGH_WHITE, ColorP shade2 = DOS_GRAY, align_t align = LEFT, - bool bevel = false, mogltk::font * = mogltk::SystemFont); + bool bevel = false, mogltk::Font * = mogltk::SystemFont); virtual void button(int x1, int y1, int x2, int y2, const String &, bool bevel = false, ColorP front = DOS_WHITE, @@ -173,25 +173,25 @@ namespace mogltk { class filldrawer : public fillwalker { public: - filldrawer(fill *, texture *, ColorP = DOS_WHITE); + filldrawer(Fill *, Texture *, ColorP = DOS_WHITE); virtual ~filldrawer(); virtual void step(int x, int y); private: - fill * f; - texture * t; + Fill * f; + Texture * t; ColorP c; int oldx, oldy; }; class segdrawer : public segwalker { public: - segdrawer(fill *, texture *, ColorP = DOS_WHITE); + segdrawer(Fill *, Texture *, ColorP = DOS_WHITE); virtual ~segdrawer(); virtual void step(int x1, int y1, int x2, int y2); private: - fill * f; - texture * t; + Fill * f; + Texture * t; ColorP c; - shape * sh; + Shape * sh; }; }; -- cgit v1.2.3