From 9da3ac3d3c700e728a4ab0a4beaa61bd9844f39e Mon Sep 17 00:00:00 2001 From: mlangkabel Date: Tue, 6 Feb 2018 10:03:46 +0100 Subject: [PATCH] src: switch to wstring for printing messages --- src/lib/utility/logging/logging.h | 21 +++++++++++++++++++ src/lib/utility/math/VectorBase.h | 16 ++++++++++++++ src/lib/utility/messaging/Message.h | 2 +- src/lib/utility/messaging/MessageBase.h | 9 ++++---- src/lib/utility/messaging/MessageQueue.cpp | 2 +- .../messaging/type/MessageActivateEdge.h | 8 +++---- .../messaging/type/MessageActivateFile.h | 4 ++-- .../type/MessageActivateLocalSymbols.h | 4 ++-- .../messaging/type/MessageActivateNodes.h | 4 ++-- .../type/MessageActivateSourceLocations.h | 4 ++-- .../messaging/type/MessageActivateTokenIds.h | 4 ++-- .../messaging/type/MessageActivateTokens.h | 4 ++-- .../messaging/type/MessageActivateTrailEdge.h | 8 +++---- .../messaging/type/MessageChangeFileView.h | 18 ++++++++-------- .../messaging/type/MessageCodeReference.h | 6 +++--- .../utility/messaging/type/MessageFocusIn.h | 4 ++-- .../utility/messaging/type/MessageFocusOut.h | 4 ++-- .../type/MessageGraphNodeBundleSplit.h | 2 +- .../messaging/type/MessageGraphNodeExpand.h | 8 +++---- .../messaging/type/MessageGraphNodeHide.h | 2 +- .../messaging/type/MessageGraphNodeMove.h | 4 ++-- .../messaging/type/MessageIDECreateCDB.h | 4 ++-- .../messaging/type/MessageLoadProject.h | 8 +++---- .../messaging/type/MessageMoveIDECursor.h | 4 ++-- .../utility/messaging/type/MessageNewErrors.h | 4 ++-- .../utility/messaging/type/MessageRefresh.h | 2 +- .../utility/messaging/type/MessageSearch.h | 6 +++--- .../type/MessageSearchAutocomplete.h | 10 ++++----- .../messaging/type/MessageSearchFullText.h | 4 ++-- .../messaging/type/MessageShowReference.h | 4 ++-- .../utility/messaging/type/MessageShowScope.h | 2 +- .../utility/messaging/type/MessageStatus.cpp | 10 ++++----- .../utility/messaging/type/MessageStatus.h | 2 +- .../messaging/type/MessageSwitchColorScheme.h | 4 ++-- src/lib/utility/messaging/type/MessageZoom.h | 6 +++--- .../data/parser/cxx/name/CxxDeclName.h | 8 +++---- 36 files changed, 127 insertions(+), 89 deletions(-) diff --git a/src/lib/utility/logging/logging.h b/src/lib/utility/logging/logging.h index 690ebb75..e7e0958a 100644 --- a/src/lib/utility/logging/logging.h +++ b/src/lib/utility/logging/logging.h @@ -29,6 +29,27 @@ } \ while(0) +#define LOG_INFO_BARE(__str__) \ + do \ + { \ + LogManager::getInstance()->logInfo(__str__, "", "", 0); \ + } \ + while(0) + +#define LOG_WARNING_BARE(__str__) \ + do \ + { \ + LogManager::getInstance()->logWarning(__str__, "", "", 0); \ + } \ + while(0) + +#define LOG_ERROR_BARE(__str__) \ + do \ + { \ + LogManager::getInstance()->logError(__str__, "", "", 0); \ + } \ + while(0) + #define LOG_INFO_STREAM(__s__) \ do \ { \ diff --git a/src/lib/utility/math/VectorBase.h b/src/lib/utility/math/VectorBase.h index 418a5a37..7dc7d648 100644 --- a/src/lib/utility/math/VectorBase.h +++ b/src/lib/utility/math/VectorBase.h @@ -89,6 +89,7 @@ public: bool operator!=(const VectorBase& other) const; std::string toString() const; + std::wstring toWString() const; protected: T m_values[N]; @@ -441,6 +442,21 @@ std::string VectorBase::toString() const return result.str(); } +template +std::wstring VectorBase::toWString() const +{ + std::wstringstream result; + result << L"["; + + for (unsigned int i = 0; i < N - 1; i++) + { + result << m_values[i] << L", "; + } + result << m_values[N - 1] << L"]"; + + return result.str(); +} + template std::ostream& operator<<(std::ostream& ostream, const VectorBase& vector) { diff --git a/src/lib/utility/messaging/Message.h b/src/lib/utility/messaging/Message.h index a74b61a9..ac41e2e0 100644 --- a/src/lib/utility/messaging/Message.h +++ b/src/lib/utility/messaging/Message.h @@ -34,7 +34,7 @@ public: MessageQueue::getInstance()->processMessage(message, true); } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { } }; diff --git a/src/lib/utility/messaging/MessageBase.h b/src/lib/utility/messaging/MessageBase.h index b12ef240..2256338f 100644 --- a/src/lib/utility/messaging/MessageBase.h +++ b/src/lib/utility/messaging/MessageBase.h @@ -5,6 +5,7 @@ #include #include "utility/types.h" +#include "utility/utilityString.h" class MessageBase { @@ -92,12 +93,12 @@ public: return m_keepContent; } - virtual void print(std::ostream& os) const = 0; + virtual void print(std::wostream& os) const = 0; - std::string str() const + std::wstring str() const { - std::stringstream ss; - ss << getType() << " "; + std::wstringstream ss; + ss << utility::decodeFromUtf8(getType()) << L" "; print(ss); return ss.str(); } diff --git a/src/lib/utility/messaging/MessageQueue.cpp b/src/lib/utility/messaging/MessageQueue.cpp index dafa8840..deffae14 100644 --- a/src/lib/utility/messaging/MessageQueue.cpp +++ b/src/lib/utility/messaging/MessageQueue.cpp @@ -92,7 +92,7 @@ void MessageQueue::processMessage(std::shared_ptr message, bool asN { if (message->isLogged()) { - LOG_INFO_STREAM_BARE(<< "send " << message->str()); + LOG_INFO_BARE(L"send " + message->str()); } if (m_sendMessagesAsTasks && message->sendAsTask()) diff --git a/src/lib/utility/messaging/type/MessageActivateEdge.h b/src/lib/utility/messaging/type/MessageActivateEdge.h index 1bd93a65..b91c13f5 100644 --- a/src/lib/utility/messaging/type/MessageActivateEdge.h +++ b/src/lib/utility/messaging/type/MessageActivateEdge.h @@ -34,17 +34,17 @@ public: return type == Edge::EDGE_AGGREGATION; } - std::string getFullName() const + std::wstring getFullName() const { std::wstring name = Edge::getReadableTypeString(type) + L":"; name += sourceNameHierarchy.getQualifiedNameWithSignature() + L"->"; name += targetNameHierarchy.getQualifiedNameWithSignature(); - return utility::encodeToUtf8(name); + return name; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { - os << tokenId << " - " << getFullName(); + os << tokenId << L" - " << getFullName(); } const Id tokenId; diff --git a/src/lib/utility/messaging/type/MessageActivateFile.h b/src/lib/utility/messaging/type/MessageActivateFile.h index eb43393f..3231dd06 100644 --- a/src/lib/utility/messaging/type/MessageActivateFile.h +++ b/src/lib/utility/messaging/type/MessageActivateFile.h @@ -18,9 +18,9 @@ public: return "MessageActivateFile"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { - os << filePath.str(); + os << filePath.wstr(); } const FilePath filePath; diff --git a/src/lib/utility/messaging/type/MessageActivateLocalSymbols.h b/src/lib/utility/messaging/type/MessageActivateLocalSymbols.h index c9e75ddc..a7d20abb 100644 --- a/src/lib/utility/messaging/type/MessageActivateLocalSymbols.h +++ b/src/lib/utility/messaging/type/MessageActivateLocalSymbols.h @@ -27,11 +27,11 @@ public: return "MessageActivateLocalSymbols"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { for (const Id& symbolId : symbolIds) { - os << symbolId << " "; + os << symbolId << L" "; } } diff --git a/src/lib/utility/messaging/type/MessageActivateNodes.h b/src/lib/utility/messaging/type/MessageActivateNodes.h index 68b77d7e..828613d1 100644 --- a/src/lib/utility/messaging/type/MessageActivateNodes.h +++ b/src/lib/utility/messaging/type/MessageActivateNodes.h @@ -36,11 +36,11 @@ public: return "MessageActivateNodes"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { for (const ActiveNode& node : nodes) { - os << node.nodeId << " "; + os << node.nodeId << L" "; } } diff --git a/src/lib/utility/messaging/type/MessageActivateSourceLocations.h b/src/lib/utility/messaging/type/MessageActivateSourceLocations.h index f17d76e5..0dd2a053 100644 --- a/src/lib/utility/messaging/type/MessageActivateSourceLocations.h +++ b/src/lib/utility/messaging/type/MessageActivateSourceLocations.h @@ -18,11 +18,11 @@ public: return "MessageActivateSourceLocations"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { for (const Id& id : locationIds) { - os << id << " "; + os << id << L" "; } } diff --git a/src/lib/utility/messaging/type/MessageActivateTokenIds.h b/src/lib/utility/messaging/type/MessageActivateTokenIds.h index 53e72d13..2474ee98 100644 --- a/src/lib/utility/messaging/type/MessageActivateTokenIds.h +++ b/src/lib/utility/messaging/type/MessageActivateTokenIds.h @@ -18,11 +18,11 @@ public: return "MessageActivateTokenIds"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { for (const Id& id : tokenIds) { - os << id << " "; + os << id << L" "; } } diff --git a/src/lib/utility/messaging/type/MessageActivateTokens.h b/src/lib/utility/messaging/type/MessageActivateTokens.h index 3910ab9a..76824329 100644 --- a/src/lib/utility/messaging/type/MessageActivateTokens.h +++ b/src/lib/utility/messaging/type/MessageActivateTokens.h @@ -24,11 +24,11 @@ public: return "MessageActivateTokens"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { for (const Id& id : tokenIds) { - os << id << " "; + os << id << L" "; } } diff --git a/src/lib/utility/messaging/type/MessageActivateTrailEdge.h b/src/lib/utility/messaging/type/MessageActivateTrailEdge.h index 44d75a43..e9d5097c 100644 --- a/src/lib/utility/messaging/type/MessageActivateTrailEdge.h +++ b/src/lib/utility/messaging/type/MessageActivateTrailEdge.h @@ -27,17 +27,17 @@ public: return "MessageActivateTrailEdge"; } - std::string getFullName() const + std::wstring getFullName() const { std::wstring name = Edge::getReadableTypeString(type) + L":"; name += sourceNameHierarchy.getQualifiedNameWithSignature() + L"->"; name += targetNameHierarchy.getQualifiedNameWithSignature(); - return utility::encodeToUtf8(name); + return name; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { - os << tokenId << " - " << getFullName(); + os << tokenId << L" - " << getFullName(); } const Id tokenId; diff --git a/src/lib/utility/messaging/type/MessageChangeFileView.h b/src/lib/utility/messaging/type/MessageChangeFileView.h index 58c55e74..fe033854 100644 --- a/src/lib/utility/messaging/type/MessageChangeFileView.h +++ b/src/lib/utility/messaging/type/MessageChangeFileView.h @@ -44,27 +44,27 @@ public: return "MessageChangeFileView"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { - os << filePath.str(); + os << filePath.wstr(); switch (state) { - case FILE_MINIMIZED: os << ", minimize"; break; - case FILE_SNIPPETS: os << ", snippets"; break; - case FILE_MAXIMIZED: os << ", maximize"; break; + case FILE_MINIMIZED: os << L", minimize"; break; + case FILE_SNIPPETS: os << L", snippets"; break; + case FILE_MAXIMIZED: os << L", maximize"; break; } switch (viewMode) { - case VIEW_LIST: os << ", list"; break; - case VIEW_SINGLE: os << ", single"; break; - case VIEW_CURRENT: os << ", current"; break; + case VIEW_LIST: os << L", list"; break; + case VIEW_SINGLE: os << L", single"; break; + case VIEW_CURRENT: os << L", current"; break; } if (needsData) { - os << ", needs data"; + os << L", needs data"; } } diff --git a/src/lib/utility/messaging/type/MessageCodeReference.h b/src/lib/utility/messaging/type/MessageCodeReference.h index 82c5c088..50cb798a 100644 --- a/src/lib/utility/messaging/type/MessageCodeReference.h +++ b/src/lib/utility/messaging/type/MessageCodeReference.h @@ -23,15 +23,15 @@ public: return "MessageCodeReference"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { if (type == REFERENCE_PREVIOUS) { - os << "previous"; + os << L"previous"; } else { - os << "next"; + os << L"next"; } } diff --git a/src/lib/utility/messaging/type/MessageFocusIn.h b/src/lib/utility/messaging/type/MessageFocusIn.h index 552abc13..20df5dd4 100644 --- a/src/lib/utility/messaging/type/MessageFocusIn.h +++ b/src/lib/utility/messaging/type/MessageFocusIn.h @@ -24,11 +24,11 @@ public: return "MessageFocusIn"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { for (const Id& id : tokenIds) { - os << id << " "; + os << id << L" "; } } diff --git a/src/lib/utility/messaging/type/MessageFocusOut.h b/src/lib/utility/messaging/type/MessageFocusOut.h index fae05cbe..069b8338 100644 --- a/src/lib/utility/messaging/type/MessageFocusOut.h +++ b/src/lib/utility/messaging/type/MessageFocusOut.h @@ -21,11 +21,11 @@ public: return "MessageFocusOut"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { for (const Id& id : tokenIds) { - os << id << " "; + os << id << L" "; } } diff --git a/src/lib/utility/messaging/type/MessageGraphNodeBundleSplit.h b/src/lib/utility/messaging/type/MessageGraphNodeBundleSplit.h index befe8486..c14729fa 100644 --- a/src/lib/utility/messaging/type/MessageGraphNodeBundleSplit.h +++ b/src/lib/utility/messaging/type/MessageGraphNodeBundleSplit.h @@ -20,7 +20,7 @@ public: return "MessageGraphNodeBundleSplit"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { os << bundleId; } diff --git a/src/lib/utility/messaging/type/MessageGraphNodeExpand.h b/src/lib/utility/messaging/type/MessageGraphNodeExpand.h index 2ea19458..2103eadd 100644 --- a/src/lib/utility/messaging/type/MessageGraphNodeExpand.h +++ b/src/lib/utility/messaging/type/MessageGraphNodeExpand.h @@ -20,16 +20,16 @@ public: return "MessageGraphNodeExpand"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { - os << tokenId << " "; + os << tokenId << L" "; if (expand) { - os << "expand"; + os << L"expand"; } else { - os << "collapse"; + os << L"collapse"; } } diff --git a/src/lib/utility/messaging/type/MessageGraphNodeHide.h b/src/lib/utility/messaging/type/MessageGraphNodeHide.h index b400317e..4088683d 100644 --- a/src/lib/utility/messaging/type/MessageGraphNodeHide.h +++ b/src/lib/utility/messaging/type/MessageGraphNodeHide.h @@ -18,7 +18,7 @@ public: return "MessageGraphNodeHide"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { os << tokenId; } diff --git a/src/lib/utility/messaging/type/MessageGraphNodeMove.h b/src/lib/utility/messaging/type/MessageGraphNodeMove.h index 5b2d66a6..6690731a 100644 --- a/src/lib/utility/messaging/type/MessageGraphNodeMove.h +++ b/src/lib/utility/messaging/type/MessageGraphNodeMove.h @@ -20,9 +20,9 @@ public: return "MessageGraphNodeMove"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { - os << tokenId << " " << delta.toString(); + os << tokenId << L" " << delta.toWString(); } const Id tokenId; diff --git a/src/lib/utility/messaging/type/MessageIDECreateCDB.h b/src/lib/utility/messaging/type/MessageIDECreateCDB.h index 79174634..0559b228 100644 --- a/src/lib/utility/messaging/type/MessageIDECreateCDB.h +++ b/src/lib/utility/messaging/type/MessageIDECreateCDB.h @@ -15,9 +15,9 @@ public: return "MessageIDECreateCDB"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { - os << "Create CDB from current solution"; + os << L"Create CDB from current solution"; } }; diff --git a/src/lib/utility/messaging/type/MessageLoadProject.h b/src/lib/utility/messaging/type/MessageLoadProject.h index 36283017..653c901f 100644 --- a/src/lib/utility/messaging/type/MessageLoadProject.h +++ b/src/lib/utility/messaging/type/MessageLoadProject.h @@ -22,11 +22,11 @@ public: return "MessageLoadProject"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { - os << projectSettingsFilePath.str(); - os << ", settingsChanged: " << std::boolalpha << settingsChanged; - os << ", refreshMode: " << refreshMode; + os << projectSettingsFilePath.wstr(); + os << L", settingsChanged: " << std::boolalpha << settingsChanged; + os << L", refreshMode: " << refreshMode; } const FilePath projectSettingsFilePath; diff --git a/src/lib/utility/messaging/type/MessageMoveIDECursor.h b/src/lib/utility/messaging/type/MessageMoveIDECursor.h index e4dda306..7071d529 100644 --- a/src/lib/utility/messaging/type/MessageMoveIDECursor.h +++ b/src/lib/utility/messaging/type/MessageMoveIDECursor.h @@ -19,9 +19,9 @@ public: return "MessageMoveIDECursor"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { - os << filePath.str() << ":" << row << ":" << column; + os << filePath.wstr() << L":" << row << L":" << column; } const FilePath filePath; diff --git a/src/lib/utility/messaging/type/MessageNewErrors.h b/src/lib/utility/messaging/type/MessageNewErrors.h index 3151f757..1cd6248e 100644 --- a/src/lib/utility/messaging/type/MessageNewErrors.h +++ b/src/lib/utility/messaging/type/MessageNewErrors.h @@ -22,9 +22,9 @@ public: return "MessageNewErrors"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { - os << errors.size() << " errors"; + os << errors.size() << L" errors"; } std::vector errors; diff --git a/src/lib/utility/messaging/type/MessageRefresh.h b/src/lib/utility/messaging/type/MessageRefresh.h index 52c9ba9d..f7cb3c16 100644 --- a/src/lib/utility/messaging/type/MessageRefresh.h +++ b/src/lib/utility/messaging/type/MessageRefresh.h @@ -37,7 +37,7 @@ public: return *this; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { if (uiOnly) { diff --git a/src/lib/utility/messaging/type/MessageSearch.h b/src/lib/utility/messaging/type/MessageSearch.h index 157bd0b0..8b16b380 100644 --- a/src/lib/utility/messaging/type/MessageSearch.h +++ b/src/lib/utility/messaging/type/MessageSearch.h @@ -22,7 +22,7 @@ public: return "MessageSearch"; } - std::string getMatchesAsString() const + std::wstring getMatchesAsString() const { std::stringstream ss; @@ -43,7 +43,7 @@ public: } } - return ss.str(); + return utility::decodeFromUtf8(ss.str()); } const std::vector& getMatches() const @@ -67,7 +67,7 @@ public: return tokenIds; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { os << getMatchesAsString(); } diff --git a/src/lib/utility/messaging/type/MessageSearchAutocomplete.h b/src/lib/utility/messaging/type/MessageSearchAutocomplete.h index 8c90635a..9bedbc5a 100644 --- a/src/lib/utility/messaging/type/MessageSearchAutocomplete.h +++ b/src/lib/utility/messaging/type/MessageSearchAutocomplete.h @@ -20,19 +20,19 @@ public: return "MessageSearchAutocomplete"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { - os << query << "["; + os << utility::decodeFromUtf8(query) << L"["; std::vector nodeTypeIds = acceptedNodeTypes.getNodeTypeIds(); for (size_t i = 0; i < nodeTypeIds.size(); i++) { if (i != 0) { - os << ", "; + os << L", "; } - os << std::to_string(nodeTypeIds[i]); + os << std::to_wstring(nodeTypeIds[i]); } - os << "]"; + os << L"]"; } const std::string query; diff --git a/src/lib/utility/messaging/type/MessageSearchFullText.h b/src/lib/utility/messaging/type/MessageSearchFullText.h index 295d9ab4..b0e06277 100644 --- a/src/lib/utility/messaging/type/MessageSearchFullText.h +++ b/src/lib/utility/messaging/type/MessageSearchFullText.h @@ -17,9 +17,9 @@ public: return "MessageSearchFullText"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { - os << searchTerm; + os << utility::decodeFromUtf8(searchTerm); } const std::string searchTerm; diff --git a/src/lib/utility/messaging/type/MessageShowReference.h b/src/lib/utility/messaging/type/MessageShowReference.h index 7bfca669..e4f90251 100644 --- a/src/lib/utility/messaging/type/MessageShowReference.h +++ b/src/lib/utility/messaging/type/MessageShowReference.h @@ -21,9 +21,9 @@ public: return "MessageShowReference"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { - os << "index: " << refIndex << " token: " << tokenId << " location: " << locationId; + os << L"index: " << refIndex << L" token: " << tokenId << L" location: " << locationId; } const size_t refIndex; diff --git a/src/lib/utility/messaging/type/MessageShowScope.h b/src/lib/utility/messaging/type/MessageShowScope.h index 7b5d2cc7..9e0cc496 100644 --- a/src/lib/utility/messaging/type/MessageShowScope.h +++ b/src/lib/utility/messaging/type/MessageShowScope.h @@ -19,7 +19,7 @@ public: return "MessageShowScope"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { os << scopeLocationId; } diff --git a/src/lib/utility/messaging/type/MessageStatus.cpp b/src/lib/utility/messaging/type/MessageStatus.cpp index bc09a4ff..bc9a0134 100644 --- a/src/lib/utility/messaging/type/MessageStatus.cpp +++ b/src/lib/utility/messaging/type/MessageStatus.cpp @@ -48,26 +48,26 @@ std::wstring MessageStatus::status() const return L""; } -void MessageStatus::print(std::ostream& os) const +void MessageStatus::print(std::wostream& os) const { for (const std::wstring& status : m_stati) { - os << utility::encodeToUtf8(status); + os << status; if (m_stati.size() > 1) { - os << " - "; + os << L" - "; } } if (isError) { - os << " - error"; + os << L" - error"; } if (showLoader) { - os << " - loading"; + os << L" - loading"; } } diff --git a/src/lib/utility/messaging/type/MessageStatus.h b/src/lib/utility/messaging/type/MessageStatus.h index a1341813..4601c6cc 100644 --- a/src/lib/utility/messaging/type/MessageStatus.h +++ b/src/lib/utility/messaging/type/MessageStatus.h @@ -18,7 +18,7 @@ public: const std::vector& stati() const; std::wstring status() const; - virtual void print(std::ostream& os) const; + virtual void print(std::wostream& os) const; const bool isError; const bool showLoader; diff --git a/src/lib/utility/messaging/type/MessageSwitchColorScheme.h b/src/lib/utility/messaging/type/MessageSwitchColorScheme.h index d7a3f7fd..c4769726 100644 --- a/src/lib/utility/messaging/type/MessageSwitchColorScheme.h +++ b/src/lib/utility/messaging/type/MessageSwitchColorScheme.h @@ -17,9 +17,9 @@ public: return "MessageSwitchColorScheme"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { - os << colorSchemePath.str(); + os << colorSchemePath.wstr(); } const FilePath colorSchemePath; diff --git a/src/lib/utility/messaging/type/MessageZoom.h b/src/lib/utility/messaging/type/MessageZoom.h index 49b319ff..dd8f3e41 100644 --- a/src/lib/utility/messaging/type/MessageZoom.h +++ b/src/lib/utility/messaging/type/MessageZoom.h @@ -17,15 +17,15 @@ public: return "MessageZoom"; } - virtual void print(std::ostream& os) const + virtual void print(std::wostream& os) const { if (zoomIn) { - os << "in"; + os << L"in"; } else { - os << "out"; + os << L"out"; } } diff --git a/src/lib_cxx/data/parser/cxx/name/CxxDeclName.h b/src/lib_cxx/data/parser/cxx/name/CxxDeclName.h index 3f1d1db9..008e6768 100644 --- a/src/lib_cxx/data/parser/cxx/name/CxxDeclName.h +++ b/src/lib_cxx/data/parser/cxx/name/CxxDeclName.h @@ -13,8 +13,8 @@ class CxxDeclName: public CxxName public: // uncomment this constructor if required, but try to use the one using move constructors for the members //CxxDeclName( - // const std::string& name, - // const std::vector& templateParameterNames + // const std::wstring& name, + // const std::vector& templateParameterNames //); CxxDeclName( @@ -24,8 +24,8 @@ public: // uncomment this constructor if required, but try to use the one using move constructors for the members //CxxDeclName( - // const std::string& name, - // const std::vector& templateParameterNames, + // const std::wstring& name, + // const std::vector& templateParameterNames, // std::shared_ptr parent //);