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

SVN commit 523934 by mlaurent:

Fix some error


 M  +1 -1      KDChartAxesPainter.cpp  
 M  +3 -3      KDChartAxisParams.h  
 M  +1 -1      KDChartBWPainter.h  
 M  +1 -1      KDChartBarPainter.h  
 M  +1 -1      KDChartHiLoPainter.h  
 M  +2 -2      KDChartParams.cpp  
 M  +3 -3      KDChartParams.h  
 M  +3 -3      KDFrameProfileSection.h  


--- trunk/koffice/kchart/kdchart/KDChartAxesPainter.cpp #523933:523934
@@ -660,7 +660,7 @@
                         // test if all texts match without mutually overlapping
                         unitedRegions = QRegion();
                         int align = nRotation
-                            ? (Qt::AlignRight | Qt::AlignVCenter) // adjusting for rotation
+                            ? (int)(Qt::AlignRight | Qt::AlignVCenter) // adjusting for rotation
                             : cv.textAlign;
                         QPoint anchor(200,200);
                         int iLeaveOut = 0;
--- trunk/koffice/kchart/kdchart/KDChartAxisParams.h #523933:523934
@@ -37,7 +37,7 @@
 #include <qstringlist.h>
 #include <qdatetime.h>
 #include <qvariant.h>
-
+#include <qrect.h>
 #include "KDChartGlobal.h"
 
 class KDChartParams;
@@ -445,12 +445,12 @@
     bool     _axisShowGrid;
     QColor   _axisGridColor;
     int      _axisGridLineWidth;
-    PenStyle _axisGridStyle;
+	Qt::PenStyle _axisGridStyle;
 
     bool     _axisShowSubDelimiters;
     QColor   _axisGridSubColor;
     int      _axisGridSubLineWidth;
-    PenStyle _axisGridSubStyle;
+	Qt::PenStyle _axisGridSubStyle;
 
     QColor _axisZeroLineColor;
     bool _axisLabelsVisible;
--- trunk/koffice/kchart/kdchart/KDChartBWPainter.h #523933:523934
@@ -37,7 +37,7 @@
 
 class KDChartParams;
 
-class KDChartBWPainter : public KDChartAxesPainter, public Qt
+class KDChartBWPainter : public KDChartAxesPainter//, public Qt
 {
     friend class KDChartPainter;
     protected:
--- trunk/koffice/kchart/kdchart/KDChartBarPainter.h #523933:523934
@@ -36,7 +36,7 @@
 
 class KDChartParams;
 
-class KDChartBarPainter : public KDChartAxesPainter, public Qt
+class KDChartBarPainter : public KDChartAxesPainter//, public Qt
 {
     friend class KDChartPainter;
     protected:
--- trunk/koffice/kchart/kdchart/KDChartHiLoPainter.h #523933:523934
@@ -36,7 +36,7 @@
 
 class KDChartParams;
 
-class KDChartHiLoPainter : public KDChartAxesPainter, public Qt
+class KDChartHiLoPainter : public KDChartAxesPainter//, public Qt
 {
     friend class KDChartPainter;
     protected:
--- trunk/koffice/kchart/kdchart/KDChartParams.cpp #523933:523934
@@ -7121,10 +7121,10 @@
 {
     uint a1 = ( KDCHART_ALL_AXES == n )
         ? 0
-        : qMin( n, KDCHART_MAX_AXES-1 );
+        : qMin( n, (uint)(KDCHART_MAX_AXES-1) );
     uint a2 = ( KDCHART_ALL_AXES == n )
         ? KDCHART_MAX_AXES-1
-        : qMin( n, KDCHART_MAX_AXES-1 );
+        : qMin( n, (uint)(KDCHART_MAX_AXES-1) );
     for( uint i = a1;  i <= a2;  ++i ) {
         _axisSettings[ i ].params.setAxisVisible( KDCHART_NO_DATASET != dataset );
         _axisSettings[ i ].dataset = dataset;
--- trunk/koffice/kchart/kdchart/KDChartParams.h #523933:523934
@@ -1154,7 +1154,7 @@
 
     void setLineStyle( Qt::PenStyle style, uint dataset=KDCHART_GLOBAL_LINE_STYLE );
 
-    PenStyle lineStyle( uint dataset=KDCHART_GLOBAL_LINE_STYLE ) const;
+	Qt::PenStyle lineStyle( uint dataset=KDCHART_GLOBAL_LINE_STYLE ) const;
 
 
     void setThreeDLines( bool threeD ) {
@@ -2556,7 +2556,7 @@
     QMap < uint, QColor > _dataColorsShadow2;
     QColor _outlineDataColor;
     uint _outlineDataLineWidth;
-    PenStyle _outlineDataLineStyle;
+	Qt::PenStyle _outlineDataLineStyle;
 
 
     struct PrintDataValuesSettings {
@@ -2618,7 +2618,7 @@
     QSize _lineMarkerSize;
     QColor _lineColor;
     int _lineWidth;
-    PenStyle _lineStyle;
+	Qt::PenStyle _lineStyle;
     typedef QMap<uint, Qt::PenStyle> LineStyleMap;
     LineStyleMap _datasetLineStyles;
     AreaChartSubType _areaChartSubType;
--- trunk/koffice/kchart/kdchart/KDFrameProfileSection.h #523933:523934
@@ -92,7 +92,7 @@
     \param string the string to convert
     \return the direction enum value
     */
-    static Qt::Orientation stringToDirection( const QString& string ) {
+    static Direction stringToDirection( const QString& string ) {
         if( string == "Plain" )
             return DirPlain;
         else if( string == "Raising" )
@@ -159,7 +159,7 @@
     \Note Instead of instantiating KDFrameProfileSection yourself
     you would normally rather call \c KDFrame::addProfileSection()
     */
-    KDFrameProfileSection( Qt::Orientation direction,
+    KDFrameProfileSection( Direction direction,
                            Curvature curvature,
                            int       width,
                            QPen      pen )
@@ -212,7 +212,7 @@
     static bool readFrameProfileSectionNode( const QDomElement& element,
             KDFrameProfileSection* section );
 
-    Qt::Orientation direction() const { return _direction; }
+    Direction direction() const { return _direction; }
     Curvature curvature() const { return _curvature; }
     int       width()     const { return _width;     }
     QPen      pen()       const { return _pen;       }
[prev in list] [next in list] [prev in thread] [next in thread]