pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Minor code fixes.

Browse source
This commit is contained in:
vng 2011-06-13 01:50:50 +03:00 • committed by Alex Zolotarev
parent 24701fb552
commit ed2113e6cf
4 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
map/window_handle.hpp
View file

@ -15,18 +15,17 @@ namespace yg
class WindowHandle
{
private:
// iOS realization needs this parameter.
// Desktop realization holds DrawerYG in draw_widget.hpp.
shared_ptr<DrawerYG> m_drawer;
shared_ptr<yg::gl::RenderContext> m_renderContext;
bool m_hasPendingUpdates;
bool m_isUpdatesEnabled;
public:
WindowHandle() : m_hasPendingUpdates(false), m_isUpdatesEnabled(true)
{}
WindowHandle() : m_hasPendingUpdates(false), m_isUpdatesEnabled(true) {}
shared_ptr<DrawerYG> const & drawer()
{

2
qt/draw_widget.cpp
View file

@ -164,7 +164,7 @@ namespace qt
{
widget_type::initializeGL();
m_handle->setRenderContext(renderContext());
m_handle->setDrawer(GetDrawer());
//m_handle->setDrawer(GetDrawer());
m_framework.initializeGL(renderContext(), resourceManager());
}

4
qt/widgets.hpp
View file

@ -19,17 +19,13 @@ namespace qt
/// Widget uses yg for drawing.
class GLDrawWidget : public GLDrawWidgetT<DrawerYG>
{
private:
typedef GLDrawWidgetT<DrawerYG> base_type;
shared_ptr<yg::gl::RenderContext> m_renderContext;
protected:
shared_ptr<yg::ResourceManager> m_resourceManager;
public:
typedef DrawerYG drawer_t;
GLDrawWidget(QWidget * pParent);

5
qt_tstfrm/widgets.hpp
View file

@ -31,14 +31,11 @@ namespace qt
template <class T> class GLDrawWidgetT : public BaseDrawWidget<T, QGLWidget>
{
typedef BaseDrawWidget<T, QGLWidget> base_type;
protected:
protected:
shared_ptr<T> m_p;
public:
shared_ptr<T> GetDrawer() {return m_p;}
GLDrawWidgetT(QWidget * pParent) : base_type(pParent){}
virtual ~GLDrawWidgetT();