Author: Jonas Devlieghere Date: 2025-02-14T22:28:42-08:00 New Revision: 776fa2d731c17d6ba0afad2554ebc89cf5e3e5ef
URL: https://github.com/llvm/llvm-project/commit/776fa2d731c17d6ba0afad2554ebc89cf5e3e5ef DIFF: https://github.com/llvm/llvm-project/commit/776fa2d731c17d6ba0afad2554ebc89cf5e3e5ef.diff LOG: [lldb] Gardening in IOHandlerCurses (NFC) - Remove _ap (auto_ptr) suffix with _up (unique_ptr) suffix - Move forward declaration from IOHandler.h to IOHandlerCursesGUI.h - Move curses namespace under lldb_private Motivated by Alex' comment in #126630. Added: Modified: lldb/include/lldb/Core/IOHandler.h lldb/include/lldb/Core/IOHandlerCursesGUI.h lldb/source/Core/IOHandlerCursesGUI.cpp Removed: ################################################################################ diff --git a/lldb/include/lldb/Core/IOHandler.h b/lldb/include/lldb/Core/IOHandler.h index cb14d72413209..d6ac1cc8b5a14 100644 --- a/lldb/include/lldb/Core/IOHandler.h +++ b/lldb/include/lldb/Core/IOHandler.h @@ -32,11 +32,6 @@ namespace lldb_private { class Debugger; } // namespace lldb_private -namespace curses { -class Application; -typedef std::unique_ptr<Application> ApplicationAP; -} // namespace curses - namespace lldb_private { class IOHandler { diff --git a/lldb/include/lldb/Core/IOHandlerCursesGUI.h b/lldb/include/lldb/Core/IOHandlerCursesGUI.h index 22ca735063ba1..e9871e0532194 100644 --- a/lldb/include/lldb/Core/IOHandlerCursesGUI.h +++ b/lldb/include/lldb/Core/IOHandlerCursesGUI.h @@ -12,6 +12,9 @@ #include "lldb/Core/IOHandler.h" namespace lldb_private { +namespace curses { +class Application; +} // namespace curses class IOHandlerCursesGUI : public IOHandler { public: @@ -34,7 +37,7 @@ class IOHandlerCursesGUI : public IOHandler { void TerminalSizeChanged() override; protected: - curses::ApplicationAP m_app_ap; + std::unique_ptr<curses::Application> m_app_up; }; } // namespace lldb_private diff --git a/lldb/source/Core/IOHandlerCursesGUI.cpp b/lldb/source/Core/IOHandlerCursesGUI.cpp index 456ce7d16e102..c5eed0c0b4089 100644 --- a/lldb/source/Core/IOHandlerCursesGUI.cpp +++ b/lldb/source/Core/IOHandlerCursesGUI.cpp @@ -94,6 +94,7 @@ using llvm::StringRef; #define KEY_SHIFT_TAB (KEY_MAX + 1) #define KEY_ALT_ENTER (KEY_MAX + 2) +namespace lldb_private { namespace curses { class Menu; class MenuDelegate; @@ -4479,8 +4480,9 @@ class Application { }; } // namespace curses +} // namespace lldb_private -using namespace curses; +using namespace lldb_private::curses; struct Row { ValueObjectUpdater value; @@ -7573,12 +7575,12 @@ IOHandlerCursesGUI::IOHandlerCursesGUI(Debugger &debugger) void IOHandlerCursesGUI::Activate() { IOHandler::Activate(); - if (!m_app_ap) { - m_app_ap = std::make_unique<Application>(GetInputFILE(), GetOutputFILE()); + if (!m_app_up) { + m_app_up = std::make_unique<Application>(GetInputFILE(), GetOutputFILE()); // This is both a window and a menu delegate std::shared_ptr<ApplicationDelegate> app_delegate_sp( - new ApplicationDelegate(*m_app_ap, m_debugger)); + new ApplicationDelegate(*m_app_up, m_debugger)); MenuDelegateSP app_menu_delegate_sp = std::static_pointer_cast<MenuDelegate>(app_delegate_sp); @@ -7652,8 +7654,8 @@ void IOHandlerCursesGUI::Activate() { help_menu_sp->AddSubmenu(MenuSP(new Menu( "GUI Help", nullptr, 'g', ApplicationDelegate::eMenuID_HelpGUIHelp))); - m_app_ap->Initialize(); - WindowSP &main_window_sp = m_app_ap->GetMainWindow(); + m_app_up->Initialize(); + WindowSP &main_window_sp = m_app_up->GetMainWindow(); MenuSP menubar_sp(new Menu(Menu::Type::Bar)); menubar_sp->AddSubmenu(lldb_menu_sp); @@ -7734,10 +7736,10 @@ void IOHandlerCursesGUI::Activate() { } } -void IOHandlerCursesGUI::Deactivate() { m_app_ap->Terminate(); } +void IOHandlerCursesGUI::Deactivate() { m_app_up->Terminate(); } void IOHandlerCursesGUI::Run() { - m_app_ap->Run(m_debugger); + m_app_up->Run(m_debugger); SetIsDone(true); } @@ -7752,7 +7754,7 @@ bool IOHandlerCursesGUI::Interrupt() { void IOHandlerCursesGUI::GotEOF() {} void IOHandlerCursesGUI::TerminalSizeChanged() { - m_app_ap->TerminalSizeChanged(); + m_app_up->TerminalSizeChanged(); } #endif // LLDB_ENABLE_CURSES _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
