From f69261d37be7fa417fae2b8ad17183a7cf6b2612 Mon Sep 17 00:00:00 2001
From: elexis <elexis@wildfiregames.com>
Date: Sat, 21 Sep 2019 16:13:18 +0000
Subject: [PATCH] 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.
---
 source/gui/CButton.cpp      | 2 --
 source/gui/CCheckBox.cpp    | 2 --
 source/gui/CImage.cpp       | 2 --
 source/gui/CInput.cpp       | 2 --
 source/gui/CList.cpp        | 2 --
 source/gui/CProgressBar.cpp | 2 --
 source/gui/CText.cpp        | 2 --
 source/gui/MiniMap.cpp      | 2 --
 8 files changed, 16 deletions(-)

diff --git a/source/gui/CButton.cpp b/source/gui/CButton.cpp
index 039f85162d..56de0d1f0f 100644
--- a/source/gui/CButton.cpp
+++ b/source/gui/CButton.cpp
@@ -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();
 }
diff --git a/source/gui/CCheckBox.cpp b/source/gui/CCheckBox.cpp
index fc66061744..9b5a10ef4e 100644
--- a/source/gui/CCheckBox.cpp
+++ b/source/gui/CCheckBox.cpp
@@ -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()
diff --git a/source/gui/CImage.cpp b/source/gui/CImage.cpp
index dff3aae181..d47606c5f2 100644
--- a/source/gui/CImage.cpp
+++ b/source/gui/CImage.cpp
@@ -27,8 +27,6 @@ CImage::CImage(CGUI& pGUI)
 {
 	AddSetting<CGUISpriteInstance>("sprite");
 	AddSetting<i32>("cell_id");
-	AddSetting<CStrW>("tooltip");
-	AddSetting<CStr>("tooltip_style");
 }
 
 CImage::~CImage()
diff --git a/source/gui/CInput.cpp b/source/gui/CInput.cpp
index 9a69f1fd3e..8695fe99a3 100644
--- a/source/gui/CInput.cpp
+++ b/source/gui/CInput.cpp
@@ -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);
 
diff --git a/source/gui/CList.cpp b/source/gui/CList.cpp
index d5b0052399..79c4195df4 100644
--- a/source/gui/CList.cpp
+++ b/source/gui/CList.cpp
@@ -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");
diff --git a/source/gui/CProgressBar.cpp b/source/gui/CProgressBar.cpp
index e0ff7e0e80..6198a9d70c 100644
--- a/source/gui/CProgressBar.cpp
+++ b/source/gui/CProgressBar.cpp
@@ -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()
diff --git a/source/gui/CText.cpp b/source/gui/CText.cpp
index 6e60d60822..cd5143d62e 100644
--- a/source/gui/CText.cpp
+++ b/source/gui/CText.cpp
@@ -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");
diff --git a/source/gui/MiniMap.cpp b/source/gui/MiniMap.cpp
index f6a9955917..b43d9ea93d 100644
--- a/source/gui/MiniMap.cpp
+++ b/source/gui/MiniMap.cpp
@@ -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;