convert to odebug

3 files changed, 14 insertions, 14 deletions

diff --git a/freetype/config.in b/freetype/config.in
index 71c5df7..68b659a 100644
--- a/freetype/config.in
+++ b/freetype/config.in
@@ -3,2 +3,2 @@
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) 
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/freetype/fontfactoryttf_qws.cpp b/freetype/fontfactoryttf_qws.cpp
index 1f082a9..1ed0d2c 100644
--- a/freetype/fontfactoryttf_qws.cpp
+++ b/freetype/fontfactoryttf_qws.cpp
@@ -20,5 +20,7 @@
 
-
 #include "fontfactoryttf_qws.h"
 
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
 #ifdef QT_NO_FREETYPE
@@ -109,3 +111,3 @@ public:
         if(err)
-            qFatal("Load glyph error %x",err);
+            ofatal << "Load glyph error " << err << "" << oendl; 
 
@@ -115,3 +117,3 @@ public:
         if(err)
-            qFatal("Get glyph error %x",err);
+            ofatal << "Get glyph error " << err << "" << oendl; 
 
@@ -129,3 +131,3 @@ public:
             if(err)
-                qWarning("Get bitmap error %d",err);
+                owarn << "Get bitmap error " << err << "" << oendl; 
         }
@@ -182,3 +184,3 @@ private:
             if (FT_IS_SCALABLE(myface) ) {
-                qWarning("Set char size error %x for size %d",err,ptsize);
+                owarn << "Set char size error " << err << " for size " << ptsize << "" << oendl; 
             } else {
@@ -200,3 +202,3 @@ private:
                 if ( err )
-                    qWarning("Set char size error %x for size %d",err,ptsize);
+                    owarn << "Set char size error " << err << " for size " << ptsize << "" << oendl; 
             }
@@ -211,3 +213,3 @@ QFontFactoryFT::QFontFactoryFT()
     if(err) {
-        qFatal("Couldn't initialise Freetype library");
+        ofatal << "Couldn't initialise Freetype library" << oendl; 
     }
@@ -238,3 +240,3 @@ void QFontFactoryFT::load(QDiskFont * qdf) const
     if(err) {
-        qFatal("Error %d opening face",err);
+        ofatal << "Error " << err << " opening face" << oendl; 
     }
diff --git a/freetype/freetype.pro b/freetype/freetype.pro
index bdc37f6..ca2841c 100644
--- a/freetype/freetype.pro
+++ b/freetype/freetype.pro
@@ -1,3 +1,3 @@
         TEMPLATE= lib
-        CONFIG  += qt warn_on release
+        CONFIG  += qt warn_on
         HEADERS         = fontfactoryttf_qws.h freetypefactoryimpl.h
@@ -9,6 +9,4 @@ INCLUDEPATH	+= $(QTDIR)/src/3rdparty/freetype/include $(QTDIR)/src/3rdparty/free
 DEPENDPATH      += $(OPIEDIR)/include
-LIBS            += -lqpe -lfreetype
-        VERSION         = 1.0.0
-
-
+LIBS            += -lqpe -lfreetype -lopiecore2
+        VERSION         = 1.0.1