From ac2fc3029f3b9b6ba182949c29a7919f2f87eb02 Mon Sep 17 00:00:00 2001 From: Graham Linden Date: Tue, 12 Mar 2019 08:56:26 -0700 Subject: Backout tabs v spaces changes. 'warn-on-failure:no-tabs' --- indra/newview/llpresetsmanager.h | 62 ++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'indra/newview/llpresetsmanager.h') diff --git a/indra/newview/llpresetsmanager.h b/indra/newview/llpresetsmanager.h index c3a6c0795c..7370e0a3b1 100644 --- a/indra/newview/llpresetsmanager.h +++ b/indra/newview/llpresetsmanager.h @@ -39,54 +39,54 @@ static const std::string PRESETS_CAMERA = "camera"; enum EDefaultOptions { - DEFAULT_SHOW, - DEFAULT_TOP, - DEFAULT_HIDE // Do not display "Default" in a list + DEFAULT_SHOW, + DEFAULT_TOP, + DEFAULT_HIDE // Do not display "Default" in a list }; class LLPresetsManager : public LLSingleton { - LLSINGLETON(LLPresetsManager); - ~LLPresetsManager(); + LLSINGLETON(LLPresetsManager); + ~LLPresetsManager(); public: - typedef std::list preset_name_list_t; - typedef boost::signals2::signal preset_list_signal_t; + typedef std::list preset_name_list_t; + typedef boost::signals2::signal preset_list_signal_t; - void createMissingDefault(const std::string& subdirectory); - void startWatching(const std::string& subdirectory); - void triggerChangeCameraSignal(); - void triggerChangeSignal(); - static std::string getPresetsDir(const std::string& subdirectory); - bool setPresetNamesInComboBox(const std::string& subdirectory, LLComboBox* combo, EDefaultOptions default_option); - void loadPresetNamesFromDir(const std::string& dir, preset_name_list_t& presets, EDefaultOptions default_option); - bool savePreset(const std::string& subdirectory, std::string name, bool createDefault = false); - void loadPreset(const std::string& subdirectory, std::string name); - bool deletePreset(const std::string& subdirectory, std::string name); - bool isCameraDirty(); - static void setCameraDirty(bool dirty); + void createMissingDefault(const std::string& subdirectory); + void startWatching(const std::string& subdirectory); + void triggerChangeCameraSignal(); + void triggerChangeSignal(); + static std::string getPresetsDir(const std::string& subdirectory); + bool setPresetNamesInComboBox(const std::string& subdirectory, LLComboBox* combo, EDefaultOptions default_option); + void loadPresetNamesFromDir(const std::string& dir, preset_name_list_t& presets, EDefaultOptions default_option); + bool savePreset(const std::string& subdirectory, std::string name, bool createDefault = false); + void loadPreset(const std::string& subdirectory, std::string name); + bool deletePreset(const std::string& subdirectory, std::string name); + bool isCameraDirty(); + static void setCameraDirty(bool dirty); - // Emitted when a preset gets loaded, deleted, or saved. - boost::signals2::connection setPresetListChangeCameraCallback(const preset_list_signal_t::slot_type& cb); - boost::signals2::connection setPresetListChangeCallback(const preset_list_signal_t::slot_type& cb); + // Emitted when a preset gets loaded, deleted, or saved. + boost::signals2::connection setPresetListChangeCameraCallback(const preset_list_signal_t::slot_type& cb); + boost::signals2::connection setPresetListChangeCallback(const preset_list_signal_t::slot_type& cb); - // Emitted when a preset gets loaded or saved. + // Emitted when a preset gets loaded or saved. - preset_name_list_t mPresetNames; + preset_name_list_t mPresetNames; - preset_list_signal_t mPresetListChangeCameraSignal; - preset_list_signal_t mPresetListChangeSignal; + preset_list_signal_t mPresetListChangeCameraSignal; + preset_list_signal_t mPresetListChangeSignal; private: - LOG_CLASS(LLPresetsManager); + LOG_CLASS(LLPresetsManager); - void getControlNames(std::vector& names); - static void settingChanged(); + void getControlNames(std::vector& names); + static void settingChanged(); - boost::signals2::connection mCameraChangedSignal; + boost::signals2::connection mCameraChangedSignal; - static bool mCameraDirty; + static bool mCameraDirty; }; #endif // LL_PRESETSMANAGER_H -- cgit v1.2.3