PR fixes

6 files changed, 15 insertions, 13 deletions

diff --git a/platform/platform.cpp b/platform/platform.cpp
index 021fe99289..ab89c3d7c1 100644
--- a/platform/platform.cpp
+++ b/platform/platform.cpp
@@ -95,9 +95,9 @@ string Platform::DeviceName() const
   return OMIM_OS_NAME;
 }
 
-string Platform::WritablePathForFileIndexes(string const & country_name) const
+string Platform::WritablePathForCountryIndexes(string const & fileName) const
 {
-  string dir = WritableDir() + country_name + my::GetNativeSeparator();
+  string dir = WritableDir() + fileName + my::GetNativeSeparator();
   if (!IsFileExistsByFullPath(dir))
     MkDir(dir);
   return dir;
diff --git a/platform/platform.hpp b/platform/platform.hpp
index 447886c671..f90f32a01e 100644
--- a/platform/platform.hpp
+++ b/platform/platform.hpp
@@ -61,13 +61,15 @@ public:
   /// @return full path to file in user's writable directory
   string WritablePathForFile(string const & file) const { return WritableDir() + file; }
   /// @return full path to indexes directory for country file. Creates directory if it's not exists.
-  string WritablePathForFileIndexes(string const & country_name) const;
+  string WritablePathForCountryIndexes(string const & country_name) const;
 
   /// @return resource dir (on some platforms it's differ from Writable dir)
   string ResourcesDir() const { return m_resourcesDir; }
 
   /// Creates directory at filesystem
-  void MkDir(string const & directory_name) const;
+  void MkDir(string const & dirName) const;
+
+  /// @TODO create join method for string concatenation
 
   /// @return path for directory with temporary files with slash at the end
   string TmpDir() const { return m_tmpDir; }
diff --git a/platform/platform_android.cpp b/platform/platform_android.cpp
index a265d060ca..aa330bc70a 100644
--- a/platform/platform_android.cpp
+++ b/platform/platform_android.cpp
@@ -11,7 +11,7 @@
 #include "../base/string_utils.hpp"
 
 #include <unistd.h>     // for sysconf
-
+#include <sys/stat.h>
 
 Platform::Platform()
 {
@@ -244,9 +244,9 @@ bool Platform::GetFileSizeByName(string const & fileName, uint64_t & size) const
   }
 }
 
-void Platform::MkDir(string const & directory_name) const
+void Platform::MkDir(string const & dirName) const
 {
-  mkdir(directory_name.c_str(), 0755);
+  ::mkdir(dirName.c_str(), 0755);
 }
 
 namespace
diff --git a/platform/platform_ios.mm b/platform/platform_ios.mm
index 280212711a..fe8cdcca0d 100644
--- a/platform/platform_ios.mm
+++ b/platform/platform_ios.mm
@@ -49,9 +49,9 @@ Platform::Platform()
   [pool release];
 }
 
-void Platform::MkDir(string const & directory_name) const
+void Platform::MkDir(string const & dirName) const
 {
-  ::mkdir(directory_name.c_str(), 0755);
+  ::mkdir(dirName.c_str(), 0755);
 }
 
 void Platform::GetFilesByRegExp(string const & directory, string const & regexp, FilesList & res)
diff --git a/platform/platform_qt.cpp b/platform/platform_qt.cpp
index 9a82b2ee08..1fae77cdfe 100644
--- a/platform/platform_qt.cpp
+++ b/platform/platform_qt.cpp
@@ -56,9 +56,9 @@ int Platform::VideoMemoryLimit() const
   return 20 * 1024 * 1024;
 }
 
-void Platform::MkDir(string const & directory_name) const
+void Platform::MkDir(string const & dirName) const
 {
-  QDir().mkdir(directory_name.c_str());
+  QDir().mkdir(dirName.c_str());
 }
 
 
diff --git a/platform/platform_tizen.cpp b/platform/platform_tizen.cpp
index 12d15da2fe..f474681476 100644
--- a/platform/platform_tizen.cpp
+++ b/platform/platform_tizen.cpp
@@ -43,9 +43,9 @@ Platform::Platform()
   m_flags[HAS_ROUTING] = true;
 }
 
-void Platform::MkDir(string const & directory_name) const
+void Platform::MkDir(string const & dirName) const
 {
-  Tizen::Io::Directory::Create(directory_name.c_str(), true);
+  Tizen::Io::Directory::Create(dirName.c_str(), true);
 }
 
 int Platform::CpuCores() const