[Marble-commits] KDE/kdeedu/marble/src

[Bernhard Beschow]

SVN commit 1226383 by beschow:

unused variables-- (reported by GCC 4.6)

 M  +0 -3      lib/ClipPainter.cpp  
 M  +0 -1      lib/TileLoader.cpp  
 M  +0 -5      lib/VectorComposer.cpp  
 M  +8 -0      lib/geodata/handlers/kml/KmlTessellateTagHandler.cpp  
 M  +4 -4      lib/geodata/handlers/osm-namefinder/NamedTagHandler.cpp  
 M  +0 -2      lib/graphicsview/FrameGraphicsItem.cpp  
 M  +0 -4      lib/graphicsview/ScreenGraphicsItem.cpp  
 M  +0 -1      plugins/render/aprs/AprsPlugin.cpp  
 M  +1 -2      plugins/render/aprs/AprsTCPIP.cpp  
 M  +2 -2      plugins/runner/openrouteservice/OpenRouteServiceRunner.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/ClipPainter.cpp #1226382:1226383
@@ -235,7 +235,6 @@
     int labelPosition = 0;
 
     bool currentAllowsLabel = false;
-    bool previousAllowsLabel = false;
 
     if ( labelPositionFlags.testFlag( LineCenter ) ) {
         // The Label at the center of the polyline:
@@ -266,7 +265,6 @@
                 }
                 break;
             }
-            previousAllowsLabel = currentAllowsLabel;
         }
     }
 
@@ -287,7 +285,6 @@
                 }
                 break;
             }
-            previousAllowsLabel = currentAllowsLabel;
         }
     }
 }
