Merge pull request #15 from ModOrganizer2/python3

Migrate to python 3.7

CMakeLists.txt

@@ -14,7 +14,7 @@ LIST(APPEND CMAKE_PREFIX_PATH ${QT_ROOT}/lib/cmake)
 FILE(GLOB_RECURSE PYTHON_ROOT ${DEPENDENCIES_DIR}/Python*/pyconfig.h.in)
 GET_FILENAME_COMPONENT(PYTHON_ROOT ${PYTHON_ROOT} DIRECTORY)
 
-FILE(GLOB_RECURSE SIP_ROOT ${DEPENDENCIES_DIR}/sip*/siplib/sip.h)
+FILE(GLOB_RECURSE SIP_ROOT ${DEPENDENCIES_DIR}/sip-*/siplib/sip.h)
 GET_FILENAME_COMPONENT(SIP_ROOT ${SIP_ROOT} DIRECTORY)
 
 # need to install python

src/runner/CMakeLists.txt

@@ -13,6 +13,7 @@ FILE(GLOB ${PROJ_NAME}_HDRS *.h)
 SET(CMAKE_INCLUDE_CURRENT_DIR ON)
 SET(CMAKE_AUTOMOC ON)
 SET(CMAKE_AUTOUIC ON)
+ADD_DEFINITIONS(-DQT_NO_KEYWORDS)
 FIND_PACKAGE(Qt5Widgets REQUIRED)
 #QT5_WRAP_UI(${PROJ_NAME}_UIHDRS ${${PROJ_NAME}_FORMS})
 FIND_PACKAGE(Qt5LinguistTools)

src/runner/proxypluginwrappers.h

@@ -202,7 +202,7 @@ public:
   virtual QIcon icon() const;
   virtual void setParentWidget(QWidget *parent);
 
-public slots:
+public Q_SLOTS:
   virtual void display() const;
 };
 

src/runner/sipapiaccess.h

@@ -7,7 +7,36 @@ static const sipAPIDef *sipAPI()
 {
   static const sipAPIDef *sipApi = nullptr;
   if (sipApi == nullptr) {
-    sipApi = (const sipAPIDef *)PyCapsule_Import("sip._C_API", 0);
+#if defined(SIP_USE_PYCAPSULE)
+    PyImport_ImportModule("PyQt5.sip");
+    sipApi = (const sipAPIDef *)PyCapsule_Import("PyQt5.sip._C_API", 0);
+#else
+    PyObject *sip_module;
+    PyObject *sip_module_dict;
+    PyObject *c_api;
+
+    /* Import the SIP module. */
+    sip_module = PyImport_ImportModule("PyQt5.sip");
+
+    if (sip_module == NULL)
+      return NULL;
+
+    /* Get the module's dictionary. */
+    sip_module_dict = PyModule_GetDict(sip_module);
+
+    /* Get the "_C_API" attribute. */
+    c_api = PyDict_GetItemString(sip_module_dict, "_C_API");
+
+    if (c_api == NULL)
+      return NULL;
+
+    /* Sanity check that it is the right type. */
+    if (!PyCObject_Check(c_api))
+      return NULL;
+
+    /* Get the actual pointer from the object. */
+    sipApi = (const sipAPIDef *)PyCObject_AsVoidPtr(c_api);
+#endif
   }
 
   return sipApi;

src/runner/uibasewrappers.h

@@ -105,7 +105,7 @@ private:
 
   Q_DISABLE_COPY(ModRepositoryBridgeWrapper)
 
-private slots:
+private Q_SLOTS:
 
   void filesAvailable(int modID, QVariant userData, const QList<ModRepositoryFileInfo> &resultData)
   {