Shut up GCC 4.1.x

This "order of variables in .h files and .cpp files" is really... picky :)

CCMAIL: kstars@30doradus.org

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=599987

diff --git a/kdeeduplot/kplotobject.cpp b/kdeeduplot/kplotobject.cpp
index 418fc612ed5285f0da31cd2ad458687571adb7d3..2277724c0c052ca52d6f4d0b16c309f3ad9ac1d9 100644 (file)
--- a/kdeeduplot/kplotobject.cpp
+++ b/kdeeduplot/kplotobject.cpp
@@ -88,7 +88,7 @@ void KPlotObject::draw( QPainter *painter, KPlotWidget *pw ) {
                painter->setPen( barPen() );
                painter->setBrush( barBrush() );
 
-               for ( unsigned int i=0; i<pList.size(); ++i ) {
+               for ( int i=0; i<pList.size(); ++i ) {
                        double w;
                        if ( pList[i]->barWidth() == 0.0 ) {
                                if ( i<pList.size()-1 ) 

diff --git a/kdeeduplot/kplotobject.h b/kdeeduplot/kplotobject.h
index 83e604f0f2551e8d3bcaf7e00d8eed7151a91b1e..33f8ac2466b0102791fc7e04e0b5acc4cc9d43b0 100644 (file)
--- a/kdeeduplot/kplotobject.h
+++ b/kdeeduplot/kplotobject.h
@@ -114,8 +114,9 @@ class EDUPLOT_EXPORT KPlotPoint {
        void stBarWidth( double w ) { BarWidth = w; }
 
  private:
-       double X, Y, BarWidth;
+       double X, Y;
        QString Label;
+  double BarWidth;
 };
 
 /**

diff --git a/kdeeduplot/kplotwidget.cpp b/kdeeduplot/kplotwidget.cpp
index 62ab5af70e433d85e3384803bc2c3357ddccce45..db63d00db889af9880f03bd4c1b0a8066967a26b 100644 (file)
--- a/kdeeduplot/kplotwidget.cpp
+++ b/kdeeduplot/kplotwidget.cpp
@@ -535,7 +535,7 @@ void KPlotWidget::drawAxes( QPainter *p ) {
 
                                //Draw ticklabel
                                if ( a->showTickLabels() ) {
-                                       QRect r( int(px) - BIGTICKSIZE, -1.5*BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE );
+                                       QRect r( int(px) - BIGTICKSIZE, (int)-1.5*BIGTICKSIZE, 2*BIGTICKSIZE, BIGTICKSIZE );
                                        p->drawText( r, Qt::AlignCenter | Qt::TextDontClip, a->tickLabel( xx ) );
                                }
                        }