github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove BOM support from encoding::type

Browse Source
This commit is contained in:
Allan Odgaard
2016-06-21 19:30:22 +02:00
parent 4b3d959c85
commit 7b2e296907
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Frameworks/file/src/encoding.cc
View File

@@ -21,12 +21,6 @@ std::string const kCharsetUnknown = "UNKNOWN";
namespace encoding
{
bool type::supports_byte_order_mark (std::string const& charset)
{
static std::set<std::string> const Encodings = { kCharsetUTF8, kCharsetUTF16BE, kCharsetUTF16LE, kCharsetUTF32BE, kCharsetUTF32LE };
return Encodings.find(charset) != Encodings.end();
}
io::bytes_ptr convert (io::bytes_ptr content, std::string const& from, std::string const& to)
{
io::bytes_ptr res;

9
Frameworks/file/src/encoding.h
View File

@@ -44,22 +44,17 @@ namespace encoding
struct PUBLIC type
{
type () { }
type (std::string const& newlines, std::string const& charset, bool byte_order_mark = false) : _newlines(newlines), _charset(charset), _byte_order_mark(byte_order_mark) { }
type (std::string const& newlines, std::string const& charset) : _newlines(newlines), _charset(charset) { }
std::string const& newlines () const { return _newlines; }
std::string const& charset () const { return _charset; }
bool byte_order_mark () const { return _byte_order_mark && supports_byte_order_mark(_charset); }
void set_newlines (std::string const& newlines) { _newlines = newlines; }
void set_charset (std::string const& charset) { _charset = charset; _byte_order_mark = charset != kCharsetUTF8 && supports_byte_order_mark(charset); }
void set_byte_order_mark (bool flag) { _byte_order_mark = flag; }
static bool supports_byte_order_mark (std::string const& charset);
void set_charset (std::string const& charset) { _charset = charset; }
private:
std::string _newlines = NULL_STR;
std::string _charset = kCharsetNoEncoding;
bool _byte_order_mark = false;
};
} /* encoding */