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

[Jens-Michael Hoffmann]

SVN commit 1012534 by jmhoffmann:

Coding style: opening braces of structs, classes, functions and namespaces should be on their own line.


 M  +2 -1      AbstractTile.cpp  
 M  +6 -3      ClipPainter.cpp  
 M  +2 -1      LatLonEdit.cpp  
 M  +2 -1      LayerManager.cpp  
 M  +4 -2      MapThemeManager.cpp  
 M  +2 -1      MarbleGeoDataModel.cpp  
 M  +2 -1      MarbleGeometryModel.cpp  
 M  +8 -4      MarbleLocale.cpp  
 M  +2 -1      MarbleMath.h  
 M  +8 -4      MarblePluginSettingsWidget.cpp  
 M  +4 -2      MarbleWidget.cpp  
 M  +2 -1      MarbleWidgetInputHandler.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/AbstractTile.cpp #1012533:1012534
@@ -16,7 +16,8 @@
 #include <QtCore/QDebug>
 
 
-namespace Marble {
+namespace Marble
+{
 
 AbstractTilePrivate::AbstractTilePrivate( const TileId& id )
     : m_id( id ),
--- trunk/KDE/kdeedu/marble/src/lib/ClipPainter.cpp #1012533:1012534
@@ -292,7 +292,8 @@
     }
 }
 
