(svn r23552) -Codechange: unify naming of the news widgets

1 files changed, 30 insertions, 31 deletions

diff --git a/src/widgets/news_widget.h b/src/widgets/news_widget.h
index 35925dff1..5462f9ea1 100644
--- a/src/widgets/news_widget.h
+++ b/src/widgets/news_widget.h
@@ -16,7 +16,7 @@
 
 /** Constants in the message options window. */
 enum MessageOptionsSpace {
-	MOS_WIDG_PER_SETTING      = 4,  ///< Number of widgets needed for each news category, starting at widget #WIDGET_NEWSOPT_START_OPTION.
+	MOS_WIDG_PER_SETTING      = 4,  ///< Number of widgets needed for each news category, starting at widget #WID_MO_START_OPTION.
 
 	MOS_LEFT_EDGE             = 6,  ///< Number of pixels between left edge of the window and the options buttons column.
 	MOS_COLUMN_SPACING        = 4,  ///< Number of pixels between the buttons and the description columns.
@@ -27,46 +27,45 @@ enum MessageOptionsSpace {
 	MOS_BOTTOM_EDGE           = 6,  ///< Number of pixels between bottom edge of the window and bottom of the global options.
 };
 
-
 /** Widgets of the WC_NEWS_WINDOW. */
-enum NewsTypeWidgets {
-	NTW_PANEL,       ///< The news item background panel.
-	NTW_TITLE,       ///< Title of the company news.
-	NTW_HEADLINE,    ///< The news headline.
-	NTW_CLOSEBOX,    ///< Close the window.
-	NTW_DATE,        ///< Date of the news item.
-	NTW_CAPTION,     ///< Title bar of the window. Only used in small news items.
-	NTW_INSET,       ///< Inset around the viewport in the window. Only used in small news items.
-	NTW_VIEWPORT,    ///< Viewport in the window.
-	NTW_COMPANY_MSG, ///< Message in company news items.
-	NTW_MESSAGE,     ///< Space for displaying the message. Only used in small news items.
-	NTW_MGR_FACE,    ///< Face of the manager.
-	NTW_MGR_NAME,    ///< Name of the manager.
-	NTW_VEH_TITLE,   ///< Vehicle new title.
-	NTW_VEH_BKGND,   ///< Dark background of new vehicle news.
-	NTW_VEH_NAME,    ///< Name of the new vehicle.
-	NTW_VEH_SPR,     ///< Graphical display of the new vehicle.
-	NTW_VEH_INFO,    ///< Some technical data of the new vehicle.
+enum NewsWidgets {
+	WID_N_PANEL,       ///< Panel of the window.
+	WID_N_TITLE,       ///< Title of the company news.
+	WID_N_HEADLINE,    ///< The news headline.
+	WID_N_CLOSEBOX,    ///< Close the window.
+	WID_N_DATE,        ///< Date of the news item.
+	WID_N_CAPTION,     ///< Title bar of the window. Only used in small news items.
+	WID_N_INSET,       ///< Inset around the viewport in the window. Only used in small news items.
+	WID_N_VIEWPORT,    ///< Viewport in the window.
+	WID_N_COMPANY_MSG, ///< Message in company news items.
+	WID_N_MESSAGE,     ///< Space for displaying the message. Only used in small news items.
+	WID_N_MGR_FACE,    ///< Face of the manager.
+	WID_N_MGR_NAME,    ///< Name of the manager.
+	WID_N_VEH_TITLE,   ///< Vehicle new title.
+	WID_N_VEH_BKGND,   ///< Dark background of new vehicle news.
+	WID_N_VEH_NAME,    ///< Name of the new vehicle.
+	WID_N_VEH_SPR,     ///< Graphical display of the new vehicle.
+	WID_N_VEH_INFO,    ///< Some technical data of the new vehicle.
 };
 
 /** Widgets of the WC_MESSAGE_HISTORY. */
 enum MessageHistoryWidgets {
-	MHW_STICKYBOX,
-	MHW_BACKGROUND,
-	MHW_SCROLLBAR,
+	WID_MH_STICKYBOX,  ///< Stickybox.
+	WID_MH_BACKGROUND, ///< Background of the window.
+	WID_MH_SCROLLBAR,  ///< Scrollbar for the list.
 };
 
 /** Widgets of the WC_GAME_OPTIONS (WC_GAME_OPTIONS is also used in others). */
 enum MessageOptionWidgets {
-	WIDGET_NEWSOPT_BACKGROUND,        ///< Background widget.
-	WIDGET_NEWSOPT_LABEL,             ///< Top label.
-	WIDGET_NEWSOPT_DROP_SUMMARY,      ///< Dropdown that adjusts at once the level for all settings.
-	WIDGET_NEWSOPT_LABEL_SUMMARY,     ///< Label of the summary drop down.
-	WIDGET_NEWSOPT_SOUNDTICKER,       ///< Button for (de)activating sound on events.
-	WIDGET_NEWSOPT_SOUNDTICKER_LABEL, ///< Label of the soundticker button,
+	WID_MO_BACKGROUND,        ///< Background of the widget.
+	WID_MO_LABEL,             ///< Top label.
+	WID_MO_DROP_SUMMARY,      ///< Dropdown that adjusts at once the level for all settings.
+	WID_MO_LABEL_SUMMARY,     ///< Label of the summary drop down.
+	WID_MO_SOUNDTICKER,       ///< Button for (de)activating sound on events.
+	WID_MO_SOUNDTICKER_LABEL, ///< Label of the soundticker button.
 
-	WIDGET_NEWSOPT_START_OPTION,      ///< First widget that is part of a group [<][label][>] [description]
-	WIDGET_NEWSOPT_END_OPTION = WIDGET_NEWSOPT_START_OPTION + NT_END * MOS_WIDG_PER_SETTING, ///< First widget after the groups.
+	WID_MO_START_OPTION,      ///< First widget that is part of a group [<][label][>] [description].
+	WID_MO_END_OPTION = WID_MO_START_OPTION + NT_END * MOS_WIDG_PER_SETTING, ///< First widget after the groups.
 };
 
 #endif /* WIDGETS_NEWS_WIDGET_H */