Move sipAPI getter function to a shared header so it isn't duplicated.

This commit is contained in:
AnyOldName3
2018-04-22 00:59:42 +01:00
parent 8fe091ab48
commit bf8f427cd8
3 changed files with 13 additions and 23 deletions
+1 -12
View File
@@ -4,7 +4,7 @@
#include "gilock.h"
#include <QUrl>
#include <QWidget>
#include <sip.h>
#include "sipApiAccess.h"
namespace boost
{
@@ -491,17 +491,6 @@ std::set<QString> IPluginPreviewWrapper::supportedExtensions() const
} PYCATCH;
}
// right now, this is copied and pasted from apythonrunner.cpp, but it should probably be moved int oa shared header
static const sipAPIDef *sipAPI()
{
static const sipAPIDef *sipApi = nullptr;
if (sipApi == nullptr) {
sipApi = (const sipAPIDef *)PyCapsule_Import("sip._C_API", 0);
}
return sipApi;
}
QWidget *IPluginPreviewWrapper::genFilePreview(const QString &fileName, const QSize &maxSize) const
{
try {
+1 -11
View File
@@ -9,6 +9,7 @@
#include <iplugintool.h>
#include "uibasewrappers.h"
#include "proxypluginwrappers.h"
#include "sipApiAccess.h"
#include <Windows.h>
#include <utility.h>
@@ -417,17 +418,6 @@ struct stdset_from_python_list
};
static const sipAPIDef *sipAPI()
{
static const sipAPIDef *sipApi = nullptr;
if (sipApi == nullptr) {
sipApi = (const sipAPIDef *)PyCapsule_Import("sip._C_API", 0);
}
return sipApi;
}
struct IModRepositoryBridge_to_python
{
static PyObject *convert(IModRepositoryBridge *bridge)
+11
View File
@@ -0,0 +1,11 @@
#include <sip.h>
static const sipAPIDef *sipAPI()
{
static const sipAPIDef *sipApi = nullptr;
if (sipApi == nullptr) {
sipApi = (const sipAPIDef *)PyCapsule_Import("sip._C_API", 0);
}
return sipApi;
}