From 33130dd288f5842f0edde0fff8618cdfe3afc856 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Fri, 2 Jan 2009 20:42:58 +0100
Subject: Removed duplicate TrueTypeFont class declaration

Noticed by QOAL
---
 src/gui/truetypefont.cpp |  9 ++----
 src/gui/truetypefont.h   | 75 +++---------------------------------------------
 2 files changed, 7 insertions(+), 77 deletions(-)

diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp
index 7f9abd3a..0eed6f08 100644
--- a/src/gui/truetypefont.cpp
+++ b/src/gui/truetypefont.cpp
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #include "truetypefont.h"
@@ -47,8 +45,7 @@ class TextChunk
 
         bool operator==(const TextChunk &chunk) const
         {
-            return (
-                chunk.text == text && chunk.color == color);
+            return (chunk.text == text && chunk.color == color);
         }
 
         void generate(TTF_Font *font)
@@ -84,7 +81,7 @@ typedef std::list<TextChunk>::iterator CacheIterator;
 
 static int fontCounter;
 
-TrueTypeFont::TrueTypeFont(const std::string& filename, int size)
+TrueTypeFont::TrueTypeFont(const std::string &filename, int size)
 {
     if (fontCounter == 0 && TTF_Init() == -1)
     {
@@ -167,7 +164,7 @@ void TrueTypeFont::drawString(gcn::Graphics *graphics,
     g->drawImage(cache.front().img, x, y);
 }
 
-int TrueTypeFont::getWidth(const std::string& text) const
+int TrueTypeFont::getWidth(const std::string &text) const
 {
     int w, h;
     TTF_SizeUTF8(mFont, text.c_str(), &w, &h);
diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h
index 48502f1f..e8617c7d 100644
--- a/src/gui/truetypefont.h
+++ b/src/gui/truetypefont.h
@@ -17,8 +17,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
  */
 
 #ifndef _TMW_TRUETYPEFONT_H
@@ -44,74 +42,7 @@ class TrueTypeFont : public gcn::Font
          * @param filename  Font filename.
          * @param size      Font size.
          */
-        TrueTypeFont(const std::string& filename, int size);
-
-        /**
-         * Destructor.
-         */
-        ~TrueTypeFont();
-
-        virtual int getWidth(const std::string& text) const;
-
-        virtual int getHeight() const;
-
-        /**
-         * @see Font::drawString
-         */
-        void drawString(gcn::Graphics* graphics, const std::string& text, int x, int y);
-
-    private:
-        TTF_Font *mFont;
-};
-
-#endif
-/*
- *  The Mana World
- *  Copyright 2004 The Mana World Development Team
- *
- *  This file is part of The Mana World.
- *
- *  The Mana World is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  The Mana World is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *  $Id$
- */
-
-#ifndef _TMW_TRUETYPEFONT_H
-#define _TMW_TRUETYPEFONT_H
-
-#include <string>
-
-#include <guichan/font.hpp>
-#include <guichan/graphics.hpp>
-#include <SDL/SDL_ttf.h>
-
-/**
- * A wrapper around SDL_ttf for allowing the use of TrueType fonts.
- *
- * <b>NOTE:</b> This class needs SDL_ttf to be initialized.
- */
-class TrueTypeFont : public gcn::Font
-{
-    public:
-        /**
-         * Constructor.
-         *
-         * @param filename  Font filename.
-         * @param size      Font size.
-         */
-        TrueTypeFont(const std::string& filename, int size);
+        TrueTypeFont(const std::string &filename, int size);
 
         /**
          * Destructor.
@@ -125,7 +56,9 @@ class TrueTypeFont : public gcn::Font
         /**
          * @see Font::drawString
          */
-        void drawString(gcn::Graphics* graphics, const std::string& text, int x, int y);
+        void drawString(gcn::Graphics *graphics,
+                        const std::string &text,
+                        int x, int y);
 
     private:
         TTF_Font *mFont;
-- 
cgit v1.2.3-60-g2f50