--- src/fmbaseshaper.h.old	2009-08-11 09:58:39.000000000 +0530
+++ src/fmbaseshaper.h	2010-02-16 11:39:27.000000000 +0530
@@ -38,8 +38,7 @@
 class FMShaperFactory
 {
 	public:
-		enum SHAPER_TYPE{ FONTMATRIX = 1, // our dear own shaper
-		                  HARFBUZZ,
+		enum SHAPER_TYPE{ HARFBUZZ = 1,
 		                  ICU,
 		                  M17N,
 		                  PANGO,
@@ -49,7 +48,7 @@
 
 		static QMap<QString, int> types();
 
-		FMShaperFactory ( FMOtf *otf, QString script , SHAPER_TYPE st = FONTMATRIX );
+		FMShaperFactory ( FMOtf *otf, QString script , SHAPER_TYPE st = HARFBUZZ );
 		~FMShaperFactory();
 
 		GlyphList doShape ( const QString& aString );
--- src/fmbaseshaper.cpp.old	2009-08-11 09:58:39.000000000 +0530
+++ src/fmbaseshaper.cpp	2010-02-16 11:38:57.000000000 +0530
@@ -39,7 +39,7 @@
 {
 	QMap<QString, int> ret;
 	ret.clear();
-	ret["Fontmatrix"] = FONTMATRIX;
+//	ret["Fontmatrix"] = FONTMATRIX;
 	
 #ifdef HAVE_HARFBUZZ
 	ret["Harfbuzz"] = HARFBUZZ;
@@ -68,10 +68,10 @@
 {
 	switch ( shaperType )
 	{
-		case FONTMATRIX :
+/*		case FONTMATRIX :
 			qDebug() << "NEW FontmatrixShaper";
 			shaperImpl = new FontmatrixShaper ( otf, script );
-			break;
+			break; */
 #ifdef HAVE_HARFBUZZ
 		case HARFBUZZ:
 			qDebug() << "NEW HarfbuzzShaper";
--- src/fontitem.cpp.old	2009-08-11 09:58:39.000000000 +0530
+++ src/fontitem.cpp	2010-02-16 12:21:52.000000000 +0530
@@ -1391,8 +1391,8 @@
 	FMShaperFactory *shaperfactory = 0;
 	switch(m_shaperType)
 	{
-		case FMShaperFactory::FONTMATRIX : shaperfactory = new FMShaperFactory(otf,script, FMShaperFactory::FONTMATRIX );
-		break;
+/*		case FMShaperFactory::FONTMATRIX : shaperfactory = new FMShaperFactory(otf,script, FMShaperFactory::FONTMATRIX );
+		break;*/
 		case FMShaperFactory::HARFBUZZ : shaperfactory = new FMShaperFactory(otf,script, FMShaperFactory::HARFBUZZ );
 		break;
 		case FMShaperFactory::ICU : shaperfactory = new FMShaperFactory(otf,script, FMShaperFactory::ICU );
@@ -1403,7 +1403,7 @@
 		break;
 		case FMShaperFactory::OMEGA : shaperfactory = new FMShaperFactory(otf,script, FMShaperFactory::OMEGA);
 		break;
-		default : shaperfactory = new FMShaperFactory(otf,script, FMShaperFactory::FONTMATRIX );
+		default : shaperfactory = new FMShaperFactory(otf,script, FMShaperFactory::HARFBUZZ );
 	}
 	
 	GlyphList refGlyph ( shaperfactory->doShape( spec ) );
@@ -3713,8 +3713,8 @@
 	FMShaperFactory *shaperfactory = 0;
 	switch(m_shaperType)
 	{
-		case FMShaperFactory::FONTMATRIX : shaperfactory = new FMShaperFactory(otf,script, FMShaperFactory::FONTMATRIX );
-		break;
+/*		case FMShaperFactory::FONTMATRIX : shaperfactory = new FMShaperFactory(otf,script, FMShaperFactory::FONTMATRIX );
+		break;*/
 		case FMShaperFactory::HARFBUZZ : shaperfactory = new FMShaperFactory(otf,script, FMShaperFactory::HARFBUZZ );
 		break;
 		case FMShaperFactory::ICU : shaperfactory = new FMShaperFactory(otf,script, FMShaperFactory::ICU );
@@ -3725,7 +3725,7 @@
 		break;
 		case FMShaperFactory::OMEGA : shaperfactory = new FMShaperFactory(otf,script, FMShaperFactory::OMEGA);
 		break;
-		default : shaperfactory = new FMShaperFactory(otf,script, FMShaperFactory::FONTMATRIX );
+		default : shaperfactory = new FMShaperFactory(otf,script, FMShaperFactory::HARFBUZZ );
 	}