[editor] review fixes

Arsentiy Milchakov · mpimenov · commit 05711a847b12 · 2019-03-03T00:03:13.000+03:00
diff --git a/android/jni/com/mapswithme/maps/editor/OsmOAuth.cpp b/android/jni/com/mapswithme/maps/editor/OsmOAuth.cpp
@@ -16,7 +16,7 @@ namespace
 using namespace osm;
 using namespace jni;
 
-jobjectArray ToStringArray(JNIEnv * env, TKeySecret const & secret)
+jobjectArray ToStringArray(JNIEnv * env, KeySecret const & secret)
 {
   jobjectArray resultArray = env->NewObjectArray(2, GetStringClass(env), nullptr);
   env->SetObjectArrayElement(resultArray, 0, ToJavaString(env, secret.first));
@@ -25,7 +25,7 @@ jobjectArray ToStringArray(JNIEnv * env, TKeySecret const & secret)
 }
 
 // @returns [url, key, secret]
-jobjectArray ToStringArray(JNIEnv * env, OsmOAuth::TUrlRequestToken const & uks)
+jobjectArray ToStringArray(JNIEnv * env, OsmOAuth::UrlRequestToken const & uks)
 {
   jobjectArray resultArray = env->NewObjectArray(3, GetStringClass(env), nullptr);
   env->SetObjectArrayElement(resultArray, 0, ToJavaString(env, uks.first));
@@ -62,9 +62,9 @@ Java_com_mapswithme_maps_editor_OsmOAuth_nativeAuthWithWebviewToken(JNIEnv * env
 {
   try
   {
-    TRequestToken const rt = { ToNativeString(env, key), ToNativeString(env, secret) };
+    RequestToken const rt = { ToNativeString(env, key), ToNativeString(env, secret) };
     OsmOAuth auth = OsmOAuth::ServerAuth();
-    TKeySecret const ks = auth.FinishAuthorization(rt, ToNativeString(env, verifier));
+    KeySecret const ks = auth.FinishAuthorization(rt, ToNativeString(env, verifier));
     return ToStringArray(env, ks);
   }
   catch (std::exception const & ex)
@@ -79,7 +79,7 @@ Java_com_mapswithme_maps_editor_OsmOAuth_nativeGetFacebookAuthUrl(JNIEnv * env,
 {
   try
   {
-    OsmOAuth::TUrlRequestToken const uks = OsmOAuth::ServerAuth().GetFacebookOAuthURL();
+    OsmOAuth::UrlRequestToken const uks = OsmOAuth::ServerAuth().GetFacebookOAuthURL();
     return ToStringArray(env, uks);
   }
   catch (std::exception const & ex)
@@ -94,7 +94,7 @@ Java_com_mapswithme_maps_editor_OsmOAuth_nativeGetGoogleAuthUrl(JNIEnv * env, jc
 {
   try
   {
-    OsmOAuth::TUrlRequestToken const uks = OsmOAuth::ServerAuth().GetGoogleOAuthURL();
+    OsmOAuth::UrlRequestToken const uks = OsmOAuth::ServerAuth().GetGoogleOAuthURL();
     return ToStringArray(env, uks);
   }
   catch (std::exception const & ex)
@@ -109,7 +109,7 @@ Java_com_mapswithme_maps_editor_OsmOAuth_nativeGetOsmUsername(JNIEnv * env, jcla
 {
   try
   {
-    TKeySecret keySecret(jni::ToNativeString(env, token), jni::ToNativeString(env, secret));
+    KeySecret keySecret(jni::ToNativeString(env, token), jni::ToNativeString(env, secret));
     ServerApi06 const api(OsmOAuth::ServerAuth(keySecret));
     return jni::ToJavaString(env, api.GetUserPreferences().m_displayName);
   }
diff --git a/editor/changeset_wrapper.cpp b/editor/changeset_wrapper.cpp
@@ -9,9 +9,11 @@
 #include "base/macros.hpp"
 
 #include <algorithm>
+#include <cstdint>
 #include <exception>
 #include <random>
 #include <sstream>
+#include <utility>
 
 #include "private.h"
 
diff --git a/editor/changeset_wrapper.hpp b/editor/changeset_wrapper.hpp
@@ -1,14 +1,15 @@
 #pragma once
 
-#include "base/exception.hpp"
-
 #include "editor/server_api.hpp"
 #include "editor/xml_feature.hpp"
 
 #include "geometry/point2d.hpp"
 #include "geometry/rect2d.hpp"
 
+#include "base/exception.hpp"
+
 #include <map>
+#include <string>
 #include <vector>
 
 class FeatureType;
diff --git a/editor/editor_tests/feature_matcher_test.cpp b/editor/editor_tests/feature_matcher_test.cpp
@@ -3,6 +3,9 @@
 #include "editor/feature_matcher.hpp"
 #include "editor/xml_feature.hpp"
 
+#include <string>
+#include <vector>
+
 #include "3party/pugixml/src/pugixml.hpp"
 
 namespace
diff --git a/editor/editor_tests/match_by_geometry_test.cpp b/editor/editor_tests/match_by_geometry_test.cpp
@@ -3,6 +3,9 @@
 #include "editor/feature_matcher.hpp"
 #include "editor/xml_feature.hpp"
 
+#include <string>
+#include <vector>
+
 #include "3party/pugixml/src/pugixml.hpp"
 
 namespace
diff --git a/editor/editor_tests/osm_editor_test.cpp b/editor/editor_tests/osm_editor_test.cpp
@@ -622,7 +622,7 @@ void EditorTest::RollBackChangesTest()
     builder.Add(cafe);
   });
 
-  const std::string houseNumber = "4a";
+  std::string const houseNumber = "4a";
 
   ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [&editor, &houseNumber](FeatureType & ft)
   {
diff --git a/editor/editor_tests/osm_editor_test.hpp b/editor/editor_tests/osm_editor_test.hpp
@@ -13,6 +13,8 @@
 
 #include "platform/local_country_file_utils.hpp"
 
+#include "base/assert.hpp"
+
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/editor/editor_tests/ui2oh_test.cpp b/editor/editor_tests/ui2oh_test.cpp
@@ -223,11 +223,13 @@ UNIT_TEST(OpeningHours2TimeTableSet_off)
     TimeTableSet tts;
 
     TEST(MakeTimeTableSet(oh, tts), ());
-    TEST_EQUAL(
-        tts.GetUnhandledDays(),
-        OpeningDays({osmoh::Weekday::Monday, osmoh::Weekday::Tuesday, osmoh::Weekday::Wednesday,
-                     osmoh::Weekday::Thursday, osmoh::Weekday::Friday, osmoh::Weekday::Saturday}),
-        ());
+    TEST_EQUAL(tts.GetUnhandledDays(),
+               OpeningDays({osmoh::Weekday::Monday,
+                            osmoh::Weekday::Tuesday,
+                            osmoh::Weekday::Wednesday,
+                            osmoh::Weekday::Thursday,
+                            osmoh::Weekday::Friday,
+                            osmoh::Weekday::Saturday}), ());
   }
   {
     OpeningHours oh("Mo-Su 08:00-13:00,14:00-20:00; Sa 10:00-11:00 off");
@@ -284,11 +286,12 @@ UNIT_TEST(OpeningHours2TimeTableSet_off)
     TEST(MakeTimeTableSet(oh, tts), ());
     TEST_EQUAL(tts.Size(), 1, ());
 
-    TEST_EQUAL(
-        tts.GetUnhandledDays(),
-        OpeningDays({osmoh::Weekday::Monday, osmoh::Weekday::Tuesday, osmoh::Weekday::Wednesday,
-                     osmoh::Weekday::Thursday, osmoh::Weekday::Friday}),
-        ());
+    TEST_EQUAL(tts.GetUnhandledDays(),
+               OpeningDays({osmoh::Weekday::Monday,
+                            osmoh::Weekday::Tuesday,
+                            osmoh::Weekday::Wednesday,
+                            osmoh::Weekday::Thursday,
+                            osmoh::Weekday::Friday}), ());
   }
   {
     OpeningHours oh("Mo-Fr 11:00-17:00; Sa-Su 12:00-16:00; Mo-Fr 11:00-13:00 off");
diff --git a/editor/editor_tests/xml_feature_test.cpp b/editor/editor_tests/xml_feature_test.cpp
@@ -265,10 +265,16 @@ UNIT_TEST(XMLFeature_FromXmlNode)
 
 UNIT_TEST(XMLFeature_Geometry)
 {
-  std::vector<m2::PointD> const geometry = {{28.7206411, 3.7182409},  {46.7569003, 47.0774689},
-                                            {22.5909217, 41.6994874}, {14.7537008, 17.7788229},
-                                            {55.1261701, 10.3199476}, {28.6519654, 50.0305930},
-                                            {28.7206411, 3.7182409}};
+  std::vector<m2::PointD> const geometry =
+  {
+    {28.7206411, 3.7182409},
+    {46.7569003, 47.0774689},
+    {22.5909217, 41.6994874},
+    {14.7537008, 17.7788229},
+    {55.1261701, 10.3199476},
+    {28.6519654, 50.0305930},
+    {28.7206411, 3.7182409}
+  };
 
   XMLFeature feature(XMLFeature::Type::Way);
   feature.SetGeometry(geometry);
diff --git a/editor/new_feature_categories.hpp b/editor/new_feature_categories.hpp
@@ -18,7 +18,7 @@ namespace osm
 class NewFeatureCategories
 {
 public:
-  using TypeName = string;
+  using TypeName = std::string;
   using TypeNames = std::vector<TypeName>;
 
   NewFeatureCategories(editor::EditorConfig const & config);
diff --git a/editor/opening_hours_ui.hpp b/editor/opening_hours_ui.hpp
@@ -49,8 +49,6 @@ class TimeTable
   osmoh::TTimespans m_excludeTime;
 };
 
-class TimeTableProxy;
-
 class TimeTableSet
 {
   using TimeTableSetImpl = std::vector<TimeTable>;
diff --git a/editor/osm_editor.cpp b/editor/osm_editor.cpp
@@ -852,9 +852,11 @@ void Editor::UploadChanges(string const & key, string const & secret, ChangesetT
   if (!m_isUploadingNow)
   {
     m_isUploadingNow = true;
-    GetPlatform().RunTask(Platform::Thread::Network, [
-      upload = move(upload), key, secret, tags = move(tags), callback = move(callback)
-    ]() { upload(move(key), move(secret), move(tags), move(callback)); });
+    GetPlatform().RunTask(Platform::Thread::Network, [upload = move(upload), key, secret,
+                                                      tags = move(tags), callback = move(callback)]()
+    {
+      upload(move(key), move(secret), move(tags), move(callback));
+    });
   }
 }
 
diff --git a/editor/osm_editor.hpp b/editor/osm_editor.hpp
@@ -19,10 +19,13 @@
 #include "base/timer.hpp"
 
 #include <atomic>
+#include <cstdint>
 #include <ctime>
 #include <functional>
 #include <map>
+#include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 namespace editor
@@ -58,7 +61,7 @@ class Editor final : public MwmSet::Observer
     virtual ~Delegate() = default;
 
     virtual MwmSet::MwmId GetMwmIdByMapName(std::string const & name) const = 0;
-    virtual unique_ptr<EditableMapObject> GetOriginalMapObject(FeatureID const & fid) const = 0;
+    virtual std::unique_ptr<EditableMapObject> GetOriginalMapObject(FeatureID const & fid) const = 0;
     virtual std::string GetOriginalFeatureStreet(FeatureID const & fid) const = 0;
     virtual void ForEachFeatureAtPoint(FeatureTypeFn && fn, m2::PointD const & point) const = 0;
   };
@@ -100,9 +103,9 @@ class Editor final : public MwmSet::Observer
 
   static Editor & Instance();
 
-  void SetDelegate(unique_ptr<Delegate> delegate) { m_delegate = std::move(delegate); }
+  void SetDelegate(std::unique_ptr<Delegate> delegate) { m_delegate = std::move(delegate); }
 
-  void SetStorageForTesting(unique_ptr<editor::StorageBase> storage)
+  void SetStorageForTesting(std::unique_ptr<editor::StorageBase> storage)
   {
     m_storage = std::move(storage);
   }
@@ -214,7 +217,7 @@ class Editor final : public MwmSet::Observer
 
   /// @returns false if fails.
   bool Save(FeaturesContainer const & features) const;
-  bool SaveTransaction(shared_ptr<FeaturesContainer> const & features);
+  bool SaveTransaction(std::shared_ptr<FeaturesContainer> const & features);
   bool RemoveFeatureIfExists(FeatureID const & fid);
   /// Notify framework that something has changed and should be redisplayed.
   void Invalidate();
@@ -239,7 +242,7 @@ class Editor final : public MwmSet::Observer
 
   // These methods are just checked wrappers around Delegate.
   MwmSet::MwmId GetMwmIdByMapName(std::string const & name);
-  unique_ptr<EditableMapObject> GetOriginalMapObject(FeatureID const & fid) const;
+  std::unique_ptr<EditableMapObject> GetOriginalMapObject(FeatureID const & fid) const;
   std::string GetOriginalFeatureStreet(FeatureID const & fid) const;
   void ForEachFeatureAtPoint(FeatureTypeFn && fn, m2::PointD const & point) const;
   FeatureID GetFeatureIdByXmlFeature(FeaturesContainer const & features,
@@ -259,7 +262,7 @@ class Editor final : public MwmSet::Observer
   /// Deleted, edited and created features.
   base::AtomicSharedPtr<FeaturesContainer> m_features;
 
-  unique_ptr<Delegate> m_delegate;
+  std::unique_ptr<Delegate> m_delegate;
 
   /// Invalidate map viewport after edits.
   InvalidateFn m_invalidateFn;
@@ -269,9 +272,9 @@ class Editor final : public MwmSet::Observer
   editor::ConfigLoader m_configLoader;
 
   /// Notes to be sent to osm.
-  shared_ptr<editor::Notes> m_notes;
+  std::shared_ptr<editor::Notes> m_notes;
 
-  unique_ptr<editor::StorageBase> m_storage;
+  std::unique_ptr<editor::StorageBase> m_storage;
   
   std::atomic<bool> m_isUploadingNow;
 
diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.h b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.h
@@ -14,10 +14,10 @@ UIColor * AuthorizationButtonBackgroundColor(AuthorizationButtonType type);
 void AuthorizationConfigButton(UIButton * btn, AuthorizationButtonType type);
 
 // Deletes any stored credentials if called with empty key or secret.
-void AuthorizationStoreCredentials(osm::TKeySecret const & keySecret);
+void AuthorizationStoreCredentials(osm::KeySecret const & keySecret);
 BOOL AuthorizationHaveCredentials();
 // Returns empty key and secret if user has not beed authorized.
-osm::TKeySecret AuthorizationGetCredentials();
+osm::KeySecret AuthorizationGetCredentials();
 
 void AuthorizationSetNeedCheck(BOOL needCheck);
 BOOL AuthorizationIsNeedCheck();
diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm
@@ -13,7 +13,7 @@
 NSString * const kAuthNeedCheck = @"AuthNeedCheck";
 NSString * const kOSMUserName = @"UDOsmUserName";
 
-void SetOSMUserNameWithCredentials(osm::TKeySecret const & keySecret)
+void SetOSMUserNameWithCredentials(osm::KeySecret const & keySecret)
 {
   using namespace osm;
   dispatch_sync(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^
@@ -75,7 +75,7 @@ void AuthorizationConfigButton(UIButton * btn, AuthorizationButtonType type)
   [btn setBackgroundColor:[bgCol colorWithAlphaComponent:highlightedAlpha] forState:UIControlStateHighlighted];
 }
 
-void AuthorizationStoreCredentials(osm::TKeySecret const & keySecret)
+void AuthorizationStoreCredentials(osm::KeySecret const & keySecret)
 {
   NSUserDefaults * ud = NSUserDefaults.standardUserDefaults;
   if (keySecret.first.empty() || keySecret.second.empty())
@@ -101,13 +101,13 @@ BOOL AuthorizationHaveCredentials()
   return requestToken && requestSecret;
 }
 
-osm::TKeySecret AuthorizationGetCredentials()
+osm::KeySecret AuthorizationGetCredentials()
 {
   NSUserDefaults * ud = NSUserDefaults.standardUserDefaults;
   NSString * requestToken = [ud stringForKey:kOSMRequestToken];
   NSString * requestSecret = [ud stringForKey:kOSMRequestSecret];
   if (requestToken && requestSecret)
-    return osm::TKeySecret(requestToken.UTF8String, requestSecret.UTF8String);
+    return osm::KeySecret(requestToken.UTF8String, requestSecret.UTF8String);
   return {};
 }
 
diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm
@@ -48,7 +48,7 @@ @interface MWMAuthorizationWebViewLoginViewController ()<UIWebViewDelegate>
 
 @implementation MWMAuthorizationWebViewLoginViewController
 {
-  TRequestToken m_requestToken;
+  RequestToken m_requestToken;
 }
 
 - (void)viewDidLoad
@@ -77,7 +77,7 @@ - (void)loadAuthorizationPage
     OsmOAuth const auth = OsmOAuth::ServerAuth();
     try
     {
-      OsmOAuth::TUrlRequestToken urt;
+      OsmOAuth::UrlRequestToken urt;
       switch (self.authType)
       {
       case MWMWebViewAuthorizationTypeGoogle: urt = auth.GetGoogleOAuthURL(); break;
@@ -133,7 +133,7 @@ - (void)checkAuthorization:(NSString *)verifier
   [self startSpinner];
   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
     OsmOAuth const auth = OsmOAuth::ServerAuth();
-    TKeySecret ks;
+    KeySecret ks;
     try
     {
       ks = auth.FinishAuthorization(self->m_requestToken, verifier.UTF8String);
diff --git a/iphone/Maps/Core/Editor/MWMEditorHelper.mm b/iphone/Maps/Core/Editor/MWMEditorHelper.mm
@@ -31,7 +31,7 @@ + (void)uploadEdits:(void (^)(UIBackgroundFetchResult))completionHandler
         break;
       }
     };
-    osm::TKeySecret const keySecret = osm_auth_ios::AuthorizationGetCredentials();
+    osm::KeySecret const keySecret = osm_auth_ios::AuthorizationGetCredentials();
     osm::Editor::Instance().UploadChanges(
         keySecret.first, keySecret.second,
         {{"created_by",
diff --git a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursCommon.h b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursCommon.h
@@ -6,6 +6,6 @@ NSDateComponents * dateComponentsFromTime(osmoh::Time const & time);
 NSDate * dateFromTime(osmoh::Time const & time);
 NSString * stringFromTime(osmoh::Time const & time);
 
-NSString * stringFromOpeningDays(editor::ui::TOpeningDays const & openingDays);
+NSString * stringFromOpeningDays(editor::ui::OpeningDays const & openingDays);
 
 BOOL isEveryDay(editor::ui::TimeTable const & timeTable);
diff --git a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursCommon.mm b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursCommon.mm
@@ -24,7 +24,7 @@
   return [fmt stringFromDate:dateFromTime(time)];
 }
 
-NSString * stringFromOpeningDays(editor::ui::TOpeningDays const & openingDays)
+NSString * stringFromOpeningDays(editor::ui::OpeningDays const & openingDays)
 {
   NSCalendar * cal = NSCalendar.currentCalendar;
   cal.locale = NSLocale.currentLocale;
diff --git a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursModel.h b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursModel.h
@@ -31,7 +31,7 @@
 - (CGFloat)heightForIndexPath:(NSIndexPath * _Nonnull)indexPath withWidth:(CGFloat)width;
 - (void)fillCell:(MWMOpeningHoursTableViewCell * _Nonnull)cell atIndexPath:(NSIndexPath * _Nonnull)indexPath;
 - (NSUInteger)numberOfRowsInSection:(NSUInteger)section;
-- (editor::ui::TOpeningDays)unhandledDays;
+- (editor::ui::OpeningDays)unhandledDays;
 
 - (void)storeCachedData;
 - (void)updateOpeningHours;
diff --git a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursModel.mm b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursModel.mm
diff --git a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.h b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.h
diff --git a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.mm b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.mm
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHours.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHours.mm
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.mm

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace`
`16`	`16`	`using namespace osm;`
`17`	`17`	`using namespace jni;`
`18`	`18`
`19`		`-jobjectArray ToStringArray(JNIEnv * env, TKeySecret const & secret)`
	`19`	`+jobjectArray ToStringArray(JNIEnv * env, KeySecret const & secret)`
`20`	`20`	`{`
`21`	`21`	`jobjectArray resultArray = env->NewObjectArray(2, GetStringClass(env), nullptr);`
`22`	`22`	`env->SetObjectArrayElement(resultArray, 0, ToJavaString(env, secret.first));`
`@@ -25,7 +25,7 @@ jobjectArray ToStringArray(JNIEnv * env, TKeySecret const & secret)`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`// @returns [url, key, secret]`
`28`		`-jobjectArray ToStringArray(JNIEnv * env, OsmOAuth::TUrlRequestToken const & uks)`
	`28`	`+jobjectArray ToStringArray(JNIEnv * env, OsmOAuth::UrlRequestToken const & uks)`
`29`	`29`	`{`
`30`	`30`	`jobjectArray resultArray = env->NewObjectArray(3, GetStringClass(env), nullptr);`
`31`	`31`	`env->SetObjectArrayElement(resultArray, 0, ToJavaString(env, uks.first));`
`@@ -62,9 +62,9 @@ Java_com_mapswithme_maps_editor_OsmOAuth_nativeAuthWithWebviewToken(JNIEnv * env`
`62`	`62`	`{`
`63`	`63`	`try`
`64`	`64`	`{`
`65`		`- TRequestToken const rt = { ToNativeString(env, key), ToNativeString(env, secret) };`
	`65`	`+ RequestToken const rt = { ToNativeString(env, key), ToNativeString(env, secret) };`
`66`	`66`	`OsmOAuth auth = OsmOAuth::ServerAuth();`
`67`		`- TKeySecret const ks = auth.FinishAuthorization(rt, ToNativeString(env, verifier));`
	`67`	`+ KeySecret const ks = auth.FinishAuthorization(rt, ToNativeString(env, verifier));`
`68`	`68`	`return ToStringArray(env, ks);`
`69`	`69`	`}`
`70`	`70`	`catch (std::exception const & ex)`
`@@ -79,7 +79,7 @@ Java_com_mapswithme_maps_editor_OsmOAuth_nativeGetFacebookAuthUrl(JNIEnv * env,`
`79`	`79`	`{`
`80`	`80`	`try`
`81`	`81`	`{`
`82`		`- OsmOAuth::TUrlRequestToken const uks = OsmOAuth::ServerAuth().GetFacebookOAuthURL();`
	`82`	`+ OsmOAuth::UrlRequestToken const uks = OsmOAuth::ServerAuth().GetFacebookOAuthURL();`
`83`	`83`	`return ToStringArray(env, uks);`
`84`	`84`	`}`
`85`	`85`	`catch (std::exception const & ex)`
`@@ -94,7 +94,7 @@ Java_com_mapswithme_maps_editor_OsmOAuth_nativeGetGoogleAuthUrl(JNIEnv * env, jc`
`94`	`94`	`{`
`95`	`95`	`try`
`96`	`96`	`{`
`97`		`- OsmOAuth::TUrlRequestToken const uks = OsmOAuth::ServerAuth().GetGoogleOAuthURL();`
	`97`	`+ OsmOAuth::UrlRequestToken const uks = OsmOAuth::ServerAuth().GetGoogleOAuthURL();`
`98`	`98`	`return ToStringArray(env, uks);`
`99`	`99`	`}`
`100`	`100`	`catch (std::exception const & ex)`
`@@ -109,7 +109,7 @@ Java_com_mapswithme_maps_editor_OsmOAuth_nativeGetOsmUsername(JNIEnv * env, jcla`
`109`	`109`	`{`
`110`	`110`	`try`
`111`	`111`	`{`
`112`		`- TKeySecret keySecret(jni::ToNativeString(env, token), jni::ToNativeString(env, secret));`
	`112`	`+ KeySecret keySecret(jni::ToNativeString(env, token), jni::ToNativeString(env, secret));`
`113`	`113`	`ServerApi06 const api(OsmOAuth::ServerAuth(keySecret));`
`114`	`114`	`return jni::ToJavaString(env, api.GetUserPreferences().m_displayName);`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -622,7 +622,7 @@ void EditorTest::RollBackChangesTest()`
`622`	`622`	`builder.Add(cafe);`
`623`	`623`	`});`
`624`	`624`
`625`		`- const std::string houseNumber = "4a";`
	`625`	`+ std::string const houseNumber = "4a";`
`626`	`626`
`627`	`627`	`ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [&editor, &houseNumber](FeatureType & ft)`
`628`	`628`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace osm`
`18`	`18`	`class NewFeatureCategories`
`19`	`19`	`{`
`20`	`20`	`public:`
`21`		`- using TypeName = string;`
	`21`	`+ using TypeName = std::string;`
`22`	`22`	`using TypeNames = std::vector<TypeName>;`
`23`	`23`
`24`	`24`	`NewFeatureCategories(editor::EditorConfig const & config);`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,6 @@ class TimeTable`
`49`	`49`	`osmoh::TTimespans m_excludeTime;`
`50`	`50`	`};`
`51`	`51`
`52`		`-class TimeTableProxy;`
`53`		`-`
`54`	`52`	`class TimeTableSet`
`55`	`53`	`{`
`56`	`54`	`using TimeTableSetImpl = std::vector<TimeTable>;`
Original file line number	Diff line number	Diff line change
`@@ -852,9 +852,11 @@ void Editor::UploadChanges(string const & key, string const & secret, ChangesetT`
`852`	`852`	`if (!m_isUploadingNow)`
`853`	`853`	`{`
`854`	`854`	`m_isUploadingNow = true;`
`855`		`- GetPlatform().RunTask(Platform::Thread::Network, [`
`856`		`- upload = move(upload), key, secret, tags = move(tags), callback = move(callback)`
`857`		`- ]() { upload(move(key), move(secret), move(tags), move(callback)); });`
	`855`	`+ GetPlatform().RunTask(Platform::Thread::Network, [upload = move(upload), key, secret,`
	`856`	`+ tags = move(tags), callback = move(callback)]()`
	`857`	`+ {`
	`858`	`+ upload(move(key), move(secret), move(tags), move(callback));`
	`859`	`+ });`
`858`	`860`	`}`
`859`	`861`	`}`
`860`	`862`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`NSString * const kAuthNeedCheck = @"AuthNeedCheck";`
`14`	`14`	`NSString * const kOSMUserName = @"UDOsmUserName";`
`15`	`15`
`16`		`-void SetOSMUserNameWithCredentials(osm::TKeySecret const & keySecret)`
	`16`	`+void SetOSMUserNameWithCredentials(osm::KeySecret const & keySecret)`
`17`	`17`	`{`
`18`	`18`	`using namespace osm;`
`19`	`19`	`dispatch_sync(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^`
`@@ -75,7 +75,7 @@ void AuthorizationConfigButton(UIButton * btn, AuthorizationButtonType type)`
`75`	`75`	`[btn setBackgroundColor:[bgCol colorWithAlphaComponent:highlightedAlpha] forState:UIControlStateHighlighted];`
`76`	`76`	`}`
`77`	`77`
`78`		`-void AuthorizationStoreCredentials(osm::TKeySecret const & keySecret)`
	`78`	`+void AuthorizationStoreCredentials(osm::KeySecret const & keySecret)`
`79`	`79`	`{`
`80`	`80`	`NSUserDefaults * ud = NSUserDefaults.standardUserDefaults;`
`81`	`81`	`if (keySecret.first.empty() \|\| keySecret.second.empty())`
`@@ -101,13 +101,13 @@ BOOL AuthorizationHaveCredentials()`
`101`	`101`	`return requestToken && requestSecret;`
`102`	`102`	`}`
`103`	`103`
`104`		`-osm::TKeySecret AuthorizationGetCredentials()`
	`104`	`+osm::KeySecret AuthorizationGetCredentials()`
`105`	`105`	`{`
`106`	`106`	`NSUserDefaults * ud = NSUserDefaults.standardUserDefaults;`
`107`	`107`	`NSString * requestToken = [ud stringForKey:kOSMRequestToken];`
`108`	`108`	`NSString * requestSecret = [ud stringForKey:kOSMRequestSecret];`
`109`	`109`	`if (requestToken && requestSecret)`
`110`		`- return osm::TKeySecret(requestToken.UTF8String, requestSecret.UTF8String);`
	`110`	`+ return osm::KeySecret(requestToken.UTF8String, requestSecret.UTF8String);`
`111`	`111`	`return {};`
`112`	`112`	`}`
`113`	`113`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ @interface MWMAuthorizationWebViewLoginViewController ()<UIWebViewDelegate>`
`48`	`48`
`49`	`49`	`@implementation MWMAuthorizationWebViewLoginViewController`
`50`	`50`	`{`
`51`		`- TRequestToken m_requestToken;`
	`51`	`+ RequestToken m_requestToken;`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`- (void)viewDidLoad`
`@@ -77,7 +77,7 @@ - (void)loadAuthorizationPage`
`77`	`77`	`OsmOAuth const auth = OsmOAuth::ServerAuth();`
`78`	`78`	`try`
`79`	`79`	`{`
`80`		`- OsmOAuth::TUrlRequestToken urt;`
	`80`	`+ OsmOAuth::UrlRequestToken urt;`
`81`	`81`	`switch (self.authType)`
`82`	`82`	`{`
`83`	`83`	`case MWMWebViewAuthorizationTypeGoogle: urt = auth.GetGoogleOAuthURL(); break;`
`@@ -133,7 +133,7 @@ - (void)checkAuthorization:(NSString *)verifier`
`133`	`133`	`[self startSpinner];`
`134`	`134`	`dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{`
`135`	`135`	`OsmOAuth const auth = OsmOAuth::ServerAuth();`
`136`		`- TKeySecret ks;`
	`136`	`+ KeySecret ks;`
`137`	`137`	`try`
`138`	`138`	`{`
`139`	`139`	`ks = auth.FinishAuthorization(self->m_requestToken, verifier.UTF8String);`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ + (void)uploadEdits:(void (^)(UIBackgroundFetchResult))completionHandler`
`31`	`31`	`break;`
`32`	`32`	`}`
`33`	`33`	`};`
`34`		`- osm::TKeySecret const keySecret = osm_auth_ios::AuthorizationGetCredentials();`
	`34`	`+ osm::KeySecret const keySecret = osm_auth_ios::AuthorizationGetCredentials();`
`35`	`35`	`osm::Editor::Instance().UploadChanges(`
`36`	`36`	`keySecret.first, keySecret.second,`
`37`	`37`	`{{"created_by",`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`return [fmt stringFromDate:dateFromTime(time)];`
`25`	`25`	`}`
`26`	`26`
`27`		`-NSString * stringFromOpeningDays(editor::ui::TOpeningDays const & openingDays)`
	`27`	`+NSString * stringFromOpeningDays(editor::ui::OpeningDays const & openingDays)`
`28`	`28`	`{`
`29`	`29`	`NSCalendar * cal = NSCalendar.currentCalendar;`
`30`	`30`	`cal.locale = NSLocale.currentLocale;`