#5101 clang-format: Adjusted penalties

Use lower absolute values to improve control of behavior
2025-02-25 18:55:39 -06:00 · 2020-02-12 11:43:15 +01:00
parent 10f0abc9b5
commit c82df63e10
710 changed files with 3167 additions and 4721 deletions
--- a/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp
@@ -255,8 +255,8 @@ public:
                {
                    size_t globalCoarseningIdx = globalCoarseningBoxIndexStart[grid->gridIndex()] + coarseningIdx;

-                    globalCoarseningBoxIdx.push_back(
-                        static_cast<qint32>( globalCoarseningIdx + 1 ) ); // NB: 1-based index in Octave
+                    globalCoarseningBoxIdx.push_back( static_cast<qint32>( globalCoarseningIdx + 1 ) ); // NB: 1-based
+                                                                                                        // index in Octave
                }
                else
                {
@@ -267,8 +267,8 @@ public:
    }
 };

-static bool RiaGetActiveCellInfo_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetActiveCellInfo>(
-    RiaGetActiveCellInfo::commandName() );
+static bool RiaGetActiveCellInfo_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetActiveCellInfo>( RiaGetActiveCellInfo::commandName() );

 //--------------------------------------------------------------------------------------------------
 ///
@@ -339,8 +339,8 @@ public:
    }
 };

-static bool RiaGetCoarseningInfo_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetCoarseningInfo>(
-    RiaGetCoarseningInfo::commandName() );
+static bool RiaGetCoarseningInfo_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetCoarseningInfo>( RiaGetCoarseningInfo::commandName() );

 //--------------------------------------------------------------------------------------------------
 ///
@@ -397,8 +397,8 @@ public:
    }
 };

-static bool RiaGetGridDimensions_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetGridDimensions>(
-    RiaGetGridDimensions::commandName() );
+static bool RiaGetGridDimensions_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetGridDimensions>( RiaGetGridDimensions::commandName() );

 //--------------------------------------------------------------------------------------------------
 ///
@@ -447,10 +447,10 @@ public:
            return true;
        }

-        std::vector<QDateTime> timeStepDates = rimCase->eclipseCaseData()
-                                                   ->results( RiaDefines::MATRIX_MODEL )
-                                                   ->timeStepDates(
-                                                       RigEclipseResultAddress( addrToMaxTimeStepCountResult ) );
+        std::vector<QDateTime> timeStepDates =
+            rimCase->eclipseCaseData()
+                ->results( RiaDefines::MATRIX_MODEL )
+                ->timeStepDates( RigEclipseResultAddress( addrToMaxTimeStepCountResult ) );

        quint64 timeStepCount = timeStepDates.size();
        quint64 byteCount     = sizeof( quint64 ) + 6 * timeStepCount * sizeof( qint32 );
@@ -485,8 +485,8 @@ public:
    }
 };

-static bool RiaGetTimeStepDates_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetTimeStepDates>(
-    RiaGetTimeStepDates::commandName() );
+static bool RiaGetTimeStepDates_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetTimeStepDates>( RiaGetTimeStepDates::commandName() );

 //--------------------------------------------------------------------------------------------------
 ///
@@ -535,9 +535,8 @@ public:
            return true;
        }

-        std::vector<double> daysSinceSimulationStart = rimCase->eclipseCaseData()
-                                                           ->results( RiaDefines::MATRIX_MODEL )
-                                                           ->daysSinceSimulationStart( addrToMaxTimeStepCountResult );
+        std::vector<double> daysSinceSimulationStart =
+            rimCase->eclipseCaseData()->results( RiaDefines::MATRIX_MODEL )->daysSinceSimulationStart( addrToMaxTimeStepCountResult );

        quint64 timeStepCount = daysSinceSimulationStart.size();
        quint64 byteCount     = sizeof( quint64 ) + timeStepCount * sizeof( qint32 );
@@ -554,8 +553,8 @@ public:
    }
 };

-static bool RiaGetTimeStepDays_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetTimeStepDays>(
-    RiaGetTimeStepDays::commandName() );
+static bool RiaGetTimeStepDays_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetTimeStepDays>( RiaGetTimeStepDays::commandName() );

 //--------------------------------------------------------------------------------------------------
 ///
@@ -664,5 +663,5 @@ public:
    }
 };

-static bool RiaGetSelectedCells_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetSelectedCells>(
-    RiaGetSelectedCells::commandName() );
+static bool RiaGetSelectedCells_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetSelectedCells>( RiaGetSelectedCells::commandName() );
--- a/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp
@@ -140,18 +140,15 @@ public:

            CVF_ASSERT( valueIndex == cellCount );

-            RiaSocketTools::writeBlockData( server,
-                                            server->currentClient(),
-                                            (const char*)doubleValues.data(),
-                                            blockByteCount );
+            RiaSocketTools::writeBlockData( server, server->currentClient(), (const char*)doubleValues.data(), blockByteCount );
        }

        return true;
    }
 };

-static bool RiaGetCellCenters_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetCellCenters>(
-    RiaGetCellCenters::commandName() );
+static bool RiaGetCellCenters_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetCellCenters>( RiaGetCellCenters::commandName() );

 //--------------------------------------------------------------------------------------------------
 ///
@@ -221,10 +218,7 @@ public:
            }

            CVF_ASSERT( valueIndex == activeCellCount );
-            RiaSocketTools::writeBlockData( server,
-                                            server->currentClient(),
-                                            (const char*)doubleValues.data(),
-                                            blockByteCount );
+            RiaSocketTools::writeBlockData( server, server->currentClient(), (const char*)doubleValues.data(), blockByteCount );
        }

        return true;
@@ -307,9 +301,8 @@ public:
                            size_t gridLocalCellIndex = rigGrid->cellIndexFromIJK( i, j, k );
                            rigGrid->cellCornerVertices( gridLocalCellIndex, cornerVerts );

-                            doubleValues[valueIndex++] = getCellCornerWithPositiveDepth( cornerVerts,
-                                                                                         cornerIndexMapping,
-                                                                                         coordIdx );
+                            doubleValues[valueIndex++] =
+                                getCellCornerWithPositiveDepth( cornerVerts, cornerIndexMapping, coordIdx );
                        }
                    }
                }
@@ -327,8 +320,8 @@ public:
    }
 };

-static bool RiaGetCellCorners_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetCellCorners>(
-    RiaGetCellCorners::commandName() );
+static bool RiaGetCellCorners_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetCellCorners>( RiaGetCellCorners::commandName() );

 //--------------------------------------------------------------------------------------------------
 ///
@@ -398,9 +391,8 @@ public:

                    mainGrid->cellCornerVertices( reservoirCellIndex, cornerVerts );

-                    doubleValues[valueIndex++] = getCellCornerWithPositiveDepth( cornerVerts,
-                                                                                 cornerIndexMapping,
-                                                                                 coordIdx );
+                    doubleValues[valueIndex++] =
+                        getCellCornerWithPositiveDepth( cornerVerts, cornerIndexMapping, coordIdx );
                }

                CVF_ASSERT( valueIndex == activeCellCount );
--- a/ApplicationCode/SocketInterface/RiaNNCCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaNNCCommands.cpp
@@ -94,8 +94,8 @@ public:
    }
 };

-static bool RiaGetNNCConnections_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetNNCConnections>(
-    RiaGetNNCConnections::commandName() );
+static bool RiaGetNNCConnections_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetNNCConnections>( RiaGetNNCConnections::commandName() );

 //--------------------------------------------------------------------------------------------------
 ///
@@ -118,9 +118,9 @@ public:

        QString propertyName = args[2];

-        RigMainGrid*                            mainGrid  = rimCase->eclipseCaseData()->mainGrid();
-        const std::vector<std::vector<double>>* nncValues = mainGrid->nncData()->dynamicConnectionScalarResultByName(
-            propertyName );
+        RigMainGrid*                            mainGrid = rimCase->eclipseCaseData()->mainGrid();
+        const std::vector<std::vector<double>>* nncValues =
+            mainGrid->nncData()->dynamicConnectionScalarResultByName( propertyName );

        if ( nncValues == nullptr )
        {
@@ -182,8 +182,8 @@ public:
    }
 };

-static bool RiaGetDynamicNNCValues_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetDynamicNNCValues>(
-    RiaGetDynamicNNCValues::commandName() );
+static bool RiaGetDynamicNNCValues_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetDynamicNNCValues>( RiaGetDynamicNNCValues::commandName() );

 //--------------------------------------------------------------------------------------------------
 ///
@@ -228,8 +228,8 @@ public:
    }
 };

