Clean-up: remove deprecated functions from OvaleGUID.

Aura.lua

@@ -367,7 +367,7 @@ function OvaleAura:COMBAT_LOG_EVENT_UNFILTERED(event, timestamp, cleuEvent, hide
 
 	local mine = (sourceGUID == self_playerGUID or self_petGUID and sourceGUID == self_petGUID)
 	if CLEU_AURA_EVENTS[cleuEvent] then
-		local unitId = OvaleGUID:GetUnitId(destGUID)
+		local unitId = OvaleGUID:GUIDUnit(destGUID)
 		if unitId then
 			-- Only update auras on the unit if it is not a unit type that receives UNIT_AURA events.
 			if not OvaleGUID.UNIT_AURA_UNIT[unitId] then
@@ -481,7 +481,7 @@ end
 
 function OvaleAura:UNIT_PET(event, unitId)
 	if unitId == "player" then
-		self_petGUID = OvaleGUID:GetGUID("pet")
+		self_petGUID = OvaleGUID:UnitGUID("pet")
 	end
 end
 
@@ -496,7 +496,7 @@ function OvaleAura:RemoveAurasOnInactiveUnits()
 	-- Remove all auras from GUIDs that can no longer be referenced by a unit ID,
 	-- i.e., not in the group or not targeted by anyone in the group or focus.
 	for guid in pairs(self.aura) do
-		local unitId = OvaleGUID:GetUnitId(guid)
+		local unitId = OvaleGUID:GUIDUnit(guid)
 		if not unitId then
 			self:Debug("Removing auras from GUID %s", guid)
 			RemoveAurasOnGUID(self.aura, guid)
@@ -707,7 +707,7 @@ end
 -- Scan auras on the given GUID and update the aura database.
 function OvaleAura:ScanAuras(unitId, guid)
 	self:StartProfiling("OvaleAura_ScanAuras")
-	guid = guid or OvaleGUID:GetGUID(unitId)
+	guid = guid or OvaleGUID:UnitGUID(unitId)
 	if guid then
 		self:DebugTimestamp("Scanning auras on %s (%s)", guid, unitId)
 
@@ -732,7 +732,7 @@ function OvaleAura:ScanAuras(unitId, guid)
 					break
 				end
 			else
-				local casterGUID = OvaleGUID:GetGUID(unitCaster)
+				local casterGUID = OvaleGUID:UnitGUID(unitCaster)
 				if debuffType == "" then
 					-- Empty string for the debuff type means this is an Enrage effect.
 					debuffType = "Enrage"
@@ -768,7 +768,7 @@ end
 function OvaleAura:GetAuraByGUID(guid, auraId, filter, mine)
 	-- If this GUID has no auras in the database, then do an aura scan.
 	if not self.serial[guid] then
-		local unitId = OvaleGUID:GetUnitId(guid)
+		local unitId = OvaleGUID:GUIDUnit(guid)
 		self:ScanAuras(unitId, guid)
 	end
 
@@ -787,7 +787,7 @@ function OvaleAura:GetAuraByGUID(guid, auraId, filter, mine)
 end
 
 function OvaleAura:GetAura(unitId, auraId, filter, mine)
-	local guid = OvaleGUID:GetGUID(unitId)
+	local guid = OvaleGUID:UnitGUID(unitId)
 	return self:GetAuraByGUID(guid, auraId, filter, mine)
 end
 
@@ -819,7 +819,7 @@ function OvaleAura:RequireBuffHandler(spellId, atTime, requirement, tokens, inde
 		if strsub(requirement, 1, 7) == "target_" then
 			if targetGUID then
 				guid = targetGUID
-				unitId = OvaleGUID:GetUnitId(guid)
+				unitId = OvaleGUID:GUIDUnit(guid)
 			else
 				unitId = self.defaultTarget or "target"
 			end
@@ -834,7 +834,7 @@ function OvaleAura:RequireBuffHandler(spellId, atTime, requirement, tokens, inde
 			filter = (strsub(requirement, 1, 4) == "buff") and "HELPFUL" or "HARMFUL"
 			mine = not (strsub(requirement, -4) == "_any")
 		end
-		guid = guid or OvaleGUID:GetGUID(unitId)
+		guid = guid or OvaleGUID:UnitGUID(unitId)
 		local aura = self:GetAuraByGUID(guid, buffName, filter, mine)
 		local isActiveAura = self:IsActiveAura(aura, atTime) and aura.stacks >= stacks
 		if not isBang and isActiveAura or isBang and not isActiveAura then
@@ -1161,7 +1161,7 @@ do
 
 	statePrototype.DebugUnitAuras = function(state, unitId, filter)
 		wipe(array)
-		local guid = OvaleGUID:GetGUID(unitId)
+		local guid = OvaleGUID:UnitGUID(unitId)
 		if OvaleAura.aura[guid] then
 			for auraId, whoseTable in pairs(OvaleAura.aura[guid]) do
 				for casterGUID in pairs(whoseTable) do
@@ -1400,7 +1400,7 @@ statePrototype.GetAuraByGUID = function(state, guid, auraId, filter, mine)
 end
 
 statePrototype.GetAura = function(state, unitId, auraId, filter, mine)
-	local guid = OvaleGUID:GetGUID(unitId)
+	local guid = OvaleGUID:UnitGUID(unitId)
 	return state:GetAuraByGUID(guid, auraId, filter, mine)
 end
 
@@ -1451,7 +1451,7 @@ end
 statePrototype.GetAuraWithProperty = function(state, unitId, propertyName, filter, atTime)
 	atTime = atTime or state.currentTime
 	local count = 0
-	local guid = OvaleGUID:GetGUID(unitId)
+	local guid = OvaleGUID:UnitGUID(unitId)
 	local start, ending = INFINITY, 0
 
 	-- Loop through auras not kept in the simulator that match the criteria.
@@ -1531,7 +1531,7 @@ do
 		stacks = 0
 		startChangeCount, endingChangeCount = INFINITY, INFINITY
 		startFirst, endingLast = INFINITY, 0
-		local excludeGUID = excludeUnitId and OvaleGUID:GetGUID(excludeUnitId) or nil
+		local excludeGUID = excludeUnitId and OvaleGUID:UnitGUID(excludeUnitId) or nil
 
 		-- Loop through auras not kept in the simulator that match the criteria.
 		for guid, auraTable in pairs(OvaleAura.aura) do

BestAction.lua

@@ -199,7 +199,7 @@ local function GetActionSpellInfo(element, state, atTime, target)
 
 	local actionTexture, actionInRange, actionCooldownStart, actionCooldownDuration,
 		actionUsable, actionShortcut, actionIsCurrent, actionEnable, actionType, actionId
-	local targetGUID = OvaleGUID:GetGUID(target)
+	local targetGUID = OvaleGUID:UnitGUID(target)
 
 	local spellId = element.positionalParams[1]
 	local si = OvaleData.spellInfo[spellId]

Cooldown.lua

@@ -364,7 +364,7 @@ statePrototype.GetGCD = function(state, spellId, atTime, targetGUID)
 			atTime = state.currentTime
 		end
 	end
-	targetGUID = targetGUID or OvaleGUID:GetGUID(state.defaultTarget)
+	targetGUID = targetGUID or OvaleGUID:UnitGUID(state.defaultTarget)
 
 	local gcd = spellId and state:GetSpellInfoProperty(spellId, atTime, "gcd", targetGUID)
 	if not gcd then

Data.lua

@@ -361,7 +361,7 @@ end
 -- Check "run-time" requirements specified in SpellRequire().
 -- NOTE: Mirrored in statePrototype below.
 function OvaleData:CheckRequirements(spellId, atTime, tokens, index, targetGUID)
-	targetGUID = targetGUID or OvaleGUID:GetGUID(self.defaultTarget or "target")
+	targetGUID = targetGUID or OvaleGUID:UnitGUID(self.defaultTarget or "target")
 	local name = tokens[index]
 	index = index + 1
 	if name then
@@ -401,7 +401,7 @@ end
 	NOTE: Mirrored in statePrototype below.
 --]]
 function OvaleData:CheckSpellAuraData(auraId, spellData, atTime, guid)
-	guid = guid or OvaleGUID:GetGUID("player")
+	guid = guid or OvaleGUID:UnitGUID("player")
 	local index, value, data
 	if type(spellData) == "table" then
 		-- Comma-separated value.
@@ -449,7 +449,7 @@ end
 -- Check "run-time" requirements specified in SpellInfo().
 -- NOTE: Mirrored in statePrototype below.
 function OvaleData:CheckSpellInfo(spellId, atTime, targetGUID)
-	targetGUID = targetGUID or OvaleGUID:GetGUID(self.defaultTarget or "target")
+	targetGUID = targetGUID or OvaleGUID:UnitGUID(self.defaultTarget or "target")
 	local verified = true
 	local requirement
 	for name, handler in pairs(self_requirement) do
@@ -471,7 +471,7 @@ end
 -- Get SpellInfo property with run-time checks as specified in SpellRequire().
 -- NOTE: Mirrored in statePrototype below.
 function OvaleData:GetSpellInfoProperty(spellId, atTime, property, targetGUID)
-	targetGUID = targetGUID or OvaleGUID:GetGUID(self.defaultTarget or "target")
+	targetGUID = targetGUID or OvaleGUID:UnitGUID(self.defaultTarget or "target")
 	local si = OvaleData.spellInfo[spellId]
 	local value = si and si[property]
 	local requirements = si and si.require[property]

Frame.lua

@@ -302,7 +302,7 @@ do
 			if (node.namedParams.size ~= "small" and not node.namedParams.nocd and profile.apparence.predictif) then
 				if start then
 					state:Log("****Second icon %s", start)
-					state:ApplySpell(actionId, OvaleGUID:GetGUID(actionTarget), start)
+					state:ApplySpell(actionId, OvaleGUID:UnitGUID(actionTarget), start)
 					local atTime = state.nextCast
 					if actionId ~= state.lastGCDSpellId then
 						-- The previous spell cast did not trigger the GCD, so compute the next action at the current time.

GUID.lua

@@ -108,9 +108,6 @@ OvaleGUID.nameUnit = {}
 OvaleGUID.guidName = {}
 OvaleGUID.nameGUID = {}
 
--- Deprecated: legacy mapping from name to GUID.
-OvaleGUID.nameToGUID = {}
-
 -- Export UNIT_AURA_UNIT table of units that receive UNIT_AURA events.
 OvaleGUID.UNIT_AURA_UNIT = UNIT_AURA_UNIT
 --</public-static-properties>
@@ -342,12 +339,6 @@ function OvaleGUID:UpdateUnit(unitId)
 			end
 		end
 	end
-	-- Deprecated: legacy mapping from name to GUID.
-	if not self.nameToGUID[name] then
-		if guid and guid ~= previousGUID and name and (unitId == "target" or self.unitGUID.target ~= guid) then
-			self.nameToGUID[name] = guid
-		end
-	end
 end
 
 function OvaleGUID:UpdateUnitWithTarget(unitId)
@@ -402,23 +393,4 @@ function OvaleGUID:NameGUID(name)
 	end
 	return nil
 end
-
---[[
-	Deprecated: old method names.
-
-	function OvaleGUID:GetGUID(unitId) end
-	function OvaleGUID:GetUnitId(guid) end
-	function OvaleGUID:GetGUIDForName(name) end
-	function OvaleGUID:GetUnitIdForName(name) end
---]]
-OvaleGUID.GetGUID = OvaleGUID.UnitGUID
-OvaleGUID.GetUnitId = OvaleGUID.GUIDUnit
-OvaleGUID.GetUnitIdForName = OvaleGUID.NameUnit
-
-function OvaleGUID:GetGUIDForName(name)
-	if name then
-		return self.nameToGUID[name]
-	end
-	return nil
-end
 --</public-static-methods>

conditions.lua

@@ -1651,7 +1651,7 @@ do
 		local comparator, limit = positionalParams[1], positionalParams[2]
 		local target = ParseCondition(positionalParams, namedParams, state, "target")
 		if state.lastSpellId then
-			local duration = state:GetGCD(state.lastSpellId, atTime, OvaleGUID:GetGUID(target))
+			local duration = state:GetGCD(state.lastSpellId, atTime, OvaleGUID:UnitGUID(target))
 			local start = state.startCast
 			local ending = start + duration
 			return TestValue(start, INFINITY, 0, ending, -1, comparator, limit)
@@ -2632,7 +2632,7 @@ do
 	local function PersistentMultiplier(positionalParams, namedParams, state, atTime)
 		local spellId, comparator, limit = positionalParams[1], positionalParams[2], positionalParams[3]
 		local target = ParseCondition(positionalParams, namedParams, state, "target")
-		local value = state:GetDamageMultiplier(spellId, OvaleGUID:GetGUID(target), atTime)
+		local value = state:GetDamageMultiplier(spellId, OvaleGUID:UnitGUID(target), atTime)
 		return Compare(value, comparator, limit)
 	end
 
@@ -4206,7 +4206,7 @@ do
 			if OvaleCondition.COMPARATOR[spellId] then
 				comparator, limit = spellId, positionalParams[i + 1]
 				break
-			elseif not usable or state:IsUsableSpell(spellId, atTime, OvaleGUID:GetGUID(target)) then
+			elseif not usable or state:IsUsableSpell(spellId, atTime, OvaleGUID:UnitGUID(target)) then
 				local start, duration = state:GetSpellCooldown(spellId)
 				local t = 0
 				if start > 0 and duration > 0 then
@@ -4324,7 +4324,7 @@ do
 	local function SpellUsable(positionalParams, namedParams, state, atTime)
 		local spellId, yesno = positionalParams[1], positionalParams[2]
 		local target = ParseCondition(positionalParams, namedParams, state, "target")
-		local isUsable, noMana = state:IsUsableSpell(spellId, atTime, OvaleGUID:GetGUID(target))
+		local isUsable, noMana = state:IsUsableSpell(spellId, atTime, OvaleGUID:UnitGUID(target))
 		local boolean = isUsable or noMana
 		return TestBoolean(boolean, yesno)
 	end
@@ -4821,7 +4821,7 @@ do
 			local _, pt = OvalePower:GetSpellCost(spellId)
 			powerType = pt
 		end
-		local seconds = state:TimeToPower(spellId, atTime, OvaleGUID:GetGUID(target), powerType)
+		local seconds = state:TimeToPower(spellId, atTime, OvaleGUID:UnitGUID(target), powerType)
 
 		if seconds == 0 then
 			return Compare(0, comparator, limit)
@@ -4883,7 +4883,7 @@ do
 	local function TimeToSpell(positionalParams, namedParams, state, atTime)
 		local spellId, comparator, limit = positionalParams[1], positionalParams[2], positionalParams[3]
 		local target = ParseCondition(positionalParams, namedParams, state, "target")
-		local seconds = state:GetTimeToSpell(spellId, atTime, OvaleGUID:GetGUID(target))
+		local seconds = state:GetTimeToSpell(spellId, atTime, OvaleGUID:UnitGUID(target))
 		if seconds == 0 then
 			return Compare(0, comparator, limit)
 		elseif seconds < INFINITY then