Fix PPropertyParser not building

AdventureT · Jan 27, 2024 · 4a63d3a · 4a63d3a
1 parent b73ab36
commit 4a63d3a
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 91 deletions.
diff --git a/Toshi/Include/TKernel/TQList.h b/Toshi/Include/TKernel/TQList.h
@@ -4,100 +4,14 @@
 
 TOSHI_NAMESPACE_BEGIN
 
-template <class T, class Node>
-class T2Iterator
-{
-public:
-
-	T2Iterator()
-	{
-		m_pPtr = TNULL;
-	}
-
-	T2Iterator(Node* pPtr)
-	{
-		m_pPtr = static_cast<T*>(pPtr);
-	}
-
-	T2Iterator(T* pPtr)
-	{
-		m_pPtr = pPtr;
-	}
-
-	/*TBOOL operator==(const T* ptr)
-	{
-		return m_pNode == ptr;
-	}*/
-
-	/*TBOOL operator!=(const T* ptr)
-	{
-		return m_pNode != ptr;
-	}*/
-
-	void operator=(const T2Iterator& other)
-	{
-		m_pPtr = other.m_pPtr;
-	}
-
-	void operator=(T* pPtr)
-	{
-		m_pPtr = pPtr;
-	}
-
-	T* operator->() const
-	{
-		TASSERT(m_pPtr != TNULL);
-		return m_pPtr;
-	}
-
-	operator T* () const
-	{
-		TASSERT(m_pPtr != TNULL);
-		return static_cast<T*>(m_pPtr);
-	}
-
-	T2Iterator operator++(int)
-	{
-		TASSERT(m_pPtr != TNULL);
-		T2Iterator old = m_pPtr;
-		m_pPtr = static_cast<T*>(m_pPtr->Next());
-		return old;
-	}
-
-	T2Iterator operator--(int)
-	{
-		TASSERT(m_pPtr != TNULL);
-		T2Iterator old = m_pPtr;
-		m_pPtr = static_cast<T*>(m_pPtr->Prev());
-		return old;
-	}
-
-	T2Iterator operator++()
-	{
-		TASSERT(m_pPtr != TNULL);
-		m_pPtr = static_cast<T*>(m_pPtr->Next());
-		return T2Iterator{ m_pPtr };
-	}
-
-	T2Iterator operator--()
-	{
-		TASSERT(m_pPtr != TNULL);
-		m_pPtr = static_cast<T*>(m_pPtr->Prev());
-		return T2Iterator{ m_pPtr };
-	}
-
-private:
-	T* m_pPtr;
-};
-
 template <class T>
 class TQList
 {
 public:
 	class TNode
 	{
 	public:
-		friend TQList;
+		friend class TQList;
 
 	public:
 		TNode()
@@ -161,7 +75,90 @@ class TQList
 		T* m_pPrev;
 	};
 
-	using Iterator = T2Iterator<T, TNode>;
+	class Iterator
+	{
+	public:
+
+		Iterator()
+		{
+			m_pPtr = TNULL;
+		}
+
+		Iterator(TNode* pPtr)
+		{
+			m_pPtr = static_cast<T*>(pPtr);
+		}
+
+		Iterator(T* pPtr)
+		{
+			m_pPtr = pPtr;
+		}
+
+		/*TBOOL operator==(const T* ptr)
+		{
+			return m_pNode == ptr;
+		}*/
+
+		/*TBOOL operator!=(const T* ptr)
+		{
+			return m_pNode != ptr;
+		}*/
+
+		void operator=(const Iterator& other)
+		{
+			m_pPtr = other.m_pPtr;
+		}
+
+		void operator=(T* pPtr)
+		{
+			m_pPtr = pPtr;
+		}
+
+		T* operator->() const
+		{
+			TASSERT(m_pPtr != TNULL);
+			return m_pPtr;
+		}
+
+		operator T* () const
+		{
+			TASSERT(m_pPtr != TNULL);
+			return static_cast<T*>(m_pPtr);
+		}
+
+		Iterator operator++(int)
+		{
+			TASSERT(m_pPtr != TNULL);
+			Iterator old = m_pPtr;
+			m_pPtr = static_cast<T*>(m_pPtr->Next());
+			return old;
+		}
+
+		Iterator operator--(int)
+		{
+			TASSERT(m_pPtr != TNULL);
+			Iterator old = m_pPtr;
+			m_pPtr = static_cast<T*>(m_pPtr->Prev());
+			return old;
+		}
+
+		Iterator operator++()
+		{
+			TASSERT(m_pPtr != TNULL);
+			m_pPtr = static_cast<T*>(m_pPtr->Next());
+			return Iterator{ m_pPtr };
+		}
+
+		Iterator operator--()
+		{
+			TASSERT(m_pPtr != TNULL);
+			m_pPtr = static_cast<T*>(m_pPtr->Prev());
+			return Iterator{ m_pPtr };
+		}
+
+	private:
+		T* m_pPtr;
+	};
 
 public:
 	TQList() = default;

diff --git a/Toshi/Plugins/Include/PPropertyParser/PProperties.h b/Toshi/Plugins/Include/PPropertyParser/PProperties.h
@@ -6,7 +6,7 @@
 #include "PPropertyName.h"
 #include "TPCString.h"
 
-class PPROPERTYPARSER_EXPORTS PProperty : Toshi::TQList<PProperty>::TNode
+class PPROPERTYPARSER_EXPORTS PProperty : public Toshi::TQList<PProperty>::TNode
 {
 	DECLARE_FREELIST(PProperty)
 

diff --git a/Toshi/Plugins/premake5.lua b/Toshi/Plugins/premake5.lua
@@ -6,13 +6,15 @@ project ("PPropertyParser")
 
 	links
 	{
-		"winmm.lib"
+		"winmm.lib", 
+		"TKernelInterface"
 	}
 
 	includedirs
 	{
 		"Include",
-		"../Include/TKernel"
+		"%{wks.location}/Toshi/Include",
+		"%{wks.location}/Toshi/Include/TKernel"
 	}
 
 	defines