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

[Bastian Holst]

SVN commit 1034874 by bholst:

Some formatting changes

 M  +8 -7      lib/MarbleControlBox.cpp  
 M  +7 -7      lib/MarbleControlBox.h  
 M  +3 -2      lib/PositionProviderPlugin.h  
 M  +1 -1      lib/gps/GpsLayer.cpp  
 M  +4 -4      lib/gps/PositionTracking.cpp  
 M  +4 -4      plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleControlBox.cpp #1034873:1034874
@@ -306,11 +306,11 @@
     selectProjection( d->m_widget->projection() );
 
     connect( d->m_widget, SIGNAL( zoomChanged( int ) ),
-	    this,        SLOT( changeZoom( int ) ) );
+             this,        SLOT( changeZoom( int ) ) );
     connect( this,        SIGNAL( centerOn( const QModelIndex&, bool ) ),
-	    d->m_widget, SLOT( centerOn( const QModelIndex&, bool ) ) );
+             d->m_widget, SLOT( centerOn( const QModelIndex&, bool ) ) );
     connect( this,        SIGNAL( selectMapTheme( const QString& ) ),
-	    d->m_widget, SLOT( setMapThemeId( const QString& ) ) );
+             d->m_widget, SLOT( setMapThemeId( const QString& ) ) );
 
     // connect signals for the Legend
 
@@ -322,10 +322,11 @@
              d->m_widget, SLOT( setShowGps( bool ) ) );
     connect( this, SIGNAL( gpsPositionChanged( qreal, qreal ) ),
              d->m_widget, SLOT( changeCurrentPosition( qreal, qreal ) ) );
-    connect ( d->m_widget->model()->gpsLayer()->getPositionTracking(), SIGNAL(gpsLocation( GeoDataCoordinates, qreal )),
-              this, SLOT(receiveGpsCoordinates(GeoDataCoordinates, qreal)) );
-    connect ( d->uiWidget.navigationCheckBox, SIGNAL(clicked(bool) ),
-              d->m_widget->model()->gpsLayer(), SLOT(setVisible(bool)) );
+    connect( d->m_widget->model()->gpsLayer()->getPositionTracking(),
+             SIGNAL( gpsLocation( GeoDataCoordinates, qreal ) ),
+             this, SLOT( receiveGpsCoordinates( GeoDataCoordinates, qreal ) ) );
+    connect( d->uiWidget.navigationCheckBox, SIGNAL(clicked(bool) ),
+             d->m_widget->model()->gpsLayer(), SLOT( setVisible(bool) ) );
 
     connect( d->m_widget, SIGNAL( timeout() ),
              this,        SIGNAL( updateGps() ) );
--- trunk/KDE/kdeedu/marble/src/lib/MarbleControlBox.h #1034873:1034874
@@ -84,7 +84,7 @@
      * @brief Construct a new MarbleControlBox
      * @param parent the parent widget
      */
-    explicit MarbleControlBox(QWidget *parent = 0);
+    explicit MarbleControlBox( QWidget *parent = 0 );
     ~MarbleControlBox();
  
     /**
@@ -162,7 +162,7 @@
     void projectionSelected( Projection );
     
     void gpsInputDisabled( bool );
-    void gpsPositionChanged( qreal lat, qreal lon);
+    void gpsPositionChanged( qreal lat, qreal lon );
     void updateGps();
    
  public Q_SLOTS:
@@ -193,8 +193,8 @@
      * value of the slider, but nothing more.  In particular it
      * doesn't emit the zoomChanged signal.
      */
-    void changeZoom(int zoom);
-    void receiveGpsCoordinates( GeoDataCoordinates in, qreal speed  );
+    void changeZoom( int zoom );
+    void receiveGpsCoordinates( GeoDataCoordinates in, qreal speed );
     void enableFileViewActions();
     
     /**
@@ -231,7 +231,7 @@
  private Q_SLOTS:
 
     /// called whenever the user types something new in the search box
-    void searchLineChanged(const QString &search);
+    void searchLineChanged( const QString &search );
     
     /// called the Return or Enter key is pressed in the search box.
     void searchReturnPressed();
@@ -257,11 +257,11 @@
      * Navigation tab will be hidden, leaving only the Zoom Up and
      * Zoom Down buttons.
      */
