diff --git a/headers/private/debugger/MessageCodes.h b/headers/private/debugger/MessageCodes.h index b7b62dcab5..5a22f1f0ec 100644 --- a/headers/private/debugger/MessageCodes.h +++ b/headers/private/debugger/MessageCodes.h @@ -1,6 +1,6 @@ /* * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de. - * Copyright 2013-2015, Rene Gollent, rene@gollent.com. + * Copyright 2013-2016, Rene Gollent, rene@gollent.com. * Distributed under the terms of the MIT License. */ #ifndef MESSAGE_CODES_H @@ -35,11 +35,7 @@ enum { MSG_THREAD_STATE_CHANGED = 'tsch', MSG_THREAD_CPU_STATE_CHANGED = 'tcsc', MSG_THREAD_STACK_TRACE_CHANGED = 'tstc', - MSG_STACK_FRAME_VALUE_RETRIEVED = 'sfvr', MSG_IMAGE_DEBUG_INFO_CHANGED = 'idic', - MSG_STOP_IMAGE_SETTINGS_CHANGED = 'sisc', - MSG_STOP_IMAGE_NAME_ADDED = 'sina', - MSG_STOP_IMAGE_NAME_REMOVED = 'sinr', MSG_CONSOLE_OUTPUT_RECEIVED = 'core', MSG_IMAGE_FILE_CHANGED = 'ifch', MSG_FUNCTION_SOURCE_CODE_CHANGED = 'fnsc', @@ -49,57 +45,20 @@ enum { MSG_DEBUGGER_EVENT = 'dbge', MSG_LOAD_SETTINGS = 'ldst', - MSG_SETTINGS_MENU_IMPL_ITEM_SELECTED = 'smii', - MSG_SETTINGS_MENU_IMPL_OPTION_ITEM_SELECTED = 'smio', - - MSG_TEXTVIEW_AUTOSCROLL = 'tvas', - - MSG_VARIABLES_VIEW_CONTEXT_MENU_DONE = 'ctxd', - MSG_VARIABLES_VIEW_NODE_SETTINGS_CHANGED = 'vvns', - MSG_VALUE_NODE_CHANGED = 'vnch', MSG_VALUE_NODE_CHILDREN_CREATED = 'vncc', MSG_VALUE_NODE_CHILDREN_DELETED = 'vncd', MSG_VALUE_NODE_VALUE_CHANGED = 'vnvc', - MSG_TEAM_DEBUGGER_QUIT = 'dbqt', - MSG_TEAM_RESTART_REQUESTED = 'trrq', - MSG_SHOW_TEAMS_WINDOW = 'stew', - MSG_TEAMS_WINDOW_CLOSED = 'tewc', - MSG_SHOW_TEAM_SETTINGS_WINDOW = 'stsw', - MSG_TEAM_SETTINGS_WINDOW_CLOSED = 'tswc', - MSG_SHOW_BREAKPOINT_EDIT_WINDOW = 'sbew', - MSG_BREAKPOINT_EDIT_WINDOW_CLOSED = 'bewc', - MSG_SHOW_SIGNAL_DISPOSITION_EDIT_WINDOW = 'sdew', - MSG_SIGNAL_DISPOSITION_EDIT_WINDOW_CLOSED = 'sdec', - MSG_SHOW_START_TEAM_WINDOW = 'sstw', - MSG_START_TEAM_WINDOW_CLOSED = 'stwc', - MSG_START_NEW_TEAM = 'sttt', - MSG_DEBUG_THIS_TEAM = 'dbtt', - MSG_LOAD_CORE_TEAM = 'lcte', - MSG_SHOW_INSPECTOR_WINDOW = 'sirw', - MSG_INSPECTOR_WINDOW_CLOSED = 'irwc', - MSG_SHOW_EXPRESSION_WINDOW = 'seww', - MSG_EXPRESSION_WINDOW_CLOSED = 'ewwc', - MSG_SHOW_EXPRESSION_PROMPT_WINDOW = 'sepw', - MSG_ADD_NEW_EXPRESSION = 'anex', - MSG_EXPRESSION_PROMPT_WINDOW_CLOSED = 'epwc', - MSG_SHOW_VARIABLE_EDIT_WINDOW = 'svew', - MSG_VARIABLE_EDIT_WINDOW_CLOSED = 'vewc', MSG_INSPECT_ADDRESS = 'isad', MSG_WRITE_TARGET_MEMORY = 'wtam', MSG_EVALUATE_EXPRESSION = 'evex', - MSG_EXPRESSION_EVALUATED = 'exev', - MSG_SHOW_TYPECAST_NODE_PROMPT = 'stnp', - MSG_TYPECAST_TO_ARRAY = 'stta', - MSG_TYPECAST_NODE = 'tyno', - MSG_SHOW_WATCH_VARIABLE_PROMPT = 'swvp', - MSG_SHOW_CONTAINER_RANGE_PROMPT = 'scrp', - MSG_SET_CONTAINER_RANGE = 'chcr', - MSG_GENERATE_DEBUG_REPORT = 'gdrp', MSG_WRITE_CORE_FILE = 'wrcf', - MSG_WRITE_VARIABLE_VALUE = 'wrvv', + MSG_TEAM_DEBUGGER_QUIT = 'dbqt', + MSG_TEAM_RESTART_REQUESTED = 'trrq', + + MSG_GENERATE_DEBUG_REPORT = 'gdrp', MSG_DEBUG_INFO_NEEDS_USER_INPUT = 'dnui', MSG_USER_INTERFACE_FILE_CHOSEN = 'uifc' }; diff --git a/src/apps/debugger/AppMessageCodes.h b/src/apps/debugger/AppMessageCodes.h new file mode 100644 index 0000000000..ec32a86c9f --- /dev/null +++ b/src/apps/debugger/AppMessageCodes.h @@ -0,0 +1,59 @@ +/* + * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de. + * Copyright 2013-2016, Rene Gollent, rene@gollent.com. + * Distributed under the terms of the MIT License. + */ +#ifndef APP_MESSAGE_CODES_H +#define APP_MESSAGE_CODES_H + + +enum { + MSG_SETTINGS_MENU_IMPL_ITEM_SELECTED = 'smii', + MSG_SETTINGS_MENU_IMPL_OPTION_ITEM_SELECTED = 'smio', + + MSG_TEXTVIEW_AUTOSCROLL = 'tvas', + + MSG_VARIABLES_VIEW_CONTEXT_MENU_DONE = 'ctxd', + MSG_VARIABLES_VIEW_NODE_SETTINGS_CHANGED = 'vvns', + + MSG_STACK_FRAME_VALUE_RETRIEVED = 'sfvr', + MSG_STOP_IMAGE_SETTINGS_CHANGED = 'sisc', + MSG_STOP_IMAGE_NAME_ADDED = 'sina', + MSG_STOP_IMAGE_NAME_REMOVED = 'sinr', + + MSG_SHOW_TEAMS_WINDOW = 'stew', + MSG_TEAMS_WINDOW_CLOSED = 'tewc', + MSG_SHOW_TEAM_SETTINGS_WINDOW = 'stsw', + MSG_TEAM_SETTINGS_WINDOW_CLOSED = 'tswc', + MSG_SHOW_CONNECTION_CONFIG_WINDOW = 'sccw', + MSG_CONNECTION_CONFIG_WINDOW_CLOSED = 'ccwc', + MSG_SHOW_BREAKPOINT_EDIT_WINDOW = 'sbew', + MSG_BREAKPOINT_EDIT_WINDOW_CLOSED = 'bewc', + MSG_SHOW_SIGNAL_DISPOSITION_EDIT_WINDOW = 'sdew', + MSG_SIGNAL_DISPOSITION_EDIT_WINDOW_CLOSED = 'sdec', + MSG_SHOW_START_TEAM_WINDOW = 'sstw', + MSG_START_TEAM_WINDOW_CLOSED = 'stwc', + MSG_START_NEW_TEAM = 'sttt', + MSG_DEBUG_THIS_TEAM = 'dbtt', + MSG_LOAD_CORE_TEAM = 'lcte', + MSG_SHOW_INSPECTOR_WINDOW = 'sirw', + MSG_INSPECTOR_WINDOW_CLOSED = 'irwc', + MSG_SHOW_EXPRESSION_WINDOW = 'seww', + MSG_EXPRESSION_WINDOW_CLOSED = 'ewwc', + MSG_SHOW_EXPRESSION_PROMPT_WINDOW = 'sepw', + MSG_ADD_NEW_EXPRESSION = 'anex', + MSG_EXPRESSION_PROMPT_WINDOW_CLOSED = 'epwc', + MSG_SHOW_VARIABLE_EDIT_WINDOW = 'svew', + MSG_VARIABLE_EDIT_WINDOW_CLOSED = 'vewc', + MSG_EXPRESSION_EVALUATED = 'exev', + MSG_SHOW_TYPECAST_NODE_PROMPT = 'stnp', + MSG_TYPECAST_TO_ARRAY = 'stta', + MSG_TYPECAST_NODE = 'tyno', + MSG_SHOW_WATCH_VARIABLE_PROMPT = 'swvp', + MSG_SHOW_CONTAINER_RANGE_PROMPT = 'scrp', + MSG_SET_CONTAINER_RANGE = 'chcr', + MSG_WRITE_VARIABLE_VALUE = 'wrvv', +}; + + +#endif // APP_MESSAGE_CODES_H diff --git a/src/apps/debugger/Debugger.cpp b/src/apps/debugger/Debugger.cpp index 903c2636a6..e83605924b 100644 --- a/src/apps/debugger/Debugger.cpp +++ b/src/apps/debugger/Debugger.cpp @@ -22,6 +22,7 @@ #include #include +#include "AppMessageCodes.h" #include "CommandLineUserInterface.h" #include "DebuggerGlobals.h" #include "DebuggerSettingsManager.h" diff --git a/src/apps/debugger/user_interface/gui/expression_eval_window/ExpressionEvaluationWindow.cpp b/src/apps/debugger/user_interface/gui/expression_eval_window/ExpressionEvaluationWindow.cpp index e182a34a0f..1ae14f3b11 100644 --- a/src/apps/debugger/user_interface/gui/expression_eval_window/ExpressionEvaluationWindow.cpp +++ b/src/apps/debugger/user_interface/gui/expression_eval_window/ExpressionEvaluationWindow.cpp @@ -13,6 +13,7 @@ #include #include +#include "AppMessageCodes.h" #include "CppLanguage.h" #include "FunctionDebugInfo.h" #include "FunctionInstance.h" diff --git a/src/apps/debugger/user_interface/gui/inspector_window/InspectorWindow.cpp b/src/apps/debugger/user_interface/gui/inspector_window/InspectorWindow.cpp index fa68daa6b0..4f43ef9981 100644 --- a/src/apps/debugger/user_interface/gui/inspector_window/InspectorWindow.cpp +++ b/src/apps/debugger/user_interface/gui/inspector_window/InspectorWindow.cpp @@ -17,6 +17,7 @@ #include #include +#include "AppMessageCodes.h" #include "Architecture.h" #include "CppLanguage.h" #include "GuiTeamUiSettings.h" diff --git a/src/apps/debugger/user_interface/gui/team_settings_window/ImageStopConfigView.cpp b/src/apps/debugger/user_interface/gui/team_settings_window/ImageStopConfigView.cpp index d5f554b6e1..1e3d324ca3 100644 --- a/src/apps/debugger/user_interface/gui/team_settings_window/ImageStopConfigView.cpp +++ b/src/apps/debugger/user_interface/gui/team_settings_window/ImageStopConfigView.cpp @@ -14,6 +14,7 @@ #include #include +#include "AppMessageCodes.h" #include "FunctionInstance.h" #include "Image.h" #include "ImageDebugInfo.h" diff --git a/src/apps/debugger/user_interface/gui/team_settings_window/SignalsConfigView.cpp b/src/apps/debugger/user_interface/gui/team_settings_window/SignalsConfigView.cpp index fef46159ca..8d5abd713a 100644 --- a/src/apps/debugger/user_interface/gui/team_settings_window/SignalsConfigView.cpp +++ b/src/apps/debugger/user_interface/gui/team_settings_window/SignalsConfigView.cpp @@ -14,6 +14,7 @@ #include "table/TableColumns.h" +#include "AppMessageCodes.h" #include "MessageCodes.h" #include "SignalDispositionEditWindow.h" #include "SignalDispositionMenu.h" diff --git a/src/apps/debugger/user_interface/gui/team_settings_window/TeamSettingsWindow.cpp b/src/apps/debugger/user_interface/gui/team_settings_window/TeamSettingsWindow.cpp index f68031db45..ec2696cebe 100644 --- a/src/apps/debugger/user_interface/gui/team_settings_window/TeamSettingsWindow.cpp +++ b/src/apps/debugger/user_interface/gui/team_settings_window/TeamSettingsWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2013-2015, Rene Gollent, rene@gollent.com. + * Copyright 2013-2016, Rene Gollent, rene@gollent.com. * Distributed under the terms of the MIT License. */ #include "TeamSettingsWindow.h" @@ -8,9 +8,9 @@ #include #include +#include "AppMessageCodes.h" #include "ExceptionStopConfigView.h" #include "ImageStopConfigView.h" -#include "MessageCodes.h" #include "SignalsConfigView.h" diff --git a/src/apps/debugger/user_interface/gui/team_window/BreakpointsView.cpp b/src/apps/debugger/user_interface/gui/team_window/BreakpointsView.cpp index b6088ad0bd..d061ac04d9 100644 --- a/src/apps/debugger/user_interface/gui/team_window/BreakpointsView.cpp +++ b/src/apps/debugger/user_interface/gui/team_window/BreakpointsView.cpp @@ -1,6 +1,6 @@ /* * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de. - * Copyright 2011-2015, Rene Gollent, rene@gollent.com. + * Copyright 2011-2016, Rene Gollent, rene@gollent.com. * Distributed under the terms of the MIT License. */ @@ -16,6 +16,7 @@ #include #include +#include "AppMessageCodes.h" #include "MessageCodes.h" #include "Team.h" #include "UserBreakpoint.h" diff --git a/src/apps/debugger/user_interface/gui/team_window/RegistersView.cpp b/src/apps/debugger/user_interface/gui/team_window/RegistersView.cpp index fea36d8888..d66faff618 100644 --- a/src/apps/debugger/user_interface/gui/team_window/RegistersView.cpp +++ b/src/apps/debugger/user_interface/gui/team_window/RegistersView.cpp @@ -1,6 +1,6 @@ /* * Copyright 2009-2012, Ingo Weinhold, ingo_weinhold@gmx.de. - * Copyright 2011-2015, Rene Gollent, rene@gollent.com. + * Copyright 2011-2016, Rene Gollent, rene@gollent.com. * Distributed under the terms of the MIT License. */ @@ -17,11 +17,11 @@ #include "table/TableColumns.h" +#include "AppMessageCodes.h" #include "Architecture.h" #include "AutoDeleter.h" #include "CpuState.h" #include "GuiSettingsUtils.h" -#include "MessageCodes.h" #include "Register.h" #include "UiUtils.h" diff --git a/src/apps/debugger/user_interface/gui/team_window/SourceView.cpp b/src/apps/debugger/user_interface/gui/team_window/SourceView.cpp index 98e90e73a6..ee30aae585 100644 --- a/src/apps/debugger/user_interface/gui/team_window/SourceView.cpp +++ b/src/apps/debugger/user_interface/gui/team_window/SourceView.cpp @@ -31,6 +31,7 @@ #include #include +#include "AppMessageCodes.h" #include "AutoDeleter.h" #include "Breakpoint.h" #include "DisassembledCode.h" diff --git a/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp b/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp index f5898698b7..486307ed31 100644 --- a/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp +++ b/src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp @@ -33,6 +33,7 @@ #include #include +#include "AppMessageCodes.h" #include "Breakpoint.h" #include "BreakpointEditWindow.h" #include "ConsoleOutputView.h" diff --git a/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp b/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp index 4b4065ba75..1fc7b75546 100644 --- a/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp +++ b/src/apps/debugger/user_interface/gui/team_window/VariablesView.cpp @@ -24,6 +24,7 @@ #include "table/TableColumns.h" #include "ActionMenuItem.h" +#include "AppMessageCodes.h" #include "Architecture.h" #include "ExpressionInfo.h" #include "ExpressionValues.h" diff --git a/src/apps/debugger/user_interface/gui/teams_window/TeamsWindow.cpp b/src/apps/debugger/user_interface/gui/teams_window/TeamsWindow.cpp index 851226dcdb..b0c5b6282d 100644 --- a/src/apps/debugger/user_interface/gui/teams_window/TeamsWindow.cpp +++ b/src/apps/debugger/user_interface/gui/teams_window/TeamsWindow.cpp @@ -28,7 +28,7 @@ #include #include -#include "MessageCodes.h" +#include "AppMessageCodes.h" #include "SettingsManager.h" #include "TargetHostInterface.h" #include "TargetHostInterfaceRoster.h" diff --git a/src/apps/debugger/user_interface/gui/util/SettingsMenu.cpp b/src/apps/debugger/user_interface/gui/util/SettingsMenu.cpp index 70e33abb50..8977e5cd40 100644 --- a/src/apps/debugger/user_interface/gui/util/SettingsMenu.cpp +++ b/src/apps/debugger/user_interface/gui/util/SettingsMenu.cpp @@ -13,7 +13,7 @@ #include -#include "MessageCodes.h" +#include "AppMessageCodes.h" #include "SettingsDescription.h" diff --git a/src/apps/debugger/user_interface/gui/utility_windows/BreakpointEditWindow.cpp b/src/apps/debugger/user_interface/gui/utility_windows/BreakpointEditWindow.cpp index a5f5abed8a..5add321b3b 100644 --- a/src/apps/debugger/user_interface/gui/utility_windows/BreakpointEditWindow.cpp +++ b/src/apps/debugger/user_interface/gui/utility_windows/BreakpointEditWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2014, Rene Gollent, rene@gollent.com. + * Copyright 2014-2016, Rene Gollent, rene@gollent.com. * Distributed under the terms of the MIT License. */ #include "BreakpointEditWindow.h" @@ -13,10 +13,10 @@ #include #include -#include "MessageCodes.h" +#include "AppMessageCodes.h" +#include "Team.h" #include "UserBreakpoint.h" #include "UserInterface.h" -#include "Team.h" enum { diff --git a/src/apps/debugger/user_interface/gui/utility_windows/ExpressionPromptWindow.cpp b/src/apps/debugger/user_interface/gui/utility_windows/ExpressionPromptWindow.cpp index 69f55c9f8b..554081786b 100644 --- a/src/apps/debugger/user_interface/gui/utility_windows/ExpressionPromptWindow.cpp +++ b/src/apps/debugger/user_interface/gui/utility_windows/ExpressionPromptWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2014, Rene Gollent, rene@gollent.com. + * Copyright 2014-2016, Rene Gollent, rene@gollent.com. * Distributed under the terms of the MIT License. */ #include "ExpressionPromptWindow.h" @@ -9,7 +9,7 @@ #include #include -#include "MessageCodes.h" +#include "AppMessageCodes.h" ExpressionPromptWindow::ExpressionPromptWindow(BHandler* addTarget, diff --git a/src/apps/debugger/user_interface/gui/utility_windows/SignalDispositionEditWindow.cpp b/src/apps/debugger/user_interface/gui/utility_windows/SignalDispositionEditWindow.cpp index 813891f7de..acf9bde867 100644 --- a/src/apps/debugger/user_interface/gui/utility_windows/SignalDispositionEditWindow.cpp +++ b/src/apps/debugger/user_interface/gui/utility_windows/SignalDispositionEditWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2015, Rene Gollent, rene@gollent.com. + * Copyright 2015-2016, Rene Gollent, rene@gollent.com. * Distributed under the terms of the MIT License. */ #include "SignalDispositionEditWindow.h" @@ -13,12 +13,12 @@ #include #include -#include "MessageCodes.h" +#include "AppMessageCodes.h" #include "SignalDispositionMenu.h" #include "SignalDispositionTypes.h" +#include "Team.h" #include "UiUtils.h" #include "UserInterface.h" -#include "Team.h" enum { diff --git a/src/apps/debugger/user_interface/gui/utility_windows/StartTeamWindow.cpp b/src/apps/debugger/user_interface/gui/utility_windows/StartTeamWindow.cpp index ac3bb97e83..4d2172e44f 100644 --- a/src/apps/debugger/user_interface/gui/utility_windows/StartTeamWindow.cpp +++ b/src/apps/debugger/user_interface/gui/utility_windows/StartTeamWindow.cpp @@ -14,7 +14,7 @@ #include #include -#include "MessageCodes.h" +#include "AppMessageCodes.h" #include "UserInterface.h" diff --git a/src/apps/debugger/user_interface/gui/utility_windows/VariableEditWindow.cpp b/src/apps/debugger/user_interface/gui/utility_windows/VariableEditWindow.cpp index da4f96258d..42312dc12e 100644 --- a/src/apps/debugger/user_interface/gui/utility_windows/VariableEditWindow.cpp +++ b/src/apps/debugger/user_interface/gui/utility_windows/VariableEditWindow.cpp @@ -9,7 +9,7 @@ #include #include -#include "MessageCodes.h" +#include "AppMessageCodes.h" #include "TableCellValueEditor.h" #include "Value.h" #include "ValueNode.h" diff --git a/src/apps/debugger/user_interface/gui/utility_windows/WatchPromptWindow.cpp b/src/apps/debugger/user_interface/gui/utility_windows/WatchPromptWindow.cpp index 2523fa5a0a..de15fbd47b 100644 --- a/src/apps/debugger/user_interface/gui/utility_windows/WatchPromptWindow.cpp +++ b/src/apps/debugger/user_interface/gui/utility_windows/WatchPromptWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2012-2014, Rene Gollent, rene@gollent.com. + * Copyright 2012-2016, Rene Gollent, rene@gollent.com. * Distributed under the terms of the MIT License. */ #include "WatchPromptWindow.h" @@ -15,6 +15,7 @@ #include "AutoLocker.h" +#include "AppMessageCodes.h" #include "Architecture.h" #include "CppLanguage.h" #include "IntegerValue.h"