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

List:       kde-commits
Subject:    KDE/kdeedu/marble/src/lib/geodata
From:       Eckhart Wörner <ew () ewsoftware ! de>
Date:       2009-03-21 12:29:29
Message-ID: 1237638569.806071.19390.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 942208 by ewoerner:

Make marble compile with -DPEDANTIC=ON, first part


 M  +2 -2      data/GeoDataContainer.cpp  
 M  +4 -4      data/GeoDataFeature.cpp  
 M  +2 -2      data/GeoDataLabelStyle.cpp  
 M  +1 -1      data/GeoDataLatLonBox.cpp  
 M  +3 -3      data/GeoDataLineString.cpp  
 M  +8 -8      data/GeoDataPoint.cpp  
 M  +1 -3      handlers/dgml/DgmlTargetTagHandler.cpp  
 M  +1 -0      handlers/gpx/GPXgpxTagHandler.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataContainer.cpp #942207:942208
@@ -97,8 +97,8 @@
 
 void GeoDataContainer::removeFeature(GeoDataFeature* feature )
 {
-    int pos = 0;
-    if( pos = d->m_features.indexOf( feature ) && pos >= 0 ) {
+    int pos = d->m_features.indexOf( feature );
+    if( pos && pos >= 0 ) {
         feature->setParent( 0 );
         d->m_features.remove( pos );
     }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataFeature.cpp #942207:942208
@@ -36,10 +36,10 @@
         m_popularity( 0 ),
         m_popularityIndex( 19 ),
         m_visible( true ),
+        m_visualCategory( GeoDataFeature::Unknown ),
         m_role(' '),
         m_style( 0 ),
-        m_styleMap( 0 ),
-        m_visualCategory( GeoDataFeature::Unknown )
+        m_styleMap( 0 )
     {
     }
 
@@ -47,10 +47,10 @@
         m_popularity( other.m_popularity ),
         m_popularityIndex( other.m_popularityIndex ),
         m_visible( other.m_visible ),
+        m_visualCategory( other.m_visualCategory ),
         m_role( other.m_role ),
         m_style( other.m_style ),               //FIXME: both style and stylemap \
                need to be reworked internally!!!!
-        m_styleMap( other.m_styleMap ),
-        m_visualCategory( other.m_visualCategory )
+        m_styleMap( other.m_styleMap )
     {
     }
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLabelStyle.cpp #942207:942208
@@ -26,9 +26,9 @@
 {
   public:
     GeoDataLabelStylePrivate() 
-        : m_font( QFont("Sans Serif").family(), defaultSize, 50, false ),
+        : m_scale( 1.0 ),
           m_alignment( GeoDataLabelStyle::Corner ),
-          m_scale( 1.0 )
+          m_font( QFont("Sans Serif").family(), defaultSize, 50, false )
     {
     }
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLatLonBox.cpp #942207:942208
@@ -535,7 +535,7 @@
         if ( idlMaxCrossState > 0 ) {
             west = otherWest;
         }
-        if ( ( idlMinCrossState < 0 ) && ( idlMaxCrossState > 0 ) 
+        if ( ( idlMinCrossState < 0 && idlMaxCrossState > 0 ) 
             || idlMinCrossState < -1  || idlMaxCrossState > 1 
             || west < east ) {
             east = +M_PI;
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLineString.cpp #942207:942208
@@ -20,9 +20,9 @@
 {
  public:
     GeoDataLineStringPrivate( TessellationFlags f )
-         : m_dirtyBox( true ),
-           m_tessellationFlags( f ),
-           m_latLonAltBox()
+         : m_latLonAltBox(),
+           m_dirtyBox( true ),
+           m_tessellationFlags( f )
     {
     }
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataPoint.cpp #942207:942208
@@ -26,23 +26,23 @@
 GeoDataPoint::GeoDataPoint( qreal _lon, qreal _lat, qreal _alt,
                             GeoDataPoint::Unit unit, int _detail,
                             GeoDataObject *parent )
-  : GeoDataGeometry( parent ),
-  GeoDataCoordinates( _lon, _lat, _alt, 
-                        static_cast<GeoDataCoordinates::Unit>( unit ), _detail )
+  : GeoDataCoordinates( _lon, _lat, _alt, 
+                        static_cast<GeoDataCoordinates::Unit>( unit ), _detail ),
+    GeoDataGeometry( parent )
 {
 }
 
 GeoDataPoint::GeoDataPoint( qreal _lon, qreal _lat, qreal _alt,
                             GeoDataObject *parent )
-  : GeoDataGeometry( parent ),
-  GeoDataCoordinates( _lon, _lat, _alt, 
-                        GeoDataPoint::Radian, 0 )
+  : GeoDataCoordinates( _lon, _lat, _alt, 
+                        GeoDataPoint::Radian, 0 ),
+    GeoDataGeometry( parent )
 {
 }
 
 GeoDataPoint::GeoDataPoint( const GeoDataPoint& other )
-  : GeoDataGeometry( other ),
-   GeoDataCoordinates( other )
+  : GeoDataCoordinates( other ),
+    GeoDataGeometry( other )
     
 {
 }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/DgmlTargetTagHandler.cpp \
#942207:942208 @@ -38,15 +38,13 @@
     // Check whether the tag is valid
     Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Target));
 
-    GeoSceneLayer *layer = 0;
-
     // Checking for parent item
     GeoStackItem parentItem = parser.parentElement();
     if (parentItem.represents(dgmlTag_Head))
         parentItem.nodeAs<GeoSceneHead>()->setTarget( \
parser.readElementText().trimmed() );  
     if (parentItem.represents(dgmlTag_Map)) {
-/*        layer = new GeoSceneLayer( "$MARBLETARGET$" );
+/*        GeoSceneLayer *layer = new GeoSceneLayer( "$MARBLETARGET$" );
         parentItem.nodeAs<GeoSceneMap>()->addLayer( layer );*/
     }
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/gpx/GPXgpxTagHandler.cpp \
#942207:942208 @@ -34,6 +34,7 @@
 
 GeoNode* GPXgpxTagHandler::parse(GeoParser& parser) const
 {
+    Q_UNUSED(parser); // Don't complain when asserts are turned off
     Q_ASSERT(parser.isStartElement() && parser.isValidElement(gpxTag_gpx));
 
     qDebug() << "Parsed <Document> start!";    


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