GIT_REPOSITORIES/LPP/PythonQt Commit - r192:b923cb867b60

added data accessors for QImage (bits()/scanLine() and const versions)...

florianlink -

r192:b923cb867b60

parent child

Context file:

r192:b923cb867b60

Collapse all files

generator/prigenerator.cpp +2 -2

                foreach(QString line, lines) {
                  if (line.startsWith("#include")) {
                    includes.insert(line);
-                 } else if (line.startsWith("#")) {
-                   // skip preprocessor stuff
+                 } else if (line.startsWith("#") && line.contains("PYTHONQTWRAPPER_")) {
+                   // skip preprocessor defines for single wrapped classes
                  } else {
                    result += line + "\n";
                  }

generator/setupgenerator.cpp +6 -1

                    QStringList cppClassNames;
                    foreach (const AbstractMetaClass *cls, list) {
+                     if (cls->qualifiedCppName().contains("Ssl")) {
+                       s << "#ifndef QT_NO_OPENSSL"  << endl;
+                     }
                      QString shellCreator;
                      if (cls->generateShellClass()) {
                        shellCreator = ", PythonQtSetInstanceWrapperOnShell<" + ShellGenerator::shellClassName(cls) + ">";
                          s << "PythonQt::self()->addParentClass(\""<< cls->qualifiedCppName() << "\", \"" << interface->qualifiedCppName() << "\",PythonQtUpcastingOffset<" << cls->qualifiedCppName() <<","<<interface->qualifiedCppName()<<">());" << endl;
                        }
                      }
+                     if (cls->qualifiedCppName().contains("Ssl")) {
+                       s << "#endif"  << endl;
+                     }
                    }
                    s << endl;
                    foreach (QString handler, polymorphicHandlers) {

generator/shellheadergenerator.cpp +11 -3

                  | AbstractMetaClass::WasVisible
                  | AbstractMetaClass::NotRemovedFromTargetLang);
+               if (meta_class->qualifiedCppName().contains("Ssl")) {
+                 s << "#ifndef QT_NO_OPENSSL"  << endl;
+               }
                // Shell-------------------------------------------------------------------
                if (meta_class->generateShellClass()) {
                  }
                  s << endl;
                  s << "   ~" << shellClassName(meta_class) << "();" << endl;
-                 s << endl;
                  foreach(AbstractMetaFunction* fun, virtualsForShell) {
                    s << "virtual ";
                writeInjectedCode(s, meta_class);
-               s  << "};" << endl << endl
-                 << "#endif // " << include_block << endl;
+               s  << "};" << endl << endl;
+               if (meta_class->qualifiedCppName().contains("Ssl")) {
+                 s << "#endif"  << endl << endl;
+               }
+               s  << "#endif // " << include_block << endl;
              }

generator/shellimplgenerator.cpp +6 0

                  //    declareFunctionMetaTypes(s, functions, registeredTypeNames);
                  //    s << endl;
                }
+               if (meta_class->qualifiedCppName().contains("Ssl")) {
+                 s << "#ifndef QT_NO_OPENSSL"  << endl;
+               }
                if (meta_class->generateShellClass()) {
                writeInjectedCode(s, meta_class);
+               if (meta_class->qualifiedCppName().contains("Ssl")) {
+                 s << "#endif"  << endl;
+               }
              }
              void ShellImplGenerator::writeInjectedCode(QTextStream &s, const AbstractMetaClass *meta_class)

generator/typesystem_core.xml +1 -10

                  <inject-code class="pywrap-h">
                PyObject* data(QByteArray* b) {
-                 if (b-&gt;data()) {
-                   return PyString_FromStringAndSize(b-&gt;data(), b-&gt;size());
-                 } else {
-                   Py_INCREF(Py_None);
-                   return Py_None;
+                 }
+                 return PyString_FromStringAndSize(b-&gt;data(), b-&gt;size());
                }
                  </inject-code>
                  </modify-function>
                  <modify-function signature="connectNotify(const char *)" remove="all"/>
                  <modify-function signature="disconnectNotify(const char *)" remove="all"/>
-                 <!-- ### modify to return value by pointer? -->
-                 <modify-function signature="buffer()const" remove="all"/>
-                 <modify-function signature="data()const" remove="all"/>
                  <modify-function signature="setData(const char*,int)" remove="all"/>
                </object-type>

generator/typesystem_gui.xml +27 0

                  <modify-function signature="scanLine(int)const">
                      <remove/>
                  </modify-function>
+                 <modify-function signature="constBits()const">
+                     <remove/>
+                 </modify-function>
+                 <modify-function signature="constScanLine(int)const">
+                     <remove/>
+                 </modify-function>
                  <modify-function signature="QImage(const unsigned char *, int, int, QImage::Format)">
                      <remove/>
                  </modify-function>
                memcpy(image-&gt;bits(), data, image-&gt;byteCount());
                return image;
              }
+             PyObject* bits(QImage* image) {
+               return PythonQtPrivate::wrapMemoryAsBuffer(image-&gt;bits(), image-&gt;bytesPerLine()* image-&gt;height());
+             }
+             #if QT_VERSION &gt;= QT_VERSION_CHECK(4,7,0)
+             PyObject* constBits(QImage* image) {
+               return PythonQtPrivate::wrapMemoryAsBuffer(image-&gt;constBits(), image-&gt;byteCount());
+             }
+             #endif
+             PyObject* scanLine(QImage* image, int line) {
+               return PythonQtPrivate::wrapMemoryAsBuffer(image-&gt;scanLine(line), image-&gt;bytesPerLine());
+             }
+             #if QT_VERSION &gt;= QT_VERSION_CHECK(4,7,0)
+             PyObject* constScanLine(QImage* image, int line) {
+               return PythonQtPrivate::wrapMemoryAsBuffer(image-&gt;constScanLine(line), image-&gt;bytesPerLine());
+             }
+             #endif
              </inject-code>
                </value-type>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages