[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kchart/kdchart
From:       Laurent Montel <montel () kde ! org>
Date:       2006-03-29 14:37:51
Message-ID: 1143643071.960198.23881.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 523940 by mlaurent:

Fix other error


 M  +6 -6      KDDrawText.cpp  
 M  +1 -1      KDFrame.cpp  
 M  +1 -1      KDFrameProfileSection.cpp  
 M  +1 -1      KDFrameProfileSection.h  
 M  +1 -1      KDXMLTools.cpp  


--- trunk/koffice/kchart/kdchart/KDDrawText.cpp #523939:523940
@@ -252,7 +252,7 @@
         }
     }
     if( infos && !useInfos ) {
-         painter->transformed( pos );
+         painter->xForm( pos );
         infos->x = x - 4;
         infos->y = y - 4;
         //PENDING Michel updating info using x , y from pos 
@@ -268,10 +268,10 @@
                     text ) );
         //painter->fillRect (rect, Qt::blue );
         
-        QPoint topLeft(     painter->transformed( rect.topLeft()     ) );
-        QPoint topRight(    painter->transformed( rect.topRight()    ) );
-        QPoint bottomRight( painter->transformed( rect.bottomRight() ) );
-        QPoint bottomLeft(  painter->transformed( rect.bottomLeft()  ) );
+        QPoint topLeft(     painter->xForm( rect.topLeft()     ) );
+        QPoint topRight(    painter->xForm( rect.topRight()    ) );
+        QPoint bottomRight( painter->xForm( rect.bottomRight() ) );
+        QPoint bottomLeft(  painter->xForm( rect.bottomLeft()  ) );
       
         int additor = addPercentOfHeightToRegion * txtHeight / 100;
         Q3PointArray points;
@@ -334,7 +334,7 @@
 */
         }else{
             // new code (rotating the text ourselves for better quality on screens)
-            QPixmap pm( txtWidth+2, txtHeight+2, Qt::AutoColor );
+            QPixmap pm( txtWidth+2, txtHeight+2/*, Qt::AutoColor*/ );
             // note: When using colored axis labels it will be necessary
             //       to change this code and use a 256 color pixmap instead
             //       of a monochrome one.                 (khz, 2002/08/15)
--- trunk/koffice/kchart/kdchart/KDFrame.cpp #523939:523940
@@ -68,7 +68,7 @@
         QPoint oldOrig(  painter.brushOrigin() );
         QBrush oldBrush( painter.brush() );
         painter.setPen( Qt::NoPen );
-        const QPoint newTopLeft( painter.transformed( innerRect.topLeft() ) );
+        const QPoint newTopLeft( painter.xForm( innerRect.topLeft() ) );
         painter.setBrushOrigin( newTopLeft.x(), newTopLeft.y() );
         painter.setBrush( _background );
         painter.drawRect( innerRect.x(), innerRect.y(),
--- trunk/koffice/kchart/kdchart/KDFrameProfileSection.cpp #523939:523940
@@ -56,7 +56,7 @@
         KDFrameProfileSection* section )
 {
     bool ok = true;
-    Qt::Orientation tempDirection = DirPlain;
+    Direction tempDirection = DirPlain;
     Curvature tempCurvature = CvtPlain;
     int tempWidth;
     QPen tempPen;
--- trunk/koffice/kchart/kdchart/KDFrameProfileSection.h #523939:523940
@@ -72,7 +72,7 @@
     \param dir the direction enum to convert
     \return the string representation of the direction enum
     */
-    static QString directionToString( Qt::Orientation dir ) {
+    static QString directionToString( Direction dir ) {
         switch( dir ) {
             case DirPlain:
                 return "Plain";
--- trunk/koffice/kchart/kdchart/KDXMLTools.cpp #523939:523940
@@ -151,7 +151,7 @@
             // XPM representation and compress this representation. This
             // conforms to the file format Qt Designer uses.
             QByteArray ba;
-            QBuffer buffer( ba );
+            QBuffer buffer( &ba );
             buffer.open( QIODevice::WriteOnly );
             QImageIO imgio( &buffer, "XPM" );
             QImage image = pixmap.convertToImage();
[prev in list] [next in list] [prev in thread] [next in thread]