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
@@ -2,3 +2,3 @@
     boolean "opie-freetype (support for fonts used via the freetype library)"
     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
@@ -19,7 +19,9 @@
 **********************************************************************/
 
-
 #include "fontfactoryttf_qws.h"
 
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
 #ifdef QT_NO_FREETYPE
 
@@ -108,5 +110,5 @@ public:
         err=FT_Load_Glyph(myface,index,FT_LOAD_DEFAULT);
         if(err)
-            qFatal("Load glyph error %x",err);
+            ofatal << "Load glyph error " << err << "" << oendl; 
 
         int width=0,height=0,pitch=0,size=0;
@@ -114,5 +116,5 @@ public:
         err=FT_Get_Glyph( myface->glyph, &glyph );
         if(err)
-            qFatal("Get glyph error %x",err);
+            ofatal << "Get glyph error " << err << "" << oendl; 
 
         FT_BBox bbox;
@@ -128,5 +130,5 @@ public:
                 &origin, 1); // destroy original glyph
             if(err)
-                qWarning("Get bitmap error %d",err);
+                owarn << "Get bitmap error " << err << "" << oendl; 
         }
 
@@ -181,5 +183,5 @@ private:
         if (err) {
             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 {
                 int best=-1;
@@ -199,5 +201,5 @@ private:
                         myface->available_sizes[best].height);
                 if ( err )
-                    qWarning("Set char size error %x for size %d",err,ptsize);
+                    owarn << "Set char size error " << err << " for size " << ptsize << "" << oendl; 
             }
         }
@@ -210,5 +212,5 @@ QFontFactoryFT::QFontFactoryFT()
     err=FT_Init_FreeType(&library);
     if(err) {
-        qFatal("Couldn't initialise Freetype library");
+        ofatal << "Couldn't initialise Freetype library" << oendl; 
     }
 }
@@ -237,5 +239,5 @@ void QFontFactoryFT::load(QDiskFont * qdf) const
     err=FT_New_Face(library,qdf->file.ascii(),0,&(f->face));
     if(err) {
-        qFatal("Error %d opening face",err);
+        ofatal << "Error " << err << " opening face" << oendl; 
     }
     qdf->loaded=true;
diff --git a/freetype/freetype.pro b/freetype/freetype.pro
index bdc37f6..ca2841c 100644
--- a/freetype/freetype.pro
+++ b/freetype/freetype.pro
@@ -1,4 +1,4 @@
         TEMPLATE= lib
-        CONFIG  += qt warn_on release
+        CONFIG  += qt warn_on
         HEADERS         = fontfactoryttf_qws.h freetypefactoryimpl.h
         SOURCES         = fontfactoryttf_qws.cpp freetypefactoryimpl.cpp
@@ -8,8 +8,6 @@ DESTDIR		= $(OPIEDIR)/plugins/fontfactories
         INCLUDEPATH+= $(QTDIR)/src/3rdparty/freetype/include $(QTDIR)/src/3rdparty/freetype/include/freetype/config $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
-LIBS            += -lqpe -lfreetype
-        VERSION         = 1.0.0
-
-
+LIBS            += -lqpe -lfreetype -lopiecore2
+        VERSION         = 1.0.1
 
 include ( $(OPIEDIR)/include.pro )