diff --git a/src/cascadia/PublicTerminalCore/HwndTerminal.cpp b/src/cascadia/PublicTerminalCore/HwndTerminal.cpp index ea35d60a20d..0499bb0896a 100644 --- a/src/cascadia/PublicTerminalCore/HwndTerminal.cpp +++ b/src/cascadia/PublicTerminalCore/HwndTerminal.cpp @@ -46,8 +46,8 @@ static bool RegisterTermClass(HINSTANCE hInstance) noexcept } HwndTerminal::HwndTerminal(HWND parentHwnd) : - _desiredFont{ DEFAULT_FONT_FACE.c_str(), 0, 10, { 0, 14 }, CP_UTF8 }, - _actualFont{ DEFAULT_FONT_FACE.c_str(), 0, 10, { 0, 14 }, CP_UTF8, false } + _desiredFont{ DEFAULT_FONT_FACE, 0, 10, { 0, 14 }, CP_UTF8 }, + _actualFont{ DEFAULT_FONT_FACE, 0, 10, { 0, 14 }, CP_UTF8, false } { HINSTANCE hInstance = wil::GetModuleInstanceHandle(); diff --git a/src/cascadia/TerminalApp/Profile.cpp b/src/cascadia/TerminalApp/Profile.cpp index 9fba138aa70..16c96db45ca 100644 --- a/src/cascadia/TerminalApp/Profile.cpp +++ b/src/cascadia/TerminalApp/Profile.cpp @@ -185,12 +185,12 @@ TerminalSettings Profile::CreateTerminalSettings(const std::unordered_map(range.EndCaretPosition) - static_cast(range.StartCaretPosition)); - args.Request().Text(winrt::to_hstring(textRequested.c_str())); + args.Request().Text(textRequested); } CATCH_LOG(); } @@ -318,7 +318,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation _inputBuffer = _inputBuffer.replace( range.StartCaretPosition, static_cast(range.EndCaretPosition) - static_cast(range.StartCaretPosition), - text.c_str()); + text); _textBlock.Text(_inputBuffer); diff --git a/src/cascadia/TerminalControl/TermControl.cpp b/src/cascadia/TerminalControl/TermControl.cpp index 0f2711986cd..b0760a100fe 100644 --- a/src/cascadia/TerminalControl/TermControl.cpp +++ b/src/cascadia/TerminalControl/TermControl.cpp @@ -60,8 +60,8 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation _autoScrollingPointerPoint{ std::nullopt }, _autoScrollTimer{}, _lastAutoScrollUpdateTime{ std::nullopt }, - _desiredFont{ DEFAULT_FONT_FACE.c_str(), 0, 10, { 0, DEFAULT_FONT_SIZE }, CP_UTF8 }, - _actualFont{ DEFAULT_FONT_FACE.c_str(), 0, 10, { 0, DEFAULT_FONT_SIZE }, CP_UTF8, false }, + _desiredFont{ DEFAULT_FONT_FACE, 0, 10, { 0, DEFAULT_FONT_SIZE }, CP_UTF8 }, + _actualFont{ DEFAULT_FONT_FACE, 0, 10, { 0, DEFAULT_FONT_SIZE }, CP_UTF8, false }, _touchAnchor{ std::nullopt }, _cursorTimer{}, _lastMouseClick{}, @@ -336,7 +336,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation } // Initialize our font information. - const auto* fontFace = _settings.FontFace().c_str(); + const auto fontFace = _settings.FontFace(); const short fontHeight = gsl::narrow(_settings.FontSize()); // The font width doesn't terribly matter, we'll only be using the // height to look it up @@ -649,7 +649,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation // This event is explicitly revoked in the destructor: does not need weak_ref auto onRecieveOutputFn = [this](const hstring str) { - _terminal->Write(str.c_str()); + _terminal->Write(str); }; _connectionOutputEventToken = _connection.TerminalOutput(onRecieveOutputFn); @@ -1458,7 +1458,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation { // Make sure we have a non-zero font size const auto newSize = std::max(gsl::narrow(fontSize), static_cast(1)); - const auto* fontFace = _settings.FontFace().c_str(); + const auto fontFace = _settings.FontFace(); _actualFont = { fontFace, 0, 10, { 0, newSize }, CP_UTF8, false }; _desiredFont = { _actualFont }; @@ -1707,7 +1707,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation } // send data up for clipboard - auto copyArgs = winrt::make_self(winrt::hstring(textData.data(), gsl::narrow(textData.size())), + auto copyArgs = winrt::make_self(winrt::hstring(textData), winrt::to_hstring(htmlData), winrt::to_hstring(rtfData)); _clipboardCopyHandlers(*this, *copyArgs); @@ -1811,7 +1811,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation winrt::Windows::Foundation::Point TermControl::GetProposedDimensions(IControlSettings const& settings, const uint32_t dpi) { // Initialize our font information. - const auto* fontFace = settings.FontFace().c_str(); + const auto fontFace = settings.FontFace(); const short fontHeight = gsl::narrow(settings.FontSize()); // The font width doesn't terribly matter, we'll only be using the // height to look it up diff --git a/src/cascadia/TerminalCore/terminalrenderdata.cpp b/src/cascadia/TerminalCore/terminalrenderdata.cpp index 72569317148..81794c4fba2 100644 --- a/src/cascadia/TerminalCore/terminalrenderdata.cpp +++ b/src/cascadia/TerminalCore/terminalrenderdata.cpp @@ -40,7 +40,7 @@ const FontInfo& Terminal::GetFontInfo() noexcept // by this method. // We could very likely replace this with just an IsRasterFont method // (which would return false) - static const FontInfo _fakeFontInfo(DEFAULT_FONT_FACE.c_str(), TMPF_TRUETYPE, 10, { 0, DEFAULT_FONT_SIZE }, CP_UTF8, false); + static const FontInfo _fakeFontInfo(DEFAULT_FONT_FACE, TMPF_TRUETYPE, 10, { 0, DEFAULT_FONT_SIZE }, CP_UTF8, false); return _fakeFontInfo; } #pragma warning(pop) diff --git a/src/cascadia/UnitTests_TerminalCore/MockTermSettings.h b/src/cascadia/UnitTests_TerminalCore/MockTermSettings.h index 0add72c8330..6866caea39a 100644 --- a/src/cascadia/UnitTests_TerminalCore/MockTermSettings.h +++ b/src/cascadia/UnitTests_TerminalCore/MockTermSettings.h @@ -32,7 +32,7 @@ namespace TerminalCoreUnitTests uint32_t CursorColor() { return COLOR_WHITE; } CursorStyle CursorShape() const noexcept { return CursorStyle::Vintage; } uint32_t CursorHeight() { return 42UL; } - winrt::hstring WordDelimiters() { return winrt::to_hstring(DEFAULT_WORD_DELIMITERS.c_str()); } + winrt::hstring WordDelimiters() { return winrt::hstring(DEFAULT_WORD_DELIMITERS); } bool CopyOnSelect() { return _copyOnSelect; } winrt::hstring StartingTitle() { return _startingTitle; } bool SuppressApplicationTitle() { return _suppressApplicationTitle; } diff --git a/src/cascadia/WindowsTerminal/AppHost.cpp b/src/cascadia/WindowsTerminal/AppHost.cpp index 63dd974de45..c4f8f2b7a75 100644 --- a/src/cascadia/WindowsTerminal/AppHost.cpp +++ b/src/cascadia/WindowsTerminal/AppHost.cpp @@ -169,7 +169,7 @@ void AppHost::Initialize() // - void AppHost::AppTitleChanged(const winrt::Windows::Foundation::IInspectable& /*sender*/, winrt::hstring newTitle) { - _window->UpdateTitle(newTitle.c_str()); + _window->UpdateTitle(newTitle); } // Method Description: