oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates for C++17

Browse Source
This commit is contained in:
itsmattkc
2022-05-11 10:50:47 -07:00
parent 490bad990a
commit 7c12b6dc16
10 changed files with 67 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/keyframe.h
-8
View File
@@ -87,14 +87,6 @@ public:
const rational& time() const;
void set_time(const rational& time);
/**
* @brief Dummy function for TimeBasedViewSelectionManager compatibility
*
* FIXME: Once we upgrade to C++17, we won't need this because we'll be able to check types in
* TimeBasedViewSelectionManager's template functions
*/
TimeRange time_range() const { return TimeRange(time_, time_); }
/**
* @brief The value of this keyframe (i.e. the value to use at this keyframe's time)
*/
app/node/project/serializer/serializer220403.cpp
+2 -2
View File
@@ -1175,8 +1175,8 @@ void ProjectSerializer220403::LoadMarker(QXmlStreamReader *reader, TimelineMarke
void ProjectSerializer220403::SaveMarker(QXmlStreamWriter *writer, TimelineMarker *marker) const
{
writer->writeAttribute(QStringLiteral("name"), marker->name());
writer->writeAttribute(QStringLiteral("in"), marker->time_range().in().toString());
writer->writeAttribute(QStringLiteral("out"), marker->time_range().out().toString());
writer->writeAttribute(QStringLiteral("in"), marker->time().in().toString());
writer->writeAttribute(QStringLiteral("out"), marker->time().out().toString());
writer->writeAttribute(QStringLiteral("color"), QString::number(marker->color()));
}