-static bool RiaGetStaticNNCValues_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetStaticNNCValues>(
-    RiaGetStaticNNCValues::commandName() );
+static bool RiaGetStaticNNCValues_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetStaticNNCValues>( RiaGetStaticNNCValues::commandName() );

 //--------------------------------------------------------------------------------------------------
 ///
@@ -300,8 +300,8 @@ public:
    }
 };

-static bool RiaGetNNCPropertyNames_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetNNCPropertyNames>(
-    RiaGetNNCPropertyNames::commandName() );
+static bool RiaGetNNCPropertyNames_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetNNCPropertyNames>( RiaGetNNCPropertyNames::commandName() );

 //--------------------------------------------------------------------------------------------------
 ///
@@ -480,20 +480,19 @@ public:

        size_t                            connectionCountFromOctave = m_bytesPerTimeStepToRead / sizeof( double );
        size_t                            connectionCount           = nncData->connections().size();
-        std::vector<std::vector<double>>* resultsToAdd              = nncData->generatedConnectionScalarResultByName(
-            m_currentPropertyName );
+        std::vector<std::vector<double>>* resultsToAdd =
+            nncData->generatedConnectionScalarResultByName( m_currentPropertyName );

        if ( connectionCountFromOctave != connectionCount )
        {
-            server->showErrorMessage(
-                RiaSocketServer::tr( "ResInsight SocketServer: \n" ) +
-                RiaSocketServer::tr(
-                    "The number of connections in the data coming from octave does not match the case: '%1'\n" )
-                    .arg( m_currentReservoir->caseUserDescription() ) +
-                RiaSocketServer::tr( "   Octave: %1\n" ).arg( connectionCountFromOctave ) +
-                RiaSocketServer::tr( "  %1: Connection count: %2" )
-                    .arg( m_currentReservoir->caseUserDescription() )
-                    .arg( connectionCount ) );
+            server->showErrorMessage( RiaSocketServer::tr( "ResInsight SocketServer: \n" ) +
+                                      RiaSocketServer::tr( "The number of connections in the data coming from octave "
+                                                           "does not match the case: '%1'\n" )
+                                          .arg( m_currentReservoir->caseUserDescription() ) +
+                                      RiaSocketServer::tr( "   Octave: %1\n" ).arg( connectionCountFromOctave ) +
+                                      RiaSocketServer::tr( "  %1: Connection count: %2" )
+                                          .arg( m_currentReservoir->caseUserDescription() )
+                                          .arg( connectionCount ) );

            connectionCountFromOctave        = 0;
            m_invalidConnectionCountDetected = true;
@@ -546,8 +545,8 @@ public:
                RimEclipseInputCase* inputRes = dynamic_cast<RimEclipseInputCase*>( m_currentReservoir );
                if ( inputRes )
                {
-                    RimEclipseInputProperty* inputProperty = inputRes->inputPropertyCollection()->findInputProperty(
-                        m_currentPropertyName );
+                    RimEclipseInputProperty* inputProperty =
+                        inputRes->inputPropertyCollection()->findInputProperty( m_currentPropertyName );
                    if ( !inputProperty )
                    {
                        inputProperty                 = new RimEclipseInputProperty;
@@ -560,8 +559,8 @@ public:
                    inputProperty->resolvedState = RimEclipseInputProperty::RESOLVED_NOT_SAVED;
                }

-                if ( m_currentEclResultAddress
-                         .isValid() && // Will never be valid because it is never set. What is correct behaviour ?
+                if ( m_currentEclResultAddress.isValid() && // Will never be valid because it is never set. What is
+                                                            // correct behaviour ?
                     m_currentReservoir->eclipseCaseData() &&
                     m_currentReservoir->eclipseCaseData()->results( m_porosityModelEnum ) )
                {
@@ -607,5 +606,5 @@ private:
    bool m_invalidConnectionCountDetected;
 };

-static bool RiaSetNNCProperty_init = RiaSocketCommandFactory::instance()->registerCreator<RiaSetNNCProperty>(
-    RiaSetNNCProperty::commandName() );
+static bool RiaSetNNCProperty_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaSetNNCProperty>( RiaSetNNCProperty::commandName() );
--- a/ApplicationCode/SocketInterface/RiaProjectInfoCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaProjectInfoCommands.cpp
@@ -106,8 +106,8 @@ public:
    }
 };

-static bool RiaGetCurrentCase_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetCurrentCase>(
-    RiaGetCurrentCase::commandName() );
+static bool RiaGetCurrentCase_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetCurrentCase>( RiaGetCurrentCase::commandName() );

 //--------------------------------------------------------------------------------------------------
 ///
@@ -156,8 +156,8 @@ public:
    }
 };

