Merge CGlobalModule(s) into CModule(s)

This commit is contained in:
Kyle Fuller
2011-08-08 17:22:08 +01:00
parent a4b155995c
commit c456d20b21
23 changed files with 181 additions and 202 deletions
+2 -2
View File
@@ -24,7 +24,7 @@ class CPyModule : public CModule {
VWebSubPages* _GetSubPages();
public:
CPyModule(CUser* pUser, const CString& sModName, const CString& sDataPath,
PyObject* pyObj, CGlobalModule* pModPython)
PyObject* pyObj, CModule* pModPython)
: CModule(NULL, pUser, sModName, sDataPath) {
m_pyObj = pyObj;
Py_INCREF(pyObj);
@@ -114,7 +114,7 @@ static inline CPyModule* AsPyModule(CModule* p) {
return dynamic_cast<CPyModule*>(p);
}
inline CPyModule* CreatePyModule(CUser* pUser, const CString& sModName, const CString& sDataPath, PyObject* pyObj, CGlobalModule* pModPython) {
inline CPyModule* CreatePyModule(CUser* pUser, const CString& sModName, const CString& sDataPath, PyObject* pyObj, CModule* pModPython) {
return new CPyModule(pUser, sModName, sDataPath, pyObj, pModPython);
}