Replace path_get_filename_start with os::getFilename

codereader · Jan 29, 2017 · 87fb451 · 87fb451
1 parent 2ab4d29
commit 87fb451
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 26 deletions.
diff --git a/libs/os/path.h b/libs/os/path.h
@@ -113,30 +113,6 @@ inline const char* path_remove_directory(const char* path)
   return "";
 }
 
-/// \brief Returns a pointer to the first character of the filename component of \p path.
-/// O(n)
-inline const char* path_get_filename_start(const char* path)
-{
-  {
-    const char* last_forward_slash = strrchr(path, '/');
-    if(last_forward_slash != 0)
-    {
-      return last_forward_slash + 1;
-    }
-  }
-
-  // not strictly necessary,since paths should not contain '\'
-  {
-    const char* last_backward_slash = strrchr(path, '\\');
-    if(last_backward_slash != 0)
-    {
-      return last_backward_slash + 1;
-    }
-  }
-
-  return path;
-}
-
 /** General utility functions for OS-related tasks
  */
 namespace os

diff --git a/radiant/map/Map.cpp b/radiant/map/Map.cpp
@@ -525,7 +525,7 @@ bool Map::saveDirect(const std::string& filename, const MapFormatPtr& mapFormat)
     if (_saveInProgress) return false; // safeguard
 
     // Disable screen updates for the scope of this function
-    ui::ScreenUpdateBlocker blocker(_("Processing..."), path_get_filename_start(filename.c_str()));
+    ui::ScreenUpdateBlocker blocker(_("Processing..."), os::getFilename(filename));
 
     _saveInProgress = true;
 
@@ -553,7 +553,7 @@ bool Map::saveSelected(const std::string& filename, const MapFormatPtr& mapForma
     if (_saveInProgress) return false; // safeguard
 
     // Disable screen updates for the scope of this function
-    ui::ScreenUpdateBlocker blocker(_("Processing..."), path_get_filename_start(filename.c_str()));
+    ui::ScreenUpdateBlocker blocker(_("Processing..."), os::getFilename(filename));
 
     _saveInProgress = true;