diff options
| author | Yuri Gorshenin <y@maps.me> | 2015-05-22 18:17:08 +0300 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:48:40 +0300 |
| commit | 688f92686a14250faf95f6d4185855a4ad85099a (patch) | |
| tree | 1df2a4ece65caf35e39f301a4fa5f9e653a5e201 /qt | |
| parent | 12ff790df7d5775763f1d841131185f316b85b15 (diff) | |
Review fixes.
Diffstat (limited to 'qt')
| -rw-r--r-- | qt/draw_widget.cpp | 16 | ||||
| -rw-r--r-- | qt/draw_widget.hpp | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp index 1562025429..6a7f94772d 100644 --- a/qt/draw_widget.cpp +++ b/qt/draw_widget.cpp @@ -1,4 +1,5 @@ #include "qt/draw_widget.hpp" + #include "qt/slider_ctrl.hpp" #include "map/country_status_display.hpp" @@ -13,24 +14,23 @@ #include "graphics/opengl/opengl.hpp" #include "graphics/depth_constants.hpp" -#include "platform/settings.hpp" #include "platform/platform.hpp" +#include "platform/settings.hpp" #include "std/chrono.hpp" +#include <QtCore/QDateTime> #include <QtCore/QLocale> - #include <QtGui/QMouseEvent> -#include <QtCore/QDateTime> #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) - #include <QtGui/QMenu> #include <QtGui/QApplication> #include <QtGui/QDesktopWidget> + #include <QtGui/QMenu> #else - #include <QtWidgets/QMenu> #include <QtWidgets/QApplication> #include <QtWidgets/QDesktopWidget> + #include <QtWidgets/QMenu> #endif namespace qt @@ -345,11 +345,11 @@ namespace qt void DrawWidget::StartPressTask(m2::PointD const & pt, unsigned ms) { KillPressTask(); - m_scheduledTask.reset( - new ScheduledTask(bind(&DrawWidget::OnPressTaskEvent, this, pt, ms), milliseconds(ms))); + m_deferredTask.reset( + new DeferredTask(bind(&DrawWidget::OnPressTaskEvent, this, pt, ms), milliseconds(ms))); } - void DrawWidget::KillPressTask() { m_scheduledTask.reset(); } + void DrawWidget::KillPressTask() { m_deferredTask.reset(); } void DrawWidget::OnPressTaskEvent(m2::PointD const & pt, unsigned ms) { diff --git a/qt/draw_widget.hpp b/qt/draw_widget.hpp index 7794d74932..5287025aac 100644 --- a/qt/draw_widget.hpp +++ b/qt/draw_widget.hpp @@ -6,10 +6,10 @@ #include "render/window_handle.hpp" -#include "base/scheduled_task.hpp" - #include "platform/video_timer.hpp" +#include "base/deferred_task.hpp" + #include "std/unique_ptr.hpp" #include <QtCore/QTimer> @@ -145,7 +145,7 @@ namespace qt QScaleSlider * m_pScale; - unique_ptr<ScheduledTask> m_scheduledTask; + unique_ptr<DeferredTask> m_deferredTask; m2::PointD m_taskPoint; bool m_wasLongClick, m_isCleanSingleClick; |