Mercurial > hg > svcore
comparison base/Clipboard.cpp @ 928:6a94bb528e9d warnfix_no_size_t
Remove size_t's, fix compiler warnings
author | Chris Cannam |
---|---|
date | Tue, 17 Jun 2014 13:52:07 +0100 |
parents | afeb580b1b57 |
children | 5cadfcec89bc |
comparison
equal
deleted
inserted
replaced
917:49618f39ff09 | 928:6a94bb528e9d |
---|---|
42 m_haveReferenceFrame(false), | 42 m_haveReferenceFrame(false), |
43 m_referenceFrame(frame) | 43 m_referenceFrame(frame) |
44 { | 44 { |
45 } | 45 } |
46 | 46 |
47 Clipboard::Point::Point(long frame, float value, size_t duration, QString label) : | 47 Clipboard::Point::Point(long frame, float value, int duration, QString label) : |
48 m_haveFrame(true), | 48 m_haveFrame(true), |
49 m_frame(frame), | 49 m_frame(frame), |
50 m_haveValue(true), | 50 m_haveValue(true), |
51 m_value(value), | 51 m_value(value), |
52 m_haveDuration(true), | 52 m_haveDuration(true), |
58 m_haveReferenceFrame(false), | 58 m_haveReferenceFrame(false), |
59 m_referenceFrame(frame) | 59 m_referenceFrame(frame) |
60 { | 60 { |
61 } | 61 } |
62 | 62 |
63 Clipboard::Point::Point(long frame, float value, size_t duration, float level, QString label) : | 63 Clipboard::Point::Point(long frame, float value, int duration, float level, QString label) : |
64 m_haveFrame(true), | 64 m_haveFrame(true), |
65 m_frame(frame), | 65 m_frame(frame), |
66 m_haveValue(true), | 66 m_haveValue(true), |
67 m_value(value), | 67 m_value(value), |
68 m_haveDuration(true), | 68 m_haveDuration(true), |
157 Clipboard::Point::haveDuration() const | 157 Clipboard::Point::haveDuration() const |
158 { | 158 { |
159 return m_haveDuration; | 159 return m_haveDuration; |
160 } | 160 } |
161 | 161 |
162 size_t | 162 int |
163 Clipboard::Point::getDuration() const | 163 Clipboard::Point::getDuration() const |
164 { | 164 { |
165 return m_duration; | 165 return m_duration; |
166 } | 166 } |
167 | 167 |
168 Clipboard::Point | 168 Clipboard::Point |
169 Clipboard::Point::withDuration(size_t duration) const | 169 Clipboard::Point::withDuration(int duration) const |
170 { | 170 { |
171 Point p(*this); | 171 Point p(*this); |
172 p.m_haveDuration = true; | 172 p.m_haveDuration = true; |
173 p.m_duration = duration; | 173 p.m_duration = duration; |
174 return p; | 174 return p; |