Renamed PlayerGenerator on the C++ side

Author: Ayuto

src/core/modules/players/players_generator_wrap.cpp

@@ -39,34 +39,34 @@
 extern IPlayerInfoManager* playerinfomanager;
 
 // ----------------------------------------------------------------------------
-// PlayerGenerator Constructor.
+// CPlayerGenerator Constructor.
 // ----------------------------------------------------------------------------
-PlayerGenerator::PlayerGenerator( PyObject* self ):
+CPlayerGenerator::CPlayerGenerator( PyObject* self ):
 	IPythonGenerator<IPlayerInfo>(self),
 	m_iEntityIndex(0)
 {
 }
 
 // ----------------------------------------------------------------------------
-// PlayerGenerator Copy-Constructor.
+// CPlayerGenerator Copy-Constructor.
 // ----------------------------------------------------------------------------
-PlayerGenerator::PlayerGenerator( PyObject* self, const PlayerGenerator& rhs ):
+CPlayerGenerator::CPlayerGenerator( PyObject* self, const CPlayerGenerator& rhs ):
 	IPythonGenerator<IPlayerInfo>(self),
 	m_iEntityIndex(rhs.m_iEntityIndex)
 {
 }
 
 // ----------------------------------------------------------------------------
-// PlayerGenerator Destructor.
+// CPlayerGenerator Destructor.
 // ----------------------------------------------------------------------------
-PlayerGenerator::~PlayerGenerator()
+CPlayerGenerator::~CPlayerGenerator()
 {
 }
 
 // ----------------------------------------------------------------------------
 // Returns the next valid IPlayerInfo instance.
 // ----------------------------------------------------------------------------
-IPlayerInfo* PlayerGenerator::getNext()
+IPlayerInfo* CPlayerGenerator::getNext()
 {
 	IPlayerInfo* pPlayerInfo = NULL;
 	while(m_iEntityIndex < gpGlobals->maxClients)

src/core/modules/players/players_generator_wrap.h

@@ -41,12 +41,12 @@ class IPlayerInfo;
 // ----------------------------------------------------------------------------
 // Declare the generator class.
 // ----------------------------------------------------------------------------
-class PlayerGenerator: public IPythonGenerator<IPlayerInfo>
+class CPlayerGenerator: public IPythonGenerator<IPlayerInfo>
 {
 public:
-	PlayerGenerator(PyObject* self);
-	PlayerGenerator(PyObject* self, const PlayerGenerator& rhs);
-	virtual ~PlayerGenerator();
+	CPlayerGenerator(PyObject* self);
+	CPlayerGenerator(PyObject* self, const CPlayerGenerator& rhs);
+	virtual ~CPlayerGenerator();
 
 protected:
 	virtual IPlayerInfo* getNext();
@@ -55,6 +55,6 @@ class PlayerGenerator: public IPythonGenerator<IPlayerInfo>
 	int m_iEntityIndex;
 };
 
-BOOST_SPECIALIZE_HAS_BACK_REFERENCE(PlayerGenerator)
+BOOST_SPECIALIZE_HAS_BACK_REFERENCE(CPlayerGenerator)
 
 #endif

src/core/modules/players/players_wrap_python.cpp

@@ -198,6 +198,16 @@ void export_netinfo()
 
 void export_player_generator()
 {
-	BOOST_GENERATOR_CLASS(PlayerGenerator)
-	BOOST_END_CLASS()
+	class_<CPlayerGenerator>("PlayerGenerator")
+		.def("__iter__",
+			&CPlayerGenerator::iter,
+			"Returns the iterable object."
+		)
+
+		.def("__next__",
+			&CPlayerGenerator::next,
+			"Returns the next valid instance.",
+			reference_existing_object_policy()
+		)
+	;
 }

src/core/utility/ipythongenerator.h

@@ -107,23 +107,4 @@ T* IPythonGenerator<T>::next()
 	return pValue;
 }
 
-//---------------------------------------------------------------------------------
-// Use this macro with classes inheriting from IPythonGenerator to automatically
-// bind the magic methods for __iter__() and __next__().
-// You should still use BOOST_CLASS_END() to end the class definition.
-//---------------------------------------------------------------------------------
-#define BOOST_GENERATOR_CLASS( classname ) \
-	BOOST_CLASS(classname) \
-		CLASS_METHOD_SPECIAL(classname, \
-			"__iter__", \
-			iter, \
-			"Returns the iterable object." \
-		) \
-		CLASS_METHOD_SPECIAL(classname, \
-			"__next__", \
-			next, \
-			"Returns the next valid instance.", \
-			reference_existing_object_policy() \
-		)
-
 #endif // _PYTHON_GENERATOR_H