mirror of
				https://github.com/ciphervance/supercell-wx.git
				synced 2025-10-31 08:00:05 +00:00 
			
		
		
		
	Inheriting MapSettings and PaletteSettings from SettingsCategory, updating SettingsManager initialization
This commit is contained in:
		
							parent
							
								
									c93e776137
								
							
						
					
					
						commit
						891b6c839f
					
				
					 14 changed files with 231 additions and 269 deletions
				
			
		|  | @ -1,10 +1,10 @@ | |||
| #pragma once | ||||
| 
 | ||||
| #include <scwx/qt/settings/settings_category.hpp> | ||||
| 
 | ||||
| #include <memory> | ||||
| #include <string> | ||||
| 
 | ||||
| #include <boost/json.hpp> | ||||
| 
 | ||||
| namespace scwx | ||||
| { | ||||
| namespace qt | ||||
|  | @ -14,25 +14,19 @@ namespace settings | |||
| 
 | ||||
| class PaletteSettingsImpl; | ||||
| 
 | ||||
| class PaletteSettings | ||||
| class PaletteSettings : public SettingsCategory | ||||
| { | ||||
| public: | ||||
|    explicit PaletteSettings(); | ||||
|    ~PaletteSettings(); | ||||
| 
 | ||||
|    PaletteSettings(const PaletteSettings&) = delete; | ||||
|    PaletteSettings(const PaletteSettings&)            = delete; | ||||
|    PaletteSettings& operator=(const PaletteSettings&) = delete; | ||||
| 
 | ||||
|    PaletteSettings(PaletteSettings&&) noexcept; | ||||
|    PaletteSettings& operator=(PaletteSettings&&) noexcept; | ||||
| 
 | ||||
|    const std::string& palette(const std::string& name) const; | ||||
| 
 | ||||
|    boost::json::value ToJson() const; | ||||
| 
 | ||||
|    static std::shared_ptr<PaletteSettings> Create(); | ||||
|    static std::shared_ptr<PaletteSettings> Load(const boost::json::value* json, | ||||
|                                                 bool& jsonDirty); | ||||
|    std::string palette(const std::string& name) const; | ||||
| 
 | ||||
|    friend bool operator==(const PaletteSettings& lhs, | ||||
|                           const PaletteSettings& rhs); | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Dan Paulat
						Dan Paulat