From d0d00f6beb9a2fab19455f653837af1b629d00da Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 1 Jan 2017 05:24:31 -0500 Subject: TITANIC: Rename CPetText to CTextControl The class is used in several areas outside of the PET, so it makes better sense to not have it in the pet_control/ folder and named so --- engines/titanic/pet_control/pet_sound.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'engines/titanic/pet_control/pet_sound.h') diff --git a/engines/titanic/pet_control/pet_sound.h b/engines/titanic/pet_control/pet_sound.h index c4b663ad44..fed4f43f92 100644 --- a/engines/titanic/pet_control/pet_sound.h +++ b/engines/titanic/pet_control/pet_sound.h @@ -25,7 +25,7 @@ #include "titanic/pet_control/pet_glyphs.h" #include "titanic/pet_control/pet_gfx_element.h" -#include "titanic/pet_control/pet_text.h" +#include "titanic/gfx/text_control.h" #include "titanic/pet_control/pet_slider.h" namespace Titanic { @@ -39,10 +39,10 @@ private: CPetSlider _musicVolume; CPetSlider _parrotVolume; CPetSlider _speechVolume; - CPetText _textMasterVolume; - CPetText _textMusicVolume; - CPetText _textParrotVolume; - CPetText _textSpeechVolume; + CTextControl _textMasterVolume; + CTextControl _textMusicVolume; + CTextControl _textParrotVolume; + CTextControl _textSpeechVolume; CPetSlider *_draggingSlider; int _draggingSliderNum; private: @@ -96,7 +96,7 @@ public: /** * Returns the tooltip text for when the glyph is selected */ - virtual void getTooltip(CPetText *text); + virtual void getTooltip(CTextControl *text); }; } // End of namespace Titanic -- cgit v1.2.3