Cleaner way of getting defaults and options from stack counters

Now we pass in the options or defaults table directly to the helper class's getter methods since they're passed by reference and can be modified in place. This saves us creation of yet more tables and obviates the need to merge tables together.

IceStackCounter.lua

@@ -4,9 +4,7 @@ local validUnits = {"player", "target", "focus", "pet", "vehicle", "targettarget
 local buffOrDebuff = {"buff", "debuff", "charges", "spell count"}
 
 -- OVERRIDE
-function IceStackCounter_GetOptions(frame)
+function IceStackCounter_GetOptions(frame, opts)
-	local opts = {}
-
 	opts["customHeader"] = {
 		type = 'header',
 		name = L["Aura settings"],
@@ -107,8 +105,6 @@ function IceStackCounter_GetOptions(frame)
 		usage = "<the maximum number of valid applications>",
 		order = 30.9,
 	}
-
-	return opts
 end
 
 function IceStackCounter_GetMaxCount(frame)
@@ -120,14 +116,12 @@ function IceStackCounter_GetMaxCount(frame)
 	end
 end
 
-function IceStackCounter_GetDefaultSettings()
+function IceStackCounter_GetDefaultSettings(defaults)
-	local defaults = {}
 	defaults["maxCount"] = 5
 	defaults["auraTarget"] = "player"
 	defaults["auraName"] = ""
 	defaults["onlyMine"] = true
 	defaults["auraType"] = "buff"
-	return defaults
 end
 
 

modules/CustomCount.lua

@@ -17,10 +17,7 @@ end
 -- OVERRIDE
 function IceCustomCount.prototype:GetOptions()
 	local opts = IceCustomCount.super.prototype.GetOptions(self)
-
+	IceStackCounter_GetOptions(self, opts)
-	for k,v in pairs(IceStackCounter_GetOptions(self)) do
-		opts[k] = v
-	end
 
 	opts["deleteme"] = {
 		type = 'execute',
@@ -261,10 +258,7 @@ end
 
 function IceCustomCount.prototype:GetDefaultSettings()
 	local defaults =  IceCustomCount.super.prototype.GetDefaultSettings(self)
-
+	IceStackCounter_GetDefaultSettings(defaults)
-	for k,v in pairs(IceStackCounter_GetDefaultSettings(self)) do
-		defaults[k] = v
-	end
 
 	defaults["vpos"] = 0
 	defaults["hpos"] = 0

modules/CustomCounterBar.lua

@@ -15,10 +15,7 @@ end
 
 function IceCustomCounterBar.prototype:GetOptions()
 	local opts = IceCustomCounterBar.super.prototype.GetOptions(self)
-
+	IceStackCounter_GetOptions(self, opts)
-	for k,v in pairs(IceStackCounter_GetOptions(self)) do
-		opts[k] = v
-	end
 
 	opts["deleteme"] = {
 		type = 'execute',
@@ -216,11 +213,8 @@ function IceCustomCounterBar.prototype:GetOptions()
 end
 
 function IceCustomCounterBar.prototype:GetDefaultSettings()
-	local defaults =  IceCustomCounterBar.super.prototype.GetDefaultSettings(self)
+	local defaults = IceCustomCounterBar.super.prototype.GetDefaultSettings(self)
-
+	IceStackCounter_GetDefaultSettings(defaults)
-	for k,v in pairs(IceStackCounter_GetDefaultSettings(self)) do
-		defaults[k] = v
-	end
 
 	defaults.textVisible['lower'] = false
 	defaults.offset = 9