Remove AddSetting<CStrW>("tooltip") and AddSetting<CStr>("tooltip_style") calls redundant with the ones in the IGUIObject base constructor.
If all redundant calls are removed, the code will be able to warn about them. Tested on: clang 8.0.1 This was SVN commit r22958.
This commit is contained in:
parent
702cdbf0c7
commit
f69261d37b
@ -44,8 +44,6 @@ CButton::CButton(CGUI& pGUI)
|
||||
AddSetting<CGUIColor>("textcolor_over");
|
||||
AddSetting<CGUIColor>("textcolor_pressed");
|
||||
AddSetting<CGUIColor>("textcolor_disabled");
|
||||
AddSetting<CStrW>("tooltip");
|
||||
AddSetting<CStr>("tooltip_style");
|
||||
|
||||
AddText();
|
||||
}
|
||||
|
@ -37,8 +37,6 @@ CCheckBox::CCheckBox(CGUI& pGUI)
|
||||
AddSetting<CGUISpriteInstance>("sprite2_over");
|
||||
AddSetting<CGUISpriteInstance>("sprite2_pressed");
|
||||
AddSetting<CGUISpriteInstance>("sprite2_disabled");
|
||||
AddSetting<CStrW>("tooltip");
|
||||
AddSetting<CStr>("tooltip_style");
|
||||
}
|
||||
|
||||
CCheckBox::~CCheckBox()
|
||||
|
@ -27,8 +27,6 @@ CImage::CImage(CGUI& pGUI)
|
||||
{
|
||||
AddSetting<CGUISpriteInstance>("sprite");
|
||||
AddSetting<i32>("cell_id");
|
||||
AddSetting<CStrW>("tooltip");
|
||||
AddSetting<CStr>("tooltip_style");
|
||||
}
|
||||
|
||||
CImage::~CImage()
|
||||
|
@ -60,8 +60,6 @@ CInput::CInput(CGUI& pGUI)
|
||||
AddSetting<CGUISpriteInstance>("sprite_selectarea");
|
||||
AddSetting<CGUIColor>("textcolor");
|
||||
AddSetting<CGUIColor>("textcolor_selected");
|
||||
AddSetting<CStrW>("tooltip");
|
||||
AddSetting<CStr>("tooltip_style");
|
||||
|
||||
CFG_GET_VAL("gui.cursorblinkrate", m_CursorBlinkRate);
|
||||
|
||||
|
@ -46,8 +46,6 @@ CList::CList(CGUI& pGUI)
|
||||
AddSetting<i32>("selected"); // Index selected. -1 is none.
|
||||
AddSetting<bool>("auto_scroll");
|
||||
AddSetting<i32>("hovered");
|
||||
AddSetting<CStrW>("tooltip");
|
||||
AddSetting<CStr>("tooltip_style");
|
||||
|
||||
// Each list item has both a name (in 'list') and an associated data string (in 'list_data')
|
||||
AddSetting<CGUIList>("list");
|
||||
|
@ -28,8 +28,6 @@ CProgressBar::CProgressBar(CGUI& pGUI)
|
||||
AddSetting<CGUISpriteInstance>("sprite_background");
|
||||
AddSetting<CGUISpriteInstance>("sprite_bar");
|
||||
AddSetting<float>("caption"); // aka value from 0 to 100
|
||||
AddSetting<CStrW>("tooltip");
|
||||
AddSetting<CStr>("tooltip_style");
|
||||
}
|
||||
|
||||
CProgressBar::~CProgressBar()
|
||||
|
@ -40,8 +40,6 @@ CText::CText(CGUI& pGUI)
|
||||
AddSetting<EVAlign>("text_valign");
|
||||
AddSetting<CGUIColor>("textcolor");
|
||||
AddSetting<CGUIColor>("textcolor_disabled");
|
||||
AddSetting<CStrW>("tooltip");
|
||||
AddSetting<CStr>("tooltip_style");
|
||||
|
||||
// Private settings
|
||||
AddSetting<CStrW>("_icon_tooltip");
|
||||
|
@ -70,8 +70,6 @@ CMiniMap::CMiniMap(CGUI& pGUI) :
|
||||
m_EntitiesDrawn(0), m_IndexArray(GL_STATIC_DRAW), m_VertexArray(GL_DYNAMIC_DRAW),
|
||||
m_NextBlinkTime(0.0), m_PingDuration(25.0), m_BlinkState(false), m_WaterHeight(0.0)
|
||||
{
|
||||
AddSetting<CStrW>("tooltip");
|
||||
AddSetting<CStr>("tooltip_style");
|
||||
m_Clicking = false;
|
||||
m_MouseHovering = false;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user