Skip to content

Commit

Permalink
ticket:4291 Don't use string buffer for xml data.
Browse files Browse the repository at this point in the history
  • Loading branch information
adeas31 committed Mar 8, 2017
1 parent 69763e4 commit 34c440b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
7 changes: 2 additions & 5 deletions OMEdit/OMEditGUI/Simulation/SimulationOutputHandler.cpp
Expand Up @@ -299,7 +299,6 @@ SimulationOutputHandler::SimulationOutputHandler(SimulationOutputWidget *pSimula
mXmlSimpleReader.setErrorHandler(this);
mpXmlInputSource = new QXmlInputSource;
mpXmlInputSource->setData(simulationOutput.prepend("<root>"));
mOutputBuffer = mpXmlInputSource->data();
mXmlSimpleReader.parse(mpXmlInputSource, true);
}

Expand All @@ -314,7 +313,6 @@ SimulationOutputHandler::~SimulationOutputHandler()
void SimulationOutputHandler::parseSimulationOutput(QString output)
{
mpXmlInputSource->setData(output);
mOutputBuffer.append(mpXmlInputSource->data());
mXmlSimpleReader.parseContinue();
}

Expand Down Expand Up @@ -383,11 +381,10 @@ bool SimulationOutputHandler::endElement(const QString &namespaceURI, const QStr
bool SimulationOutputHandler::fatalError(const QXmlParseException &exception)
{
// read the error message
QString error = QString("Fatal error on line %1, column %2: %3\nXML ::\n%4")
QString error = QString("Fatal error on line %1, column %2: %3")
.arg(exception.lineNumber())
.arg(exception.columnNumber())
.arg(exception.message())
.arg(mOutputBuffer);
.arg(exception.message());
// construct the SimulationMessage object with error
SimulationMessage *pSimulationMessage;
if (mpSimulationOutputWidget->isOutputStructured()) {
Expand Down
1 change: 0 additions & 1 deletion OMEdit/OMEditGUI/Simulation/SimulationOutputHandler.h
Expand Up @@ -100,7 +100,6 @@ class SimulationOutputHandler : private QXmlDefaultHandler
int mLevel;
SimulationMessage* mpSimulationMessage;
QMap<int, SimulationMessage*> mSimulationMessagesLevelMap;
QString mOutputBuffer;
SimulationMessageModel *mpSimulationMessageModel;
QXmlSimpleReader mXmlSimpleReader;
QXmlInputSource *mpXmlInputSource;
Expand Down

0 comments on commit 34c440b

Please sign in to comment.