From 085a38aee90042d932d3f5b5bd577259fb51c3f8 Mon Sep 17 00:00:00 2001
From: tatiana-yan <tatiana.kondakova@gmail.com>
Date: Thu, 28 Jun 2018 16:00:51 +0300
Subject: [PATCH] [editor] Get rid of T prefixes

---
 editor/osm_editor.cpp |  8 ++++----
 editor/osm_editor.hpp | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/editor/osm_editor.cpp b/editor/osm_editor.cpp
index 4bfa77f5c7..f6a5421727 100644
--- a/editor/osm_editor.cpp
+++ b/editor/osm_editor.cpp
@@ -486,7 +486,7 @@ bool Editor::RollBackChanges(FeatureID const & fid)
 }
 
 void Editor::ForEachFeatureInMwmRectAndScale(MwmSet::MwmId const & id,
-                                             TFeatureIndexFunctor const & f, m2::RectD const & rect,
+                                             FeatureIndexFunctor const & f, m2::RectD const & rect,
                                              int /*scale*/)
 {
   auto const mwmFound = m_features.find(id);
@@ -625,8 +625,8 @@ bool Editor::HaveMapEditsToUpload(MwmSet::MwmId const & mwmId) const
   return false;
 }
 
-void Editor::UploadChanges(string const & key, string const & secret, TChangesetTags tags,
-                           TFinishUploadCallback callBack)
+void Editor::UploadChanges(string const & key, string const & secret, ChangesetTags tags,
+                           FinishUploadCallback callBack)
 {
   if (m_notes->NotUploadedNotesCount())
     UploadNotes(key, secret);
@@ -640,7 +640,7 @@ void Editor::UploadChanges(string const & key, string const & secret, TChangeset
   alohalytics::LogEvent("Editor_DataSync_started");
 
   // TODO(AlexZ): features access should be synchronized.
-  auto const upload = [this](string key, string secret, TChangesetTags tags, TFinishUploadCallback callBack)
+  auto const upload = [this](string key, string secret, ChangesetTags tags, FinishUploadCallback callBack)
   {
     // This lambda was designed to start after app goes into background. But for cases when user is immediately
     // coming back to the app we work with a copy, because 'for' loops below can take a significant amount of time.
diff --git a/editor/osm_editor.hpp b/editor/osm_editor.hpp
index 51236cdaee..8c74061eb5 100644
--- a/editor/osm_editor.hpp
+++ b/editor/osm_editor.hpp
@@ -65,7 +65,7 @@ public:
     Error,
     NothingToUpload
   };
-  using TFinishUploadCallback = function<void(UploadResult)>;
+  using FinishUploadCallback = function<void(UploadResult)>;
 
   static Editor & Instance();
 
@@ -92,8 +92,8 @@ public:
 
   void OnMapDeregistered(platform::LocalCountryFile const & localFile) override;
 
-  using TFeatureIndexFunctor = function<void(uint32_t)>;
-  void ForEachFeatureInMwmRectAndScale(MwmSet::MwmId const & id, TFeatureIndexFunctor const & f,
+  using FeatureIndexFunctor = function<void(uint32_t)>;
+  void ForEachFeatureInMwmRectAndScale(MwmSet::MwmId const & id, FeatureIndexFunctor const & f,
                                        m2::RectD const & rect, int scale);
 
   // TODO(mgsergio): Unify feature functions signatures.
@@ -140,11 +140,11 @@ public:
   bool HaveMapEditsOrNotesToUpload() const;
   bool HaveMapEditsToUpload(MwmSet::MwmId const & mwmId) const;
   bool HaveMapEditsToUpload() const;
-  using TChangesetTags = map<string, string>;
+  using ChangesetTags = map<string, string>;
   /// Tries to upload all local changes to OSM server in a separate thread.
   /// @param[in] tags should provide additional information about client to use in changeset.
-  void UploadChanges(string const & key, string const & secret, TChangesetTags tags,
-                     TFinishUploadCallback callBack = TFinishUploadCallback());
+  void UploadChanges(string const & key, string const & secret, ChangesetTags tags,
+                     FinishUploadCallback callBack = FinishUploadCallback());
   // TODO(mgsergio): Test new types from new config but with old classificator (where these types are absent).
   // Editor should silently ignore all types in config which are unknown to him.
   NewFeatureCategories GetNewFeatureCategories() const;