From 3cddcc852445bc72dc2216950cb5a8d62abd0f13 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Tue, 7 Feb 2017 20:45:56 +0100
Subject: [PATCH] - removed PClassType and PClassClass.

All non-actors now use PClass exclusively as their type descriptor.
Getting rid of these two classes already removes a lot of obtuse code from the type system, but there's still three more classes to go before a major cleanup can be undertaken.
---
 src/dobject.h    |  2 --
 src/dobjtype.cpp | 41 +----------------------------------------
 src/dobjtype.h   | 39 ---------------------------------------
 3 files changed, 1 insertion(+), 81 deletions(-)

diff --git a/src/dobject.h b/src/dobject.h
index 1a7afaea00..ef75609095 100644
--- a/src/dobject.h
+++ b/src/dobject.h
@@ -95,8 +95,6 @@ enum
 	CLASSREG_PClassActor,
 	CLASSREG_PClassInventory,
 	CLASSREG_PClassPlayerPawn,
-	CLASSREG_PClassType,
-	CLASSREG_PClassClass,
 };
 
 struct ClassReg
diff --git a/src/dobjtype.cpp b/src/dobjtype.cpp
index 0e7a5e304f..54cc646756 100644
--- a/src/dobjtype.cpp
+++ b/src/dobjtype.cpp
@@ -151,34 +151,6 @@ void DumpTypeTable()
 		Printf("Buckets of len %d: %d (%.2f%%)\n", j, lens[j], j!=0?double(lens[j])/used*100:-1.0);
 }
 
-/* PClassType *************************************************************/
-
-IMPLEMENT_CLASS(PClassType, false, false)
-
-//==========================================================================
-//
-// PClassType Constructor
-//
-//==========================================================================
-
-PClassType::PClassType()
-{
-}
-
-/* PClassClass ************************************************************/
-
-IMPLEMENT_CLASS(PClassClass, false, false)
-
-//==========================================================================
-//
-// PClassClass Constructor
-//
-//==========================================================================
-
-PClassClass::PClassClass()
-{
-}
-
 /* PType ******************************************************************/
 
 IMPLEMENT_CLASS(PType, true, true)
@@ -3014,28 +2986,19 @@ void PClass::StaticShutdown ()
 //
 // PClass :: StaticBootstrap										STATIC
 //
-// PClass and PClassClass have intermingling dependencies on their
-// definitions. To sort this out, we explicitly define them before
-// proceeding with the RegisterClass loop in StaticInit().
-//
 //==========================================================================
 
 void PClass::StaticBootstrap()
 {
-	PClassClass *clscls = new PClassClass;
-	PClassClass::RegistrationInfo.SetupClass(clscls);
-
-	PClassClass *cls = new PClassClass;
+	PClass *cls = new PClass;
 	PClass::RegistrationInfo.SetupClass(cls);
 
 	// The PClassClass constructor initialized these to nullptr, because the
 	// PClass metadata had not been created yet. Now it has, so we know what
 	// they should be and can insert them into the type table successfully.
-	clscls->InsertIntoHash();
 	cls->InsertIntoHash();
 
 	// Create parent objects before we go so that these definitions are complete.
-	clscls->ParentClass = PClassType::RegistrationInfo.ParentType->RegisterClass();
 	cls->ParentClass = PClass::RegistrationInfo.ParentType->RegisterClass();
 }
 
@@ -3095,8 +3058,6 @@ PClass *ClassReg::RegisterClass()
 		&PClassActor::RegistrationInfo,
 		&PClassInventory::RegistrationInfo,
 		&PClassPlayerPawn::RegistrationInfo,
-		&PClassType::RegistrationInfo,
-		&PClassClass::RegistrationInfo,
 	};
 
 	// Skip classes that have already been registered
diff --git a/src/dobjtype.h b/src/dobjtype.h
index 02877a4ec4..3858585e92 100644
--- a/src/dobjtype.h
+++ b/src/dobjtype.h
@@ -199,22 +199,13 @@ public:
 //   Prototype                     *+     *+
 
 struct ZCC_ExprConstant;
-class PClassType;
 class PType : public PTypeBase
 {
-	//DECLARE_ABSTRACT_CLASS_WITH_META(PType, DObject, PClassType);
-	// We need to unravel the _WITH_META macro, since PClassType isn't defined yet,
-	// and we can't define it until we've defined PClass. But we can't define that
-	// without defining PType.
 	DECLARE_ABSTRACT_CLASS(PType, PTypeBase)
 	HAS_OBJECT_POINTERS;
 protected:
-	enum { MetaClassNum = CLASSREG_PClassType };
 
 public:
-	typedef PClassType MetaClass;
-	MetaClass *GetClass() const;
-
 	PClass *TypeTableType;			// The type to use for hashing into the type table
 	unsigned int	Size;			// this type's size
 	unsigned int	Align;			// this type's preferred alignment
@@ -777,22 +768,17 @@ enum
 	TentativeClass = UINT_MAX,
 };
 
-class PClassClass;
 class PClass : public PNativeStruct
 {
 	DECLARE_CLASS(PClass, PNativeStruct);
 	HAS_OBJECT_POINTERS;
 protected:
 	// We unravel _WITH_META here just as we did for PType.
-	enum { MetaClassNum = CLASSREG_PClassClass };
 	TArray<FTypeAndOffset> SpecialInits;
 	void Derive(PClass *newclass, FName name);
 	void InitializeSpecials(void *addr, void *defaults) const;
 	void SetSuper();
 public:
-	typedef PClassClass MetaClass;
-	MetaClass *GetClass() const;
-
 	void WriteValue(FSerializer &ar, const char *key,const void *addr) const override;
 	void WriteAllFields(FSerializer &ar, const void *addr) const;
 	bool ReadValue(FSerializer &ar, const char *key,void *addr) const override;
@@ -870,31 +856,6 @@ public:
 	static bool bVMOperational;
 };
 
-class PClassType : public PClass
-{
-	DECLARE_CLASS(PClassType, PClass);
-protected:
-public:
-	PClassType();
-};
-
-inline PType::MetaClass *PType::GetClass() const
-{
-	return static_cast<MetaClass *>(DObject::GetClass());
-}
-
-class PClassClass : public PClassType
-{
-	DECLARE_CLASS(PClassClass, PClassType);
-public:
-	PClassClass();
-};
-
-inline PClass::MetaClass *PClass::GetClass() const
-{
-	return static_cast<MetaClass *>(DObject::GetClass());
-}
-
 // Type tables --------------------------------------------------------------
 
 struct FTypeTable