diff --git a/SocExplorer.pro b/SocExplorer.pro --- a/SocExplorer.pro +++ b/SocExplorer.pro @@ -28,7 +28,10 @@ unix{ PluginConfPath.files = unixcfg/plugins.conf share.path = /usr/share/SocExplorer share.files = ressources/images/icon.png \ - ressources/Grlib.xml + ressources/Grlib.xml \ + ressources/LPP.xml \ + ressources/IAP.xml + Wizard.path = /usr/share/qtcreator/templates/wizards/SocExplorerPlugin Wizard.files = Qt_Creator_Wizard/SocExplorerPlugin/logo-lpp-cutted.png \ Qt_Creator_Wizard/SocExplorerPlugin/plugin.cpp \ diff --git a/ressources/IAP.xml b/ressources/IAP.xml new file mode 100644 --- /dev/null +++ b/ressources/IAP.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ressources/LPP.xml b/ressources/LPP.xml new file mode 100644 --- /dev/null +++ b/ressources/LPP.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/PyWdgt/pythonconsole.cpp b/src/PyWdgt/pythonconsole.cpp --- a/src/PyWdgt/pythonconsole.cpp +++ b/src/PyWdgt/pythonconsole.cpp @@ -37,9 +37,15 @@ PythonConsole::PythonConsole(socexplorer void PythonConsole::addObject(const QString& name, QObject* object) { - this->mainContext->addObject(name, object); + this->mainContext->addObject(name, object); } +void PythonConsole::removeVariable(const QString& name) +{ + this->mainContext->removeVariable(name); +} + + void PythonConsole::setBussDriver(socexplorerplugin *driver) { this->bussdriver = driver; diff --git a/src/PyWdgt/pythonconsole.h b/src/PyWdgt/pythonconsole.h --- a/src/PyWdgt/pythonconsole.h +++ b/src/PyWdgt/pythonconsole.h @@ -57,6 +57,7 @@ public slots: void registerObject(QObject* object,const QString& instanceName); void changeSysDriverInstName(const QString newinstanceName,const QString previnstanceName); void addObject(const QString& name, QObject* object); + void removeVariable(const QString& name); protected: QSize sizeHint(); diff --git a/src/SocExplorerEngine/PySocExplorerEngine.h b/src/SocExplorerEngine/PySocExplorerEngine.h --- a/src/SocExplorerEngine/PySocExplorerEngine.h +++ b/src/SocExplorerEngine/PySocExplorerEngine.h @@ -1,4 +1,3 @@ #include #include #include "plugins/socexplorerplugin.h" - diff --git a/src/SocExplorerEngine/SocExplorerEngine.pro b/src/SocExplorerEngine/SocExplorerEngine.pro --- a/src/SocExplorerEngine/SocExplorerEngine.pro +++ b/src/SocExplorerEngine/SocExplorerEngine.pro @@ -10,7 +10,7 @@ SOCEXPLORER_PLUGIN_LOADER="custom" SOCEXPLORER_CHAGESETNUM=$$system(hg id) isEmpty(SOCEXPLORER_CHAGESETNUM){ - SOCEXPLORER_CHAGESETNUM=6e5eaa13fad9 + SOCEXPLORER_CHAGESETNUM=c4b98d42ee59 } SOCEXPLORER_CHAGESETNUMSTR = '\\"$${SOCEXPLORER_CHAGESETNUM}\\"' SOCEXPLORER_BRANCH=$$system(hg branch) @@ -19,7 +19,7 @@ isEmpty(SOCEXPLORER_BRANCH){ } SOCEXPLORER_BRANCHSTR = '\\"$${SOCEXPLORER_BRANCH}\\"' -DEFINES += SOCEXPLORER_VERSION="\"\\\"0.4.4"\\\"\" +DEFINES += SOCEXPLORER_VERSION="\"\\\"0.4.5"\\\"\" DEFINES += SOCEXPLORER_CHAGESET=\"$${SOCEXPLORER_CHAGESETNUMSTR}\" DEFINES += SOCEXPLORER_BRANCH=\"$${SOCEXPLORER_BRANCHSTR}\" @@ -66,7 +66,8 @@ header.files = engine/socexplorerengine. SOC/socclk.h \ PeripheralWidget/src/peripheralwidget.h \ PeripheralWidget/src/registerwidget.h \ - PeripheralWidget/src/socregsviewer.h + PeripheralWidget/src/socregsviewer.h \ + memtester/memtester.h @@ -94,7 +95,8 @@ INCLUDEPATH += engine \ RegisterMVS \ XmlEngine \ SOC \ - PeripheralWidget/src + PeripheralWidget/src \ + memtester HEADERS += \ @@ -121,7 +123,8 @@ HEADERS += \ pluginsInterface/socexplorerplugininterface_global.h \ proxy/socexplorerproxy.h \ SOC/socexplorerenumdevice.h \ - PySocExplorerEngine.h + PySocExplorerEngine.h \ + memtester/memtester.h @@ -149,7 +152,8 @@ SOURCES += \ engine/socexplorerxmlfile.cpp \ proxy/socexplorerproxy.cpp \ SOC/socexplorerenumdevice.cpp \ - plugins/socexplorerplugin.cpp + plugins/socexplorerplugin.cpp \ + memtester/memtester.cpp OTHER_FILES += \ diff --git a/src/SocExplorerEngine/engine/socexplorerengine.cpp b/src/SocExplorerEngine/engine/socexplorerengine.cpp --- a/src/SocExplorerEngine/engine/socexplorerengine.cpp +++ b/src/SocExplorerEngine/engine/socexplorerengine.cpp @@ -183,6 +183,16 @@ int SocExplorerEngine::addEnumDevice(con return 1; } +unsigned int SocExplorerEngine::memMeasureSize(socexplorerplugin *plugin, unsigned int address, unsigned int maxSize) +{ + return MemTester::measureMemSize(plugin,address,maxSize); +} + +unsigned int SocExplorerEngine::memMeasureSize(const QString &plugin, unsigned int address, unsigned int maxSize) +{ + return MemTester::measureMemSize(plugin,address,maxSize); +} + QString SocExplorerEngine::getDevName(int VID, int PID) { diff --git a/src/SocExplorerEngine/engine/socexplorerengine.h b/src/SocExplorerEngine/engine/socexplorerengine.h --- a/src/SocExplorerEngine/engine/socexplorerengine.h +++ b/src/SocExplorerEngine/engine/socexplorerengine.h @@ -41,6 +41,7 @@ #include #include #include +#include #if defined(SOCEXPLORER_SDK_BUILD) # define SOCEXPLORER_SDK_EXPORT Q_DECL_EXPORT @@ -119,6 +120,8 @@ public slots: qint32 getEnumDeviceCount(socexplorerplugin* plugin,int VID,int PID); qint32 getEnumDeviceCount(const QString& rootPlugin,int VID,int PID); int addEnumDevice(const QString& rootPlugin,int VID,int PID,qint32 baseAddress,const QString& name); + unsigned int memMeasureSize(socexplorerplugin* plugin, unsigned int address,unsigned int maxSize=0xFFFFFFFF); + unsigned int memMeasureSize(const QString& plugin, unsigned int address,unsigned int maxSize=0xFFFFFFFF); private: static SOCModel* plugin2Soc(socexplorerplugin* plugin); diff --git a/src/SocExplorerEngine/memtester/memtester.cpp b/src/SocExplorerEngine/memtester/memtester.cpp new file mode 100644 --- /dev/null +++ b/src/SocExplorerEngine/memtester/memtester.cpp @@ -0,0 +1,75 @@ +#include "memtester.h" +#include +#include + +MemTester::MemTester(QObject* parent) + :QObject(parent) +{ + +} + +MemTester::~MemTester() +{ + +} + + +unsigned int p_pow2(unsigned int v) +{ + static const char LogTable256[256] = + { + #define LT(n) n, n, n, n, n, n, n, n, n, n, n, n, n, n, n, n + -1, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, + LT(4), LT(5), LT(5), LT(6), LT(6), LT(6), LT(6), + LT(7), LT(7), LT(7), LT(7), LT(7), LT(7), LT(7), LT(7) + }; + + unsigned int r; // r will be lg(v) + register unsigned int t, tt; // temporaries + + if (tt = v >> 16) + { + r = (t = tt >> 8) ? 24 + LogTable256[t] : 16 + LogTable256[tt]; + } + else + { + r = (t = v >> 8) ? 8 + LogTable256[t] : LogTable256[v]; + } + return r; +} + +unsigned int MemTester::measureMemSize(socexplorerplugin *plugin, unsigned int address, unsigned int maxSize) +{ + unsigned int curVal=1,testAddress=address; + unsigned int size=0; + if(Q_UNLIKELY(!plugin || !plugin->isConnected()))return 0; + plugin->Write(&curVal,1,testAddress); + plugin->Read(&curVal,1,testAddress); + if(Q_UNLIKELY(curVal!=1)) + return size; + unsigned int max= p_pow2((0xFFFFFFFFFFFFFFFF - address))+1; + register unsigned int maxSizeLg=p_pow2(maxSize)-1; + if(max>maxSizeLg) + max=maxSizeLg; + if(max>32)max=32; + for(size=2;sizeWrite(&curVal,1,testAddress); + plugin->Read(&curVal,1,testAddress); + if((unsigned int)curVal!=(unsigned int)(1<Read(&curVal,1,address); + if((curVal==(unsigned int)(1< +#include + +class MemTester : public QObject +{ + Q_OBJECT +public: + MemTester(QObject *parent=0); + ~MemTester(); + + static unsigned int measureMemSize(socexplorerplugin* plugin, unsigned int address,unsigned int maxSize=0xFFFFFFFF); + static unsigned int measureMemSize(const QString& plugin, unsigned int address,unsigned int maxSize=0xFFFFFFFF); +public slots: + +}; + +#endif // MEMTESTER_H diff --git a/src/SocExplorerEngine/proxy/socexplorerproxy.cpp b/src/SocExplorerEngine/proxy/socexplorerproxy.cpp --- a/src/SocExplorerEngine/proxy/socexplorerproxy.cpp +++ b/src/SocExplorerEngine/proxy/socexplorerproxy.cpp @@ -257,7 +257,7 @@ socexplorerplugin *socexplorerproxy::fin if(!_self)init(); for(int k=0;kcount();k++) { - if(linearDriverList->at(k)->instanceName().compare(instanceName)) + if(!linearDriverList->at(k)->instanceName().compare(instanceName)) return linearDriverList->at(k); } return NULL; diff --git a/src/SocExplorerEngine/pythonQtOut/generated_cpp/PySocExplorerEngine/PySocExplorerEngine0.cpp b/src/SocExplorerEngine/pythonQtOut/generated_cpp/PySocExplorerEngine/PySocExplorerEngine0.cpp --- a/src/SocExplorerEngine/pythonQtOut/generated_cpp/PySocExplorerEngine/PySocExplorerEngine0.cpp +++ b/src/SocExplorerEngine/pythonQtOut/generated_cpp/PySocExplorerEngine/PySocExplorerEngine0.cpp @@ -2,9 +2,9 @@ #include #include #include -#include #include #include +#include #include #include #include @@ -14,12 +14,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include #include @@ -34,6 +36,7 @@ #include #include #include +#include #include PythonQtShell_socexplorerplugin::~PythonQtShell_socexplorerplugin() { @@ -42,10 +45,10 @@ PythonQtShell_socexplorerplugin::~Python } int PythonQtShell_socexplorerplugin::PID() { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "PID"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("PID"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"int"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(1, argumentList); int returnValue; @@ -64,20 +67,22 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } return socexplorerplugin::PID(); } -unsigned int PythonQtShell_socexplorerplugin::Read(unsigned int* Value, unsigned int count, unsigned int address) +unsigned int PythonQtShell_socexplorerplugin::Read(unsigned int* Value0, unsigned int count1, unsigned int address2) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "Read"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("Read"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"unsigned int" , "unsigned int*" , "unsigned int" , "unsigned int"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(4, argumentList); unsigned int returnValue; - void* args[4] = {NULL, (void*)&Value, (void*)&count, (void*)&address}; + void* args[4] = {NULL, (void*)&Value0, (void*)&count1, (void*)&address2}; PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); if (result) { args[0] = PythonQtConv::ConvertPythonToQt(methodInfo->parameters().at(0), result, false, NULL, &returnValue); @@ -92,16 +97,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } - return socexplorerplugin::Read(Value, count, address); + return socexplorerplugin::Read(Value0, count1, address2); } int PythonQtShell_socexplorerplugin::VID() { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "VID"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("VID"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"int"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(1, argumentList); int returnValue; @@ -120,20 +127,22 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } return socexplorerplugin::VID(); } -unsigned int PythonQtShell_socexplorerplugin::Write(unsigned int* Value, unsigned int count, unsigned int address) +unsigned int PythonQtShell_socexplorerplugin::Write(unsigned int* Value0, unsigned int count1, unsigned int address2) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "Write"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("Write"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"unsigned int" , "unsigned int*" , "unsigned int" , "unsigned int"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(4, argumentList); unsigned int returnValue; - void* args[4] = {NULL, (void*)&Value, (void*)&count, (void*)&address}; + void* args[4] = {NULL, (void*)&Value0, (void*)&count1, (void*)&address2}; PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); if (result) { args[0] = PythonQtConv::ConvertPythonToQt(methodInfo->parameters().at(0), result, false, NULL, &returnValue); @@ -148,16 +157,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } - return socexplorerplugin::Write(Value, count, address); + return socexplorerplugin::Write(Value0, count1, address2); } void PythonQtShell_socexplorerplugin::actionEvent(QActionEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "actionEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("actionEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QActionEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -165,33 +176,37 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::actionEvent(arg__1); } -void PythonQtShell_socexplorerplugin::activate(bool flag) +void PythonQtShell_socexplorerplugin::activate(bool flag0) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "activate"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("activate"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "bool"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); - void* args[2] = {NULL, (void*)&flag}; + void* args[2] = {NULL, (void*)&flag0}; PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } - socexplorerplugin::activate(flag); + socexplorerplugin::activate(flag0); } int PythonQtShell_socexplorerplugin::baseAddress() { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "baseAddress"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("baseAddress"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"int"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(1, argumentList); int returnValue; @@ -210,16 +225,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } return socexplorerplugin::baseAddress(); } QString PythonQtShell_socexplorerplugin::baseName() { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "baseName"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("baseName"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"QString"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(1, argumentList); QString returnValue; @@ -238,33 +255,37 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } return socexplorerplugin::baseName(); } -void PythonQtShell_socexplorerplugin::changeEvent(QEvent* event) +void PythonQtShell_socexplorerplugin::changeEvent(QEvent* event0) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "changeEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("changeEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); - void* args[2] = {NULL, (void*)&event}; + void* args[2] = {NULL, (void*)&event0}; PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } - socexplorerplugin::changeEvent(event); + socexplorerplugin::changeEvent(event0); } void PythonQtShell_socexplorerplugin::childEvent(QChildEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "childEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("childEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QChildEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -272,33 +293,37 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::childEvent(arg__1); } -void PythonQtShell_socexplorerplugin::closeEvent(QCloseEvent* event) +void PythonQtShell_socexplorerplugin::closeEvent(QCloseEvent* event0) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "closeEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("closeEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QCloseEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); - void* args[2] = {NULL, (void*)&event}; + void* args[2] = {NULL, (void*)&event0}; PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } - socexplorerplugin::closeEvent(event); + socexplorerplugin::closeEvent(event0); } void PythonQtShell_socexplorerplugin::closeMe() { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "closeMe"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("closeMe"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={""}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(1, argumentList); void* args[1] = {NULL}; @@ -306,16 +331,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::closeMe(); } void PythonQtShell_socexplorerplugin::contextMenuEvent(QContextMenuEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "contextMenuEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("contextMenuEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QContextMenuEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -323,16 +350,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::contextMenuEvent(arg__1); } void PythonQtShell_socexplorerplugin::customEvent(QEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "customEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("customEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -340,16 +369,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::customEvent(arg__1); } int PythonQtShell_socexplorerplugin::devType() const { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "devType"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("devType"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"int"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(1, argumentList); int returnValue; @@ -368,16 +399,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } return socexplorerplugin::devType(); } void PythonQtShell_socexplorerplugin::dragEnterEvent(QDragEnterEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "dragEnterEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("dragEnterEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QDragEnterEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -385,16 +418,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::dragEnterEvent(arg__1); } void PythonQtShell_socexplorerplugin::dragLeaveEvent(QDragLeaveEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "dragLeaveEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("dragLeaveEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QDragLeaveEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -402,16 +437,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::dragLeaveEvent(arg__1); } void PythonQtShell_socexplorerplugin::dragMoveEvent(QDragMoveEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "dragMoveEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("dragMoveEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QDragMoveEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -419,16 +456,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::dragMoveEvent(arg__1); } void PythonQtShell_socexplorerplugin::dropEvent(QDropEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "dropEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("dropEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QDropEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -436,16 +475,78 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::dropEvent(arg__1); } +bool PythonQtShell_socexplorerplugin::dumpMemory(unsigned int address0, unsigned int count1, QString file2) +{ +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("dumpMemory"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { + static const char* argumentList[] ={"bool" , "unsigned int" , "unsigned int" , "QString"}; + static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(4, argumentList); + bool returnValue; + void* args[4] = {NULL, (void*)&address0, (void*)&count1, (void*)&file2}; + PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); + if (result) { + args[0] = PythonQtConv::ConvertPythonToQt(methodInfo->parameters().at(0), result, false, NULL, &returnValue); + if (args[0]!=&returnValue) { + if (args[0]==NULL) { + PythonQt::priv()->handleVirtualOverloadReturnError("dumpMemory", methodInfo, result); + } else { + returnValue = *((bool*)args[0]); + } + } + } + if (result) { Py_DECREF(result); } + Py_DECREF(obj); + return returnValue; + } else { + PyErr_Clear(); + } +} + return socexplorerplugin::dumpMemory(address0, count1, file2); +} +bool PythonQtShell_socexplorerplugin::dumpMemory(unsigned int address0, unsigned int count1, QString file2, const QString& format3) +{ +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("dumpMemory"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { + static const char* argumentList[] ={"bool" , "unsigned int" , "unsigned int" , "QString" , "const QString&"}; + static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(5, argumentList); + bool returnValue; + void* args[5] = {NULL, (void*)&address0, (void*)&count1, (void*)&file2, (void*)&format3}; + PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); + if (result) { + args[0] = PythonQtConv::ConvertPythonToQt(methodInfo->parameters().at(0), result, false, NULL, &returnValue); + if (args[0]!=&returnValue) { + if (args[0]==NULL) { + PythonQt::priv()->handleVirtualOverloadReturnError("dumpMemory", methodInfo, result); + } else { + returnValue = *((bool*)args[0]); + } + } + } + if (result) { Py_DECREF(result); } + Py_DECREF(obj); + return returnValue; + } else { + PyErr_Clear(); + } +} + return socexplorerplugin::dumpMemory(address0, count1, file2, format3); +} void PythonQtShell_socexplorerplugin::enterEvent(QEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "enterEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("enterEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -453,20 +554,22 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::enterEvent(arg__1); } -bool PythonQtShell_socexplorerplugin::event(QEvent* event) +bool PythonQtShell_socexplorerplugin::event(QEvent* event0) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "event"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("event"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"bool" , "QEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); bool returnValue; - void* args[2] = {NULL, (void*)&event}; + void* args[2] = {NULL, (void*)&event0}; PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); if (result) { args[0] = PythonQtConv::ConvertPythonToQt(methodInfo->parameters().at(0), result, false, NULL, &returnValue); @@ -481,16 +584,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } - return socexplorerplugin::event(event); + return socexplorerplugin::event(event0); } bool PythonQtShell_socexplorerplugin::eventFilter(QObject* arg__1, QEvent* arg__2) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "eventFilter"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("eventFilter"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"bool" , "QObject*" , "QEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(3, argumentList); bool returnValue; @@ -509,16 +614,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } return socexplorerplugin::eventFilter(arg__1, arg__2); } void PythonQtShell_socexplorerplugin::focusInEvent(QFocusEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "focusInEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("focusInEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QFocusEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -526,20 +633,22 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::focusInEvent(arg__1); } -bool PythonQtShell_socexplorerplugin::focusNextPrevChild(bool next) +bool PythonQtShell_socexplorerplugin::focusNextPrevChild(bool next0) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "focusNextPrevChild"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("focusNextPrevChild"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"bool" , "bool"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); bool returnValue; - void* args[2] = {NULL, (void*)&next}; + void* args[2] = {NULL, (void*)&next0}; PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); if (result) { args[0] = PythonQtConv::ConvertPythonToQt(methodInfo->parameters().at(0), result, false, NULL, &returnValue); @@ -554,16 +663,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } - return socexplorerplugin::focusNextPrevChild(next); + return socexplorerplugin::focusNextPrevChild(next0); } void PythonQtShell_socexplorerplugin::focusOutEvent(QFocusEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "focusOutEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("focusOutEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QFocusEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -571,16 +682,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::focusOutEvent(arg__1); } bool PythonQtShell_socexplorerplugin::hasHeightForWidth() const { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "hasHeightForWidth"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("hasHeightForWidth"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"bool"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(1, argumentList); bool returnValue; @@ -599,16 +712,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } return socexplorerplugin::hasHeightForWidth(); } int PythonQtShell_socexplorerplugin::heightForWidth(int arg__1) const { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "heightForWidth"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("heightForWidth"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"int" , "int"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); int returnValue; @@ -627,16 +742,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } return socexplorerplugin::heightForWidth(arg__1); } void PythonQtShell_socexplorerplugin::hideEvent(QHideEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "hideEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("hideEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QHideEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -644,33 +761,37 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::hideEvent(arg__1); } -void PythonQtShell_socexplorerplugin::initPainter(QPainter* painter) const +void PythonQtShell_socexplorerplugin::initPainter(QPainter* painter0) const { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "initPainter"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("initPainter"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QPainter*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); - void* args[2] = {NULL, (void*)&painter}; + void* args[2] = {NULL, (void*)&painter0}; PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } - socexplorerplugin::initPainter(painter); + socexplorerplugin::initPainter(painter0); } void PythonQtShell_socexplorerplugin::inputMethodEvent(QInputMethodEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "inputMethodEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("inputMethodEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QInputMethodEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -678,16 +799,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::inputMethodEvent(arg__1); } QVariant PythonQtShell_socexplorerplugin::inputMethodQuery(Qt::InputMethodQuery arg__1) const { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "inputMethodQuery"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("inputMethodQuery"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"QVariant" , "Qt::InputMethodQuery"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); QVariant returnValue; @@ -706,16 +829,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } return socexplorerplugin::inputMethodQuery(arg__1); } int PythonQtShell_socexplorerplugin::isConnected() { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "isConnected"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("isConnected"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"int"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(1, argumentList); int returnValue; @@ -734,16 +859,37 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } return socexplorerplugin::isConnected(); } void PythonQtShell_socexplorerplugin::keyPressEvent(QKeyEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "keyPressEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("keyPressEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { + static const char* argumentList[] ={"" , "QKeyEvent*"}; + static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); + void* args[2] = {NULL, (void*)&arg__1}; + PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); + if (result) { Py_DECREF(result); } + Py_DECREF(obj); + return; + } else { + PyErr_Clear(); + } +} + socexplorerplugin::keyPressEvent(arg__1); +} +void PythonQtShell_socexplorerplugin::keyReleaseEvent(QKeyEvent* arg__1) +{ +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("keyReleaseEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QKeyEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -751,33 +897,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; - } -} - socexplorerplugin::keyPressEvent(arg__1); -} -void PythonQtShell_socexplorerplugin::keyReleaseEvent(QKeyEvent* arg__1) -{ -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "keyReleaseEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { - static const char* argumentList[] ={"" , "QKeyEvent*"}; - static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); - void* args[2] = {NULL, (void*)&arg__1}; - PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); - if (result) { Py_DECREF(result); } - Py_DECREF(obj); - return; + } else { + PyErr_Clear(); } } socexplorerplugin::keyReleaseEvent(arg__1); } void PythonQtShell_socexplorerplugin::leaveEvent(QEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "leaveEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("leaveEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -785,16 +916,78 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::leaveEvent(arg__1); } +bool PythonQtShell_socexplorerplugin::loadbin(unsigned int address0, QString file1) +{ +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("loadbin"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { + static const char* argumentList[] ={"bool" , "unsigned int" , "QString"}; + static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(3, argumentList); + bool returnValue; + void* args[3] = {NULL, (void*)&address0, (void*)&file1}; + PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); + if (result) { + args[0] = PythonQtConv::ConvertPythonToQt(methodInfo->parameters().at(0), result, false, NULL, &returnValue); + if (args[0]!=&returnValue) { + if (args[0]==NULL) { + PythonQt::priv()->handleVirtualOverloadReturnError("loadbin", methodInfo, result); + } else { + returnValue = *((bool*)args[0]); + } + } + } + if (result) { Py_DECREF(result); } + Py_DECREF(obj); + return returnValue; + } else { + PyErr_Clear(); + } +} + return socexplorerplugin::loadbin(address0, file1); +} +bool PythonQtShell_socexplorerplugin::memSet(unsigned int address0, int value1, unsigned int count2) +{ +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("memSet"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { + static const char* argumentList[] ={"bool" , "unsigned int" , "int" , "unsigned int"}; + static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(4, argumentList); + bool returnValue; + void* args[4] = {NULL, (void*)&address0, (void*)&value1, (void*)&count2}; + PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); + if (result) { + args[0] = PythonQtConv::ConvertPythonToQt(methodInfo->parameters().at(0), result, false, NULL, &returnValue); + if (args[0]!=&returnValue) { + if (args[0]==NULL) { + PythonQt::priv()->handleVirtualOverloadReturnError("memSet", methodInfo, result); + } else { + returnValue = *((bool*)args[0]); + } + } + } + if (result) { Py_DECREF(result); } + Py_DECREF(obj); + return returnValue; + } else { + PyErr_Clear(); + } +} + return socexplorerplugin::memSet(address0, value1, count2); +} int PythonQtShell_socexplorerplugin::metric(QPaintDevice::PaintDeviceMetric arg__1) const { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "metric"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("metric"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"int" , "QPaintDevice::PaintDeviceMetric"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); int returnValue; @@ -813,16 +1006,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } return socexplorerplugin::metric(arg__1); } QSize PythonQtShell_socexplorerplugin::minimumSizeHint() const { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "getMinimumSizeHint"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("getMinimumSizeHint"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"QSize"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(1, argumentList); QSize returnValue; @@ -841,16 +1036,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } return socexplorerplugin::minimumSizeHint(); } void PythonQtShell_socexplorerplugin::mouseDoubleClickEvent(QMouseEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "mouseDoubleClickEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("mouseDoubleClickEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QMouseEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -858,16 +1055,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::mouseDoubleClickEvent(arg__1); } void PythonQtShell_socexplorerplugin::mouseMoveEvent(QMouseEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "mouseMoveEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("mouseMoveEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QMouseEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -875,16 +1074,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::mouseMoveEvent(arg__1); } void PythonQtShell_socexplorerplugin::mousePressEvent(QMouseEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "mousePressEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("mousePressEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QMouseEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -892,16 +1093,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::mousePressEvent(arg__1); } void PythonQtShell_socexplorerplugin::mouseReleaseEvent(QMouseEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "mouseReleaseEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("mouseReleaseEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QMouseEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -909,16 +1112,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::mouseReleaseEvent(arg__1); } void PythonQtShell_socexplorerplugin::moveEvent(QMoveEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "moveEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("moveEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QMoveEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -926,20 +1131,22 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::moveEvent(arg__1); } -bool PythonQtShell_socexplorerplugin::nativeEvent(const QByteArray& eventType, void* message, long* result) +bool PythonQtShell_socexplorerplugin::nativeEvent(const QByteArray& eventType0, void* message1, long* result2) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "nativeEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("nativeEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"bool" , "const QByteArray&" , "void*" , "long*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(4, argumentList); bool returnValue; - void* args[4] = {NULL, (void*)&eventType, (void*)&message, (void*)&result}; + void* args[4] = {NULL, (void*)&eventType0, (void*)&message1, (void*)&result2}; PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); if (result) { args[0] = PythonQtConv::ConvertPythonToQt(methodInfo->parameters().at(0), result, false, NULL, &returnValue); @@ -954,16 +1161,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } - return socexplorerplugin::nativeEvent(eventType, message, result); + return socexplorerplugin::nativeEvent(eventType0, message1, result2); } QPaintEngine* PythonQtShell_socexplorerplugin::paintEngine() const { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "paintEngine"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("paintEngine"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"QPaintEngine*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(1, argumentList); QPaintEngine* returnValue; @@ -982,33 +1191,37 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } return socexplorerplugin::paintEngine(); } -void PythonQtShell_socexplorerplugin::paintEvent(QPaintEvent* event) +void PythonQtShell_socexplorerplugin::paintEvent(QPaintEvent* event0) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "paintEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("paintEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QPaintEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); - void* args[2] = {NULL, (void*)&event}; + void* args[2] = {NULL, (void*)&event0}; PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } - socexplorerplugin::paintEvent(event); + socexplorerplugin::paintEvent(event0); } void PythonQtShell_socexplorerplugin::postInstantiationTrigger() { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "postInstantiationTrigger"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("postInstantiationTrigger"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={""}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(1, argumentList); void* args[1] = {NULL}; @@ -1016,20 +1229,22 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::postInstantiationTrigger(); } -QPaintDevice* PythonQtShell_socexplorerplugin::redirected(QPoint* offset) const +QPaintDevice* PythonQtShell_socexplorerplugin::redirected(QPoint* offset0) const { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "redirected"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("redirected"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"QPaintDevice*" , "QPoint*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); QPaintDevice* returnValue; - void* args[2] = {NULL, (void*)&offset}; + void* args[2] = {NULL, (void*)&offset0}; PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); if (result) { args[0] = PythonQtConv::ConvertPythonToQt(methodInfo->parameters().at(0), result, false, NULL, &returnValue); @@ -1044,20 +1259,22 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } - return socexplorerplugin::redirected(offset); + return socexplorerplugin::redirected(offset0); } -int PythonQtShell_socexplorerplugin::registermenu(QMenu* menu) +int PythonQtShell_socexplorerplugin::registermenu(QMenu* menu0) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "registermenu"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("registermenu"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"int" , "QMenu*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); int returnValue; - void* args[2] = {NULL, (void*)&menu}; + void* args[2] = {NULL, (void*)&menu0}; PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); if (result) { args[0] = PythonQtConv::ConvertPythonToQt(methodInfo->parameters().at(0), result, false, NULL, &returnValue); @@ -1072,16 +1289,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } - return socexplorerplugin::registermenu(menu); + return socexplorerplugin::registermenu(menu0); } void PythonQtShell_socexplorerplugin::resizeEvent(QResizeEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "resizeEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("resizeEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QResizeEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -1089,50 +1308,56 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::resizeEvent(arg__1); } -void PythonQtShell_socexplorerplugin::setBaseAddress(unsigned int baseAddress) +void PythonQtShell_socexplorerplugin::setBaseAddress(unsigned int baseAddress0) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "setBaseAddress"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("setBaseAddress"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "unsigned int"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); - void* args[2] = {NULL, (void*)&baseAddress}; + void* args[2] = {NULL, (void*)&baseAddress0}; PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } - socexplorerplugin::setBaseAddress(baseAddress); + socexplorerplugin::setBaseAddress(baseAddress0); } -void PythonQtShell_socexplorerplugin::setInstanceName(const QString& newName) +void PythonQtShell_socexplorerplugin::setInstanceName(const QString& newName0) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "setInstanceName"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("setInstanceName"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "const QString&"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); - void* args[2] = {NULL, (void*)&newName}; + void* args[2] = {NULL, (void*)&newName0}; PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } - socexplorerplugin::setInstanceName(newName); + socexplorerplugin::setInstanceName(newName0); } QPainter* PythonQtShell_socexplorerplugin::sharedPainter() const { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "sharedPainter"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("sharedPainter"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"QPainter*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(1, argumentList); QPainter* returnValue; @@ -1151,16 +1376,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } return socexplorerplugin::sharedPainter(); } void PythonQtShell_socexplorerplugin::showEvent(QShowEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "showEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("showEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QShowEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -1168,16 +1395,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::showEvent(arg__1); } QSize PythonQtShell_socexplorerplugin::sizeHint() const { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "getSizeHint"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("getSizeHint"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"QSize"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(1, argumentList); QSize returnValue; @@ -1196,16 +1425,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return returnValue; + } else { + PyErr_Clear(); } } return socexplorerplugin::sizeHint(); } void PythonQtShell_socexplorerplugin::tabletEvent(QTabletEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "tabletEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("tabletEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QTabletEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -1213,16 +1444,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::tabletEvent(arg__1); } void PythonQtShell_socexplorerplugin::timerEvent(QTimerEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "timerEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("timerEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QTimerEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -1230,16 +1463,18 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::timerEvent(arg__1); } void PythonQtShell_socexplorerplugin::wheelEvent(QWheelEvent* arg__1) { -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "wheelEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { +if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) { + static PyObject* name = PyString_FromString("wheelEvent"); + PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name); + if (obj) { static const char* argumentList[] ={"" , "QWheelEvent*"}; static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); void* args[2] = {NULL, (void*)&arg__1}; @@ -1247,6 +1482,8 @@ if (_wrapper) { if (result) { Py_DECREF(result); } Py_DECREF(obj); return; + } else { + PyErr_Clear(); } } socexplorerplugin::wheelEvent(arg__1); @@ -1295,6 +1532,16 @@ void PythonQtWrapper_socexplorerplugin:: ( ((PythonQtPublicPromoter_socexplorerplugin*)theWrappedObject)->promoted_closeMe()); } +bool PythonQtWrapper_socexplorerplugin::dumpMemory(socexplorerplugin* theWrappedObject, unsigned int address, unsigned int count, QString file) +{ + return ( ((PythonQtPublicPromoter_socexplorerplugin*)theWrappedObject)->promoted_dumpMemory(address, count, file)); +} + +bool PythonQtWrapper_socexplorerplugin::dumpMemory(socexplorerplugin* theWrappedObject, unsigned int address, unsigned int count, QString file, const QString& format) +{ + return ( ((PythonQtPublicPromoter_socexplorerplugin*)theWrappedObject)->promoted_dumpMemory(address, count, file, format)); +} + QString PythonQtWrapper_socexplorerplugin::instanceName(socexplorerplugin* theWrappedObject) { return ( theWrappedObject->instanceName()); @@ -1305,6 +1552,21 @@ int PythonQtWrapper_socexplorerplugin:: return ( ((PythonQtPublicPromoter_socexplorerplugin*)theWrappedObject)->promoted_isConnected()); } +bool PythonQtWrapper_socexplorerplugin::loadbin(socexplorerplugin* theWrappedObject, unsigned int address, QString file) +{ + return ( ((PythonQtPublicPromoter_socexplorerplugin*)theWrappedObject)->promoted_loadbin(address, file)); +} + +void PythonQtWrapper_socexplorerplugin::makeGenericPyWrapper(socexplorerplugin* theWrappedObject) +{ + ( ((PythonQtPublicPromoter_socexplorerplugin*)theWrappedObject)->promoted_makeGenericPyWrapper()); +} + +bool PythonQtWrapper_socexplorerplugin::memSet(socexplorerplugin* theWrappedObject, unsigned int address, int value, unsigned int count) +{ + return ( ((PythonQtPublicPromoter_socexplorerplugin*)theWrappedObject)->promoted_memSet(address, value, count)); +} + void PythonQtWrapper_socexplorerplugin::postInstantiationTrigger(socexplorerplugin* theWrappedObject) { ( ((PythonQtPublicPromoter_socexplorerplugin*)theWrappedObject)->promoted_postInstantiationTrigger()); diff --git a/src/SocExplorerEngine/pythonQtOut/generated_cpp/PySocExplorerEngine/PySocExplorerEngine0.h b/src/SocExplorerEngine/pythonQtOut/generated_cpp/PySocExplorerEngine/PySocExplorerEngine0.h --- a/src/SocExplorerEngine/pythonQtOut/generated_cpp/PySocExplorerEngine/PySocExplorerEngine0.h +++ b/src/SocExplorerEngine/pythonQtOut/generated_cpp/PySocExplorerEngine/PySocExplorerEngine0.h @@ -1,8 +1,8 @@ #include -#include #include #include #include +#include #include #include #include @@ -12,12 +12,14 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include #include @@ -32,6 +34,7 @@ #include #include #include +#include #include @@ -39,7 +42,7 @@ class PythonQtShell_socexplorerplugin : public socexplorerplugin { public: - PythonQtShell_socexplorerplugin(QWidget* parent = 0, bool createPyObject = true):socexplorerplugin(parent, createPyObject),_wrapper(NULL) {}; + PythonQtShell_socexplorerplugin(QWidget* parent = 0, bool createPyObject = true):socexplorerplugin(parent, createPyObject),_wrapper(NULL) { }; ~PythonQtShell_socexplorerplugin(); @@ -62,6 +65,8 @@ virtual void dragEnterEvent(QDragEnterEv virtual void dragLeaveEvent(QDragLeaveEvent* arg__1); virtual void dragMoveEvent(QDragMoveEvent* arg__1); virtual void dropEvent(QDropEvent* arg__1); +virtual bool dumpMemory(unsigned int address, unsigned int count, QString file); +virtual bool dumpMemory(unsigned int address, unsigned int count, QString file, const QString& format); virtual void enterEvent(QEvent* arg__1); virtual bool event(QEvent* event); virtual bool eventFilter(QObject* arg__1, QEvent* arg__2); @@ -78,6 +83,8 @@ virtual int isConnected(); virtual void keyPressEvent(QKeyEvent* arg__1); virtual void keyReleaseEvent(QKeyEvent* arg__1); virtual void leaveEvent(QEvent* arg__1); +virtual bool loadbin(unsigned int address, QString file); +virtual bool memSet(unsigned int address, int value, unsigned int count); virtual int metric(QPaintDevice::PaintDeviceMetric arg__1) const; virtual QSize minimumSizeHint() const; virtual void mouseDoubleClickEvent(QMouseEvent* arg__1); @@ -114,7 +121,12 @@ inline void promoted_activate(bool flag inline int promoted_baseAddress() { return socexplorerplugin::baseAddress(); } inline QString promoted_baseName() { return socexplorerplugin::baseName(); } inline void promoted_closeMe() { socexplorerplugin::closeMe(); } +inline bool promoted_dumpMemory(unsigned int address, unsigned int count, QString file) { return socexplorerplugin::dumpMemory(address, count, file); } +inline bool promoted_dumpMemory(unsigned int address, unsigned int count, QString file, const QString& format) { return socexplorerplugin::dumpMemory(address, count, file, format); } inline int promoted_isConnected() { return socexplorerplugin::isConnected(); } +inline bool promoted_loadbin(unsigned int address, QString file) { return socexplorerplugin::loadbin(address, file); } +inline void promoted_makeGenericPyWrapper() { socexplorerplugin::makeGenericPyWrapper(); } +inline bool promoted_memSet(unsigned int address, int value, unsigned int count) { return socexplorerplugin::memSet(address, value, count); } inline void promoted_postInstantiationTrigger() { socexplorerplugin::postInstantiationTrigger(); } inline int promoted_registermenu(QMenu* menu) { return socexplorerplugin::registermenu(menu); } inline void promoted_setBaseAddress(unsigned int baseAddress) { socexplorerplugin::setBaseAddress(baseAddress); } @@ -135,22 +147,27 @@ void delete_socexplorerplugin(socexplore int baseAddress(socexplorerplugin* theWrappedObject); QString baseName(socexplorerplugin* theWrappedObject); void closeMe(socexplorerplugin* theWrappedObject); + bool dumpMemory(socexplorerplugin* theWrappedObject, unsigned int address, unsigned int count, QString file); + bool dumpMemory(socexplorerplugin* theWrappedObject, unsigned int address, unsigned int count, QString file, const QString& format); QString instanceName(socexplorerplugin* theWrappedObject); int isConnected(socexplorerplugin* theWrappedObject); + bool loadbin(socexplorerplugin* theWrappedObject, unsigned int address, QString file); + void makeGenericPyWrapper(socexplorerplugin* theWrappedObject); + bool memSet(socexplorerplugin* theWrappedObject, unsigned int address, int value, unsigned int count); void postInstantiationTrigger(socexplorerplugin* theWrappedObject); int registermenu(socexplorerplugin* theWrappedObject, QMenu* menu); void setBaseAddress(socexplorerplugin* theWrappedObject, unsigned int baseAddress); void setInstanceName(socexplorerplugin* theWrappedObject, const QString& newName); -void py_set_parent(socexplorerplugin* theWrappedObject, socexplorerplugin* parent){ theWrappedObject->parent = parent; } -socexplorerplugin* py_get_parent(socexplorerplugin* theWrappedObject){ return theWrappedObject->parent; } +void py_set_ChildsMenu(socexplorerplugin* theWrappedObject, QMenu* ChildsMenu){ theWrappedObject->ChildsMenu = ChildsMenu; } +QMenu* py_get_ChildsMenu(socexplorerplugin* theWrappedObject){ return theWrappedObject->ChildsMenu; } +void py_set_childs(socexplorerplugin* theWrappedObject, QList childs){ theWrappedObject->childs = childs; } +QList py_get_childs(socexplorerplugin* theWrappedObject){ return theWrappedObject->childs; } +void py_set_closeAction(socexplorerplugin* theWrappedObject, QAction* closeAction){ theWrappedObject->closeAction = closeAction; } +QAction* py_get_closeAction(socexplorerplugin* theWrappedObject){ return theWrappedObject->closeAction; } void py_set_menu(socexplorerplugin* theWrappedObject, QMenu* menu){ theWrappedObject->menu = menu; } QMenu* py_get_menu(socexplorerplugin* theWrappedObject){ return theWrappedObject->menu; } -void py_set_ChildsMenu(socexplorerplugin* theWrappedObject, QMenu* ChildsMenu){ theWrappedObject->ChildsMenu = ChildsMenu; } -QMenu* py_get_ChildsMenu(socexplorerplugin* theWrappedObject){ return theWrappedObject->ChildsMenu; } -void py_set_closeAction(socexplorerplugin* theWrappedObject, QAction* closeAction){ theWrappedObject->closeAction = closeAction; } -QAction* py_get_closeAction(socexplorerplugin* theWrappedObject){ return theWrappedObject->closeAction; } -void py_set_childs(socexplorerplugin* theWrappedObject, QList childs){ theWrappedObject->childs = childs; } -QList py_get_childs(socexplorerplugin* theWrappedObject){ return theWrappedObject->childs; } +void py_set_parent(socexplorerplugin* theWrappedObject, socexplorerplugin* parent){ theWrappedObject->parent = parent; } +socexplorerplugin* py_get_parent(socexplorerplugin* theWrappedObject){ return theWrappedObject->parent; } }; diff --git a/src/SocExplorerEngine/pythonQtOut/generated_cpp/PySocExplorerEngine/PySocExplorerEngine_init.cpp b/src/SocExplorerEngine/pythonQtOut/generated_cpp/PySocExplorerEngine/PySocExplorerEngine_init.cpp --- a/src/SocExplorerEngine/pythonQtOut/generated_cpp/PySocExplorerEngine/PySocExplorerEngine_init.cpp +++ b/src/SocExplorerEngine/pythonQtOut/generated_cpp/PySocExplorerEngine/PySocExplorerEngine_init.cpp @@ -1,8 +1,11 @@ #include +#include #include "PySocExplorerEngine0.h" + void PythonQt_init_PySocExplorerEngine(PyObject* module) { PythonQt::priv()->registerClass(&socexplorerplugin::staticMetaObject, "PySocExplorerEngine", PythonQtCreateObject, PythonQtSetInstanceWrapperOnShell, module, 0); + } diff --git a/src/main.cpp b/src/main.cpp --- a/src/main.cpp +++ b/src/main.cpp @@ -37,9 +37,10 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); QString scriptToEval; QStringList args= a.arguments(); - for(int i=0;i - 0.4 +- Reseted patches uses r73 as source. +* Tue Dec 30 2014 Alexis Jeandet - 0.4 +- Reseted patches uses r72 as source. + +* Sun Jun 29 2014 Alexis Jeandet - 0.4 +- Reseted patches uses r69 as source. + +* Sat Jun 28 2014 Alexis Jeandet - 0.4 +- Applied patch r65 to install also plugin as RPM +- Applied patch r66 to install xml soc descriptions in /usr/share/SocExplorer +- Applied patch r67 to add appdata for gnome-software visibility + +* Tue Jun 24 2014 Alexis Jeandet - 0.4 +- Initial Fedora packaging