diff --git a/src/lib/component/controller/CodeController.cpp b/src/lib/component/controller/CodeController.cpp index a11d1cd7..f58ee104 100644 --- a/src/lib/component/controller/CodeController.cpp +++ b/src/lib/component/controller/CodeController.cpp @@ -40,7 +40,7 @@ void CodeController::handleMessage(MessageActivateAll* message) } CodeSnippetParams statsSnippet; - statsSnippet.title = currentProject->getProjectSettingsFilePath().withoutExtension().fileName(); + statsSnippet.title = currentProject->getProjectSettingsFilePath().withoutExtension().wFileName(); statsSnippet.startLineNumber = 1; statsSnippet.endLineNumber = 1; @@ -660,7 +660,7 @@ std::vector CodeController::getSnippetsForFile( { if (location->getTokenIds().size()) { - params.title = utility::encodeToUtf8(m_storageAccess->getNameHierarchyForNodeId(location->getTokenIds()[0]).getQualifiedName()); + params.title = m_storageAccess->getNameHierarchyForNodeId(location->getTokenIds()[0]).getQualifiedName(); params.titleId = location->getLocationId(); } } @@ -669,7 +669,7 @@ std::vector CodeController::getSnippetsForFile( if (!activeSourceLocations->isWhole() && params.titleId == 0) { - params.title = activeSourceLocations->getFilePath().str(); + params.title = activeSourceLocations->getFilePath().wstr(); } const SourceLocation* lastSourceLocation = @@ -682,7 +682,7 @@ std::vector CodeController::getSnippetsForFile( { if (location->getTokenIds().size()) { - params.footer = utility::encodeToUtf8(m_storageAccess->getNameHierarchyForNodeId(location->getTokenIds()[0]).getQualifiedName()); + params.footer = m_storageAccess->getNameHierarchyForNodeId(location->getTokenIds()[0]).getQualifiedName(); params.footerId = location->getLocationId(); } } diff --git a/src/lib/component/controller/TooltipController.cpp b/src/lib/component/controller/TooltipController.cpp index 68efd680..2c463f3e 100644 --- a/src/lib/component/controller/TooltipController.cpp +++ b/src/lib/component/controller/TooltipController.cpp @@ -75,7 +75,7 @@ void TooltipController::handleMessage(MessageTooltipHide* message) void TooltipController::handleMessage(MessageTooltipShow* message) { - if (message->tooltipInfo.title.size()) + if (!message->tooltipInfo.title.empty()) { requestTooltipShow(std::vector(), message->tooltipInfo, message->origin); } diff --git a/src/lib/component/view/helper/CodeSnippetParams.h b/src/lib/component/view/helper/CodeSnippetParams.h index 25e4a77d..12db8e33 100644 --- a/src/lib/component/view/helper/CodeSnippetParams.h +++ b/src/lib/component/view/helper/CodeSnippetParams.h @@ -19,8 +19,8 @@ struct CodeSnippetParams uint startLineNumber; uint endLineNumber; - std::string title; - std::string footer; + std::wstring title; + std::wstring footer; std::string code; Id titleId; diff --git a/src/lib/data/parser/AccessKind.cpp b/src/lib/data/parser/AccessKind.cpp index 55031b4a..6c3e08dc 100644 --- a/src/lib/data/parser/AccessKind.cpp +++ b/src/lib/data/parser/AccessKind.cpp @@ -25,25 +25,25 @@ int accessKindToInt(AccessKind t) return t; } -std::string accessKindToString(AccessKind t) +std::wstring accessKindToString(AccessKind t) { switch (t) { case ACCESS_NONE: - return ""; + return L""; case ACCESS_PUBLIC: - return "public"; + return L"public"; case ACCESS_PROTECTED: - return "protected"; + return L"protected"; case ACCESS_PRIVATE: - return "private"; + return L"private"; case ACCESS_DEFAULT: - return "default"; + return L"default"; case ACCESS_TEMPLATE_PARAMETER: - return "template parameter"; + return L"template parameter"; case ACCESS_TYPE_PARAMETER: - return "type parameter"; + return L"type parameter"; } - return ""; + return L""; } diff --git a/src/lib/data/parser/AccessKind.h b/src/lib/data/parser/AccessKind.h index 308fb5c2..8c7ac5be 100644 --- a/src/lib/data/parser/AccessKind.h +++ b/src/lib/data/parser/AccessKind.h @@ -16,6 +16,6 @@ enum AccessKind AccessKind intToAccessKind(int v); int accessKindToInt(AccessKind t); -std::string accessKindToString(AccessKind t); +std::wstring accessKindToString(AccessKind t); #endif // ACCESS_KIND_H diff --git a/src/lib/data/storage/PersistentStorage.cpp b/src/lib/data/storage/PersistentStorage.cpp index bbc8dcbc..ac82d60f 100644 --- a/src/lib/data/storage/PersistentStorage.cpp +++ b/src/lib/data/storage/PersistentStorage.cpp @@ -1703,7 +1703,7 @@ TooltipInfo PersistentStorage::getTooltipInfoForTokenIds(const std::vector& } const NodeType type = utility::intToType(node.type); - info.title = type.getReadableTypeString(); + info.title = type.getReadableTypeWString(); DefinitionKind defKind = DEFINITION_NONE; const StorageSymbol symbol = m_sqliteIndexStorage.getFirstById(node.id); @@ -1717,7 +1717,7 @@ TooltipInfo PersistentStorage::getTooltipInfoForTokenIds(const std::vector& const StorageComponentAccess access = m_sqliteIndexStorage.getComponentAccessByNodeId(node.id); if (access.nodeId != 0) { - info.title = accessKindToString(intToAccessKind(access.type)) + " " + info.title; + info.title = accessKindToString(intToAccessKind(access.type)) + L" " + info.title; } } @@ -1725,16 +1725,16 @@ TooltipInfo PersistentStorage::getTooltipInfoForTokenIds(const std::vector& { if (!getFileNodeComplete(node.id)) { - info.title = "incomplete " + info.title; + info.title = L"incomplete " + info.title; } } else if (defKind == DEFINITION_NONE) { - info.title = "non-indexed " + info.title; + info.title = L"non-indexed " + info.title; } else if (defKind == DEFINITION_IMPLICIT) { - info.title = "implicit " + info.title; + info.title = L"implicit " + info.title; } info.count = 0; diff --git a/src/lib/data/tooltip/TooltipInfo.h b/src/lib/data/tooltip/TooltipInfo.h index 9c5047bd..49ab292d 100644 --- a/src/lib/data/tooltip/TooltipInfo.h +++ b/src/lib/data/tooltip/TooltipInfo.h @@ -21,7 +21,7 @@ struct TooltipInfo return title.size() || snippets.size(); } - std::string title; + std::wstring title; int count = -1; std::string countText; diff --git a/src/lib_gui/qt/element/QtCodeFileSingle.cpp b/src/lib_gui/qt/element/QtCodeFileSingle.cpp index 07720e31..8f5f4f68 100644 --- a/src/lib_gui/qt/element/QtCodeFileSingle.cpp +++ b/src/lib_gui/qt/element/QtCodeFileSingle.cpp @@ -301,7 +301,7 @@ void QtCodeFileSingle::setFileData(const FileData& file) m_currentFilePath = file.filePath; m_titleBar->setMaximized(); - if (file.title.size()) + if (!file.title.empty()) { titleButton->setProject(file.title); titleButton->setIsComplete(true); diff --git a/src/lib_gui/qt/element/QtCodeFileSingle.h b/src/lib_gui/qt/element/QtCodeFileSingle.h index 062f2491..d2e5bd5c 100644 --- a/src/lib_gui/qt/element/QtCodeFileSingle.h +++ b/src/lib_gui/qt/element/QtCodeFileSingle.h @@ -61,7 +61,7 @@ private: FilePath filePath; TimeStamp modificationTime; bool isComplete = false; - std::string title; + std::wstring title; QtCodeArea* area = nullptr; }; diff --git a/src/lib_gui/qt/element/QtCodeFileTitleButton.cpp b/src/lib_gui/qt/element/QtCodeFileTitleButton.cpp index f8bb1dfd..bdbb699e 100644 --- a/src/lib_gui/qt/element/QtCodeFileTitleButton.cpp +++ b/src/lib_gui/qt/element/QtCodeFileTitleButton.cpp @@ -82,17 +82,15 @@ void QtCodeFileTitleButton::setIsComplete(bool isComplete) } } -void QtCodeFileTitleButton::setProject(const std::string& name) +void QtCodeFileTitleButton::setProject(const std::wstring& name) { m_filePath = FilePath(); - setText(name.c_str()); + setText(QString::fromStdWString(name)); setToolTip("edit project"); - std::string text = ResourcePaths::getGuiPath().str() + "code_view/images/edit.png"; - setIcon(utility::colorizePixmap( - QPixmap(text.c_str()), + QPixmap(QString::fromStdWString(ResourcePaths::getGuiPath().concatenate(L"code_view/images/edit.png").wstr())), ColorScheme::getInstance()->getColor("code/file/title/icon").c_str() )); } @@ -131,7 +129,7 @@ void QtCodeFileTitleButton::updateFromOther(const QtCodeFileTitleButton* other) } else { - setProject(other->text().toStdString()); + setProject(other->text().toStdWString()); } setModificationTime(other->m_modificationTime); diff --git a/src/lib_gui/qt/element/QtCodeFileTitleButton.h b/src/lib_gui/qt/element/QtCodeFileTitleButton.h index dfd29120..7f51bbe6 100644 --- a/src/lib_gui/qt/element/QtCodeFileTitleButton.h +++ b/src/lib_gui/qt/element/QtCodeFileTitleButton.h @@ -18,7 +18,7 @@ public: void setFilePath(const FilePath& filePath); void setModificationTime(const TimeStamp modificationTime); void setIsComplete(bool isComplete); - void setProject(const std::string& name); + void setProject(const std::wstring& name); void updateTexts(); diff --git a/src/lib_gui/qt/element/QtCodeSnippet.cpp b/src/lib_gui/qt/element/QtCodeSnippet.cpp index 8bc89974..09ce52ad 100644 --- a/src/lib_gui/qt/element/QtCodeSnippet.cpp +++ b/src/lib_gui/qt/element/QtCodeSnippet.cpp @@ -78,7 +78,7 @@ QtCodeSnippet::QtCodeSnippet(const CodeSnippetParams& params, QtCodeNavigator* n layout->setAlignment(Qt::AlignTop); setLayout(layout); - if (m_titleString.size() && !params.reduced) + if (!m_titleString.empty() && !params.reduced) { m_title = createScopeLine(layout); if (m_titleId == 0) // title is a file path @@ -87,7 +87,7 @@ QtCodeSnippet::QtCodeSnippet(const CodeSnippetParams& params, QtCodeNavigator* n } else { - m_title->setText(m_titleString.c_str()); + m_title->setText(QString::fromStdWString(m_titleString)); } connect(m_title, &QPushButton::clicked, this, &QtCodeSnippet::clickedTitle); } @@ -95,7 +95,7 @@ QtCodeSnippet::QtCodeSnippet(const CodeSnippetParams& params, QtCodeNavigator* n m_codeArea = new QtCodeArea(params.startLineNumber, params.code, params.locationFile, navigator, !params.reduced, this); layout->addWidget(m_codeArea); - if (m_footerString.size()) + if (!m_footerString.empty()) { m_footer = createScopeLine(layout); if (m_footerId == 0) // footer is a file path @@ -104,7 +104,7 @@ QtCodeSnippet::QtCodeSnippet(const CodeSnippetParams& params, QtCodeNavigator* n } else { - m_footer->setText(m_footerString.c_str()); + m_footer->setText(QString::fromStdWString(m_footerString)); } connect(m_footer, &QPushButton::clicked, this, &QtCodeSnippet::clickedFooter); } diff --git a/src/lib_gui/qt/element/QtCodeSnippet.h b/src/lib_gui/qt/element/QtCodeSnippet.h index 8f7aa520..bf71e188 100644 --- a/src/lib_gui/qt/element/QtCodeSnippet.h +++ b/src/lib_gui/qt/element/QtCodeSnippet.h @@ -64,10 +64,10 @@ private: QtCodeFile* m_file; Id m_titleId; - std::string m_titleString; + std::wstring m_titleString; Id m_footerId; - std::string m_footerString; + std::wstring m_footerString; std::vector m_dots; diff --git a/src/lib_gui/qt/element/QtTooltip.cpp b/src/lib_gui/qt/element/QtTooltip.cpp index 6949d1e3..486234ba 100644 --- a/src/lib_gui/qt/element/QtTooltip.cpp +++ b/src/lib_gui/qt/element/QtTooltip.cpp @@ -34,7 +34,7 @@ void QtTooltip::setTooltipInfo(TooltipInfo info) { if (info.title.size()) { - addTitle(info.title.c_str(), info.count, info.countText.c_str()); + addTitle(QString::fromStdWString(info.title), info.count, info.countText.c_str()); } for (TooltipSnippet& snippet : info.snippets) diff --git a/src/lib_gui/qt/view/graphElements/QtGraphEdge.cpp b/src/lib_gui/qt/view/graphElements/QtGraphEdge.cpp index 4ddc5011..599ed5d4 100644 --- a/src/lib_gui/qt/view/graphElements/QtGraphEdge.cpp +++ b/src/lib_gui/qt/view/graphElements/QtGraphEdge.cpp @@ -302,11 +302,11 @@ void QtGraphEdge::focusIn() Edge::EdgeType type = (getData() ? getData()->getType() : Edge::EDGE_AGGREGATION); TooltipInfo info; - info.title = utility::encodeToUtf8(Edge::getReadableTypeString(type)); + info.title = Edge::getReadableTypeString(type); if (type == Edge::EDGE_AGGREGATION && m_direction == TokenComponentAggregation::DIRECTION_NONE) { - info.title = "bidirectional " + info.title; + info.title = L"bidirectional " + info.title; } if (type == Edge::EDGE_AGGREGATION)