1 files changed, 3 insertions, 46 deletions

diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp
index 387f75dfe..1ad9ccf9e 100644
--- a/src/kernel/qfont.cpp
+++ b/src/kernel/qfont.cpp
@@ -1691,17 +1691,13 @@ bool TQFont::fromString(const TQString &descrip)
     return TRUE;
 }
 
-#if !defined( TQ_WS_QWS )
 /*! \internal
 
   Internal function that dumps font cache statistics.
 */
 void TQFont::cacheStatistics()
 {
-
-
 }
-#endif // !TQ_WS_QWS
 
 
 
@@ -2170,7 +2166,7 @@ bool TQFontMetrics::inFont(TQChar ch) const
 
     \sa rightBearing(), minLeftBearing(), width()
 */
-#if !defined(TQ_WS_WIN) && !defined(TQ_WS_QWS)
+#if !defined(TQ_WS_WIN)
 int TQFontMetrics::leftBearing(TQChar ch) const
 {
     TQFont::Script script;
@@ -2204,7 +2200,7 @@ int TQFontMetrics::leftBearing(TQChar ch) const
 
     \sa leftBearing(), minRightBearing(), width()
 */
-#if !defined(TQ_WS_WIN) && !defined(TQ_WS_QWS)
+#if !defined(TQ_WS_WIN)
 int TQFontMetrics::rightBearing(TQChar ch) const
 {
     TQFont::Script script;
@@ -2227,7 +2223,6 @@ int TQFontMetrics::rightBearing(TQChar ch) const
 #endif // !TQ_WS_WIN
 
 
-#ifndef TQ_WS_QWS
 /*!
     Returns the width in pixels of the first \a len characters of \a
     str. If \a len is negative (the default), the entire string is
@@ -2292,7 +2287,6 @@ int TQFontMetrics::width( const TQString &str, int len ) const
 #endif
     return width;
 }
-#endif
 
 /*! \fn int TQFontMetrics::width( TQChar ch ) const
 
@@ -2339,7 +2333,6 @@ int TQFontMetrics::width( const TQString &str, int len ) const
     account.
 */
 
-#ifndef TQ_WS_QWS
 /*!
     Returns the bounding rectangle of the first \a len characters of
     \a str, which is the set of pixels the text would cover if drawn
@@ -2371,7 +2364,6 @@ TQRect TQFontMetrics::boundingRect( const TQString &str, int len ) const
     glyph_metrics_t gm = layout.boundingBox( 0, len );
     return TQRect( gm.x, gm.y, gm.width, gm.height );
 }
-#endif
 
 /*!
     Returns the rectangle that is covered by ink if the character
@@ -2986,41 +2978,6 @@ TQFontCache::~TQFontCache()
     instance = 0;
 }
 
-#ifdef TQ_WS_QWS
-void TQFontCache::clear()
-{
-    {
-	EngineDataCache::Iterator it = engineDataCache.begin(),
-				 end = engineDataCache.end();
-	while ( it != end ) {
-	    TQFontEngineData *data = it.data();
-	    if ( data->engine )
-		data->engine->deref();
-	    data->engine = 0;
-	    ++it;
-	}
-    }
-
-    EngineCache::Iterator it = engineCache.begin(),
-			 end = engineCache.end();
-    while ( it != end ) {
-	if ( it.data().data->count == 0 ) {
-	    if ( --it.data().data->cache_count == 0 ) {
-		FC_DEBUG("TQFontCache::~TQFontCache: deleting engine %p key=(%d / %d %d %d %d %d)",
-			 it.data().data, it.key().script, it.key().def.pointSize,
-			 it.key().def.pixelSize, it.key().def.weight, it.key().def.italic,
-			 it.key().def.fixedPitch);
-		delete it.data().data;
-	    }
-	} else {
-	    FC_DEBUG("TQFontCache::~TQFontCache: engine = %p still has refcount %d",
-		     it.data().data, it.data().data->count);
-	}
-	++it;
-    }
-}
-#endif
-
 TQFontEngineData *TQFontCache::findEngineData( const Key &key ) const
 {
     EngineDataCache::ConstIterator it = engineDataCache.find( key ),
@@ -3107,7 +3064,7 @@ void TQFontCache::decreaseCost( uint cost )
 	    cost, total_cost, max_cost );
 }
 
-#if defined(TQ_WS_WIN ) || defined (TQ_WS_QWS)
+#if defined(TQ_WS_WIN )
 void TQFontCache::cleanupPrinterFonts()
 {
     FC_DEBUG( "TQFontCache::cleanupPrinterFonts" );