diff --git a/src/libs/utils/smallstringio.h b/src/libs/utils/smallstringio.h index dabb444912a..8e2b3f598be 100644 --- a/src/libs/utils/smallstringio.h +++ b/src/libs/utils/smallstringio.h @@ -62,7 +62,7 @@ QDataStream &operator>>(QDataStream &in, BasicSmallString &string) char *data = string.data(); - in.readRawData(data, size); + in.readRawData(data, int(size)); } return in; @@ -79,38 +79,26 @@ QDebug &operator<<(QDebug &debug, const String &string) } template -std::ostream &operator<<(std::ostream &stream, const BasicSmallString &string) -{ - using std::operator<<; - - stream.write(string.data(), std::streamsize(string.size())); - - return stream; -} - -inline -std::ostream &operator<<(std::ostream &stream, SmallStringView string) -{ - using std::operator<<; - - stream.write(string.data(), std::streamsize(string.size())); - - return stream; -} - -template -void PrintTo(const BasicSmallString &string, ::std::ostream *os) +std::ostream &operator<<(std::ostream &out, const BasicSmallString &string) { BasicSmallString formatedString = string.clone(); formatedString.replace("\n", "\\n"); formatedString.replace("\t", "\\t"); - *os << "'"; + out << "\""; - os->write(formatedString.data(), formatedString.size()); + out.write(formatedString.data(), std::streamsize(formatedString.size())); - *os<< "'"; + out << "\""; + + return out; +} + +inline +std::ostream &operator<<(std::ostream &out, SmallStringView string) +{ + return out << PathString(string); } template @@ -155,9 +143,9 @@ QDebug operator<<(QDebug debug, const BasicSmallStringVector &stringVect } template -void PrintTo(const BasicSmallStringVector &textVector, ::std::ostream* os) +std::ostream &operator<<(std::ostream &out, const BasicSmallStringVector &textVector) { - *os << "[" << textVector.join(", ").constData() << "]"; + return out << "[" << textVector.join("\", \"") << "]"; } } // namespace Utils