mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-07 03:30:44 +00:00
Fix deprecated-copy when compiling with qt-creator
This commit is contained in:
parent
4d6893f4cc
commit
e89bd462c9
@ -40,6 +40,8 @@ struct Filter {
|
|||||||
param2 = copy.param2;
|
param2 = copy.param2;
|
||||||
param3 = copy.param3;
|
param3 = copy.param3;
|
||||||
}
|
}
|
||||||
|
Filter& operator=(const Filter ©) = default;
|
||||||
|
~Filter() {};
|
||||||
|
|
||||||
FilterType type;
|
FilterType type;
|
||||||
EventDataType param1;
|
EventDataType param1;
|
||||||
|
@ -291,6 +291,7 @@ public:
|
|||||||
friend class QXmlStreamWriter & operator<<(QXmlStreamWriter & xml, const SerialPortInfo & info);
|
friend class QXmlStreamWriter & operator<<(QXmlStreamWriter & xml, const SerialPortInfo & info);
|
||||||
friend class QXmlStreamReader & operator>>(QXmlStreamReader & xml, SerialPortInfo & info);
|
friend class QXmlStreamReader & operator>>(QXmlStreamReader & xml, SerialPortInfo & info);
|
||||||
bool operator==(const SerialPortInfo & other) const;
|
bool operator==(const SerialPortInfo & other) const;
|
||||||
|
SerialPortInfo& operator=(const SerialPortInfo & other) = default;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
SerialPortInfo(const class QSerialPortInfo & other);
|
SerialPortInfo(const class QSerialPortInfo & other);
|
||||||
|
@ -25,6 +25,7 @@ public:
|
|||||||
end = copy.end;
|
end = copy.end;
|
||||||
notes = copy.notes;
|
notes = copy.notes;
|
||||||
}
|
}
|
||||||
|
Bookmark& operator=(const Bookmark & other) = default;
|
||||||
Bookmark(qint64 start, qint64 end, QString notes):
|
Bookmark(qint64 start, qint64 end, QString notes):
|
||||||
start(start), end(end), notes(notes) {}
|
start(start), end(end), notes(notes) {}
|
||||||
|
|
||||||
|
@ -66,6 +66,7 @@ struct CompInfo
|
|||||||
pres_start(ps), pres_size(pl),
|
pres_start(ps), pres_size(pl),
|
||||||
amv_start(ms), amv_size(ml),
|
amv_start(ms), amv_size(ml),
|
||||||
event_start(es), event_recs(er) {}
|
event_start(es), event_recs(er) {}
|
||||||
|
CompInfo& operator=(const CompInfo & other) = default;
|
||||||
Session * session;
|
Session * session;
|
||||||
QDateTime time;
|
QDateTime time;
|
||||||
quint32 flow_start;
|
quint32 flow_start;
|
||||||
|
@ -879,6 +879,8 @@ struct Period {
|
|||||||
end=copy.end;
|
end=copy.end;
|
||||||
header=copy.header;
|
header=copy.header;
|
||||||
}
|
}
|
||||||
|
Period& operator=(const Period&) = default;
|
||||||
|
~Period() {};
|
||||||
QDate start;
|
QDate start;
|
||||||
QDate end;
|
QDate end;
|
||||||
QString header;
|
QString header;
|
||||||
|
@ -44,6 +44,8 @@ struct StatisticsRow {
|
|||||||
calc=copy.calc;
|
calc=copy.calc;
|
||||||
type=copy.type;
|
type=copy.type;
|
||||||
}
|
}
|
||||||
|
StatisticsRow& operator=(const StatisticsRow&) = default;
|
||||||
|
~StatisticsRow() {};
|
||||||
QString src;
|
QString src;
|
||||||
StatCalcType calc;
|
StatCalcType calc;
|
||||||
MachineType type;
|
MachineType type;
|
||||||
|
Loading…
Reference in New Issue
Block a user