From c285f59ce2a05703e3a1232fcaf3ee3aea714b3f Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 18 Feb 2024 12:52:19 +0100 Subject: Replace BOOL with bool in llwindow and dependent classes --- indra/newview/llsettingspicker.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llsettingspicker.h') diff --git a/indra/newview/llsettingspicker.h b/indra/newview/llsettingspicker.h index 859f92fbe8..f70da700e2 100644 --- a/indra/newview/llsettingspicker.h +++ b/indra/newview/llsettingspicker.h @@ -107,7 +107,7 @@ private: void onAssetLoaded(LLUUID asset_id, LLSettingsBase::ptr_t settings); void onButtonCancel(); void onButtonSelect(); - virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask) override; + virtual bool handleDoubleClick(S32 x, S32 y, MASK mask) override; BOOL handleKeyHere(KEY key, MASK mask) override; void onFocusLost() override; -- cgit v1.2.3 From a5261a5fa8fad810ecb5c260d92c3e771822bf58 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 20 Feb 2024 23:46:23 +0100 Subject: Convert BOOL to bool in llui --- indra/newview/llsettingspicker.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llsettingspicker.h') diff --git a/indra/newview/llsettingspicker.h b/indra/newview/llsettingspicker.h index f70da700e2..291af6a304 100644 --- a/indra/newview/llsettingspicker.h +++ b/indra/newview/llsettingspicker.h @@ -60,7 +60,7 @@ public: void setActive(bool active); - virtual BOOL postBuild() override; + virtual bool postBuild() override; virtual void onClose(bool app_quitting) override; virtual void draw() override; @@ -108,7 +108,7 @@ private: void onButtonCancel(); void onButtonSelect(); virtual bool handleDoubleClick(S32 x, S32 y, MASK mask) override; - BOOL handleKeyHere(KEY key, MASK mask) override; + bool handleKeyHere(KEY key, MASK mask) override; void onFocusLost() override; -- cgit v1.2.3 From e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 22 May 2024 21:25:21 +0200 Subject: Fix line endlings --- indra/newview/llsettingspicker.h | 274 +++++++++++++++++++-------------------- 1 file changed, 137 insertions(+), 137 deletions(-) (limited to 'indra/newview/llsettingspicker.h') diff --git a/indra/newview/llsettingspicker.h b/indra/newview/llsettingspicker.h index a6fa307a63..29827dfb94 100644 --- a/indra/newview/llsettingspicker.h +++ b/indra/newview/llsettingspicker.h @@ -1,137 +1,137 @@ -/** - * @file llsettingspicker.h - * @author Rider Linden - * @brief LLSettingsPicker class header file including related functions - * - * $LicenseInfo:firstyear=2018&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2018, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#ifndef LL_SETTINGSPICKER_H -#define LL_SETTINGSPICKER_H - -#include "llinventorysettings.h" -#include "llfloater.h" -#include "llpermissionsflags.h" -#include "llfolderview.h" -#include "llinventory.h" -#include "llsettingsdaycycle.h" - -#include - -//========================================================================= -class LLFilterEditor; -class LLInventoryPanel; - -//========================================================================= -class LLFloaterSettingsPicker : public LLFloater -{ -public: - enum ETrackMode - { - TRACK_NONE, - TRACK_WATER, - TRACK_SKY - }; - typedef std::function close_callback_t; - typedef std::function id_changed_callback_t; - - LLFloaterSettingsPicker(LLView * owner, LLUUID setting_item_id, const LLSD ¶ms = LLSD()); - - virtual ~LLFloaterSettingsPicker() override; - - void setActive(bool active); - - virtual bool postBuild() override; - virtual void onClose(bool app_quitting) override; - virtual void draw() override; - - void setSettingsItemId(const LLUUID &settings_id, bool set_selection = true); - LLUUID getSettingsItemId() const { return mSettingItemID; } - - void setSettingsFilter(LLSettingsType::type_e type); - LLSettingsType::type_e getSettingsFilter() const { return mSettingsType; } - - // Only for day cycle - void setTrackMode(ETrackMode mode); - void setTrackWater() { mTrackMode = TRACK_WATER; } - void setTrackSky() { mTrackMode = TRACK_SKY; } - - // Takes a UUID, wraps get/setImageAssetID - virtual void setValue(const LLSD& value) override; - virtual LLSD getValue() const override; - - static LLUUID findItemID(const LLUUID& asset_id, bool copyable_only, bool ignore_library = false) - { - LLInventoryItem *pitem = findItem(asset_id, copyable_only, ignore_library); - if (pitem) - return pitem->getUUID(); - return LLUUID::null; - } - - static std::string findItemName(const LLUUID& asset_id, bool copyable_only, bool ignore_library = false) - { - LLInventoryItem *pitem = findItem(asset_id, copyable_only, ignore_library); - if (pitem) - return pitem->getName(); - return std::string(); - } - - static LLInventoryItem * findItem(const LLUUID& asset_id, bool copyable_only, bool ignore_library); - - -private: - typedef std::deque itemlist_t; - - void onFilterEdit(const std::string& search_string); - void onSelectionChange(const itemlist_t &items, bool user_action); - static void onAssetLoadedCb(LLHandle handle, LLUUID item_id, LLUUID asset_id, LLSettingsBase::ptr_t settings, S32 status); - void onAssetLoaded(LLUUID asset_id, LLSettingsBase::ptr_t settings); - void onButtonCancel(); - void onButtonSelect(); - virtual bool handleDoubleClick(S32 x, S32 y, MASK mask) override; - bool handleKeyHere(KEY key, MASK mask) override; - void onFocusLost() override; - - - LLHandle mOwnerHandle; - LLUUID mSettingItemID; - LLUUID mSettingAssetID; - ETrackMode mTrackMode; - - LLFilterEditor * mFilterEdit; - LLInventoryPanel * mInventoryPanel; - LLSettingsType::type_e mSettingsType; - - F32 mContextConeOpacity; - PermissionMask mImmediateFilterPermMask; - - bool mActive; - bool mNoCopySettingsSelected; - - LLSaveFolderState mSavedFolderState; - -// boost::signals2::signal mCommitSignal; - boost::signals2::signal mCloseSignal; - boost::signals2::signal mChangeIDSignal; -}; - -#endif // LL_LLTEXTURECTRL_H +/** + * @file llsettingspicker.h + * @author Rider Linden + * @brief LLSettingsPicker class header file including related functions + * + * $LicenseInfo:firstyear=2018&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2018, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#ifndef LL_SETTINGSPICKER_H +#define LL_SETTINGSPICKER_H + +#include "llinventorysettings.h" +#include "llfloater.h" +#include "llpermissionsflags.h" +#include "llfolderview.h" +#include "llinventory.h" +#include "llsettingsdaycycle.h" + +#include + +//========================================================================= +class LLFilterEditor; +class LLInventoryPanel; + +//========================================================================= +class LLFloaterSettingsPicker : public LLFloater +{ +public: + enum ETrackMode + { + TRACK_NONE, + TRACK_WATER, + TRACK_SKY + }; + typedef std::function close_callback_t; + typedef std::function id_changed_callback_t; + + LLFloaterSettingsPicker(LLView * owner, LLUUID setting_item_id, const LLSD ¶ms = LLSD()); + + virtual ~LLFloaterSettingsPicker() override; + + void setActive(bool active); + + virtual bool postBuild() override; + virtual void onClose(bool app_quitting) override; + virtual void draw() override; + + void setSettingsItemId(const LLUUID &settings_id, bool set_selection = true); + LLUUID getSettingsItemId() const { return mSettingItemID; } + + void setSettingsFilter(LLSettingsType::type_e type); + LLSettingsType::type_e getSettingsFilter() const { return mSettingsType; } + + // Only for day cycle + void setTrackMode(ETrackMode mode); + void setTrackWater() { mTrackMode = TRACK_WATER; } + void setTrackSky() { mTrackMode = TRACK_SKY; } + + // Takes a UUID, wraps get/setImageAssetID + virtual void setValue(const LLSD& value) override; + virtual LLSD getValue() const override; + + static LLUUID findItemID(const LLUUID& asset_id, bool copyable_only, bool ignore_library = false) + { + LLInventoryItem *pitem = findItem(asset_id, copyable_only, ignore_library); + if (pitem) + return pitem->getUUID(); + return LLUUID::null; + } + + static std::string findItemName(const LLUUID& asset_id, bool copyable_only, bool ignore_library = false) + { + LLInventoryItem *pitem = findItem(asset_id, copyable_only, ignore_library); + if (pitem) + return pitem->getName(); + return std::string(); + } + + static LLInventoryItem * findItem(const LLUUID& asset_id, bool copyable_only, bool ignore_library); + + +private: + typedef std::deque itemlist_t; + + void onFilterEdit(const std::string& search_string); + void onSelectionChange(const itemlist_t &items, bool user_action); + static void onAssetLoadedCb(LLHandle handle, LLUUID item_id, LLUUID asset_id, LLSettingsBase::ptr_t settings, S32 status); + void onAssetLoaded(LLUUID asset_id, LLSettingsBase::ptr_t settings); + void onButtonCancel(); + void onButtonSelect(); + virtual bool handleDoubleClick(S32 x, S32 y, MASK mask) override; + bool handleKeyHere(KEY key, MASK mask) override; + void onFocusLost() override; + + + LLHandle mOwnerHandle; + LLUUID mSettingItemID; + LLUUID mSettingAssetID; + ETrackMode mTrackMode; + + LLFilterEditor * mFilterEdit; + LLInventoryPanel * mInventoryPanel; + LLSettingsType::type_e mSettingsType; + + F32 mContextConeOpacity; + PermissionMask mImmediateFilterPermMask; + + bool mActive; + bool mNoCopySettingsSelected; + + LLSaveFolderState mSavedFolderState; + +// boost::signals2::signal mCommitSignal; + boost::signals2::signal mCloseSignal; + boost::signals2::signal mChangeIDSignal; +}; + +#endif // LL_LLTEXTURECTRL_H -- cgit v1.2.3