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

diff --git a/src/base/fontlist.h b/src/base/fontlist.h
index 4030493..29d1dc0 100644
--- a/src/base/fontlist.h
+++ b/src/base/fontlist.h
@@ -3,47 +3,47 @@
 
 #include <QtCore>
 
-#define RS_FONTLIST RS_FontList::instance()
+#define FONTLIST FontList::instance()
 
-class RS_Font;
+class Font;
 
 /**
  * The global list of fonts. This is implemented as a singleton.
- * Use RS_FontList::instance() to get a pointer to the object.
+ * Use FontList::instance() to get a pointer to the object.
  *
  * @author James Hammons
  * @author Andrew Mustun
  */
-class RS_FontList
+class FontList
 {
 	protected:
-		RS_FontList();
+		FontList();
 
 	public:
 		/**
 		 * @return Instance to the unique font list.
 		 */
-		static RS_FontList * instance();
+		static FontList * instance();
 
-		virtual ~RS_FontList();
+		virtual ~FontList();
 
 		void init();
 		void clearFonts();
 		int countFonts();
-		virtual void removeFont(RS_Font * font);
-		RS_Font * requestFont(const QString & name);
-		RS_Font * firstFont();
-		RS_Font * nextFont();
+		virtual void removeFont(Font * font);
+		Font * requestFont(const QString & name);
+		Font * firstFont();
+		Font * nextFont();
 
-		friend std::ostream & operator<<(std::ostream & os, RS_FontList & l);
+		friend std::ostream & operator<<(std::ostream & os, FontList & l);
 
 	protected:
-		static RS_FontList * uniqueInstance;
+		static FontList * uniqueInstance;
 
 	private:
 		//! fonts in the graphic
-		QList<RS_Font *> fonts;
-		QListIterator<RS_Font *> fontIterator;
+		QList<Font *> fonts;
+		QListIterator<Font *> fontIterator;
 };
 
 #endif	// __FONTLIST_H__