@@ -94,6 +94,7 @@ using llvm::StringRef;
94
94
#define KEY_SHIFT_TAB (KEY_MAX + 1 )
95
95
#define KEY_ALT_ENTER (KEY_MAX + 2 )
96
96
97
+ namespace lldb_private {
97
98
namespace curses {
98
99
class Menu ;
99
100
class MenuDelegate ;
@@ -4479,8 +4480,9 @@ class Application {
4479
4480
};
4480
4481
4481
4482
} // namespace curses
4483
+ } // namespace lldb_private
4482
4484
4483
- using namespace curses ;
4485
+ using namespace lldb_private :: curses;
4484
4486
4485
4487
struct Row {
4486
4488
ValueObjectUpdater value;
@@ -7573,12 +7575,12 @@ IOHandlerCursesGUI::IOHandlerCursesGUI(Debugger &debugger)
7573
7575
7574
7576
void IOHandlerCursesGUI::Activate () {
7575
7577
IOHandler::Activate ();
7576
- if (!m_app_ap ) {
7577
- m_app_ap = std::make_unique<Application>(GetInputFILE (), GetOutputFILE ());
7578
+ if (!m_app_up ) {
7579
+ m_app_up = std::make_unique<Application>(GetInputFILE (), GetOutputFILE ());
7578
7580
7579
7581
// This is both a window and a menu delegate
7580
7582
std::shared_ptr<ApplicationDelegate> app_delegate_sp (
7581
- new ApplicationDelegate (*m_app_ap , m_debugger));
7583
+ new ApplicationDelegate (*m_app_up , m_debugger));
7582
7584
7583
7585
MenuDelegateSP app_menu_delegate_sp =
7584
7586
std::static_pointer_cast<MenuDelegate>(app_delegate_sp);
@@ -7652,8 +7654,8 @@ void IOHandlerCursesGUI::Activate() {
7652
7654
help_menu_sp->AddSubmenu (MenuSP (new Menu (
7653
7655
" GUI Help" , nullptr , ' g' , ApplicationDelegate::eMenuID_HelpGUIHelp)));
7654
7656
7655
- m_app_ap ->Initialize ();
7656
- WindowSP &main_window_sp = m_app_ap ->GetMainWindow ();
7657
+ m_app_up ->Initialize ();
7658
+ WindowSP &main_window_sp = m_app_up ->GetMainWindow ();
7657
7659
7658
7660
MenuSP menubar_sp (new Menu (Menu::Type::Bar));
7659
7661
menubar_sp->AddSubmenu (lldb_menu_sp);
@@ -7734,10 +7736,10 @@ void IOHandlerCursesGUI::Activate() {
7734
7736
}
7735
7737
}
7736
7738
7737
- void IOHandlerCursesGUI::Deactivate () { m_app_ap ->Terminate (); }
7739
+ void IOHandlerCursesGUI::Deactivate () { m_app_up ->Terminate (); }
7738
7740
7739
7741
void IOHandlerCursesGUI::Run () {
7740
- m_app_ap ->Run (m_debugger);
7742
+ m_app_up ->Run (m_debugger);
7741
7743
SetIsDone (true );
7742
7744
}
7743
7745
@@ -7752,7 +7754,7 @@ bool IOHandlerCursesGUI::Interrupt() {
7752
7754
void IOHandlerCursesGUI::GotEOF () {}
7753
7755
7754
7756
void IOHandlerCursesGUI::TerminalSizeChanged () {
7755
- m_app_ap ->TerminalSizeChanged ();
7757
+ m_app_up ->TerminalSizeChanged ();
7756
7758
}
7757
7759
7758
7760
#endif // LLDB_ENABLE_CURSES
0 commit comments