comparison base/Clipboard.cpp @ 980:6e6da0636e5e tonioni

Merge from default branch
author Chris Cannam
date Tue, 09 Sep 2014 16:36:21 +0100
parents 048173126e71
children 31f01931b781
comparison
equal deleted inserted replaced
954:35b05cac32d0 980:6e6da0636e5e
17 17
18 Clipboard::Point::Point(long frame, QString label) : 18 Clipboard::Point::Point(long frame, QString label) :
19 m_haveFrame(true), 19 m_haveFrame(true),
20 m_frame(frame), 20 m_frame(frame),
21 m_haveValue(false), 21 m_haveValue(false),
22 m_value(0),
22 m_haveDuration(false), 23 m_haveDuration(false),
24 m_duration(0),
23 m_haveLabel(true), 25 m_haveLabel(true),
24 m_label(label), 26 m_label(label),
25 m_haveLevel(false), 27 m_haveLevel(false),
26 m_level(0.f), 28 m_level(0.f),
27 m_haveReferenceFrame(false), 29 m_haveReferenceFrame(false),
33 m_haveFrame(true), 35 m_haveFrame(true),
34 m_frame(frame), 36 m_frame(frame),
35 m_haveValue(true), 37 m_haveValue(true),
36 m_value(value), 38 m_value(value),
37 m_haveDuration(false), 39 m_haveDuration(false),
40 m_duration(0),
38 m_haveLabel(true), 41 m_haveLabel(true),
39 m_label(label), 42 m_label(label),
40 m_haveLevel(false), 43 m_haveLevel(false),
41 m_level(0.f), 44 m_level(0.f),
42 m_haveReferenceFrame(false), 45 m_haveReferenceFrame(false),