From kde-commits  Sat Aug 23 18:15:09 2008
From: Maks Orlovich <maksim () kde ! org>
Date: Sat, 23 Aug 2008 18:15:09 +0000
To: kde-commits
Subject: branches/KDE/4.1/kdelibs/khtml
Message-Id: <1219515309.486315.20861.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=121951531800947

SVN commit 851467 by orlovich:

Revise this 0-advance workaround to work again w/Qt4.1


 M  +2 -6      test_regression_fontoverload.cpp  


--- branches/KDE/4.1/kdelibs/khtml/test_regression_fontoverload.cpp #851466:851467
@@ -182,11 +182,9 @@
     int   pixS;
     XFontStruct* xfs;
 
-    bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, QTextEngine::ShaperFlags flags) const
+    void recalcAdvances(int len, QGlyphLayout *glyphs, QTextEngine::ShaperFlags flags) const
     {
-        bool res = QFontEngineXLFD::stringToCMap(str, len, glyphs, nglyphs, flags);
-        if (!res)
-            return false;
+        QFontEngineXLFD::recalcAdvances(len, glyphs, flags);
 
         // Go through the glyhs with glyph 0 and fix up their x advance
         // to make sense (or at least match Qt3)
@@ -206,8 +204,6 @@
                 g->advance.x = fallBackWidth;
             }
         }
-
-        return true;
     }
 
     Type type() const