Change class constructor to be added as a separate method, instead of being an argument to newClass

Author: vaisest

src/Classes/BuildListControl.lua

@@ -7,11 +7,13 @@ local ipairs = ipairs
 local s_format = string.format
 
 ---@class BuildListControl: ListControl
-local BuildListClass = newClass("BuildListControl", "ListControl", function(self, anchor, rect, listMode)
+local BuildListClass = newClass("BuildListControl", "ListControl")
+
+function BuildListClass:BuildListControl(anchor, rect, listMode)
 	self.ListControl(anchor, rect, 20, "VERTICAL", false, listMode.list)
 	self.listMode = listMode
-	self.colList = { 
-		{ width = function() return self:GetProperty("width") - 172 end }, 
+	self.colList = {
+		{ width = function() return self:GetProperty("width") - 172 end },
 		{ },
 	}
 	self.showRowSeparators = true
@@ -45,7 +47,7 @@ local BuildListClass = newClass("BuildListControl", "ListControl", function(self
 	self.controls.path.width = function ()
 		return self.width()
 	end
-end)
+end
 
 function BuildListClass:SelByFileName(selFileName)
 	for index, build in ipairs(self.list) do

src/Classes/ButtonControl.lua

@@ -4,14 +4,16 @@
 -- Basic button control.
 --
 ---@class ButtonControl: Control, TooltipHost
-local ButtonClass = newClass("ButtonControl", "Control", "TooltipHost", function(self, anchor, rect, label, onClick, onHover, forceTooltip)
+local ButtonClass = newClass("ButtonControl", "Control", "TooltipHost")
+
+function ButtonClass:ButtonControl(anchor, rect, label, onClick, onHover, forceTooltip)
 	self.Control(anchor, rect)
 	self.TooltipHost()
 	self.label = label
 	self.onClick = onClick
 	self.onHover = onHover
 	self.forceTooltip = forceTooltip
-end)
+end
 
 function ButtonClass:Click()
 	if self:IsShown() and self:IsEnabled() then

src/Classes/CalcBreakdownControl.lua

@@ -14,7 +14,9 @@ local m_pi = math.pi
 local band = bit.band
 
 ---@class CalcBreakdownControl: Control, ControlHost
-local CalcBreakdownClass = newClass("CalcBreakdownControl", "Control", "ControlHost", function(self, calcsTab)
+local CalcBreakdownClass = newClass("CalcBreakdownControl", "Control", "ControlHost")
+
+function CalcBreakdownClass:CalcBreakdownControl(calcsTab)
 	self.Control()
 	self.ControlHost()
 	self.calcsTab = calcsTab
@@ -26,7 +28,7 @@ local CalcBreakdownClass = newClass("CalcBreakdownControl", "Control", "ControlH
 	self.uiOverlay = NewImageHandle()
 	self.uiOverlay:Load("Assets/game_ui_small.png")
 	self.controls.scrollBar = new("ScrollBarControl", {"RIGHT",self,"RIGHT"}, {-2, 0, 18, 0}, 80, "VERTICAL", true)
-end)
+end
 
 function CalcBreakdownClass:IsMouseOver()
 	if not self:IsShown() then

src/Classes/CalcSectionControl.lua

@@ -6,7 +6,9 @@
 local t_insert = table.insert
 
 ---@class CalcSectionControl: Control, ControlHost
-local CalcSectionClass = newClass("CalcSectionControl", "Control", "ControlHost", function(self, calcsTab, width, id, group, colour, subSection, updateFunc)
+local CalcSectionClass = newClass("CalcSectionControl", "Control", "ControlHost")
+
+function CalcSectionClass:CalcSectionControl(calcsTab, width, id, group, colour, subSection, updateFunc)
 	self.Control(calcsTab, {0, 0, width, 0})
 	self.ControlHost()
 	self.calcsTab = calcsTab
@@ -53,7 +55,7 @@ local CalcSectionClass = newClass("CalcSectionControl", "Control", "ControlHost"
 	self.shown = function()
 		return self.enabled
 	end
-end)
+end
 
 function CalcSectionClass:IsMouseOver()
 	if not self:IsShown() then

src/Classes/CalcsTab.lua

@@ -17,7 +17,9 @@ local buffModeDropList = {
 }
 
 ---@class CalcsTab: UndoHandler, ControlHost, Control
-local CalcsTabClass = newClass("CalcsTab", "UndoHandler", "ControlHost", "Control", function(self, build)
+local CalcsTabClass = newClass("CalcsTab", "UndoHandler", "ControlHost", "Control")
+
+function CalcsTabClass:CalcsTab(build)
 	self.UndoHandler()
 	self.ControlHost()
 	self.Control()
@@ -152,7 +154,7 @@ Effective DPS: Curses and enemy properties (such as resistances and status condi
 
 	self.controls.scrollBar = new("ScrollBarControl", {"TOPRIGHT",self,"TOPRIGHT"}, {0, 0, 18, 0}, 50, "VERTICAL", true)
 	self.powerBuilderInitialized = nil
-end)
+end
 
 function CalcsTabClass:Load(xml, dbFileName)
 	for _, node in ipairs(xml) do

src/Classes/CheckBoxControl.lua

@@ -4,15 +4,17 @@
 -- Basic check box control.
 --
 ---@class CheckBoxControl: Control, TooltipHost
-local CheckBoxClass = newClass("CheckBoxControl", "Control", "TooltipHost", function(self, anchor, rect, label, changeFunc, tooltipText, initialState)
+local CheckBoxClass = newClass("CheckBoxControl", "Control", "TooltipHost")
+
+function CheckBoxClass:CheckBoxControl(anchor, rect, label, changeFunc, tooltipText, initialState)
 	rect[4] = rect[3] or 0
 	self.Control(anchor, rect)
 	self.TooltipHost(tooltipText)
 	self.label = label
 	self.labelWidth = DrawStringWidth(self.width - 4, "VAR", label or "") + 5
 	self.changeFunc = changeFunc
 	self.state = initialState
-end)
+end
 
 function CheckBoxClass:IsMouseOver()
 	if not self:IsShown() then

src/Classes/CompareEntry.lua

@@ -10,7 +10,9 @@ local m_min = math.min
 local m_max = math.max
 
 ---@class CompareEntry: ControlHost
-local CompareEntryClass = newClass("CompareEntry", "ControlHost", function(self, xmlText, label)
+local CompareEntryClass = newClass("CompareEntry", "ControlHost")
+
+function CompareEntryClass:CompareEntry(xmlText, label)
 	self.ControlHost()
 
 	self.label = label or "Comparison Build"
@@ -52,7 +54,7 @@ local CompareEntryClass = newClass("CompareEntry", "ControlHost", function(self,
 	if xmlText then
 		self:LoadFromXML(xmlText)
 	end
-end)
+end
 
 function CompareEntryClass:LoadFromXML(xmlText)
 	-- Parse the XML

src/Classes/ComparePowerReportListControl.lua

@@ -8,7 +8,9 @@ local t_insert = table.insert
 local t_sort = table.sort
 
 ---@class ComparePowerReportListControl: ListControl
-local ComparePowerReportListClass = newClass("ComparePowerReportListControl", "ListControl", function(self, anchor, rect)
+local ComparePowerReportListClass = newClass("ComparePowerReportListControl", "ListControl")
+
+function ComparePowerReportListClass:ComparePowerReportListControl(anchor, rect)
 	self.ListControl(anchor, rect, 18, "VERTICAL", false)
 
 	local width = rect[3]
@@ -23,7 +25,7 @@ local ComparePowerReportListClass = newClass("ComparePowerReportListControl", "L
 	self.colLabels = true
 	self.showRowSeparators = true
 	self.statusText = "Select a metric above to generate the power report."
-end)
+end
 
 function ComparePowerReportListClass:SetReport(stat, report)
 	self.impactColumn.label = stat and stat.label or ""

src/Classes/CompareTab.lua

@@ -123,7 +123,9 @@ local function matchFlags(reqFlags, notFlags, flags)
 end
 
 ---@class CompareTab: ControlHost, Control
-local CompareTabClass = newClass("CompareTab", "ControlHost", "Control", function(self, primaryBuild)
+local CompareTabClass = newClass("CompareTab", "ControlHost", "Control")
+
+function CompareTabClass:CompareTab(primaryBuild)
 	self.ControlHost()
 	self.Control()
 
@@ -191,7 +193,7 @@ local CompareTabClass = newClass("CompareTab", "ControlHost", "Control", functio
 
 	-- Controls for the comparison screen
 	self:InitControls()
-end)
+end
 
 function CompareTabClass:InitControls()
 	-- Sub-tab buttons

src/Classes/ConfigSetListControl.lua

@@ -8,7 +8,9 @@ local t_remove = table.remove
 local m_max = math.max
 
 ---@class ConfigSetListControl: ListControl
-local ConfigSetListClass = newClass("ConfigSetListControl", "ListControl", function(self, anchor, rect, configTab)
+local ConfigSetListClass = newClass("ConfigSetListControl", "ListControl")
+
+function ConfigSetListClass:ConfigSetListControl(anchor, rect, configTab)
 	self.ListControl(anchor, rect, 16, "VERTICAL", true, configTab.configSetOrderList)
 	self.configTab = configTab
 	self.controls.copy = new("ButtonControl", {"BOTTOMLEFT",self,"TOP"}, {2, -4, 60, 18}, "Copy", function()
@@ -39,7 +41,7 @@ local ConfigSetListClass = newClass("ConfigSetListControl", "ListControl", funct
 	self.controls.new = new("ButtonControl", {"RIGHT",self.controls.rename,"LEFT"}, {-4, 0, 60, 18}, "New", function()
 		self:RenameSet(configTab:NewConfigSet(), true)
 	end)
-end)
+end
 
 function ConfigSetListClass:RenameSet(configSet, addOnName)
 	local controls = { }