Merge latest fixes from stable branch

This commit is contained in:
Christophe Dumez
2010-06-03 20:08:19 +00:00
parent b67938aa3f
commit 4e1366bf0d
8 changed files with 69 additions and 29 deletions

View File

@@ -59,6 +59,14 @@ public:
return QString::fromLocal8Bit(str);
}
static inline QString toQStringU(std::string str) {
return QString::fromUtf8(str.c_str());
}
static inline QString toQStringU(char* str) {
return QString::fromUtf8(str);
}
static inline QString toQString(sha1_hash hash) {
std::ostringstream o;
o << hash;