"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "xbmc/settings/lib/SettingSection.h" between
xbmc-19.0-Matrix.tar.gz and xbmc-19.1.tar.gz

About:

SettingSection.h  (xbmc-19.0-Matrix):SettingSection.h  (xbmc-19.1)
skipping to change at line 14 skipping to change at line 14
* *
* SPDX-License-Identifier: GPL-2.0-or-later * SPDX-License-Identifier: GPL-2.0-or-later
* See LICENSES/README.md for more information. * See LICENSES/README.md for more information.
*/ */
#pragma once #pragma once
#include "ISetting.h" #include "ISetting.h"
#include "Setting.h" #include "Setting.h"
#include "SettingCategoryAccess.h" #include "SettingCategoryAccess.h"
#include "utils/StaticLoggerBase.h" #include "utils/logtypes.h"
#include <string> #include <string>
#include <utility> #include <utility>
#include <vector> #include <vector>
class CSettingsManager; class CSettingsManager;
/*! /*!
\ingroup settings \ingroup settings
\brief Group of settings being part of a category \brief Group of settings being part of a category
\sa CSettingCategory \sa CSettingCategory
\sa CSetting \sa CSetting
*/ */
class CSettingGroup : public ISetting, protected CStaticLoggerBase class CSettingGroup : public ISetting
{ {
public: public:
/*! /*!
\brief Creates a new setting group with the given identifier. \brief Creates a new setting group with the given identifier.
\param id Identifier of the setting group \param id Identifier of the setting group
\param settingsManager Reference to the settings manager \param settingsManager Reference to the settings manager
*/ */
CSettingGroup(const std::string &id, CSettingsManager *settingsManager = nullp tr); CSettingGroup(const std::string &id, CSettingsManager *settingsManager = nullp tr);
~CSettingGroup() override = default; ~CSettingGroup() override = default;
skipping to change at line 72 skipping to change at line 72
bool ReplaceSetting(const std::shared_ptr<const CSetting>& currentSetting, bool ReplaceSetting(const std::shared_ptr<const CSetting>& currentSetting,
const std::shared_ptr<CSetting>& newSetting); const std::shared_ptr<CSetting>& newSetting);
std::shared_ptr<const ISettingControl> GetControl() const { return m_control; } std::shared_ptr<const ISettingControl> GetControl() const { return m_control; }
std::shared_ptr<ISettingControl> GetControl() { return m_control; } std::shared_ptr<ISettingControl> GetControl() { return m_control; }
void SetControl(std::shared_ptr<ISettingControl> control) { m_control = std::m ove(control); } void SetControl(std::shared_ptr<ISettingControl> control) { m_control = std::m ove(control); }
private: private:
SettingList m_settings; SettingList m_settings;
std::shared_ptr<ISettingControl> m_control; std::shared_ptr<ISettingControl> m_control;
static Logger s_logger;
}; };
using SettingGroupPtr = std::shared_ptr<CSettingGroup>; using SettingGroupPtr = std::shared_ptr<CSettingGroup>;
using SettingGroupList = std::vector<SettingGroupPtr>; using SettingGroupList = std::vector<SettingGroupPtr>;
/*! /*!
\ingroup settings \ingroup settings
\brief Category of groups of settings being part of a section \brief Category of groups of settings being part of a section
\sa CSettingSection \sa CSettingSection
\sa CSettingGroup \sa CSettingGroup
*/ */
class CSettingCategory : public ISetting, protected CStaticLoggerBase class CSettingCategory : public ISetting
{ {
public: public:
/*! /*!
\brief Creates a new setting category with the given identifier. \brief Creates a new setting category with the given identifier.
\param id Identifier of the setting category \param id Identifier of the setting category
\param settingsManager Reference to the settings manager \param settingsManager Reference to the settings manager
*/ */
CSettingCategory(const std::string &id, CSettingsManager *settingsManager = nu llptr); CSettingCategory(const std::string &id, CSettingsManager *settingsManager = nu llptr);
~CSettingCategory() override = default; ~CSettingCategory() override = default;
skipping to change at line 128 skipping to change at line 130
\return True if the setting category can be accessed, false otherwise \return True if the setting category can be accessed, false otherwise
*/ */
bool CanAccess() const; bool CanAccess() const;
void AddGroup(const SettingGroupPtr& group); void AddGroup(const SettingGroupPtr& group);
void AddGroups(const SettingGroupList &groups); void AddGroups(const SettingGroupList &groups);
private: private:
SettingGroupList m_groups; SettingGroupList m_groups;
CSettingCategoryAccess m_accessCondition; CSettingCategoryAccess m_accessCondition;
static Logger s_logger;
}; };
using SettingCategoryPtr = std::shared_ptr<CSettingCategory>; using SettingCategoryPtr = std::shared_ptr<CSettingCategory>;
using SettingCategoryList = std::vector<SettingCategoryPtr>; using SettingCategoryList = std::vector<SettingCategoryPtr>;
/*! /*!
\ingroup settings \ingroup settings
\brief Section of setting categories \brief Section of setting categories
\sa CSettings \sa CSettings
\sa CSettingCategory \sa CSettingCategory
*/ */
class CSettingSection : public ISetting, protected CStaticLoggerBase class CSettingSection : public ISetting
{ {
public: public:
/*! /*!
\brief Creates a new setting section with the given identifier. \brief Creates a new setting section with the given identifier.
\param id Identifier of the setting section \param id Identifier of the setting section
\param settingsManager Reference to the settings manager \param settingsManager Reference to the settings manager
*/ */
CSettingSection(const std::string &id, CSettingsManager *settingsManager = nul lptr); CSettingSection(const std::string &id, CSettingsManager *settingsManager = nul lptr);
~CSettingSection() override = default; ~CSettingSection() override = default;
skipping to change at line 176 skipping to change at line 180
\param level Level the settings should be assigned to \param level Level the settings should be assigned to
\return List of setting categories belonging to the setting section \return List of setting categories belonging to the setting section
*/ */
SettingCategoryList GetCategories(SettingLevel level) const; SettingCategoryList GetCategories(SettingLevel level) const;
void AddCategory(const SettingCategoryPtr& category); void AddCategory(const SettingCategoryPtr& category);
void AddCategories(const SettingCategoryList &categories); void AddCategories(const SettingCategoryList &categories);
private: private:
SettingCategoryList m_categories; SettingCategoryList m_categories;
static Logger s_logger;
}; };
using SettingSectionPtr = std::shared_ptr<CSettingSection>; using SettingSectionPtr = std::shared_ptr<CSettingSection>;
using SettingSectionList = std::vector<SettingSectionPtr>; using SettingSectionList = std::vector<SettingSectionPtr>;
 End of changes. 7 change blocks. 
4 lines changed or deleted 10 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)