Phase two of adding polyline functionality...

[architektonas] / src / widgets / fontbox.cpp

diff --git a/src/widgets/fontbox.cpp b/src/widgets/fontbox.cpp
index ba06a48e543bf2ffe455a02fab930e3077814858..1e987cb8a5069230c474137585a3644f7b187276 100644 (file)
--- a/src/widgets/fontbox.cpp
+++ b/src/widgets/fontbox.cpp
@@ -16,9 +16,9 @@
 
 #include "fontbox.h"
 
-#include "rs_debug.h"
-#include "rs_font.h"
-#include "rs_fontlist.h"
+#include "debug.h"
+#include "font.h"
+#include "fontlist.h"
 
 /**
  * Default Constructor. You must call init manually if you choose
@@ -43,7 +43,7 @@ void FontBox::init()
 {
        QStringList fonts;
 
-       for(RS_Font * f=RS_FONTLIST->firstFont(); f!=NULL; f=RS_FONTLIST->nextFont())
+       for(Font * f=FONTLIST->firstFont(); f!=NULL; f=FONTLIST->nextFont())
                fonts.append(f->getFileName());
 
        fonts.sort();
@@ -58,7 +58,7 @@ void FontBox::init()
        slotFontChanged(currentIndex());
 }
 
-RS_Font * FontBox::getFont()
+Font * FontBox::getFont()
 {
        return currentFont;
 }
@@ -68,7 +68,7 @@ RS_Font * FontBox::getFont()
  */
 void FontBox::setFont(const QString & fName)
 {
-       RS_DEBUG->print("FontBox::setFont %s\n", fName.toLatin1().data());
+       DEBUG->print("FontBox::setFont %s\n", fName.toLatin1().data());
 //     setCurrentText(fName);
        setItemText(currentIndex(), fName);
 //     slotFontChanged(currentItem());
@@ -81,11 +81,11 @@ void FontBox::setFont(const QString & fName)
  */
 void FontBox::slotFontChanged(int index)
 {
-    RS_DEBUG->print("FontBox::slotFontChanged %d\n", index);
-    currentFont = RS_FONTLIST->requestFont(currentText());
+    DEBUG->print("FontBox::slotFontChanged %d\n", index);
+    currentFont = FONTLIST->requestFont(currentText());
 
     if (currentFont != NULL)
-        RS_DEBUG->print("Current font is (%d): %s\n", index, currentFont->getFileName().toLatin1().data());
+        DEBUG->print("Current font is (%d): %s\n", index, currentFont->getFileName().toLatin1().data());
 
     emit fontChanged(currentFont);
 }