OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

clang-tidy : Remove redundant 'virtual' and add 'override'

Browse Source
This commit is contained in:
Magne Sjaastad
2018-10-18 19:45:57 +02:00
parent c8285602b1
commit 6346ed012c
599 changed files with 2056 additions and 2056 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp
+7 -7
View File
@@ -63,7 +63,7 @@ class RiaGetMainGridDimensions: public RiaSocketCommand
public:
static QString commandName () { return QString("GetMainGridDimensions"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
RimEclipseCase* rimCase = RiaSocketTools::findCaseFromArgs(server, args);
@@ -100,7 +100,7 @@ class RiaGetActiveCellInfo: public RiaSocketCommand
public:
static QString commandName () { return QString("GetActiveCellInfo"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
RimEclipseCase* rimCase = RiaSocketTools::findCaseFromArgs(server, args);
if (!rimCase) return true;
@@ -270,7 +270,7 @@ class RiaGetCoarseningInfo : public RiaSocketCommand
public:
static QString commandName () { return QString("GetCoarseningInfo"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
int argCaseGroupId = -1;
@@ -342,7 +342,7 @@ class RiaGetGridDimensions : public RiaSocketCommand
public:
static QString commandName () { return QString("GetGridDimensions"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
int argCaseGroupId = -1;
@@ -401,7 +401,7 @@ class RiaGetTimeStepDates : public RiaSocketCommand
{
public:
static QString commandName () { return QString("GetTimeStepDates"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
int argCaseGroupId = -1;
@@ -488,7 +488,7 @@ class RiaGetTimeStepDays : public RiaSocketCommand
{
public:
static QString commandName () { return QString("GetTimeStepDays"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
int argCaseGroupId = -1;
@@ -556,7 +556,7 @@ class RiaGetSelectedCells: public RiaSocketCommand
public:
static QString commandName () { return QString("GetSelectedCells"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
// findCaseFromArgs only returns RimEclipseCase, so geomech cases are not supported because of this.
// The rest of the function supports geomech cases, so using a findCaseFromArgs that supports geomech
ApplicationCode/SocketInterface/RiaGeometryCommands.cpp
+4 -4
View File
@@ -75,7 +75,7 @@ class RiaGetCellCenters : public RiaSocketCommand
public:
static QString commandName () { return QString("GetCellCenters"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
RimEclipseCase* rimCase = RiaSocketTools::findCaseFromArgs(server, args);
size_t argGridIndex = args[2].toUInt();
@@ -158,7 +158,7 @@ class RiaGetActiveCellCenters : public RiaSocketCommand
public:
static QString commandName () { return QString("GetActiveCellCenters"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
RimEclipseCase* rimCase = RiaSocketTools::findCaseFromArgs(server, args);
@@ -240,7 +240,7 @@ class RiaGetCellCorners : public RiaSocketCommand
public:
static QString commandName () { return QString("GetCellCorners"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
RimEclipseCase* rimCase = RiaSocketTools::findCaseFromArgs(server, args);
size_t argGridIndex = args[2].toUInt();
@@ -329,7 +329,7 @@ class RiaGetActiveCellCorners : public RiaSocketCommand
public:
static QString commandName () { return QString("GetActiveCellCorners"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
RimEclipseCase* rimCase = RiaSocketTools::findCaseFromArgs(server, args);
ApplicationCode/SocketInterface/RiaNNCCommands.cpp
+6 -6
View File
@@ -54,7 +54,7 @@ class RiaGetNNCConnections: public RiaSocketCommand
public:
static QString commandName () { return QString("GetNNCConnections"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
RimEclipseCase* rimCase = RiaSocketTools::findCaseFromArgs(server, args);
// Write data back to octave: columnCount, GridNr I J K GridNr I J K
@@ -105,7 +105,7 @@ class RiaGetDynamicNNCValues: public RiaSocketCommand
public:
static QString commandName () { return QString("GetDynamicNNCValues"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
RimEclipseCase* rimCase = RiaSocketTools::findCaseFromArgs(server, args);
// Write data back to octave: connectionCount, timeStepCount, property values
@@ -186,7 +186,7 @@ class RiaGetStaticNNCValues: public RiaSocketCommand
public:
static QString commandName () { return QString("GetStaticNNCValues"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
RimEclipseCase* rimCase = RiaSocketTools::findCaseFromArgs(server, args);
QString propertyName = args[2];
@@ -228,7 +228,7 @@ class RiaGetNNCPropertyNames: public RiaSocketCommand
public:
static QString commandName () { return QString("GetNNCPropertyNames"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
RimEclipseCase* rimCase = RiaSocketTools::findCaseFromArgs(server, args);
@@ -309,7 +309,7 @@ public:
static QString commandName () { return QString("SetNNCProperty"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
RimEclipseCase* rimCase = RiaSocketTools::findCaseFromArgs(server, args);
@@ -443,7 +443,7 @@ public:
return false;
}
virtual bool interpretMore(RiaSocketServer* server, QTcpSocket* currentClient)
bool interpretMore(RiaSocketServer* server, QTcpSocket* currentClient) override
{
if (m_invalidConnectionCountDetected) return true;
ApplicationCode/SocketInterface/RiaProjectInfoCommands.cpp
+4 -4
View File
@@ -76,7 +76,7 @@ class RiaGetCurrentCase : public RiaSocketCommand
{
public:
static QString commandName () { return QString("GetCurrentCase"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
qint64 caseId = server->currentCaseId();
QString caseName;
@@ -119,7 +119,7 @@ class RiaGetSelectedCases: public RiaSocketCommand
public:
static QString commandName () { return QString("GetSelectedCases"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
{
std::vector<RimCase*> cases;
@@ -168,7 +168,7 @@ class RiaGetCaseGroups : public RiaSocketCommand
{
public:
static QString commandName () { return QString("GetCaseGroups"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
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;
@@ -226,7 +226,7 @@ class RiaGetCases : public RiaSocketCommand
public:
static QString commandName () { return QString("GetCases"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
int argCaseGroupId = -1;
ApplicationCode/SocketInterface/RiaPropertyDataCommands.cpp
+8 -8
View File
@@ -58,7 +58,7 @@ class RiaGetActiveCellProperty: public RiaSocketCommand
public:
static QString commandName () { return QString("GetActiveCellProperty"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
RimEclipseCase* rimCase = RiaSocketTools::findCaseFromArgs(server, args);
@@ -222,7 +222,7 @@ class RiaGetGridProperty: public RiaSocketCommand
public:
static QString commandName () { return QString("GetGridProperty"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
int caseId = args[1].toInt();
int gridIdx = args[2].toInt();
@@ -394,7 +394,7 @@ public:
static QString commandName () { return QString("SetActiveCellProperty"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
RimEclipseCase* rimCase = RiaSocketTools::findCaseFromArgs(server, args);
@@ -510,7 +510,7 @@ public:
return false;
}
virtual bool interpretMore(RiaSocketServer* server, QTcpSocket* currentClient)
bool interpretMore(RiaSocketServer* server, QTcpSocket* currentClient) override
{
// std::cout << "RiaSetActiveCellProperty, interpretMore: scalarIndex : " << m_currentScalarIndex;
@@ -741,7 +741,7 @@ public:
static QString commandName () { return QString("SetGridProperty"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
int caseId = args[1].toInt();
RimEclipseCase* rimCase = server->findReservoir(caseId);
@@ -887,7 +887,7 @@ public:
return false;
}
virtual bool interpretMore(RiaSocketServer* server, QTcpSocket* currentClient)
bool interpretMore(RiaSocketServer* server, QTcpSocket* currentClient) override
{
if (m_invalidDataDetected){
@@ -1094,7 +1094,7 @@ class RiaGetPropertyNames : public RiaSocketCommand
public:
static QString commandName () { return QString("GetPropertyNames"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
int caseId = args[1].toInt();
RimEclipseCase* rimCase = server->findReservoir(caseId);
@@ -1180,7 +1180,7 @@ class RiaGetGridPropertyForSelectedCells: public RiaSocketCommand
public:
static QString commandName() { return QString("GetGridPropertyForSelectedCells"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
RimEclipseCase* rimCase = RiaSocketTools::findCaseFromArgs(server, args);
if (!rimCase) return true;
ApplicationCode/SocketInterface/RiaSocketServer.h
+1 -1
View File
@@ -48,7 +48,7 @@ public:
public:
explicit RiaSocketServer(QObject *parent = nullptr);
~RiaSocketServer();
~RiaSocketServer() override;
unsigned short serverPort();
RimEclipseCase* findReservoir(int caseId);
ApplicationCode/SocketInterface/RiaWellDataCommands.cpp
+3 -3
View File
@@ -42,7 +42,7 @@ class RiaGetWellNames : public RiaSocketCommand
public:
static QString commandName () { return QString("GetWellNames"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
int caseId = args[1].toInt();
RimEclipseCase* rimCase = server->findReservoir(caseId);
@@ -94,7 +94,7 @@ class RiaGetWellStatus : public RiaSocketCommand
public:
static QString commandName () { return QString("GetWellStatus"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
int caseId = args[1].toInt();
QString wellName = args[2];
@@ -232,7 +232,7 @@ class RiaGetWellCells : public RiaSocketCommand
public:
static QString commandName () { return QString("GetWellCells"); }
virtual bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream)
bool interpretCommand(RiaSocketServer* server, const QList<QByteArray>& args, QDataStream& socketStream) override
{
int caseId = args[1].toInt();
QString wellName = args[2];