rename time => timestamp to avoid naming conflicts

This commit is contained in:
Konstantin Käfer
2014-06-27 15:52:45 +02:00
parent 6de9d9769e
commit 6d9de75732
15 changed files with 79 additions and 79 deletions

View File

@@ -69,7 +69,7 @@ void Raster::bind(bool linear) {
}
void Raster::beginFadeInTransition() {
time start = util::now();
timestamp start = util::now();
fade_transition = std::make_shared<util::ease_transition<double>>(opacity, 1.0, opacity, start, 250_milliseconds);
}
@@ -77,7 +77,7 @@ bool Raster::needsTransition() const {
return fade_transition != nullptr;
}
void Raster::updateTransitions(time now) {
void Raster::updateTransitions(timestamp now) {
if (fade_transition->update(now) == util::transition::complete) {
fade_transition = nullptr;
}