#6902 Octave Plugin: Use %s to concatenate text strings

This commit is contained in:
Magne Sjaastad
2020-11-03 12:25:15 +01:00
parent fe0490301f
commit 3d2710f507
29 changed files with 78 additions and 78 deletions

View File

@@ -17,7 +17,7 @@ void getActiveCellCenters(NDArray& cellCenterValues, const QString &hostName, qu
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -38,7 +38,7 @@ void getActiveCellCenters(NDArray& cellCenterValues, const QString &hostName, qu
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }
@@ -71,7 +71,7 @@ void getActiveCellCenters(NDArray& cellCenterValues, const QString &hostName, qu
{ {
for (int i = 0; i < errorMessages.size(); i++) for (int i = 0; i < errorMessages.size(); i++)
{ {
error(errorMessages[i].toLatin1().data()); error("%s",errorMessages[i].toLatin1().data());
} }
OCTAVE_QUIT; OCTAVE_QUIT;

View File

@@ -17,7 +17,7 @@ void getActiveCellCorners(NDArray& cellCornerValues, const QString &hostName, qu
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -38,7 +38,7 @@ void getActiveCellCorners(NDArray& cellCornerValues, const QString &hostName, qu
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }
@@ -70,7 +70,7 @@ void getActiveCellCorners(NDArray& cellCornerValues, const QString &hostName, qu
{ {
for (int i = 0; i < errorMessages.size(); i++) for (int i = 0; i < errorMessages.size(); i++)
{ {
error(errorMessages[i].toLatin1().data()); error("%s",errorMessages[i].toLatin1().data());
} }
OCTAVE_QUIT; OCTAVE_QUIT;

View File

@@ -15,7 +15,7 @@ void getActiveCellInfo(int32NDArray& activeCellInfo, const QString &hostName, qu
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -36,7 +36,7 @@ void getActiveCellInfo(int32NDArray& activeCellInfo, const QString &hostName, qu
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }
@@ -69,7 +69,7 @@ void getActiveCellInfo(int32NDArray& activeCellInfo, const QString &hostName, qu
{ {
for (int i = 0; i < errorMessages.size(); i++) for (int i = 0; i < errorMessages.size(); i++)
{ {
error(errorMessages[i].toLatin1().data()); error("%s",errorMessages[i].toLatin1().data());
} }
OCTAVE_QUIT; OCTAVE_QUIT;

View File

@@ -15,7 +15,7 @@ void getActiveCellProperty(Matrix& propertyFrames, const QString &serverName, qu
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -45,7 +45,7 @@ void getActiveCellProperty(Matrix& propertyFrames, const QString &serverName, qu
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }
@@ -76,7 +76,7 @@ void getActiveCellProperty(Matrix& propertyFrames, const QString &serverName, qu
{ {
for (int i = 0; i < errorMessages.size(); i++) for (int i = 0; i < errorMessages.size(); i++)
{ {
error(errorMessages[i].toLatin1().data()); error("%s",errorMessages[i].toLatin1().data());
} }
return; return;

View File

@@ -14,7 +14,7 @@ void getCaseGroups(std::vector<QString>& groupNames, std::vector<int>& groupIds,
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -33,7 +33,7 @@ void getCaseGroups(std::vector<QString>& groupNames, std::vector<int>& groupIds,
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); error("Waiting for data: %s",socket.errorString().toLatin1().data());
return; return;
} }
OCTAVE_QUIT; OCTAVE_QUIT;
@@ -51,7 +51,7 @@ void getCaseGroups(std::vector<QString>& groupNames, std::vector<int>& groupIds,
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); error("Waiting for data: %s",socket.errorString().toLatin1().data());
return; return;
} }
OCTAVE_QUIT; OCTAVE_QUIT;

View File

@@ -14,7 +14,7 @@ void getCases(std::vector<qint64>& caseIds, std::vector<QString>& caseNames, std
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -35,7 +35,7 @@ void getCases(std::vector<qint64>& caseIds, std::vector<QString>& caseNames, std
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }
@@ -47,7 +47,7 @@ void getCases(std::vector<qint64>& caseIds, std::vector<QString>& caseNames, std
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); error("Waiting for data: %s",socket.errorString().toLatin1().data());
return; return;
} }
OCTAVE_QUIT; OCTAVE_QUIT;

View File

@@ -17,7 +17,7 @@ void getCellCenters(NDArray& cellCenterValues, const QString &hostName, quint16
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -38,7 +38,7 @@ void getCellCenters(NDArray& cellCenterValues, const QString &hostName, quint16
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }
@@ -75,7 +75,7 @@ void getCellCenters(NDArray& cellCenterValues, const QString &hostName, quint16
{ {
for (int i = 0; i < errorMessages.size(); i++) for (int i = 0; i < errorMessages.size(); i++)
{ {
error(errorMessages[i].toLatin1().data()); error("%s",errorMessages[i].toLatin1().data());
} }
OCTAVE_QUIT; OCTAVE_QUIT;

View File

@@ -19,7 +19,7 @@ void getCellCorners(NDArray& cellCornerValues, const QString &hostName, quint16
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -40,7 +40,7 @@ void getCellCorners(NDArray& cellCornerValues, const QString &hostName, quint16
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }
@@ -78,7 +78,7 @@ void getCellCorners(NDArray& cellCornerValues, const QString &hostName, quint16
{ {
for (int i = 0; i < errorMessages.size(); i++) for (int i = 0; i < errorMessages.size(); i++)
{ {
error(errorMessages[i].toLatin1().data()); error("%s",errorMessages[i].toLatin1().data());
} }
OCTAVE_QUIT; OCTAVE_QUIT;

View File

@@ -14,7 +14,7 @@ void getCoarseningInfo(int32NDArray& coarseningInfo, const QString &hostName, qu
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -35,7 +35,7 @@ void getCoarseningInfo(int32NDArray& coarseningInfo, const QString &hostName, qu
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }

View File

@@ -14,7 +14,7 @@ void getCurrentCase(qint64& caseId, QString& caseName, QString& caseType, qint64
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -35,7 +35,7 @@ void getCurrentCase(qint64& caseId, QString& caseName, QString& caseType, qint64
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }
@@ -47,7 +47,7 @@ void getCurrentCase(qint64& caseId, QString& caseName, QString& caseType, qint64
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); error("Waiting for data: %s",socket.errorString().toLatin1().data());
return; return;
} }
OCTAVE_QUIT; OCTAVE_QUIT;

View File

@@ -15,7 +15,7 @@ void getDynamicNNCValues(Matrix& propertyFrames, const QString &serverName, quin
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -44,7 +44,7 @@ void getDynamicNNCValues(Matrix& propertyFrames, const QString &serverName, quin
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }
@@ -72,7 +72,7 @@ void getDynamicNNCValues(Matrix& propertyFrames, const QString &serverName, quin
{ {
for (int i = 0; i < errorMessages.size(); i++) for (int i = 0; i < errorMessages.size(); i++)
{ {
error(errorMessages[i].toLatin1().data()); error("%s",errorMessages[i].toLatin1().data());
} }
return; return;

View File

@@ -14,7 +14,7 @@ void getGridDimensions(int32NDArray& gridDimensions, const QString &hostName, qu
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -35,7 +35,7 @@ void getGridDimensions(int32NDArray& gridDimensions, const QString &hostName, qu
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }

View File

@@ -15,7 +15,7 @@ void getGridProperty(NDArray& propertyFrames, const QString &serverName, quint16
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -45,7 +45,7 @@ void getGridProperty(NDArray& propertyFrames, const QString &serverName, quint16
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }
@@ -87,7 +87,7 @@ void getGridProperty(NDArray& propertyFrames, const QString &serverName, quint16
{ {
for (int i = 0; i < errorMessages.size(); i++) for (int i = 0; i < errorMessages.size(); i++)
{ {
error(errorMessages[i].toLatin1().data()); error("%s",errorMessages[i].toLatin1().data());
} }
return; return;

View File

@@ -15,7 +15,7 @@ void getGridPropertyForSelectedCells(Matrix& propertyFrames, const QString &serv
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -45,7 +45,7 @@ void getGridPropertyForSelectedCells(Matrix& propertyFrames, const QString &serv
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }
@@ -76,7 +76,7 @@ void getGridPropertyForSelectedCells(Matrix& propertyFrames, const QString &serv
{ {
for (int i = 0; i < errorMessages.size(); i++) for (int i = 0; i < errorMessages.size(); i++)
{ {
error(errorMessages[i].toLatin1().data()); error("%s",errorMessages[i].toLatin1().data());
} }
return; return;

View File

@@ -13,7 +13,7 @@ void getMainGridDimensions(int32NDArray& gridDimensions, const QString &hostName
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -35,7 +35,7 @@ void getMainGridDimensions(int32NDArray& gridDimensions, const QString &hostName
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }

View File

@@ -29,7 +29,7 @@ void getNNCConnections(std::vector<Connection>& connections, const QString& host
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -46,7 +46,7 @@ void getNNCConnections(std::vector<Connection>& connections, const QString& host
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
OCTAVE_QUIT; OCTAVE_QUIT;
@@ -64,7 +64,7 @@ void getNNCConnections(std::vector<Connection>& connections, const QString& host
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); error("Waiting for data: %s",socket.errorString().toLatin1().data());
return; return;
} }
OCTAVE_QUIT; OCTAVE_QUIT;

View File

@@ -15,7 +15,7 @@ void getNNCPropertyNames(std::vector<QString>& propNames, std::vector<QString>&
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -37,7 +37,7 @@ void getNNCPropertyNames(std::vector<QString>& propNames, std::vector<QString>&
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }
@@ -52,7 +52,7 @@ void getNNCPropertyNames(std::vector<QString>& propNames, std::vector<QString>&
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); error("Waiting for data: %s",socket.errorString().toLatin1().data());
return; return;
} }
OCTAVE_QUIT; OCTAVE_QUIT;

View File

@@ -15,7 +15,7 @@ void getPropertyNames(std::vector<QString>& propNames, std::vector<QString>& pro
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -37,7 +37,7 @@ void getPropertyNames(std::vector<QString>& propNames, std::vector<QString>& pro
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }
@@ -52,7 +52,7 @@ void getPropertyNames(std::vector<QString>& propNames, std::vector<QString>& pro
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); error("Waiting for data: %s",socket.errorString().toLatin1().data());
return; return;
} }
OCTAVE_QUIT; OCTAVE_QUIT;

View File

@@ -14,7 +14,7 @@ void getSelectedCases(std::vector<qint64>& caseIds, std::vector<QString>& caseNa
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -35,7 +35,7 @@ void getSelectedCases(std::vector<qint64>& caseIds, std::vector<QString>& caseNa
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }
@@ -47,7 +47,7 @@ void getSelectedCases(std::vector<qint64>& caseIds, std::vector<QString>& caseNa
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); error("Waiting for data: %s",socket.errorString().toLatin1().data());
return; return;
} }
OCTAVE_QUIT; OCTAVE_QUIT;

View File

@@ -15,7 +15,7 @@ void getSelectedCells(int32NDArray& selectedCellInfo, const QString &hostName, q
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -36,7 +36,7 @@ void getSelectedCells(int32NDArray& selectedCellInfo, const QString &hostName, q
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }
@@ -69,7 +69,7 @@ void getSelectedCells(int32NDArray& selectedCellInfo, const QString &hostName, q
{ {
for (int i = 0; i < errorMessages.size(); i++) for (int i = 0; i < errorMessages.size(); i++)
{ {
error(errorMessages[i].toLatin1().data()); error("%s",errorMessages[i].toLatin1().data());
} }
OCTAVE_QUIT; OCTAVE_QUIT;

View File

@@ -15,7 +15,7 @@ void getStaticNNCValues(std::vector<double>& propertyValues, const QString &serv
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -37,7 +37,7 @@ void getStaticNNCValues(std::vector<double>& propertyValues, const QString &serv
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }

View File

@@ -22,7 +22,7 @@ void getTimeStepDates( std::vector<qint32>& yearValues,
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -43,7 +43,7 @@ void getTimeStepDates( std::vector<qint32>& yearValues,
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }
@@ -55,7 +55,7 @@ void getTimeStepDates( std::vector<qint32>& yearValues,
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); error("Waiting for data: %s",socket.errorString().toLatin1().data());
return; return;
} }
OCTAVE_QUIT; OCTAVE_QUIT;

View File

@@ -16,7 +16,7 @@ void getTimeStepDates( std::vector<double>& decimalDays,
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -37,7 +37,7 @@ void getTimeStepDates( std::vector<double>& decimalDays,
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }
@@ -49,7 +49,7 @@ void getTimeStepDates( std::vector<double>& decimalDays,
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); error("Waiting for data: %s",socket.errorString().toLatin1().data());
return; return;
} }
OCTAVE_QUIT; OCTAVE_QUIT;

View File

@@ -22,7 +22,7 @@ void getWellCells( std::vector<int>& cellIs,
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -45,7 +45,7 @@ void getWellCells( std::vector<int>& cellIs,
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }
@@ -62,7 +62,7 @@ void getWellCells( std::vector<int>& cellIs,
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); error("Waiting for data: %s",socket.errorString().toLatin1().data());
return; return;
} }
OCTAVE_QUIT; OCTAVE_QUIT;

View File

@@ -15,7 +15,7 @@ void getWellNames(std::vector<QString>& wellNames, const QString &hostName, quin
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -37,7 +37,7 @@ void getWellNames(std::vector<QString>& wellNames, const QString &hostName, quin
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }
@@ -52,7 +52,7 @@ void getWellNames(std::vector<QString>& wellNames, const QString &hostName, quin
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); error("Waiting for data: %s",socket.errorString().toLatin1().data());
return; return;
} }
OCTAVE_QUIT; OCTAVE_QUIT;

View File

@@ -15,7 +15,7 @@ void getWellStatus(std::vector<QString>& wellTypes, std::vector<int>& wellStatus
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }
@@ -45,7 +45,7 @@ void getWellStatus(std::vector<QString>& wellTypes, std::vector<int>& wellStatus
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); error("Waiting for header: %s",socket.errorString().toLatin1().data());
return; return;
} }
} }
@@ -57,7 +57,7 @@ void getWellStatus(std::vector<QString>& wellTypes, std::vector<int>& wellStatus
{ {
if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs))
{ {
error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); error("Waiting for data: %s",socket.errorString().toLatin1().data());
return; return;
} }
OCTAVE_QUIT; OCTAVE_QUIT;

View File

@@ -19,7 +19,7 @@ void setEclipseProperty(const Matrix& propertyFrames, const QString &hostName, q
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }

View File

@@ -19,7 +19,7 @@ void setEclipseProperty(const NDArray& propertyFrames, const QString &hostName,
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }

View File

@@ -19,7 +19,7 @@ void setNNCProperty(const Matrix& propertyFrames, const QString &hostName, quint
if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs))
{ {
error((("Connection: ") + socket.errorString()).toLatin1().data()); error("Connection: %s",socket.errorString().toLatin1().data());
return; return;
} }