-static bool RiaGetSelectedCases_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetSelectedCases>(
-    RiaGetSelectedCases::commandName() );
+static bool RiaGetSelectedCases_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetSelectedCases>( RiaGetSelectedCases::commandName() );

 //--------------------------------------------------------------------------------------------------
 ///
@@ -168,10 +168,9 @@ public:
    static QString commandName() { return QString( "GetCaseGroups" ); }
    bool interpretCommand( RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream ) override
    {
-        RimProject*               proj           = RiaApplication::instance()->project();
-        RimEclipseCaseCollection* analysisModels = ( proj && proj->activeOilField() )
-                                                       ? proj->activeOilField()->analysisModels()
-                                                       : nullptr;
+        RimProject*               proj = RiaApplication::instance()->project();
+        RimEclipseCaseCollection* analysisModels =
+            ( proj && proj->activeOilField() ) ? proj->activeOilField()->analysisModels() : nullptr;
        if ( analysisModels )
        {
            std::vector<QString> groupNames;
@@ -212,8 +211,8 @@ public:
    }
 };

-static bool RiaGetCaseGroups_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetCaseGroups>(
-    RiaGetCaseGroups::commandName() );
+static bool RiaGetCaseGroups_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetCaseGroups>( RiaGetCaseGroups::commandName() );

 //--------------------------------------------------------------------------------------------------
 ///
@@ -232,10 +231,9 @@ public:
            argCaseGroupId = args[1].toInt();
        }

-        RimProject*               proj           = RiaApplication::instance()->project();
-        RimEclipseCaseCollection* analysisModels = ( proj && proj->activeOilField() )
-                                                       ? proj->activeOilField()->analysisModels()
-                                                       : nullptr;
+        RimProject*               proj = RiaApplication::instance()->project();
+        RimEclipseCaseCollection* analysisModels =
+            ( proj && proj->activeOilField() ) ? proj->activeOilField()->analysisModels() : nullptr;
        if ( analysisModels )
        {
            std::vector<RimCase*> cases;
@@ -303,5 +301,5 @@ public:
    }
 };

-static bool RiaGetCases_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetCases>(
-    RiaGetCases::commandName() );
+static bool RiaGetCases_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetCases>( RiaGetCases::commandName() );
--- a/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
@@ -386,8 +386,8 @@ public:
    }
 };

-static bool RiaGetGridProperty_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetGridProperty>(
-    RiaGetGridProperty::commandName() );
+static bool RiaGetGridProperty_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetGridProperty>( RiaGetGridProperty::commandName() );

 //--------------------------------------------------------------------------------------------------
 ///
@@ -570,9 +570,8 @@ public:
                QString::number( cellCountFromOctave ) +
                "\n"
                "  " +
-                m_currentReservoir->caseUserDescription() +
-                ": Active cell count: " + QString::number( activeCellCountReservoir ) +
-                " Total cell count: " + QString::number( totalCellCount ) );
+                m_currentReservoir->caseUserDescription() + ": Active cell count: " +
+                QString::number( activeCellCountReservoir ) + " Total cell count: " + QString::number( totalCellCount ) );

            cellCountFromOctave              = 0;
            m_invalidActiveCellCountDetected = true;
@@ -594,8 +593,7 @@ public:
                }
            }

-            if ( maxRequestedTimeStepIdx != cvf::UNDEFINED_SIZE_T &&
-                 m_scalarResultsToAdd->size() <= maxRequestedTimeStepIdx )
+            if ( maxRequestedTimeStepIdx != cvf::UNDEFINED_SIZE_T && m_scalarResultsToAdd->size() <= maxRequestedTimeStepIdx )
            {
                m_scalarResultsToAdd->resize( maxRequestedTimeStepIdx + 1 );
            }
