From 1a7df4a3c0516feac3d74138d5934dd394c91913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=97=D0=B0=D1=86=D0=B5=D0=BF=D0=B8=D0=BD?= Date: Thu, 1 Mar 2018 14:16:55 +0300 Subject: [PATCH] Added 'DeviceModel' method to platfom.hpp and stub implementations --- platform/platform.hpp | 2 ++ platform/platform_android.cpp | 5 +++++ platform/platform_ios.mm | 5 +++++ platform/platform_linux.cpp | 5 +++++ platform/platform_mac.mm | 5 +++++ platform/platform_qt.cpp | 5 ----- platform/platform_tizen.cpp | 5 +++++ platform/platform_win.cpp | 5 +++++ 8 files changed, 32 insertions(+), 5 deletions(-) diff --git a/platform/platform.hpp b/platform/platform.hpp index 577215bdf9..1635eecb5a 100644 --- a/platform/platform.hpp +++ b/platform/platform.hpp @@ -246,6 +246,8 @@ public: string DeviceName() const; + string DeviceModel() const; + string UniqueClientId() const; /// @return url for clients to download maps diff --git a/platform/platform_android.cpp b/platform/platform_android.cpp index 368018c49a..78df4b652e 100644 --- a/platform/platform_android.cpp +++ b/platform/platform_android.cpp @@ -196,6 +196,11 @@ string Platform::DeviceName() const return OMIM_OS_NAME; } +string Platform::DeviceModel() const +{ + return {}; +} + void Platform::GetFilesByRegExp(string const & directory, string const & regexp, FilesList & res) { if (ZipFileReader::IsZip(directory)) diff --git a/platform/platform_ios.mm b/platform/platform_ios.mm index eb5eb3e275..ff1d11a8bb 100644 --- a/platform/platform_ios.mm +++ b/platform/platform_ios.mm @@ -148,6 +148,11 @@ string Platform::DeviceName() const return OMIM_OS_NAME; } +string Platform::DeviceModel() const +{ + return {}; +} + void Platform::RunOnGuiThread(base::TaskLoop::Task && task) { ASSERT(m_guiThread, ()); diff --git a/platform/platform_linux.cpp b/platform/platform_linux.cpp index c5e0f88b20..296fc7761a 100644 --- a/platform/platform_linux.cpp +++ b/platform/platform_linux.cpp @@ -217,6 +217,11 @@ string Platform::DeviceName() const return OMIM_OS_NAME; } +string Platform::DeviceModel() const +{ + return {}; +} + Platform::EConnectionType Platform::ConnectionStatus() { int socketFd = socket(AF_INET, SOCK_STREAM, 0); diff --git a/platform/platform_mac.mm b/platform/platform_mac.mm index 2bfcaa1793..544795cd8f 100644 --- a/platform/platform_mac.mm +++ b/platform/platform_mac.mm @@ -118,6 +118,11 @@ string Platform::DeviceName() const return OMIM_OS_NAME; } +string Platform::DeviceModel() const +{ + return {}; +} + void Platform::RunOnGuiThread(base::TaskLoop::Task && task) { ASSERT(m_guiThread, ()); diff --git a/platform/platform_qt.cpp b/platform/platform_qt.cpp index a04ff02d69..b84e5b97d6 100644 --- a/platform/platform_qt.cpp +++ b/platform/platform_qt.cpp @@ -23,11 +23,6 @@ unique_ptr Platform::GetReader(string const & file, string const & READER_CHUNK_LOG_SIZE, READER_CHUNK_LOG_COUNT); } -string Platform::DeviceName() const -{ - return OMIM_OS_NAME; -} - bool Platform::GetFileSizeByName(string const & fileName, uint64_t & size) const { try diff --git a/platform/platform_tizen.cpp b/platform/platform_tizen.cpp index 96efd9e269..a116a6acd0 100644 --- a/platform/platform_tizen.cpp +++ b/platform/platform_tizen.cpp @@ -60,6 +60,11 @@ string Platform::DeviceName() const return OMIM_OS_NAME; } +string Platform::DeviceModel() const +{ + return {}; +} + void Platform::RunOnGuiThread(TFunctor const & fn) { /// @todo diff --git a/platform/platform_win.cpp b/platform/platform_win.cpp index d0e8dac596..bbb70ae8ca 100644 --- a/platform/platform_win.cpp +++ b/platform/platform_win.cpp @@ -141,6 +141,11 @@ string Platform::DeviceName() const return OMIM_OS_NAME; } +string Platform::DeviceModel() const +{ + return {}; +} + void Platform::RunOnGuiThread(TFunctor const & fn) { /// @todo