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("#")) {
+                } else if (line.startsWith("#") && line.contains("PYTHONQTWRAPPER_")) {
-                  // skip preprocessor stuff
+                  // 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
+              s  << "};" << endl << endl;
-                << "#endif // " << include_block << 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());
-                  return PyString_FromStringAndSize(b-&gt;data(), b-&gt;size());
-                } else {
-                  Py_INCREF(Py_None);
-                  return Py_None;
               }
                 </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

@@ -1098,6 +1098,12
1098	<modify-function signature="scanLine(int)const">	1098	<modify-function signature="scanLine(int)const">
1099	<remove/>	1099	<remove/>
1100	</modify-function>	1100	</modify-function>
		1101	<modify-function signature="constBits()const">
		1102	<remove/>
		1103	</modify-function>
		1104	<modify-function signature="constScanLine(int)const">
		1105	<remove/>
		1106	</modify-function>
1101	<modify-function signature="QImage(const unsigned char *, int, int, QImage::Format)">	1107	<modify-function signature="QImage(const unsigned char *, int, int, QImage::Format)">
1102	<remove/>	1108	<remove/>
1103	</modify-function>	1109	</modify-function>
@@ -1260,6 +1266,27 QImage* new_QImage( const uchar * data, int width, int height, QImage::Format fo
1260	memcpy(image->bits(), data, image->byteCount());	1266	memcpy(image->bits(), data, image->byteCount());
1261	return image;	1267	return image;
1262	}	1268	}
		1269
		1270	PyObject* bits(QImage* image) {
		1271	return PythonQtPrivate::wrapMemoryAsBuffer(image->bits(), image->bytesPerLine()* image->height());
		1272	}
		1273
		1274	#if QT_VERSION >= QT_VERSION_CHECK(4,7,0)
		1275	PyObject* constBits(QImage* image) {
		1276	return PythonQtPrivate::wrapMemoryAsBuffer(image->constBits(), image->byteCount());
		1277	}
		1278	#endif
		1279
		1280	PyObject* scanLine(QImage* image, int line) {
		1281	return PythonQtPrivate::wrapMemoryAsBuffer(image->scanLine(line), image->bytesPerLine());
		1282	}
		1283
		1284	#if QT_VERSION >= QT_VERSION_CHECK(4,7,0)
		1285	PyObject* constScanLine(QImage* image, int line) {
		1286	return PythonQtPrivate::wrapMemoryAsBuffer(image->constScanLine(line), image->bytesPerLine());
		1287	}
		1288	#endif
		1289
1263	</inject-code>	1290	</inject-code>
1264	</value-type>	1291	</value-type>
1265		1292

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