diff --git a/OctavePlugin/riGetActiveCellCenters.cpp b/OctavePlugin/riGetActiveCellCenters.cpp index b97016d54c..300cf68d5a 100644 --- a/OctavePlugin/riGetActiveCellCenters.cpp +++ b/OctavePlugin/riGetActiveCellCenters.cpp @@ -17,7 +17,7 @@ void getActiveCellCenters(NDArray& cellCenterValues, const QString &hostName, qu if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -38,7 +38,7 @@ void getActiveCellCenters(NDArray& cellCenterValues, const QString &hostName, qu { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } @@ -71,7 +71,7 @@ void getActiveCellCenters(NDArray& cellCenterValues, const QString &hostName, qu { for (int i = 0; i < errorMessages.size(); i++) { - error(errorMessages[i].toLatin1().data()); + error("%s",errorMessages[i].toLatin1().data()); } OCTAVE_QUIT; diff --git a/OctavePlugin/riGetActiveCellCorners.cpp b/OctavePlugin/riGetActiveCellCorners.cpp index 9dac8d02a6..1c7ba597da 100644 --- a/OctavePlugin/riGetActiveCellCorners.cpp +++ b/OctavePlugin/riGetActiveCellCorners.cpp @@ -17,7 +17,7 @@ void getActiveCellCorners(NDArray& cellCornerValues, const QString &hostName, qu if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -38,7 +38,7 @@ void getActiveCellCorners(NDArray& cellCornerValues, const QString &hostName, qu { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } @@ -70,7 +70,7 @@ void getActiveCellCorners(NDArray& cellCornerValues, const QString &hostName, qu { for (int i = 0; i < errorMessages.size(); i++) { - error(errorMessages[i].toLatin1().data()); + error("%s",errorMessages[i].toLatin1().data()); } OCTAVE_QUIT; diff --git a/OctavePlugin/riGetActiveCellInfo.cpp b/OctavePlugin/riGetActiveCellInfo.cpp index bd703906be..8b389d0704 100644 --- a/OctavePlugin/riGetActiveCellInfo.cpp +++ b/OctavePlugin/riGetActiveCellInfo.cpp @@ -15,7 +15,7 @@ void getActiveCellInfo(int32NDArray& activeCellInfo, const QString &hostName, qu if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -36,7 +36,7 @@ void getActiveCellInfo(int32NDArray& activeCellInfo, const QString &hostName, qu { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } @@ -69,7 +69,7 @@ void getActiveCellInfo(int32NDArray& activeCellInfo, const QString &hostName, qu { for (int i = 0; i < errorMessages.size(); i++) { - error(errorMessages[i].toLatin1().data()); + error("%s",errorMessages[i].toLatin1().data()); } OCTAVE_QUIT; diff --git a/OctavePlugin/riGetActiveCellProperty.cpp b/OctavePlugin/riGetActiveCellProperty.cpp index b9861ad590..088ab3890f 100644 --- a/OctavePlugin/riGetActiveCellProperty.cpp +++ b/OctavePlugin/riGetActiveCellProperty.cpp @@ -15,7 +15,7 @@ void getActiveCellProperty(Matrix& propertyFrames, const QString &serverName, qu if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -45,7 +45,7 @@ void getActiveCellProperty(Matrix& propertyFrames, const QString &serverName, qu { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } @@ -76,7 +76,7 @@ void getActiveCellProperty(Matrix& propertyFrames, const QString &serverName, qu { for (int i = 0; i < errorMessages.size(); i++) { - error(errorMessages[i].toLatin1().data()); + error("%s",errorMessages[i].toLatin1().data()); } return; diff --git a/OctavePlugin/riGetCaseGroups.cpp b/OctavePlugin/riGetCaseGroups.cpp index 58ec3bd3e8..c78cb9c9b1 100644 --- a/OctavePlugin/riGetCaseGroups.cpp +++ b/OctavePlugin/riGetCaseGroups.cpp @@ -14,7 +14,7 @@ void getCaseGroups(std::vector& groupNames, std::vector& groupIds, if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -33,7 +33,7 @@ void getCaseGroups(std::vector& groupNames, std::vector& groupIds, { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); + error("Waiting for data: %s",socket.errorString().toLatin1().data()); return; } OCTAVE_QUIT; @@ -51,7 +51,7 @@ void getCaseGroups(std::vector& groupNames, std::vector& groupIds, { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); + error("Waiting for data: %s",socket.errorString().toLatin1().data()); return; } OCTAVE_QUIT; diff --git a/OctavePlugin/riGetCases.cpp b/OctavePlugin/riGetCases.cpp index 9d68816376..a3500e0287 100644 --- a/OctavePlugin/riGetCases.cpp +++ b/OctavePlugin/riGetCases.cpp @@ -14,7 +14,7 @@ void getCases(std::vector& caseIds, std::vector& caseNames, std if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -35,7 +35,7 @@ void getCases(std::vector& caseIds, std::vector& caseNames, std { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } @@ -47,7 +47,7 @@ void getCases(std::vector& caseIds, std::vector& caseNames, std { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); + error("Waiting for data: %s",socket.errorString().toLatin1().data()); return; } OCTAVE_QUIT; diff --git a/OctavePlugin/riGetCellCenters.cpp b/OctavePlugin/riGetCellCenters.cpp index a8255b6fb5..c4807c5b7b 100644 --- a/OctavePlugin/riGetCellCenters.cpp +++ b/OctavePlugin/riGetCellCenters.cpp @@ -17,7 +17,7 @@ void getCellCenters(NDArray& cellCenterValues, const QString &hostName, quint16 if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -38,7 +38,7 @@ void getCellCenters(NDArray& cellCenterValues, const QString &hostName, quint16 { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } @@ -75,7 +75,7 @@ void getCellCenters(NDArray& cellCenterValues, const QString &hostName, quint16 { for (int i = 0; i < errorMessages.size(); i++) { - error(errorMessages[i].toLatin1().data()); + error("%s",errorMessages[i].toLatin1().data()); } OCTAVE_QUIT; diff --git a/OctavePlugin/riGetCellCorners.cpp b/OctavePlugin/riGetCellCorners.cpp index 2ed5d264b9..782a18a468 100644 --- a/OctavePlugin/riGetCellCorners.cpp +++ b/OctavePlugin/riGetCellCorners.cpp @@ -19,7 +19,7 @@ void getCellCorners(NDArray& cellCornerValues, const QString &hostName, quint16 if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -40,7 +40,7 @@ void getCellCorners(NDArray& cellCornerValues, const QString &hostName, quint16 { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } @@ -78,7 +78,7 @@ void getCellCorners(NDArray& cellCornerValues, const QString &hostName, quint16 { for (int i = 0; i < errorMessages.size(); i++) { - error(errorMessages[i].toLatin1().data()); + error("%s",errorMessages[i].toLatin1().data()); } OCTAVE_QUIT; diff --git a/OctavePlugin/riGetCoarseningInfo.cpp b/OctavePlugin/riGetCoarseningInfo.cpp index 0993047f9e..ed415ff420 100644 --- a/OctavePlugin/riGetCoarseningInfo.cpp +++ b/OctavePlugin/riGetCoarseningInfo.cpp @@ -14,7 +14,7 @@ void getCoarseningInfo(int32NDArray& coarseningInfo, const QString &hostName, qu if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -35,7 +35,7 @@ void getCoarseningInfo(int32NDArray& coarseningInfo, const QString &hostName, qu { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } diff --git a/OctavePlugin/riGetCurrentCase.cpp b/OctavePlugin/riGetCurrentCase.cpp index 90bd23aac1..d5bfd2590e 100644 --- a/OctavePlugin/riGetCurrentCase.cpp +++ b/OctavePlugin/riGetCurrentCase.cpp @@ -14,7 +14,7 @@ void getCurrentCase(qint64& caseId, QString& caseName, QString& caseType, qint64 if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -35,7 +35,7 @@ void getCurrentCase(qint64& caseId, QString& caseName, QString& caseType, qint64 { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } @@ -47,7 +47,7 @@ void getCurrentCase(qint64& caseId, QString& caseName, QString& caseType, qint64 { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); + error("Waiting for data: %s",socket.errorString().toLatin1().data()); return; } OCTAVE_QUIT; diff --git a/OctavePlugin/riGetDynamicNNCValues.cpp b/OctavePlugin/riGetDynamicNNCValues.cpp index 3d30f00a26..ce8473e44e 100644 --- a/OctavePlugin/riGetDynamicNNCValues.cpp +++ b/OctavePlugin/riGetDynamicNNCValues.cpp @@ -15,7 +15,7 @@ void getDynamicNNCValues(Matrix& propertyFrames, const QString &serverName, quin if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -44,7 +44,7 @@ void getDynamicNNCValues(Matrix& propertyFrames, const QString &serverName, quin { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } @@ -72,7 +72,7 @@ void getDynamicNNCValues(Matrix& propertyFrames, const QString &serverName, quin { for (int i = 0; i < errorMessages.size(); i++) { - error(errorMessages[i].toLatin1().data()); + error("%s",errorMessages[i].toLatin1().data()); } return; diff --git a/OctavePlugin/riGetGridDimensions.cpp b/OctavePlugin/riGetGridDimensions.cpp index 17b4ecf2f6..7478b859e8 100644 --- a/OctavePlugin/riGetGridDimensions.cpp +++ b/OctavePlugin/riGetGridDimensions.cpp @@ -14,7 +14,7 @@ void getGridDimensions(int32NDArray& gridDimensions, const QString &hostName, qu if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -35,7 +35,7 @@ void getGridDimensions(int32NDArray& gridDimensions, const QString &hostName, qu { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } diff --git a/OctavePlugin/riGetGridProperty.cpp b/OctavePlugin/riGetGridProperty.cpp index 61c39fd1b4..1507317445 100644 --- a/OctavePlugin/riGetGridProperty.cpp +++ b/OctavePlugin/riGetGridProperty.cpp @@ -15,7 +15,7 @@ void getGridProperty(NDArray& propertyFrames, const QString &serverName, quint16 if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -45,7 +45,7 @@ void getGridProperty(NDArray& propertyFrames, const QString &serverName, quint16 { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } @@ -87,7 +87,7 @@ void getGridProperty(NDArray& propertyFrames, const QString &serverName, quint16 { for (int i = 0; i < errorMessages.size(); i++) { - error(errorMessages[i].toLatin1().data()); + error("%s",errorMessages[i].toLatin1().data()); } return; diff --git a/OctavePlugin/riGetGridPropertyForSelectedCells.cpp b/OctavePlugin/riGetGridPropertyForSelectedCells.cpp index e32adbdc03..8cd71a5774 100644 --- a/OctavePlugin/riGetGridPropertyForSelectedCells.cpp +++ b/OctavePlugin/riGetGridPropertyForSelectedCells.cpp @@ -15,7 +15,7 @@ void getGridPropertyForSelectedCells(Matrix& propertyFrames, const QString &serv if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -45,7 +45,7 @@ void getGridPropertyForSelectedCells(Matrix& propertyFrames, const QString &serv { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } @@ -76,7 +76,7 @@ void getGridPropertyForSelectedCells(Matrix& propertyFrames, const QString &serv { for (int i = 0; i < errorMessages.size(); i++) { - error(errorMessages[i].toLatin1().data()); + error("%s",errorMessages[i].toLatin1().data()); } return; diff --git a/OctavePlugin/riGetMainGridDimensions.cpp b/OctavePlugin/riGetMainGridDimensions.cpp index 329b57a5f3..af009cfd91 100644 --- a/OctavePlugin/riGetMainGridDimensions.cpp +++ b/OctavePlugin/riGetMainGridDimensions.cpp @@ -13,7 +13,7 @@ void getMainGridDimensions(int32NDArray& gridDimensions, const QString &hostName if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -35,7 +35,7 @@ void getMainGridDimensions(int32NDArray& gridDimensions, const QString &hostName { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } diff --git a/OctavePlugin/riGetNNCConnections.cpp b/OctavePlugin/riGetNNCConnections.cpp index 181928ecca..6595047863 100644 --- a/OctavePlugin/riGetNNCConnections.cpp +++ b/OctavePlugin/riGetNNCConnections.cpp @@ -29,7 +29,7 @@ void getNNCConnections(std::vector& connections, const QString& host if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -46,7 +46,7 @@ void getNNCConnections(std::vector& connections, const QString& host { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } OCTAVE_QUIT; @@ -64,7 +64,7 @@ void getNNCConnections(std::vector& connections, const QString& host { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); + error("Waiting for data: %s",socket.errorString().toLatin1().data()); return; } OCTAVE_QUIT; @@ -155,4 +155,4 @@ DEFUN_DLD(riGetNNCConnections, args, nargout, } return octave_value(); -} \ No newline at end of file +} diff --git a/OctavePlugin/riGetNNCPropertyNames.cpp b/OctavePlugin/riGetNNCPropertyNames.cpp index 5223f8d49c..ba9140d0b9 100644 --- a/OctavePlugin/riGetNNCPropertyNames.cpp +++ b/OctavePlugin/riGetNNCPropertyNames.cpp @@ -15,7 +15,7 @@ void getNNCPropertyNames(std::vector& propNames, std::vector& if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -37,7 +37,7 @@ void getNNCPropertyNames(std::vector& propNames, std::vector& { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } @@ -52,7 +52,7 @@ void getNNCPropertyNames(std::vector& propNames, std::vector& { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); + error("Waiting for data: %s",socket.errorString().toLatin1().data()); return; } OCTAVE_QUIT; diff --git a/OctavePlugin/riGetPropertyNames.cpp b/OctavePlugin/riGetPropertyNames.cpp index b62add2179..b870448d81 100644 --- a/OctavePlugin/riGetPropertyNames.cpp +++ b/OctavePlugin/riGetPropertyNames.cpp @@ -15,7 +15,7 @@ void getPropertyNames(std::vector& propNames, std::vector& pro if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -37,7 +37,7 @@ void getPropertyNames(std::vector& propNames, std::vector& pro { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } @@ -52,7 +52,7 @@ void getPropertyNames(std::vector& propNames, std::vector& pro { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); + error("Waiting for data: %s",socket.errorString().toLatin1().data()); return; } OCTAVE_QUIT; diff --git a/OctavePlugin/riGetSelectedCases.cpp b/OctavePlugin/riGetSelectedCases.cpp index 4ea1227884..7d65e50ed1 100644 --- a/OctavePlugin/riGetSelectedCases.cpp +++ b/OctavePlugin/riGetSelectedCases.cpp @@ -14,7 +14,7 @@ void getSelectedCases(std::vector& caseIds, std::vector& caseNa if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -35,7 +35,7 @@ void getSelectedCases(std::vector& caseIds, std::vector& caseNa { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } @@ -47,7 +47,7 @@ void getSelectedCases(std::vector& caseIds, std::vector& caseNa { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); + error("Waiting for data: %s",socket.errorString().toLatin1().data()); return; } OCTAVE_QUIT; diff --git a/OctavePlugin/riGetSelectedCells.cpp b/OctavePlugin/riGetSelectedCells.cpp index e1cd77e247..6c5783f3fa 100644 --- a/OctavePlugin/riGetSelectedCells.cpp +++ b/OctavePlugin/riGetSelectedCells.cpp @@ -15,7 +15,7 @@ void getSelectedCells(int32NDArray& selectedCellInfo, const QString &hostName, q if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -36,7 +36,7 @@ void getSelectedCells(int32NDArray& selectedCellInfo, const QString &hostName, q { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } @@ -69,7 +69,7 @@ void getSelectedCells(int32NDArray& selectedCellInfo, const QString &hostName, q { for (int i = 0; i < errorMessages.size(); i++) { - error(errorMessages[i].toLatin1().data()); + error("%s",errorMessages[i].toLatin1().data()); } OCTAVE_QUIT; diff --git a/OctavePlugin/riGetStaticNNCValues.cpp b/OctavePlugin/riGetStaticNNCValues.cpp index 82fcc1f540..0610f6a4de 100644 --- a/OctavePlugin/riGetStaticNNCValues.cpp +++ b/OctavePlugin/riGetStaticNNCValues.cpp @@ -15,7 +15,7 @@ void getStaticNNCValues(std::vector& propertyValues, const QString &serv if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -37,7 +37,7 @@ void getStaticNNCValues(std::vector& propertyValues, const QString &serv { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } diff --git a/OctavePlugin/riGetTimeStepDates.cpp b/OctavePlugin/riGetTimeStepDates.cpp index 494e41cf02..9be5748448 100644 --- a/OctavePlugin/riGetTimeStepDates.cpp +++ b/OctavePlugin/riGetTimeStepDates.cpp @@ -22,7 +22,7 @@ void getTimeStepDates( std::vector& yearValues, if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -43,7 +43,7 @@ void getTimeStepDates( std::vector& yearValues, { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } @@ -55,7 +55,7 @@ void getTimeStepDates( std::vector& yearValues, { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); + error("Waiting for data: %s",socket.errorString().toLatin1().data()); return; } OCTAVE_QUIT; diff --git a/OctavePlugin/riGetTimeStepDays.cpp b/OctavePlugin/riGetTimeStepDays.cpp index 3edf12f183..62f5cf13f3 100644 --- a/OctavePlugin/riGetTimeStepDays.cpp +++ b/OctavePlugin/riGetTimeStepDays.cpp @@ -16,7 +16,7 @@ void getTimeStepDates( std::vector& decimalDays, if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -37,7 +37,7 @@ void getTimeStepDates( std::vector& decimalDays, { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } @@ -49,7 +49,7 @@ void getTimeStepDates( std::vector& decimalDays, { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); + error("Waiting for data: %s",socket.errorString().toLatin1().data()); return; } OCTAVE_QUIT; diff --git a/OctavePlugin/riGetWellCells.cpp b/OctavePlugin/riGetWellCells.cpp index a4acbe52e7..b967636ba0 100644 --- a/OctavePlugin/riGetWellCells.cpp +++ b/OctavePlugin/riGetWellCells.cpp @@ -22,7 +22,7 @@ void getWellCells( std::vector& cellIs, if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -45,7 +45,7 @@ void getWellCells( std::vector& cellIs, { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } @@ -62,7 +62,7 @@ void getWellCells( std::vector& cellIs, { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); + error("Waiting for data: %s",socket.errorString().toLatin1().data()); return; } OCTAVE_QUIT; diff --git a/OctavePlugin/riGetWellNames.cpp b/OctavePlugin/riGetWellNames.cpp index aa73a0f274..4bbd17733b 100644 --- a/OctavePlugin/riGetWellNames.cpp +++ b/OctavePlugin/riGetWellNames.cpp @@ -15,7 +15,7 @@ void getWellNames(std::vector& wellNames, const QString &hostName, quin if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -37,7 +37,7 @@ void getWellNames(std::vector& wellNames, const QString &hostName, quin { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } @@ -52,7 +52,7 @@ void getWellNames(std::vector& wellNames, const QString &hostName, quin { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); + error("Waiting for data: %s",socket.errorString().toLatin1().data()); return; } OCTAVE_QUIT; diff --git a/OctavePlugin/riGetWellStatus.cpp b/OctavePlugin/riGetWellStatus.cpp index 7093d97487..318e9b9d80 100644 --- a/OctavePlugin/riGetWellStatus.cpp +++ b/OctavePlugin/riGetWellStatus.cpp @@ -15,7 +15,7 @@ void getWellStatus(std::vector& wellTypes, std::vector& wellStatus if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } @@ -45,7 +45,7 @@ void getWellStatus(std::vector& wellTypes, std::vector& wellStatus { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for header: ") + socket.errorString()).toLatin1().data()); + error("Waiting for header: %s",socket.errorString().toLatin1().data()); return; } } @@ -57,7 +57,7 @@ void getWellStatus(std::vector& wellTypes, std::vector& wellStatus { if (!socket.waitForReadyRead(riOctavePlugin::longTimeOutMilliSecs)) { - error((("Waiting for data: ") + socket.errorString()).toLatin1().data()); + error("Waiting for data: %s",socket.errorString().toLatin1().data()); return; } OCTAVE_QUIT; diff --git a/OctavePlugin/riSetActiveCellProperty.cpp b/OctavePlugin/riSetActiveCellProperty.cpp index 7546e216d3..370af8e39f 100644 --- a/OctavePlugin/riSetActiveCellProperty.cpp +++ b/OctavePlugin/riSetActiveCellProperty.cpp @@ -19,7 +19,7 @@ void setEclipseProperty(const Matrix& propertyFrames, const QString &hostName, q if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } diff --git a/OctavePlugin/riSetGridProperty.cpp b/OctavePlugin/riSetGridProperty.cpp index 6b8a259ec7..199f68bcf6 100644 --- a/OctavePlugin/riSetGridProperty.cpp +++ b/OctavePlugin/riSetGridProperty.cpp @@ -19,7 +19,7 @@ void setEclipseProperty(const NDArray& propertyFrames, const QString &hostName, if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; } diff --git a/OctavePlugin/riSetNNCProperty.cpp b/OctavePlugin/riSetNNCProperty.cpp index f5f38cf929..0660ba75cc 100644 --- a/OctavePlugin/riSetNNCProperty.cpp +++ b/OctavePlugin/riSetNNCProperty.cpp @@ -19,7 +19,7 @@ void setNNCProperty(const Matrix& propertyFrames, const QString &hostName, quint if (!socket.waitForConnected(riOctavePlugin::connectTimeOutMilliSecs)) { - error((("Connection: ") + socket.errorString()).toLatin1().data()); + error("Connection: %s",socket.errorString().toLatin1().data()); return; }