--- branches/koffice/1.6/koffice/lib/kformula/textelement.h	2007/05/28 18:20:51	669185
+++ branches/koffice/1.6/koffice/lib/kformula/textelement.h	2007/05/28 18:26:19
@@ -75,7 +75,7 @@ 
      * Calculates our width and height and
      * our children's parentPosition.
      */
-    virtual void calcSizes( const ContextStyle& style,
+    virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
 						    ContextStyle::IndexStyle istyle,
 							StyleAttributes& style );
@@ -246,7 +246,7 @@ 
      * Calculates our width and height and
      * our children's parentPosition.
      */
-    virtual void calcSizes( const ContextStyle& style,
+    virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
 						    ContextStyle::IndexStyle istyle,
 							StyleAttributes& style );
--- branches/koffice/1.6/koffice/lib/kformula/symbolelement.h	2007/05/28 18:20:51	669185
+++ branches/koffice/1.6/koffice/lib/kformula/symbolelement.h	2007/05/28 18:26:19
@@ -67,7 +67,7 @@ 
      * Calculates our width and height and
      * our children's parentPosition.
      */
-    virtual void calcSizes( const ContextStyle& style,
+    virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
 						    ContextStyle::IndexStyle istyle,
 							StyleAttributes& style );
--- branches/koffice/1.6/koffice/lib/kformula/spaceelement.h	2007/05/28 18:20:51	669185
+++ branches/koffice/1.6/koffice/lib/kformula/spaceelement.h	2007/05/28 18:26:19
@@ -80,7 +80,7 @@ 
      * Calculates our width and height and
      * our children's parentPosition.
      */
-    virtual void calcSizes( const ContextStyle& style,
+    virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
 						    ContextStyle::IndexStyle istyle,
 							StyleAttributes& style );
--- branches/koffice/1.6/koffice/lib/kformula/sequenceelement.h	2007/05/28 18:20:51	669185
+++ branches/koffice/1.6/koffice/lib/kformula/sequenceelement.h	2007/05/28 18:26:19
@@ -94,7 +94,7 @@ 
      * Calculates our width and height and
      * our children's parentPosition.
      */
-    virtual void calcSizes( const ContextStyle& style,
+    virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
 						    ContextStyle::IndexStyle istyle,
 							StyleAttributes& style );
--- branches/koffice/1.6/koffice/lib/kformula/rootelement.h	2007/05/28 18:20:51	669185
+++ branches/koffice/1.6/koffice/lib/kformula/rootelement.h	2007/05/28 18:26:19
@@ -68,7 +68,7 @@ 
      * Calculates our width and height and
      * our children's parentPosition.
      */
-    virtual void calcSizes( const ContextStyle& style,
+    virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
 						    ContextStyle::IndexStyle istyle,
 							StyleAttributes& style );
@@ -79,7 +79,7 @@ 
      * We can use our parentPosition to get our own origin then.
      */
     virtual void draw( QPainter& painter, const LuPixelRect& r,
-                       const ContextStyle& style,
+                       const ContextStyle& cstyle,
                        ContextStyle::TextStyle tstyle,
                        ContextStyle::IndexStyle istyle,
 					   StyleAttributes& style,
--- branches/koffice/1.6/koffice/lib/kformula/paddedelement.h	2007/05/28 18:20:51	669185
+++ branches/koffice/1.6/koffice/lib/kformula/paddedelement.h	2007/05/28 18:26:19
@@ -34,7 +34,7 @@ 
      * Calculates our width and height and
      * our children's parentPosition.
      */
-    virtual void calcSizes( const ContextStyle& style,
+    virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
 						    ContextStyle::IndexStyle istyle,
 							StyleAttributes& style );
--- branches/koffice/1.6/koffice/lib/kformula/matrixelement.h	2007/05/28 18:20:51	669185
+++ branches/koffice/1.6/koffice/lib/kformula/matrixelement.h	2007/05/28 18:26:19
@@ -82,7 +82,7 @@ 
      * Calculates our width and height and
      * our children's parentPosition.
      */
-    virtual void calcSizes( const ContextStyle& style,
+    virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
 						    ContextStyle::IndexStyle istyle,
 							StyleAttributes& style );
@@ -377,7 +377,7 @@ 
      * Calculates our width and height and
      * our children's parentPosition.
      */
-    virtual void calcSizes( const ContextStyle& style,
+    virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
 						    ContextStyle::IndexStyle istyle,
 							StyleAttributes& style );
--- branches/koffice/1.6/koffice/lib/kformula/indexelement.h	2007/05/28 18:20:51	669185
+++ branches/koffice/1.6/koffice/lib/kformula/indexelement.h	2007/05/28 18:26:19
@@ -79,7 +79,7 @@ 
      * Calculates our width and height and
      * our children's parentPosition.
      */
-    virtual void calcSizes( const ContextStyle& style,
+    virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
 						    ContextStyle::IndexStyle istyle,
 							StyleAttributes& style );
--- branches/koffice/1.6/koffice/lib/kformula/glyphelement.h	2007/05/28 18:20:51	669185
+++ branches/koffice/1.6/koffice/lib/kformula/glyphelement.h	2007/05/28 18:26:19
@@ -33,7 +33,7 @@ 
      * Calculates our width and height and
      * our children's parentPosition.
      */
-    virtual void calcSizes( const ContextStyle& style,
+    virtual void calcSizes( const ContextStyle& cstyle,
 						    ContextStyle::TextStyle tstyle,
 						    ContextStyle::IndexStyle istyle,
 							StyleAttributes& style );