From: Carsten Niehaus <cniehaus@gmx.de>
Date: Sun, 29 Oct 2006 11:43:21 +0000 (+0000)
Subject: Shut up GCC 4.1.x
X-Git-Tag: v3.80.3~115
X-Git-Url: https://git.rmz.fi/?a=commitdiff_plain;h=c7c502fdf263b49d691297cf4820d1805f6222c8;p=libqmvoc.git

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 418fc61..2277724 100644
--- 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 83e604f..33f8ac2 100644
--- 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 62ab5af..db63d00 100644
--- 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 ) );
 				}
 			}