"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/backend/core/Folder.cpp" between
labplot-2.8.1.tar.gz and labplot-2.8.2.tar.gz

About: LabPlot is an application for plotting and analysis of 2D and 3D functions and data. It is a complete rewrite of LabPlot1 and lacks in the first release a lot of features available in the predecessor. On the other hand, the GUI and the usability is more superior.

Folder.cpp  (labplot-2.8.1):Folder.cpp  (labplot-2.8.2)
skipping to change at line 261 skipping to change at line 261
addChildFast(matrix); addChildFast(matrix);
} else if (element_name == QLatin1String("worksheet")) { } else if (element_name == QLatin1String("worksheet")) {
Worksheet* worksheet = new Worksheet(QString()); Worksheet* worksheet = new Worksheet(QString());
worksheet->setIsLoading(true); worksheet->setIsLoading(true);
if (!worksheet->load(reader, preview)) { if (!worksheet->load(reader, preview)) {
delete worksheet; delete worksheet;
return false; return false;
} }
addChildFast(worksheet); addChildFast(worksheet);
worksheet->setIsLoading(false); worksheet->setIsLoading(false);
#ifdef HAVE_CANTOR_LIBS
} else if (element_name == QLatin1String("cantorWorksheet")) { } else if (element_name == QLatin1String("cantorWorksheet")) {
#ifdef HAVE_CANTOR_LIBS
CantorWorksheet* cantorWorksheet = new CantorWorksheet(QLatin1Str ing("null"), true); CantorWorksheet* cantorWorksheet = new CantorWorksheet(QLatin1Str ing("null"), true);
if (!cantorWorksheet->load(reader, preview)) { if (!cantorWorksheet->load(reader, preview)) {
delete cantorWorksheet; delete cantorWorksheet;
return false;
//if we only failed to load because of the missing CAS, d
on't return with false here.
//in this case we continue loading the project and show a
warning about missing CAS at the end.
if (!reader->failedCASMissing())
return false;
else {
//failed because of the missing CAS. Read until t
he end of the current
//element in XML and continue loading the project
.
while (!reader->atEnd()) {
reader->readNext();
if (reader->isEndElement() && reader->nam
e() == QLatin1String("cantorWorksheet"))
break;
}
}
} else
addChildFast(cantorWorksheet);
#else
if (!preview) {
while (!reader->atEnd()) {
reader->readNext();
if (reader->isEndElement() && reader->name() == QLatin1St
ring("cantorWorksheet"))
break;
if (!reader->isStartElement())
continue;
if (reader->name() == QLatin1String("general")) {
const QString& backendName = reader->attributes()
.value("backend_name").toString().trimmed();
if (!backendName.isEmpty())
reader->raiseMissingCASWarning(backendNam
e);
} else
reader->skipToEndElement();
} }
addChildFast(cantorWorksheet); }
#endif #endif
#ifdef HAVE_MQTT #ifdef HAVE_MQTT
} else if (element_name == QLatin1String("MQTTClient")) { } else if (element_name == QLatin1String("MQTTClient")) {
MQTTClient* client = new MQTTClient(QString()); MQTTClient* client = new MQTTClient(QString());
if (!client->load(reader, preview)) { if (!client->load(reader, preview)) {
delete client; delete client;
return false; return false;
} }
addChildFast(client); addChildFast(client);
#endif #endif
 End of changes. 4 change blocks. 
3 lines changed or deleted 42 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)