diff options
| author | Alex Zolotarev <deathbaba@gmail.com> | 2011-11-17 19:49:53 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:28:16 +0300 |
| commit | 5c614297c02c7997bbfb5b51f70b0c421b7a3889 (patch) | |
| tree | 4b2caac1b4a0234ddba6b2ed9550e2b417e94463 /qt | |
| parent | 036b072800e8c13f15d5c3c4c317a8c3265defec (diff) | |
Made Framework non-template
Diffstat (limited to 'qt')
| -rw-r--r-- | qt/draw_widget.cpp | 2 | ||||
| -rw-r--r-- | qt/draw_widget.hpp | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp index fd14e51682..406fb1bacd 100644 --- a/qt/draw_widget.cpp +++ b/qt/draw_widget.cpp @@ -48,7 +48,7 @@ namespace qt : QGLWidget(pParent), m_isInitialized(false), m_isTimerStarted(false), - m_framework(FrameworkFactory<model_t>::CreateFramework()), + m_framework(FrameworkFactory::CreateFramework()), m_isDrag(false), m_isRotate(false), m_redrawInterval(100), diff --git a/qt/draw_widget.hpp b/qt/draw_widget.hpp index 57bd2a8bd4..9a10032399 100644 --- a/qt/draw_widget.hpp +++ b/qt/draw_widget.hpp @@ -3,7 +3,6 @@ #include "widgets.hpp" #include "../map/window_handle.hpp" -#include "../map/feature_vec_model.hpp" #include "../map/framework.hpp" #include "../map/navigator.hpp" @@ -39,12 +38,10 @@ namespace qt class DrawWidget : public QGLWidget { - typedef model::FeaturesFetcher model_t; - bool m_isInitialized; bool m_isTimerStarted; - scoped_ptr<Framework<model_t> > m_framework; + scoped_ptr<Framework> m_framework; scoped_ptr<VideoTimer> m_videoTimer; bool m_isDrag; @@ -93,7 +90,7 @@ namespace qt void PrepareShutdown(); - Framework<model_t> & GetFramework() { return *m_framework.get(); } + Framework & GetFramework() { return *m_framework.get(); } protected: |