Renamed EntityGenerator on the C++ side to CEntityGenerator

Author: Ayuto

src/core/modules/commands/command_wrap_python.cpp

@@ -158,7 +158,6 @@ BOOST_PYTHON_FUNCTION_OVERLOADS( get_server_command_overloads, GetServerCommand,
 
 void export_server_command()
 {
-	// TODO: Rename
 	class_<CServerCommandManager, boost::noncopyable>("ServerCommandDispatcher", no_init)
 		.def("add_callback",
 			&CServerCommandManager::AddCallback,
@@ -186,7 +185,6 @@ void export_server_command()
 //-----------------------------------------------------------------------------
 void export_client_command()
 {
-	// TODO: Rename
 	class_<CClientCommandManager, boost::noncopyable>("ClientCommandDispatcher", no_init)
 		.def("add_callback",
 			&CClientCommandManager::AddCallback,
@@ -226,7 +224,6 @@ void export_client_command()
 //-----------------------------------------------------------------------------
 void export_say_command()
 {
-	// TODO: Rename
 	class_<CSayCommandManager, boost::noncopyable>("SayCommandDispatcher", no_init)
 		.def("add_callback",
 			&CSayCommandManager::AddCallback,

src/core/modules/entities/entities_generator_wrap.cpp

@@ -34,9 +34,9 @@
 #include "modules/conversions/conversions_wrap.h"
 
 // ----------------------------------------------------------------------------
-// EntityGenerator Constructor.
+// CEntityGenerator Constructor.
 // ----------------------------------------------------------------------------
-EntityGenerator::EntityGenerator( PyObject* self ):
+CEntityGenerator::CEntityGenerator( PyObject* self ):
 	IPythonGenerator<edict_t>(self),
 	m_iEntityIndex(0),
 	m_szClassName(NULL),
@@ -46,9 +46,9 @@ EntityGenerator::EntityGenerator( PyObject* self ):
 }
 
 // ----------------------------------------------------------------------------
-// EntityGenerator Copy-Constructor.
+// CEntityGenerator Copy-Constructor.
 // ----------------------------------------------------------------------------
-EntityGenerator::EntityGenerator( PyObject* self, const EntityGenerator& rhs ):
+CEntityGenerator::CEntityGenerator( PyObject* self, const CEntityGenerator& rhs ):
 	IPythonGenerator<edict_t>(self),
 	m_iEntityIndex(rhs.m_iEntityIndex),
 	m_uiClassNameLen(rhs.m_uiClassNameLen),
@@ -58,9 +58,9 @@ EntityGenerator::EntityGenerator( PyObject* self, const EntityGenerator& rhs ):
 }
 
 // ----------------------------------------------------------------------------
-// EntityGenerator Constructor (takes a filter string).
+// CEntityGenerator Constructor (takes a filter string).
 // ----------------------------------------------------------------------------
-EntityGenerator::EntityGenerator(PyObject* self, const char* szClassName):
+CEntityGenerator::CEntityGenerator(PyObject* self, const char* szClassName):
 	IPythonGenerator<edict_t>(self),
 	m_iEntityIndex(0),
 	m_uiClassNameLen(strlen(szClassName)),
@@ -70,9 +70,9 @@ EntityGenerator::EntityGenerator(PyObject* self, const char* szClassName):
 }
 
 // ----------------------------------------------------------------------------
-// EntityGenerator Constructor (takes a filter string and a boolean flag).
+// CEntityGenerator Constructor (takes a filter string and a boolean flag).
 // ----------------------------------------------------------------------------
-EntityGenerator::EntityGenerator(PyObject* self, const char* szClassName, bool bExactMatch):
+CEntityGenerator::CEntityGenerator(PyObject* self, const char* szClassName, bool bExactMatch):
 	IPythonGenerator<edict_t>(self),
 	m_iEntityIndex(0),
 	m_uiClassNameLen(strlen(szClassName)),
@@ -82,17 +82,17 @@ EntityGenerator::EntityGenerator(PyObject* self, const char* szClassName, bool b
 }
 
 // ----------------------------------------------------------------------------
-// EntityGenerator Destructor.
+// CEntityGenerator Destructor.
 // ----------------------------------------------------------------------------
-EntityGenerator::~EntityGenerator()
+CEntityGenerator::~CEntityGenerator()
 {
 	delete[] m_szClassName;
 }
 
 // ----------------------------------------------------------------------------
 // Returns the next valid edict_t instance.
 // ----------------------------------------------------------------------------
-edict_t* EntityGenerator::getNext()
+edict_t* CEntityGenerator::getNext()
 {
 	edict_t* pEdict = NULL;
 	while(m_iEntityIndex < gpGlobals->maxEntities)
@@ -125,7 +125,7 @@ edict_t* EntityGenerator::getNext()
 //---------------------------------------------------------------------------------
 // Private function, creates a copy of the class name string.
 //---------------------------------------------------------------------------------
-void EntityGenerator::makeStringCopy(const char* szClassName, unsigned int uiClassNameLen)
+void CEntityGenerator::makeStringCopy(const char* szClassName, unsigned int uiClassNameLen)
 {
 	if (uiClassNameLen > 0)
 	{

src/core/modules/entities/entities_generator_wrap.h

@@ -41,14 +41,14 @@ struct edict_t;
 // ----------------------------------------------------------------------------
 // Declare the generator class.
 // ----------------------------------------------------------------------------
-class EntityGenerator: public IPythonGenerator<edict_t>
+class CEntityGenerator: public IPythonGenerator<edict_t>
 {
 public:
-	EntityGenerator(PyObject* self);
-	EntityGenerator(PyObject* self, const EntityGenerator& rhs);
-	EntityGenerator(PyObject* self, const char* szClassName);
-	EntityGenerator(PyObject* self, const char* szClassName, bool exactMatch);
-	virtual ~EntityGenerator();
+	CEntityGenerator(PyObject* self);
+	CEntityGenerator(PyObject* self, const CEntityGenerator& rhs);
+	CEntityGenerator(PyObject* self, const char* szClassName);
+	CEntityGenerator(PyObject* self, const char* szClassName, bool exactMatch);
+	virtual ~CEntityGenerator();
 
 protected:
 	virtual edict_t* getNext();
@@ -61,6 +61,6 @@ class EntityGenerator: public IPythonGenerator<edict_t>
 	bool m_bExactMatch;
 };
 
-BOOST_SPECIALIZE_HAS_BACK_REFERENCE(EntityGenerator)
+BOOST_SPECIALIZE_HAS_BACK_REFERENCE(CEntityGenerator)
 
 #endif

src/core/modules/entities/entities_wrap_python.cpp

@@ -445,13 +445,23 @@ void export_edict()
 }
 
 //-----------------------------------------------------------------------------
-// Exports EntityGenerator.
+// Exports CEntityGenerator.
 //-----------------------------------------------------------------------------
 void export_entity_generator()
 {
-	// TODO: Rename
-	BOOST_GENERATOR_CLASS(EntityGenerator)
-		CLASS_CONSTRUCTOR(const char*)
-		CLASS_CONSTRUCTOR(const char*, bool)
-	BOOST_END_CLASS()
+	class_<CEntityGenerator>("EntityGenerator")
+		.def(init<const char*>())
+		.def(init<const char*, bool>())
+
+		.def("__iter__",
+			&CEntityGenerator::iter,
+			"Returns the iterable object."
+		)
+
+		.def("__next__",
+			&CEntityGenerator::next,
+			"Returns the next valid instance.",
+			reference_existing_object_policy()
+		)
+	;
 }