From 6eed77d4160765cbd89cfcca75edb810fdc822fc Mon Sep 17 00:00:00 2001
From: ExMix <rahuba.youri@mapswithme.com>
Date: Thu, 14 May 2015 14:50:47 +0300
Subject: [PATCH] [drape] compile fix

---
 ...ation.hpp => base_modelview_animation.hpp} |  0
 drape_frontend/animation/interpolations.hpp   | 22 ++++++++++---------
 .../animation/modelview_angle_animation.cpp   |  2 +-
 .../animation/modelview_angle_animation.hpp   |  4 ++--
 .../animation/modelview_center_animation.hpp  |  2 +-
 drape_frontend/drape_frontend.pro             |  6 ++---
 drape_frontend/user_event_stream.hpp          |  4 ++--
 7 files changed, 21 insertions(+), 19 deletions(-)
 rename drape_frontend/animation/{base_viewport_animation.hpp => base_modelview_animation.hpp} (100%)

diff --git a/drape_frontend/animation/base_viewport_animation.hpp b/drape_frontend/animation/base_modelview_animation.hpp
similarity index 100%
rename from drape_frontend/animation/base_viewport_animation.hpp
rename to drape_frontend/animation/base_modelview_animation.hpp
diff --git a/drape_frontend/animation/interpolations.hpp b/drape_frontend/animation/interpolations.hpp
index a3c0084692..729fd21d00 100644
--- a/drape_frontend/animation/interpolations.hpp
+++ b/drape_frontend/animation/interpolations.hpp
@@ -4,16 +4,18 @@
 
 namespace df
 {
-  m2::PointD InterpolatePoint(m2::PointD const & startPt, m2::PointD const & endPt, double t);
 
-  class InerpolateAngle
-  {
-  public:
-    InerpolateAngle(double startAngle, double endAngle);
-    double Interpolate(double t);
+m2::PointD InterpolatePoint(m2::PointD const & startPt, m2::PointD const & endPt, double t);
+
+class InerpolateAngle
+{
+public:
+  InerpolateAngle(double startAngle, double endAngle);
+  double Interpolate(double t);
+
+private:
+  double m_startAngle;
+  double m_delta;
+};
 
-  private:
-    double m_startAngle;
-    double m_delta;
-  };
 } // namespace df
diff --git a/drape_frontend/animation/modelview_angle_animation.cpp b/drape_frontend/animation/modelview_angle_animation.cpp
index fd5c41f557..6f0538947f 100644
--- a/drape_frontend/animation/modelview_angle_animation.cpp
+++ b/drape_frontend/animation/modelview_angle_animation.cpp
@@ -4,7 +4,7 @@ namespace df
 {
 
 ModelViewAngleAnimation::ModelViewAngleAnimation(double startAngle, double endAngle, double duration)
-  : BaseViewportAnimation(duration)
+  : BaseModeViewAnimation(duration)
   , m_angle(startAngle, endAngle)
 {
 }
diff --git a/drape_frontend/animation/modelview_angle_animation.hpp b/drape_frontend/animation/modelview_angle_animation.hpp
index cb6a8ae0a1..0abf1076a3 100644
--- a/drape_frontend/animation/modelview_angle_animation.hpp
+++ b/drape_frontend/animation/modelview_angle_animation.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "drape_frontend/animation/base_viewport_animation.hpp"
+#include "drape_frontend/animation/base_modelview_animation.hpp"
 #include "drape_frontend/animation/interpolations.hpp"
 
 namespace df
 {
 
-class ModelViewAngleAnimation : public BaseViewportAnimation
+class ModelViewAngleAnimation : public BaseModeViewAnimation
 {
 public:
   ModelViewAngleAnimation(double startAngle, double endAngle, double duration);
diff --git a/drape_frontend/animation/modelview_center_animation.hpp b/drape_frontend/animation/modelview_center_animation.hpp
index 9321636cb8..1e4e4747b1 100644
--- a/drape_frontend/animation/modelview_center_animation.hpp
+++ b/drape_frontend/animation/modelview_center_animation.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "drape_frontend/animation/base_viewport_animation.hpp"
+#include "drape_frontend/animation/base_modelview_animation.hpp"
 
 namespace df
 {
diff --git a/drape_frontend/drape_frontend.pro b/drape_frontend/drape_frontend.pro
index f736d50236..803cc36bf5 100755
--- a/drape_frontend/drape_frontend.pro
+++ b/drape_frontend/drape_frontend.pro
@@ -10,6 +10,7 @@ DEFINES += DRAW_INFO
 
 SOURCES += \
     animation/base_interpolator.cpp \
+    animation/modelview_angle_animation.cpp \
     animation/modelview_center_animation.cpp \
     animation/interpolation_holder.cpp \
     animation/interpolations.cpp \
@@ -50,10 +51,10 @@ SOURCES += \
     visual_params.cpp \
     my_position.cpp \
     user_event_stream.cpp \
-    animation/modelview_angle_animation.cpp
 
 HEADERS += \
-    animation/base_viewport_animation.hpp \
+    animation/base_modelview_animation.hpp \
+    animation/modelview_angle_animation.hpp \
     animation/modelview_center_animation.hpp \
     animation/interpolation_holder.hpp \
     animation/interpolations.hpp \
@@ -100,4 +101,3 @@ HEADERS += \
     visual_params.hpp \
     my_position.hpp \
     user_event_stream.hpp \
-    animation/modelview_angle_animation.hpp
diff --git a/drape_frontend/user_event_stream.hpp b/drape_frontend/user_event_stream.hpp
index c5b0c9a3f2..e5f0db7fa2 100644
--- a/drape_frontend/user_event_stream.hpp
+++ b/drape_frontend/user_event_stream.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "drape_frontend/navigator.hpp"
-#include "drape_frontend/animation/base_viewport_animation.hpp"
+#include "drape_frontend/animation/base_modelview_animation.hpp"
 
 #include "geometry/point2d.hpp"
 #include "geometry/rect2d.hpp"
@@ -210,7 +210,7 @@ private:
   array<Touch, 2> m_touches;
   size_t m_validTouchesCount;
 
-  unique_ptr<BaseViewportAnimation> m_animation;
+  unique_ptr<BaseModeViewAnimation> m_animation;
 
 #ifdef DEBUG
   TTestBridge m_testFn;