forked from eden-emu/eden
		
	settings: Consolidate RangedSetting's with regular ones
The latest git version of GCC has issues with my diamond inheritance shenanigans. Since that's now two compilers that don't like it I thought it'd be best to just axe all of it and just have the two templates like before. This rolls the features of BasicRangedSetting into BasicSetting, and likewise RangedSetting into Setting. It also renames them from BasicSetting and Setting to Setting and SwitchableSetting respectively. Now longer name corresponds to more complex thing.
This commit is contained in:
		
							parent
							
								
									01bc0c84f0
								
							
						
					
					
						commit
						ca36722a54
					
				
					 8 changed files with 230 additions and 318 deletions
				
			
		|  | @ -160,7 +160,7 @@ private: | |||
|      * @param The setting | ||||
|      */ | ||||
|     template <typename Type> | ||||
|     void ReadGlobalSetting(Settings::Setting<Type>& setting); | ||||
|     void ReadGlobalSetting(Settings::SwitchableSetting<Type>& setting); | ||||
| 
 | ||||
|     /**
 | ||||
|      * Sets a value to the qt_config using the setting's label and default value. If the config is a | ||||
|  | @ -169,7 +169,7 @@ private: | |||
|      * @param The setting | ||||
|      */ | ||||
|     template <typename Type> | ||||
|     void WriteGlobalSetting(const Settings::Setting<Type>& setting); | ||||
|     void WriteGlobalSetting(const Settings::SwitchableSetting<Type>& setting); | ||||
| 
 | ||||
|     /**
 | ||||
|      * Reads a value from the qt_config using the setting's label and default value and applies the | ||||
|  | @ -178,14 +178,14 @@ private: | |||
|      * @param The setting | ||||
|      */ | ||||
|     template <typename Type> | ||||
|     void ReadBasicSetting(Settings::BasicSetting<Type>& setting); | ||||
|     void ReadBasicSetting(Settings::Setting<Type>& setting); | ||||
| 
 | ||||
|     /** Sets a value from the setting in the qt_config using the setting's label and default value.
 | ||||
|      * | ||||
|      * @param The setting | ||||
|      */ | ||||
|     template <typename Type> | ||||
|     void WriteBasicSetting(const Settings::BasicSetting<Type>& setting); | ||||
|     void WriteBasicSetting(const Settings::Setting<Type>& setting); | ||||
| 
 | ||||
|     ConfigType type; | ||||
|     std::unique_ptr<QSettings> qt_config; | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 lat9nq
						lat9nq