summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMaxime Coste <mawww@kakoune.org>2018-03-25 07:55:39 +1100
committerMaxime Coste <mawww@kakoune.org>2018-03-25 07:55:39 +1100
commit81f605709c51fc2818caae202dd27212fb9bed71 (patch)
tree051575ec5616edf87ecd2ec4f9cb19d350bdce44 /src
parent3fe93db610ae9961ddc756ccc70c4bb7c22234d9 (diff)
Remove parse_filename overload and use a default parameter
Diffstat (limited to 'src')
-rw-r--r--src/file.cc5
-rw-r--r--src/file.hh5
2 files changed, 2 insertions, 8 deletions
diff --git a/src/file.cc b/src/file.cc
index 49a1e6ab..6fa6d19f 100644
--- a/src/file.cc
+++ b/src/file.cc
@@ -58,11 +58,6 @@ String parse_filename(StringView filename, StringView buf_dir)
return filename.str();
}
-String parse_filename(StringView filename)
-{
- return parse_filename(filename, {});
-}
-
std::pair<StringView, StringView> split_path(StringView path)
{
auto it = find(path | reverse(), '/');
diff --git a/src/file.hh b/src/file.hh
index 5986ab2f..f5a8cf0b 100644
--- a/src/file.hh
+++ b/src/file.hh
@@ -3,6 +3,7 @@
#include "array_view.hh"
#include "meta.hh"
+#include "string.hh"
#include "units.hh"
#include "vector.hh"
@@ -14,14 +15,12 @@ namespace Kakoune
class Buffer;
class String;
-class StringView;
class Regex;
using CandidateList = Vector<String, MemoryDomain::Completion>;
// parse ~/ and %/ in filename and returns the translated filename
-String parse_filename(StringView filename, StringView buf_dir);
-String parse_filename(StringView filename);
+String parse_filename(StringView filename, StringView buf_dir = {});
String real_path(StringView filename);
String compact_path(StringView filename);