Skip to content

Commit

Permalink
remove template from getSettingValue()
Browse files Browse the repository at this point in the history
  • Loading branch information
Fleeym committed Oct 25, 2023
1 parent 6fb0f31 commit e5f2fdd
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/features/NewColorSelect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ class $modify(NewColorSelect, CustomizeObjectLayer) {
}

void onSelectColor(CCObject* sender) {
if (!Mod::get()->template getSettingValue<bool>("new-color-menu")) {
if (!Mod::get()->getSettingValue<bool>("new-color-menu")) {
return CustomizeObjectLayer::onSelectColor(sender);
}
CustomizeObjectLayer::onSelectColor(sender);
Expand All @@ -175,7 +175,7 @@ class $modify(NewColorSelect, CustomizeObjectLayer) {
}

void highlightSelected(ButtonSprite* sprite) {
if (!Mod::get()->template getSettingValue<bool>("new-color-menu")) {
if (!Mod::get()->getSettingValue<bool>("new-color-menu")) {
return CustomizeObjectLayer::highlightSelected(sprite);
}
auto selected = this->getActiveMode(true);
Expand All @@ -185,15 +185,15 @@ class $modify(NewColorSelect, CustomizeObjectLayer) {
}

void colorSelectClosed(CCNode* target) {
if (!Mod::get()->template getSettingValue<bool>("new-color-menu")) {
if (!Mod::get()->getSettingValue<bool>("new-color-menu")) {
return CustomizeObjectLayer::colorSelectClosed(target);
}
CustomizeObjectLayer::colorSelectClosed(target);
this->updateSprites();
}

void updateCustomColorLabels() {
if (!Mod::get()->template getSettingValue<bool>("new-color-menu")) {
if (!Mod::get()->getSettingValue<bool>("new-color-menu")) {
return CustomizeObjectLayer::updateCustomColorLabels();
}
// prevent textChanged from firing
Expand All @@ -205,7 +205,7 @@ class $modify(NewColorSelect, CustomizeObjectLayer) {
}

void onUpdateCustomColor(CCObject* sender) {
if (!Mod::get()->template getSettingValue<bool>("new-color-menu")) {
if (!Mod::get()->getSettingValue<bool>("new-color-menu")) {
return CustomizeObjectLayer::onUpdateCustomColor(sender);
}
// recreate to avoid the default clamp of 10..999 without needing to patch
Expand Down Expand Up @@ -288,7 +288,7 @@ class $modify(NewColorSelect, CustomizeObjectLayer) {
}

void textChanged(CCTextInputNode* input) {
if (!Mod::get()->template getSettingValue<bool>("new-color-menu")) {
if (!Mod::get()->getSettingValue<bool>("new-color-menu")) {
return CustomizeObjectLayer::textChanged(input);
}
CustomizeObjectLayer::textChanged(input);
Expand All @@ -297,7 +297,7 @@ class $modify(NewColorSelect, CustomizeObjectLayer) {
}

void onClose(CCObject* sender) {
if (!Mod::get()->template getSettingValue<bool>("new-color-menu")) {
if (!Mod::get()->getSettingValue<bool>("new-color-menu")) {
return CustomizeObjectLayer::onClose(sender);
}
// add selected color to recent list if it's not there and it's not 0
Expand Down Expand Up @@ -360,7 +360,7 @@ class $modify(NewColorSelect, CustomizeObjectLayer) {
if (!CustomizeObjectLayer::init(obj, objs))
return false;

if (!Mod::get()->template getSettingValue<bool>("new-color-menu")) {
if (!Mod::get()->getSettingValue<bool>("new-color-menu")) {
return true;
}

Expand Down

0 comments on commit e5f2fdd

Please sign in to comment.