diff --git a/src/lib/base/BaseException.cpp b/src/lib/base/BaseException.cpp index 93f4d00d3..3f7a256ca 100644 --- a/src/lib/base/BaseException.cpp +++ b/src/lib/base/BaseException.cpp @@ -31,8 +31,8 @@ const char *BaseException::what() const throw() return what; } - m_what = getWhat(); - return qPrintable(m_what); + m_what = getWhat().toLocal8Bit(); + return m_what.constData(); } QString BaseException::format(const char * /*id*/, const char *fmt, ...) const noexcept diff --git a/src/lib/base/BaseException.h b/src/lib/base/BaseException.h index 4b447e32e..8727efdd4 100644 --- a/src/lib/base/BaseException.h +++ b/src/lib/base/BaseException.h @@ -11,6 +11,7 @@ #include #include +#include #include //! Exception base class @@ -45,5 +46,5 @@ protected: virtual QString format(const char *id, const char *defaultFormat, ...) const noexcept; private: - mutable QString m_what; + mutable QByteArray m_what; }; diff --git a/src/lib/net/SocketException.h b/src/lib/net/SocketException.h index f5a26eb8b..0ddc74d9a 100644 --- a/src/lib/net/SocketException.h +++ b/src/lib/net/SocketException.h @@ -11,6 +11,8 @@ #include "base/BaseException.h" #include "io/IOException.h" +#include + /** * @brief SocketException generic socket exception */ @@ -81,11 +83,11 @@ public: { if (m_state == kFirst) { m_state = kFormat; - m_formatted = getWhat(); + m_formatted = getWhat().toLocal8Bit(); m_state = kDone; } if (m_state == kDone) { - return qPrintable(m_formatted); + return m_formatted.constData(); } else { return IOCloseException::what(); } @@ -102,7 +104,7 @@ private: kDone }; mutable EState m_state; - mutable QString m_formatted; + mutable QByteArray m_formatted; }; /** @@ -125,11 +127,11 @@ public: { if (m_state == kFirst) { m_state = kFormat; - m_formatted = getWhat(); + m_formatted = getWhat().toLocal8Bit(); m_state = kDone; } if (m_state == kDone) { - return qPrintable(m_formatted); + return m_formatted.constData(); } else { return SocketException::what(); } @@ -143,7 +145,7 @@ private: kDone }; mutable EState m_state; - mutable QString m_formatted; + mutable QByteArray m_formatted; }; /**