Skip to content
Snippets Groups Projects
Commit d2336e0b authored by Mikhail Svechnikov's avatar Mikhail Svechnikov Committed by Mikhail Svechnikov
Browse files

RealItem: readFrom() accepts instrument

parent 73279ea2
No related branches found
No related tags found
1 merge request!1360GUI: serialize only selected index for "ComboProperty"
Hide whitespace changes
Inline Side-by-side
GUI/Model/Data/RealItem.cpp
+ 1
− 1
View file @ d2336e0b
......@@ -414,7 +414,7 @@ void RealItem::writeTo(QXmlStreamWriter* w, const QString& projectDir) const
}
QString RealItem::readFrom(QXmlStreamReader* r, const QString& projectDir,
MessageService* messageService)
MessageService* messageService, InstrumentItem* jobInstrument)
{
const uint version = XML::readUIntAttribute(r, XML::Attrib::version);
Q_UNUSED(version)
......
GUI/Model/Data/RealItem.h
+ 1
− 1
View file @ d2336e0b
......@@ -109,7 +109,7 @@ public:
void writeTo(QXmlStreamWriter* w, const QString& projectDir = "") const;
QString readFrom(QXmlStreamReader* r, const QString& projectDir = "",
MessageService* messageService = nullptr);
MessageService* messageService = nullptr, InstrumentItem *jobInstrument = nullptr);
// other
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment