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

[Thibaut Gridel]

SVN commit 1135204 by tgridel:

fixes

 M  +0 -2      MarbleTest.cpp  
 M  +1 -1      lib/MarbleModel.cpp  
 M  +1 -8      lib/MarbleWidget.cpp  
 M  +0 -3      lib/gps/PositionTracking.cpp  


--- trunk/KDE/kdeedu/marble/src/MarbleTest.cpp #1135203:1135204
@@ -84,8 +84,6 @@
     //
     //set up for the test
     //
-    qDebug("stopping polling now");
-    
     m_marbleWidget->centerOn( -15.2325, 58.3723 );
     
     m_marbleWidget->setShowGps( true );
--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp #1135203:1135204
@@ -229,7 +229,7 @@
               this,              SIGNAL( renderPluginInitialized( RenderPlugin * ) ) );
 
     d->m_timer = new QTimer( this );
-    d->m_timer->start( 200 );
+    d->m_timer->start( 1000 );
 
     connect( d->m_timer, SIGNAL( timeout() ),
              this,       SIGNAL( timeout() ) );
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.cpp #1135203:1135204
@@ -1062,15 +1062,8 @@
 
 void MarbleWidget::updateGps()
 {
-    QRegion temp;
-    const bool draw = d->m_model->positionTracking()->update( size(),
-                                                         d->m_map->viewParams(),
-                                                         temp );
-    if ( draw ) {
-//        mDebug() << "Updating viewport for GPS";
-        update( temp );
+    update();
     }
-}
 
 void MarbleWidget::openGpxFile( const QString &filename )
 {
--- trunk/KDE/kdeedu/marble/src/lib/gps/PositionTracking.cpp #1135203:1135204
@@ -20,9 +20,6 @@
 #include "MarbleDebug.h"
 #include "ViewParams.h"
 
-#include <QtXml/QXmlInputSource>
-#include <QtXml/QXmlSimpleReader>
-
 using namespace Marble;
 
 PositionTracking::PositionTracking( GpxFile *currentGpx,