@ -15,8 +15,7 @@
|
||||
|
||||
#include "OverrideSetting.h"
|
||||
|
||||
OverrideSetting::OverrideSetting(std::shared_ptr<Setting> other, std::shared_ptr<Setting> gate)
|
||||
: Setting(other->configKeys(), QVariant())
|
||||
OverrideSetting::OverrideSetting(std::shared_ptr<Setting> other, std::shared_ptr<Setting> gate) : Setting(other->configKeys(), QVariant())
|
||||
{
|
||||
Q_ASSERT(other);
|
||||
Q_ASSERT(gate);
|
||||
@ -36,8 +35,7 @@ QVariant OverrideSetting::defValue() const
|
||||
|
||||
QVariant OverrideSetting::get() const
|
||||
{
|
||||
if(isOverriding())
|
||||
{
|
||||
if (isOverriding()) {
|
||||
return Setting::get();
|
||||
}
|
||||
return m_other->get();
|
||||
|
Reference in New Issue
Block a user