X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Ffont.h;fp=src%2Fbase%2Ffont.h;h=f2e1bbfc8dabfab3404b399de4564871b7751a27;hb=16354e0421b316a62c6b9f7b0b4f3b8cf6f06284;hp=f47d0cf949a9e9a18cca18bd2ea9d3e3dbce6560;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/base/font.h b/src/base/font.h
index f47d0cf..f2e1bbf 100644
--- a/src/base/font.h
+++ b/src/base/font.h
@@ -12,12 +12,12 @@
  *
  * @author Andrew Mustun
  */
-class RS_Font
+class Font
 {
-    friend class RS_FontList;
+    friend class FontList;
 
 	public:
-		RS_Font(const QString & name, bool owner = true);
+		Font(const QString & name, bool owner = true);
 
 		QString getFileName() const;
 		QString getEncoding() const;
@@ -29,12 +29,12 @@ class RS_Font
 		bool loadFont();
 
 		// Wrappers for block list (letters) functions
-		RS_BlockList * getLetterList();
-		RS_Block * findLetter(const QString & name);
+		BlockList * getLetterList();
+		Block * findLetter(const QString & name);
 		uint countLetters();
-		RS_Block * letterAt(uint i);
+		Block * letterAt(uint i);
 
-		friend std::ostream & operator<<(std::ostream & os, const RS_Font & l);
+		friend std::ostream & operator<<(std::ostream & os, const Font & l);
 
 #if 1
 	private:
@@ -44,7 +44,7 @@ class RS_Font
 
 	private:
 		//! block list (letters)
-		RS_BlockList letterList;
+		BlockList letterList;
 		//! Font file name
 		QString fileName;
 		//! Font encoding (see docu for QTextCodec)