--- trunk/KDE/kdeedu/marble/src/lib/TileLoader.cpp #1226382:1226383
@@ -265,7 +265,6 @@
 
         if ( !toScale.isNull() ) {
             // which rect to scale?
-            QSize const size = toScale.size();
             int const restTileX = id.x() % ( 1 << deltaLevel );
             int const restTileY = id.y() % ( 1 << deltaLevel );
             int const partWidth = toScale.width() >> deltaLevel;
--- trunk/KDE/kdeedu/marble/src/lib/VectorComposer.cpp #1226382:1226383
@@ -151,7 +151,6 @@
     loadCoastlines();
 
     QImage        *origimg = viewParams->coastImage();
-    Quaternion     rotAxis = viewParams->planetAxis();
 
     origimg->fill( Qt::transparent );
 
@@ -231,8 +230,6 @@
 {
     loadCoastlines();
 
-    Quaternion  rotAxis = viewParams->planetAxis();
-
     bool antialiased = false;
 
     if (   viewParams->mapQuality() == HighQuality
@@ -309,8 +306,6 @@
 {
     // m_vectorMap->clearNodeCount();
 
-    Quaternion  rotAxis = viewParams->planetAxis();
-
     bool antialiased = false;
 
     if (   viewParams->mapQuality() == HighQuality
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/kml/KmlTessellateTagHandler.cpp #1226382:1226383
@@ -43,7 +43,9 @@
 
     GeoStackItem parentItem = parser.parentElement();
     
+#ifdef DEBUG_TAGS
     bool validParents = false;
+#endif
 
     QString content = parser.readElementText().trimmed();
 
@@ -56,7 +58,9 @@
             lineString->setTessellate( false );
         }
 
+#ifdef DEBUG_TAGS
         validParents = true;
+#endif
 
     } else if( parentItem.is<GeoDataLinearRing>() ) {
         GeoDataLinearRing* linearRing = parentItem.nodeAs<GeoDataLinearRing>();
@@ -67,7 +71,9 @@
             linearRing->setTessellate( false );
         }
 
+#ifdef DEBUG_TAGS
         validParents = true;
+#endif
 
     } else if( parentItem.is<GeoDataPolygon>() ) {
         GeoDataPolygon* polygon = parentItem.nodeAs<GeoDataPolygon>();
@@ -78,7 +84,9 @@
             polygon->setTessellate( false );
         }
 
+#ifdef DEBUG_TAGS
         validParents = true;
+#endif
 
     }
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/osm-namefinder/NamedTagHandler.cpp #1226382:1226383
@@ -77,10 +77,10 @@
     named->setName( name );
 
     // attribute rank
-    int rank = 0;
-    const QString rankStr = parser.attribute( attr_rank ).trimmed();
-    if ( !rankStr.isEmpty() )
-        rank = rankStr.toInt();
+    // int rank = 0;
+    // const QString rankStr = parser.attribute( attr_rank ).trimmed();
+    // if ( !rankStr.isEmpty() )
+    //     rank = rankStr.toInt();
     // FIXME: where is the rank in GeoDataPlacemark?
     // named->setRank( rank );
 
--- trunk/KDE/kdeedu/marble/src/lib/graphicsview/FrameGraphicsItem.cpp #1226382:1226383
@@ -175,8 +175,6 @@
     qreal marginTop = ( d->m_marginTop == 0.0 ) ? d->m_margin : d->m_marginTop;
     qreal marginLeft = ( d->m_marginLeft == 0.0 ) ? d->m_margin : d->m_marginLeft;
 
-    QSizeF size = this->size();
-
     QRectF contentRect = QRectF( position.x() + marginLeft + d->m_padding,
                                  position.y() + marginTop + d->m_padding,
                                  d->m_contentSize.width(),
--- trunk/KDE/kdeedu/marble/src/lib/graphicsview/ScreenGraphicsItem.cpp #1226382:1226383
@@ -100,16 +100,12 @@
         }
         
         // Move ScreenGraphicsItem
-        bool cursorAboveFloatItem = false;
         if ( e->type() == QEvent::MouseButtonPress )
         {
             QMouseEvent *event = static_cast<QMouseEvent*>(e);
-            QRectF floatItemRect = QRectF( positivePosition(), size() + QSize( 1, 1 ) );
 
             // Click and move above a float item triggers moving the float item
             if ( contains( event->pos() ) ) {
-                cursorAboveFloatItem = true;
-
                 if ( event->button() == Qt::LeftButton ) {
                     p()->m_floatItemMoveStartPos = event->pos();
                     p()->m_floatItemMoving = true;
--- trunk/KDE/kdeedu/marble/src/plugins/render/aprs/AprsPlugin.cpp #1226382:1226383
@@ -426,7 +426,6 @@
 
     QMutexLocker locker( m_mutex );
     QMap<QString, AprsObject *>::ConstIterator obj;
-    QMap<QString, AprsObject *>::ConstIterator end = m_objects.constEnd();
     for( obj = m_objects.constBegin(); obj != m_objects.constEnd(); ++obj ) {
         ( *obj )->render( painter, viewport, renderPos, layer, fadetime, hidetime );
     }
--- trunk/KDE/kdeedu/marble/src/plugins/render/aprs/AprsTCPIP.cpp #1226382:1226383
@@ -55,8 +55,7 @@
     {
         // read the initial server statement
         char buf[4096];
-        qint64 lineLength;
-        lineLength = socket->readLine( buf, sizeof( buf ) );
+        socket->readLine( buf, sizeof( buf ) );
         mDebug() << "Aprs TCPIP server: " << buf;
     }
 
--- trunk/KDE/kdeedu/marble/src/plugins/runner/openrouteservice/OpenRouteServiceRunner.cpp #1226382:1226383
@@ -243,10 +243,10 @@
             QRegExp regexp = QRegExp( "^P(?:(\\d+)D)?T(?:(\\d+)H)?(?:(\\d+)M)?(\\d+)S" );
             if ( regexp.indexIn( time.item( 0 ).toElement().text() ) == 0 ) {
                 QStringList matches = regexp.capturedTexts();
-                unsigned int days( 0 ), hours( 0 ), minutes( 0 ), seconds( 0 );
+                unsigned int hours( 0 ), minutes( 0 ), seconds( 0 );
                 switch ( matches.size() ) {
                 case 5:
-                    days    = regexp.cap( matches.size() - 4 ).toInt();
+                    // days    = regexp.cap( matches.size() - 4 ).toInt();
                     // Intentionally no break
                 case 4:
                     hours   = regexp.cap( matches.size() - 3 ).toInt();