-bool ClipPainterPrivate::pointAllowsLabel( const QPointF& point ){
+bool ClipPainterPrivate::pointAllowsLabel( const QPointF& point )
+{
 
     if ( point.x() > m_labelAreaMargin && point.x() < q->viewport().width() - m_labelAreaMargin 
          && point.y() > m_labelAreaMargin && point.y() < q->viewport().height() - m_labelAreaMargin ) {
@@ -303,7 +304,8 @@
 
 QPointF ClipPainterPrivate::interpolateLabelPoint( const QPointF& previousPoint, 
                                                    const QPointF& currentPoint,
-                                                   LabelPositionFlags labelPositionFlags ) {
+                                                   LabelPositionFlags labelPositionFlags )
+{
     qreal m = _m( previousPoint, currentPoint );
     if ( previousPoint.x() <= m_labelAreaMargin ) {
         if ( labelPositionFlags.testFlag( IgnoreXMargin ) ) {
@@ -1115,7 +1117,8 @@
 
 #ifdef DEBUG_DRAW_NODES
 
-void ClipPainterPrivate::debugDrawNodes( const QPolygonF & polygon ) {
+void ClipPainterPrivate::debugDrawNodes( const QPolygonF & polygon )
+{
 
     q->save();
     q->setRenderHint( QPainter::Antialiasing, false );
--- trunk/KDE/kdeedu/marble/src/lib/LatLonEdit.cpp #1012533:1012534
@@ -28,7 +28,8 @@
 #include "global.h"
 
 using namespace Marble;
-namespace Marble {
+namespace Marble
+{
 
 class LatLonEditPrivate : public Ui::LatLonEditPrivate
 {
--- trunk/KDE/kdeedu/marble/src/lib/LayerManager.cpp #1012533:1012534
@@ -105,7 +105,8 @@
     return d->m_dataPlugins;
 }
 
-QList<AbstractDataPluginItem *> LayerManager::whichItemAt( const QPoint& curpos ) const {
+QList<AbstractDataPluginItem *> LayerManager::whichItemAt( const QPoint& curpos ) const
+{
     QList<AbstractDataPluginItem *> itemList;
     
     foreach( AbstractDataPlugin *plugin, d->m_dataPlugins ) {
--- trunk/KDE/kdeedu/marble/src/lib/MapThemeManager.cpp #1012533:1012534
@@ -33,12 +33,14 @@
 
 using namespace Marble;
 
-namespace {
+namespace
+{
     const QString mapDirName = "maps";
     const int columnRelativePath = 1;
 }
 
-namespace Marble {
+namespace Marble
+{
 
 class MapThemeManagerPrivate
 {
--- trunk/KDE/kdeedu/marble/src/lib/MarbleGeoDataModel.cpp #1012533:1012534
@@ -27,7 +27,8 @@
 
 using namespace Marble;
 
-class MarbleGeoDataModel::Private {
+class MarbleGeoDataModel::Private
+{
  public:
     Private()
         : m_rootDocument( new GeoDataDocument() ),
--- trunk/KDE/kdeedu/marble/src/lib/MarbleGeometryModel.cpp #1012533:1012534
@@ -33,7 +33,8 @@
 
 using namespace Marble;
 
-class MarbleGeometryModel::Private {
+class MarbleGeometryModel::Private
+{
  public:
     Private( GeoDataDocument* rootDocument ) : m_rootDocument( rootDocument )
     {
--- trunk/KDE/kdeedu/marble/src/lib/MarbleLocale.cpp #1012533:1012534
@@ -15,7 +15,8 @@
 #include <QtCore/QLocale>
 
 
-namespace Marble {
+namespace Marble
+{
 
 MarbleLocalePrivate::MarbleLocalePrivate()
     : m_distanceUnit( Marble::NoDistanceUnit ),
@@ -57,15 +58,18 @@
     d->m_distanceUnit = distanceUnit;
 }
 
-void MarbleLocale::setMeasureSystem( Marble::MeasureSystem measureSystem ) {
+void MarbleLocale::setMeasureSystem( Marble::MeasureSystem measureSystem )
+{
     d->m_measureSystem = measureSystem;
 }
 
-Marble::MeasureSystem MarbleLocale::measureSystem() const {
+Marble::MeasureSystem MarbleLocale::measureSystem() const
+{
     return d->m_measureSystem;
 }
 
-QString MarbleLocale::languageCode() {
+QString MarbleLocale::languageCode()
+{
     const QString lang = QLocale::system().name();
     QString code;
 
--- trunk/KDE/kdeedu/marble/src/lib/MarbleMath.h #1012533:1012534
@@ -19,7 +19,8 @@
 #include <math.h>
 
 
-namespace {
+namespace
+{
     const qreal a1 = 1.0/6.0; 
     const qreal a2 = 1.0/24.0; 
     const qreal a3 = 61.0/5040; 
--- trunk/KDE/kdeedu/marble/src/lib/MarblePluginSettingsWidget.cpp #1012533:1012534
@@ -18,9 +18,11 @@
 // Marble
 #include "PluginItemDelegate.h"
 
-namespace Marble {
+namespace Marble
+{
 
-class MarblePluginSettingsWidgetPrivate {
+class MarblePluginSettingsWidgetPrivate
+{
  public:
     PluginItemDelegate *m_itemDelegate;
 };
@@ -41,7 +43,8 @@
              this, SIGNAL( configPluginClicked( QString ) ) );
 }
 
-void MarblePluginSettingsWidget::setAboutIcon( const QIcon& icon ) {
+void MarblePluginSettingsWidget::setAboutIcon( const QIcon& icon )
+{
     d->m_itemDelegate->setAboutIcon( icon );
 }
 
@@ -50,7 +53,8 @@
     delete d;
 }
 
-void MarblePluginSettingsWidget::setConfigIcon( const QIcon& icon ) {
+void MarblePluginSettingsWidget::setConfigIcon( const QIcon& icon )
+{
     d->m_itemDelegate->setConfigIcon( icon );
 }
 
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.cpp #1012533:1012534
@@ -1344,7 +1344,8 @@
     return d->m_model->renderPlugins();
 }
 
-void MarbleWidget::readPluginSettings( QSettings& settings ) {
+void MarbleWidget::readPluginSettings( QSettings& settings )
+{
     foreach( RenderPlugin *plugin, renderPlugins() ) {
         settings.beginGroup( QString( "plugin_" ) + plugin->nameId() );
 
@@ -1360,7 +1361,8 @@
     }
 }
 
-void MarbleWidget::writePluginSettings( QSettings& settings ) const {
+void MarbleWidget::writePluginSettings( QSettings& settings ) const
+{
     foreach( RenderPlugin *plugin, renderPlugins() ) {
         settings.beginGroup( QString( "plugin_" ) + plugin->nameId() );
 
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidgetInputHandler.cpp #1012533:1012534
@@ -173,7 +173,8 @@
     }
 }
 
-void MarbleWidgetDefaultInputHandler::openItemToolTip() {
+void MarbleWidgetDefaultInputHandler::openItemToolTip()
+{
     if ( !m_lastToolTipItem.isNull() ) {
         QToolTip::showText( m_widget->mapToGlobal( m_toolTipPosition ),
                             m_lastToolTipItem->toolTip(),