[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:25:42
Message-ID: 1143642342.711847.22494.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 523936 by mlaurent:

Fix some errro


 M  +8 -8      KDChartPainter.cpp  
 M  +1 -1      KDChartParams_io.cpp  
 M  +1 -1      KDChartPolarPainter.cpp  


--- trunk/koffice/kchart/kdchart/KDChartPainter.cpp #523935:523936
@@ -750,9 +750,9 @@
                                         oldDatacolorNo = datacolorNo;
                                         QColor color( params()->dataColor( datacolorNo ) );
                                         painter->setPen( QColor(
-                                                        static_cast < int > (255-color.Qt::red()  ),
-                                                        static_cast < int > (255-color.Qt::green()),
-                                                        static_cast < int > (255-color.Qt::blue() )));
+                                                        static_cast < int > (255-color.red()  ),
+                                                        static_cast < int > (255-color.green()),
+                                                        static_cast < int > (255-color.blue() )));
                                     }
                                 }
                             }
@@ -887,9 +887,9 @@
                                                     || KDChartParams::Ring  == params()->chartType() )
                                                 ? region->col
                                                 : region->row ) );
-                                    painter->setPen( QColor( static_cast < int > ( 255- color.Qt::red() ),
-                                                static_cast < int > ( 255- color.Qt::green() ),
-                                                static_cast < int > ( 255- color.Qt::blue() ) ) );
+                                    painter->setPen( QColor( static_cast < int > ( 255- color.red() ),
+                                                static_cast < int > ( 255- color.green() ),
+                                                static_cast < int > ( 255- color.blue() ) ) );
                                 }
                             }
                         }else{
@@ -1916,7 +1916,7 @@
                             if( KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT == format )
                                 areaMin = qMax( areaMin, static_cast < int > ( fntHeight * 6.75 ) );
                             else
-                                areaMin = qMax( areaMin, fntHeight * ( 3 + format.contains("\n") ) );
+                                areaMin = qMax( areaMin, fntHeight * ( 3 + format.count("\n") ) );
                         }
                         else
                             areaMin = qMax( areaMin, fntHeight * 3 );
@@ -1958,7 +1958,7 @@
                                 for ( uint i = 0; i < nLabels; ++i )
                                     maxLabelsWidth =
                                         qMax( maxLabelsWidth,
-                                              axisLabelsFontMetrics.boundingRect(*labelTexts->at(i)).width() );
+                                              axisLabelsFontMetrics.boundingRect(labelTexts->at(i)).width() );
                                 if( nUsableAxisWidth < maxLabelsWidth )
                                     areaSize = maxLabelsWidth
                                              + (para.axisTrueAreaRect().width() - nUsableAxisWidth)
--- trunk/koffice/kchart/kdchart/KDChartParams_io.cpp #523935:523936
@@ -1283,7 +1283,7 @@
             } else if( tagName == "LabelText" ) {
                 QString string;
                 if( KDXML::readStringNode( element, string ) )
-                    axisSettings->_axisLabelTexts = string;
+                    axisSettings->_axisLabelTexts = QStringList(string);
             } else if( tagName == "LabelTextsDirty" ) {
                 bool labelTextsDirty;
                 if( KDXML::readBoolNode( element, labelTextsDirty ) )
--- trunk/koffice/kchart/kdchart/KDChartPolarPainter.cpp #523935:523936
@@ -679,7 +679,7 @@
             txt,
             0,
             step
-            ? (rotate ? Qt::AlignBottom | Qt::AlignHCenter : align)
+            ? (rotate ? (int)(Qt::AlignBottom | Qt::AlignHCenter) : align)
             : Qt::AlignCenter,
             false,0,false,
             false );
[prev in list] [next in list] [prev in thread] [next in thread]