-    void resizeEvent ( QResizeEvent * );
+    void resizeEvent( QResizeEvent * );
 
  private:
     Q_DISABLE_COPY( MarbleControlBox )
-    MarbleControlBoxPrivate  * const d;
+    MarbleControlBoxPrivate * const d;
 };
 
 }
--- trunk/KDE/kdeedu/marble/src/lib/PositionProviderPlugin.h #1034873:1034874
@@ -38,8 +38,9 @@
 
     
  signals:
-    void statusChanged(Marble::PositionProviderStatus status) const;
-    void positionChanged(Marble::GeoDataCoordinates position, Marble::GeoDataAccuracy accuracy) const;
+    void statusChanged( Marble::PositionProviderStatus status ) const;
+    void positionChanged( Marble::GeoDataCoordinates position,
+                          Marble::GeoDataAccuracy accuracy ) const;
 
  protected:
     PositionProviderPlugin();
--- trunk/KDE/kdeedu/marble/src/lib/gps/GpsLayer.cpp #1034873:1034874
@@ -69,7 +69,7 @@
         m_currentPosition->draw( painter, canvasSize,
                                  viewParams );
         QRegion temp; // useless variable
-        updateGps( canvasSize, viewParams, temp);
+        updateGps( canvasSize, viewParams, temp );
         paintCurrentPosition( painter, canvasSize, viewParams );
         m_currentGpx->draw( painter, canvasSize, viewParams );
     }
--- trunk/KDE/kdeedu/marble/src/lib/gps/PositionTracking.cpp #1034873:1034874
@@ -122,7 +122,7 @@
     {
         m_gpsTracking->setPosition( m_positionProvider->position() );
         m_gpsTracking->setPosition( m_gpsTracking->position().latitude(GeoDataCoordinates::Degree),
-                                       m_gpsTracking->position().longitude( GeoDataCoordinates::Degree ) );
+                                    m_gpsTracking->position().longitude( GeoDataCoordinates::Degree ) );
 
 
         if (m_gpsTrackSeg == 0 ) {
@@ -135,9 +135,9 @@
         updateSpeed( m_gpsPreviousPosition, m_gpsTracking );
         m_speed *= viewParams->radius();
 
-        //if the position has not moved then update the current position
-        if (!( m_gpsPreviousPosition->position() ==
-            m_gpsTracking->position() ) )
+        //if the position has moved then update the current position
+        if ( !( m_gpsPreviousPosition->position() ==
+                m_gpsTracking->position() ) )
         {
             notifyPosition( m_gpsTracking->position() );
             m_gpsTrackSeg->append( m_gpsPreviousPosition );
--- trunk/KDE/kdeedu/marble/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp #1034873:1034874
@@ -49,16 +49,16 @@
     m_thread->start();
 }
 
-void GpsdPositionProviderPlugin::update(gps_data_t data)
+void GpsdPositionProviderPlugin::update( gps_data_t data )
 {
     PositionProviderStatus oldStatus = m_status;
     GeoDataCoordinates oldPosition = m_position;
-    if (data.status == STATUS_NO_FIX)
+    if ( data.status == STATUS_NO_FIX )
         m_status = PositionProviderStatusUnavailable;
     else {
         m_status = PositionProviderStatusAvailable;
         m_position.set( data.fix.longitude, data.fix.latitude,
-        data.fix.altitude, GeoDataCoordinates::Degree );
+                        data.fix.altitude, GeoDataCoordinates::Degree );
         m_accuracy.level = GeoDataAccuracy::Detailed;
         // FIXME: Add real values here
         m_accuracy.horizontal = 5;
@@ -67,7 +67,7 @@
     if (m_status != oldStatus)
         emit statusChanged( m_status );
     // FIXME: Check whether position has changed first
-    if (m_status == PositionProviderStatusAvailable)
+    if ( m_status == PositionProviderStatusAvailable )
         emit positionChanged( m_position, m_accuracy );
 }