@@ -626,7 +624,8 @@ public:
        {
            if ( !isCoarseningActive )
            {
-                internalMatrixData = m_scalarResultsToAdd->at( m_requestedTimesteps[m_currentTimeStepNumberToRead] ).data();
+                internalMatrixData =
+                    m_scalarResultsToAdd->at( m_requestedTimesteps[m_currentTimeStepNumberToRead] ).data();
            }

            QStringList errorMessages;
@@ -673,8 +672,8 @@ public:
                RimEclipseInputCase* inputRes = dynamic_cast<RimEclipseInputCase*>( m_currentReservoir );
                if ( inputRes )
                {
-                    RimEclipseInputProperty* inputProperty = inputRes->inputPropertyCollection()->findInputProperty(
-                        m_currentPropertyName );
+                    RimEclipseInputProperty* inputProperty =
+                        inputRes->inputPropertyCollection()->findInputProperty( m_currentPropertyName );
                    if ( !inputProperty )
                    {
                        inputProperty                 = new RimEclipseInputProperty;
@@ -693,10 +692,9 @@ public:
                    // Adjust the result data if only one time step is requested so the result behaves like a static result
                    if ( m_requestedTimesteps.size() == 1 && m_currentEclResultAddress.isValid() )
                    {
-                        std::vector<std::vector<double>>* scalarResultFrames = m_currentReservoir
-                                                                                   ->results( m_porosityModelEnum )
-                                                                                   ->modifiableCellScalarResultTimesteps(
-                                                                                       m_currentEclResultAddress );
+                        std::vector<std::vector<double>>* scalarResultFrames =
+                            m_currentReservoir->results( m_porosityModelEnum )
+                                ->modifiableCellScalarResultTimesteps( m_currentEclResultAddress );
                        size_t lastIndexWithDataPresent = cvf::UNDEFINED_SIZE_T;
                        for ( size_t i = 0; i < scalarResultFrames->size(); i++ )
                        {
@@ -992,8 +990,7 @@ public:
                }
            }

-            if ( maxRequestedTimeStepIdx != cvf::UNDEFINED_SIZE_T &&
-                 m_scalarResultsToAdd->size() <= maxRequestedTimeStepIdx )
+            if ( maxRequestedTimeStepIdx != cvf::UNDEFINED_SIZE_T && m_scalarResultsToAdd->size() <= maxRequestedTimeStepIdx )
            {
                m_scalarResultsToAdd->resize( maxRequestedTimeStepIdx + 1 );
            }
@@ -1061,8 +1058,8 @@ public:
                RimEclipseInputCase* inputRes = dynamic_cast<RimEclipseInputCase*>( m_currentReservoir );
                if ( inputRes )
                {
-                    RimEclipseInputProperty* inputProperty = inputRes->inputPropertyCollection()->findInputProperty(
-                        m_currentPropertyName );
+                    RimEclipseInputProperty* inputProperty =
+                        inputRes->inputPropertyCollection()->findInputProperty( m_currentPropertyName );
                    if ( !inputProperty )
                    {
                        inputProperty                 = new RimEclipseInputProperty;
@@ -1081,9 +1078,9 @@ public:
                    // Adjust the result data if only one time step is requested so the result behaves like a static result
                    if ( m_requestedTimesteps.size() == 1 && m_currentResultAddress.isValid() )
                    {
-                        auto scalarResultFrames = m_currentReservoir->results( m_porosityModelEnum )
-                                                      ->modifiableCellScalarResultTimesteps(
-                                                          RigEclipseResultAddress( m_currentResultAddress ) );
+                        auto scalarResultFrames =
+                            m_currentReservoir->results( m_porosityModelEnum )
+                                ->modifiableCellScalarResultTimesteps( RigEclipseResultAddress( m_currentResultAddress ) );

                        size_t lastIndexWithDataPresent = cvf::UNDEFINED_SIZE_T;
                        for ( size_t i = 0; i < scalarResultFrames->size(); i++ )
@@ -1144,8 +1141,8 @@ private:
    bool m_invalidDataDetected;
 };

-static bool RiaSetGridProperty_init = RiaSocketCommandFactory::instance()->registerCreator<RiaSetGridProperty>(
-    RiaSetGridProperty::commandName() );
+static bool RiaSetGridProperty_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaSetGridProperty>( RiaSetGridProperty::commandName() );

 //--------------------------------------------------------------------------------------------------
 ///
@@ -1231,8 +1228,8 @@ public:
    }
 };

-static bool RiaGetPropertyNames_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetPropertyNames>(
-    RiaGetPropertyNames::commandName() );
+static bool RiaGetPropertyNames_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetPropertyNames>( RiaGetPropertyNames::commandName() );

 //--------------------------------------------------------------------------------------------------
 ///
@@ -1382,8 +1379,7 @@ public:

                if ( eclipseItem->m_resultDefinition->eclipseCase()->caseId == reservoirCase->caseId )
                {
-                    selectedCells.push_back(
-                        std::make_pair( eclipseItem->m_gridIndex, eclipseItem->m_gridLocalCellIndex ) );
+                    selectedCells.push_back( std::make_pair( eclipseItem->m_gridIndex, eclipseItem->m_gridLocalCellIndex ) );
                }
            }
            else if ( item->type() == RiuSelectionItem::GEOMECH_SELECTION_OBJECT )
--- a/ApplicationCode/SocketInterface/RiaSocketDataTransfer.cpp
+++ b/ApplicationCode/SocketInterface/RiaSocketDataTransfer.cpp
@@ -53,10 +53,7 @@ bool RiaSocketDataTransfer::writeBlockDataToSocket( QTcpSocket*  socket,
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-bool RiaSocketDataTransfer::readBlockDataFromSocket( QTcpSocket*  socket,
-                                                     char*        data,
-                                                     quint64      bytesToRead,
-                                                     QStringList& errorMessages )
+bool RiaSocketDataTransfer::readBlockDataFromSocket( QTcpSocket* socket, char* data, quint64 bytesToRead, QStringList& errorMessages )
 {
    quint64 bytesRead = 0;

--- a/ApplicationCode/SocketInterface/RiaSocketTools.cpp
+++ b/ApplicationCode/SocketInterface/RiaSocketTools.cpp
@@ -70,11 +70,7 @@ RimEclipseCase* RiaSocketTools::findCaseFromArgs( RiaSocketServer* server, const
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RiaSocketTools::getCaseInfoFromCase( RimCase* rimCase,
-                                          qint64&  caseId,
-                                          QString& caseName,
-                                          QString& caseType,
-                                          qint64&  caseGroupId )
+void RiaSocketTools::getCaseInfoFromCase( RimCase* rimCase, qint64& caseId, QString& caseName, QString& caseType, qint64& caseGroupId )
 {
    CVF_ASSERT( rimCase );

--- a/ApplicationCode/SocketInterface/RiaWellDataCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaWellDataCommands.cpp
@@ -81,8 +81,8 @@ public:
    }
 };

-static bool RiaGetWellNames_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetWellNames>(
-    RiaGetWellNames::commandName() );
+static bool RiaGetWellNames_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetWellNames>( RiaGetWellNames::commandName() );

 //--------------------------------------------------------------------------------------------------
 ///
@@ -124,9 +124,8 @@ public:

        if ( currentWellResult.isNull() )
        {
-            server->showErrorMessage(
-                RiaSocketServer::tr( "ResInsight SocketServer: \n" ) +
-                RiaSocketServer::tr( "Could not find the well with name : \"%1\"" ).arg( wellName ) );
+            server->showErrorMessage( RiaSocketServer::tr( "ResInsight SocketServer: \n" ) +
+                                      RiaSocketServer::tr( "Could not find the well with name : \"%1\"" ).arg( wellName ) );

            return true;
        }
@@ -220,8 +219,8 @@ public:
    }
 };

-static bool RiaGetWellStatus_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetWellStatus>(
-    RiaGetWellStatus::commandName() );
+static bool RiaGetWellStatus_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetWellStatus>( RiaGetWellStatus::commandName() );

 //--------------------------------------------------------------------------------------------------
 ///
@@ -260,9 +259,8 @@ public:

        if ( currentWellResult.isNull() )
        {
-            server->showErrorMessage(
-                RiaSocketServer::tr( "ResInsight SocketServer: \n" ) +
-                RiaSocketServer::tr( "Could not find the well with name : \"%1\"" ).arg( wellName ) );
+            server->showErrorMessage( RiaSocketServer::tr( "ResInsight SocketServer: \n" ) +
+                                      RiaSocketServer::tr( "Could not find the well with name : \"%1\"" ).arg( wellName ) );

            socketStream << (quint64)0;
            return true;
@@ -340,5 +338,5 @@ public:
    }
 };

-static bool RiaGetWellCells_init = RiaSocketCommandFactory::instance()->registerCreator<RiaGetWellCells>(
-    RiaGetWellCells::commandName() );
+static bool RiaGetWellCells_init =
+    RiaSocketCommandFactory::instance()->registerCreator<RiaGetWellCells>( RiaGetWellCells::commandName() );