From 7cbc5a5964bb954f0d4a95bc730be2f890d9853d Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Wed, 29 May 2013 21:57:48 -0400 Subject: [PATCH] Add UserInterfaceListener hook to request a team restart. --- .../debugger/controllers/TeamDebugger.cpp | 19 ++++++++----------- src/apps/debugger/controllers/TeamDebugger.h | 2 ++ .../debugger/user_interface/UserInterface.h | 3 +++ 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/apps/debugger/controllers/TeamDebugger.cpp b/src/apps/debugger/controllers/TeamDebugger.cpp index 3f369afd15..03c4f2c782 100644 --- a/src/apps/debugger/controllers/TeamDebugger.cpp +++ b/src/apps/debugger/controllers/TeamDebugger.cpp @@ -736,17 +736,7 @@ TeamDebugger::MessageReceived(BMessage* message) if (fCommandLineArgc == 0) break; - BString argumentString; - for (int i = 0; i < fCommandLineArgc; i++) { - if (i > 0) - argumentString.Append(" "); - argumentString.Append(fCommandLineArgv[i]); - } - - BMessage startMessage(MSG_START_NEW_TEAM); - startMessage.AddString("path", fCommandLineArgv[0]); - startMessage.AddString("arguments", argumentString); - + fListener->TeamDebuggerRestartRequested(this); break; } @@ -961,6 +951,13 @@ TeamDebugger::DebugReportRequested(entry_ref* targetPath) } +void +TeamDebugger::TeamRestartRequested() +{ + PostMessage(MSG_TEAM_RESTART_REQUESTED); +} + + bool TeamDebugger::UserInterfaceQuitRequested(QuitOption quitOption) { diff --git a/src/apps/debugger/controllers/TeamDebugger.h b/src/apps/debugger/controllers/TeamDebugger.h index 57ec4b497c..0c85698d69 100644 --- a/src/apps/debugger/controllers/TeamDebugger.h +++ b/src/apps/debugger/controllers/TeamDebugger.h @@ -90,6 +90,8 @@ private: virtual void DebugReportRequested(entry_ref* targetPath); + virtual void TeamRestartRequested(); + virtual bool UserInterfaceQuitRequested( QuitOption quitOption); diff --git a/src/apps/debugger/user_interface/UserInterface.h b/src/apps/debugger/user_interface/UserInterface.h index 96d1926ab8..c115fed609 100644 --- a/src/apps/debugger/user_interface/UserInterface.h +++ b/src/apps/debugger/user_interface/UserInterface.h @@ -1,5 +1,6 @@ /* * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de. + * Copyright 2013, Rene Gollent, rene@gollent.com. * Distributed under the terms of the MIT License. */ #ifndef USER_INTERFACE_H @@ -121,6 +122,8 @@ public: virtual void DebugReportRequested(entry_ref* path) = 0; + virtual void TeamRestartRequested() = 0; + virtual bool UserInterfaceQuitRequested( QuitOption quitOption = QUIT_OPTION_ASK_USER) = 0;