From 900fb3d498891d9aca81c362b2ea3460d1dc3f59 Mon Sep 17 00:00:00 2001
From: mickeyl <mickeyl>
Date: Mon, 05 Apr 2004 10:36:31 +0000
Subject: convert to odebug

---
(limited to 'freetype')

diff --git a/freetype/config.in b/freetype/config.in
index 71c5df7..68b659a 100644
--- a/freetype/config.in
+++ b/freetype/config.in
@@ -1,4 +1,4 @@
   config FREETYPE
     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
@@ -18,9 +18,11 @@
 **
 **********************************************************************/
 
-
 #include "fontfactoryttf_qws.h"
 
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
 #ifdef QT_NO_FREETYPE
 
 #include "qfontdata_p.h"
@@ -107,13 +109,13 @@ 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;
 	FT_Glyph glyph;
 	err=FT_Get_Glyph( myface->glyph, &glyph );
 	if(err)
-	    qFatal("Get glyph error %x",err);
+	    ofatal << "Get glyph error " << err << "" << oendl; 
 
 	FT_BBox bbox;
 	FT_Glyph_Get_CBox(glyph, ft_glyph_bbox_gridfit, &bbox);
@@ -127,7 +129,7 @@ public:
 		smooth ? ft_render_mode_normal : ft_render_mode_mono,
 		&origin, 1); // destroy original glyph
 	    if(err)
-		qWarning("Get bitmap error %d",err);
+		owarn << "Get bitmap error " << err << "" << oendl; 
 	}
 
 	if ( !err ) {
@@ -180,7 +182,7 @@ private:
 	err=FT_Set_Char_Size(myface, psize,psize,dpi,dpi);
 	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;
 		int bdh=99;
@@ -198,7 +200,7 @@ private:
 			myface->available_sizes[best].width,
 			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; 
 	    }
 	}
     }
@@ -209,7 +211,7 @@ QFontFactoryFT::QFontFactoryFT()
     FT_Error err;
     err=FT_Init_FreeType(&library);
     if(err) {
-	qFatal("Couldn't initialise Freetype library");
+	ofatal << "Couldn't initialise Freetype library" << oendl; 
     }
 }
 
@@ -236,7 +238,7 @@ void QFontFactoryFT::load(QDiskFont * qdf) const
     FT_Error err;
     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,5 +1,5 @@
 TEMPLATE	= lib
-CONFIG		+= qt warn_on release
+CONFIG		+= qt warn_on
 HEADERS		= fontfactoryttf_qws.h freetypefactoryimpl.h
 SOURCES		= fontfactoryttf_qws.cpp freetypefactoryimpl.cpp
 qt2:HEADERS	+= qfontdata_p.h
@@ -7,9 +7,7 @@ TARGET		= freetypefactory
 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 )
--
cgit v0.9.0.2