mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Eliminate some object file bloat

Browse source
This commit is contained in:
Thomas Goyne 2014-12-30 17:31:10 -08:00
parent affb47776b
commit b6edf58651
6 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libaegisub/include/libaegisub/access.h
View file

@ -24,9 +24,9 @@ enum Type {
void Check(fs::path const& file, acs::Type);
inline void CheckFileRead(fs::path const& file) { Check(file, acs::FileRead); }
inline void CheckFileWrite(fs::path const& file) { Check(file, acs::FileWrite); }
static inline void CheckFileRead(fs::path const& file) { Check(file, acs::FileRead); }
static inline void CheckFileWrite(fs::path const& file) { Check(file, acs::FileWrite); }
inline void CheckDirRead(fs::path const& dir) { Check(dir, acs::DirRead); }
inline void CheckDirWrite(fs::path const& dir) { Check(dir, acs::DirWrite); }
static inline void CheckDirRead(fs::path const& dir) { Check(dir, acs::DirRead); }
static inline void CheckDirWrite(fs::path const& dir) { Check(dir, acs::DirWrite); }
} }

4
libaegisub/include/libaegisub/fs.h
View file

@ -166,8 +166,8 @@ namespace agi {
template<typename T> void GetAll(T& cont);
};
inline DirectoryIterator& begin(DirectoryIterator &it) { return it; }
inline DirectoryIterator end(DirectoryIterator &) { return DirectoryIterator(); }
static inline DirectoryIterator& begin(DirectoryIterator &it) { return it; }
static inline DirectoryIterator end(DirectoryIterator &) { return DirectoryIterator(); }
template<typename T>
inline void DirectoryIterator::GetAll(T& cont) {

2
libaegisub/include/libaegisub/split.h
View file

@ -25,7 +25,7 @@ namespace agi {
return boost::make_split_iterator(str, boost::token_finder([=](Char c) { return c == delim; }));
}
inline std::string str(StringRange const& r) {
static inline std::string str(StringRange const& r) {
return std::string(r.begin(), r.end());
}
}

5
libaegisub/include/libaegisub/util.h
View file

@ -21,7 +21,10 @@ struct tm;
namespace agi {
namespace util {
/// Clamp `b` to the range [`a`,`c`]
template<typename T> inline T mid(T a, T b, T c) { return std::max(a, std::min(b, c)); }
template<typename T>
static inline T mid(T a, T b, T c) {
return std::max(a, std::min(b, c));
}
bool try_parse(std::string const& str, double *out);
bool try_parse(std::string const& str, int *out);

16
src/compat.cpp
View file

@ -19,3 +19,19 @@ wxArrayString to_wx(std::vector<std::string> const& vec) {
transform(vec.begin(), vec.end(), std::back_inserter(ret), (wxString (*)(std::string const&))to_wx);
return ret;
}
wxColour to_wx(agi::Color color) {
return wxColour(color.r, color.g, color.b, 255 - color.a);
}
wxString to_wx(std::string const& str) {
return wxString(str.c_str(), wxConvUTF8);
}
agi::Color from_wx(wxColour color) {
return agi::Color(color.Red(), color.Green(), color.Blue(), 255 - color.Alpha());
}
std::string from_wx(wxString const& str) {
return std::string(str.utf8_str());
}

8
src/compat.h
View file

@ -9,11 +9,11 @@
#include <libaegisub/color.h>
inline wxColour to_wx(agi::Color color) { return wxColour(color.r, color.g, color.b, 255 - color.a); }
inline wxString to_wx(std::string const& str) { return wxString(str.c_str(), wxConvUTF8); }
wxColour to_wx(agi::Color color);
wxString to_wx(std::string const& str);
wxArrayString to_wx(std::vector<std::string> const& vec);
inline agi::Color from_wx(wxColour color) { return agi::Color(color.Red(), color.Green(), color.Blue(), 255 - color.Alpha()); }
inline std::string from_wx(wxString const& str) { return std::string(str.utf8_str()); }
agi::Color from_wx(wxColour color);
std::string from_wx(wxString const& str);
wxArrayString lagi_MRU_wxAS(const char *list);