Re: compiling qt2

[John Levon]

On Fri, Jun 21, 2002 at 02:32:53PM +0100, Angus Leeming wrote:

> I take it that these become redundant too when I apply you qt2 patch to alter 
> lyxfunc.C, minibuffer.C:
> 
> for i in Color.h Color.C DropDown.h DropDown.C Tooltips.h Tooltips.C 
> xformsGImage.C xformsGImage.h xforms_helpers.h xforms_helpers.C; do \
>         ln -sf "../../../../../devel/src/frontends/xforms/$i" . ; \

Not all of them ... (yet)

>       QFontMetrics const & metrics(metrics(f));

eep !

try this :

Index: qfont_metrics.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/qfont_metrics.C,v
retrieving revision 1.3
diff -u -r1.3 qfont_metrics.C
--- qfont_metrics.C     19 Jun 2002 05:20:29 -0000      1.3
+++ qfont_metrics.C     21 Jun 2002 13:48:44 -0000
@@ -113,11 +113,11 @@
        int & ascent, 
        int & descent)
 {
-       QFontMetrics const & metrics(metrics(f));
+       QFontMetrics const & m(metrics(f));
  
        w = width(str, f);
-       ascent = metrics.ascent();
-       descent = metrics.descent();
+       ascent = m.ascent();
+       descent = m.descent();
 }
 
 
@@ -127,13 +127,13 @@
        int & ascent, 
        int & descent)
 {
-       QFontMetrics const & metrics(metrics(f));
+       QFontMetrics const & m(metrics(f));
  
        static int const d = 3;
        
        w = width(str, f) + d * 2 + 2;
-       ascent = metrics.ascent() + d;
-       descent = metrics.descent() + d;
+       ascent = m.ascent() + d;
+       descent = m.descent() + d;
 }
 
 } // namespace font_metrics