replaced emit with Q_EMIT

florianlink · florianlink · commit dd99a94f82d3 · 2014-09-02T07:19:48.000Z
added std::endl
diff --git a/src/PythonQt.cpp b/src/PythonQt.cpp
@@ -142,7 +142,7 @@ void PythonQt::init(int flags, const QByteArray& pythonQtModuleName)
         Py_INCREF(obj);
         PyModule_AddObject(pack2, names[i], obj);
       } else {
-        std::cerr << "method not found " << names[i];
+        std::cerr << "method not found " << names[i] << std::endl;
       }
     }
   }
@@ -1324,7 +1324,7 @@ bool PythonQt::handleError()
     if (_p->_systemExitExceptionHandlerEnabled &&
         PyErr_ExceptionMatches(PyExc_SystemExit)) {
       int exitcode = custom_system_exit_exception_handler();
-      emit PythonQt::self()->systemExitExceptionRaised(exitcode);
+      Q_EMIT PythonQt::self()->systemExitExceptionRaised(exitcode);
       }
     else
       {
@@ -1396,7 +1396,7 @@ void PythonQt::stdOutRedirectCB(const QString& str)
     std::cout << str.toLatin1().data() << std::endl;
     return;
   }
-  emit PythonQt::self()->pythonStdOut(str);
+  Q_EMIT PythonQt::self()->pythonStdOut(str);
 }
 
 void PythonQt::stdErrRedirectCB(const QString& str)
@@ -1405,7 +1405,7 @@ void PythonQt::stdErrRedirectCB(const QString& str)
     std::cerr << str.toLatin1().data() << std::endl;
     return;
   }
-  emit PythonQt::self()->pythonStdErr(str);
+  Q_EMIT PythonQt::self()->pythonStdErr(str);
 }
 
 void PythonQt::setQObjectWrappedCallback(PythonQtQObjectWrappedCB* cb)
@@ -1641,7 +1641,7 @@ void PythonQtPrivate::handleVirtualOverloadReturnError(const char* signature, co
 PyObject* PythonQt::helpCalled(PythonQtClassInfo* info)
 {
   if (_p->_initFlags & ExternalHelp) {
-    emit pythonHelpRequest(QByteArray(info->className()));
+    Q_EMIT pythonHelpRequest(QByteArray(info->className()));
     return Py_BuildValue("");
   } else {
     return PyString_FromString(info->help().toLatin1().data());
diff --git a/src/PythonQtMethodInfo.cpp b/src/PythonQtMethodInfo.cpp
@@ -288,6 +288,7 @@ void PythonQtMethodInfo::cleanupCachedMethodInfos()
   while (i.hasNext()) {
     delete i.next().value();
   }
+  _cachedSignatures.clear();
 }
 
 void PythonQtMethodInfo::addParameterTypeAlias(const QByteArray& alias, const QByteArray& name)

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ void PythonQt::init(int flags, const QByteArray& pythonQtModuleName)`
`142`	`142`	`Py_INCREF(obj);`
`143`	`143`	`PyModule_AddObject(pack2, names[i], obj);`
`144`	`144`	`} else {`
`145`		`- std::cerr << "method not found " << names[i];`
	`145`	`+ std::cerr << "method not found " << names[i] << std::endl;`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`	`}`
`@@ -1324,7 +1324,7 @@ bool PythonQt::handleError()`
`1324`	`1324`	`if (_p->_systemExitExceptionHandlerEnabled &&`
`1325`	`1325`	`PyErr_ExceptionMatches(PyExc_SystemExit)) {`
`1326`	`1326`	`int exitcode = custom_system_exit_exception_handler();`
`1327`		`- emit PythonQt::self()->systemExitExceptionRaised(exitcode);`
	`1327`	`+ Q_EMIT PythonQt::self()->systemExitExceptionRaised(exitcode);`
`1328`	`1328`	`}`
`1329`	`1329`	`else`
`1330`	`1330`	`{`
`@@ -1396,7 +1396,7 @@ void PythonQt::stdOutRedirectCB(const QString& str)`
`1396`	`1396`	`std::cout << str.toLatin1().data() << std::endl;`
`1397`	`1397`	`return;`
`1398`	`1398`	`}`
`1399`		`- emit PythonQt::self()->pythonStdOut(str);`
	`1399`	`+ Q_EMIT PythonQt::self()->pythonStdOut(str);`
`1400`	`1400`	`}`
`1401`	`1401`
`1402`	`1402`	`void PythonQt::stdErrRedirectCB(const QString& str)`
`@@ -1405,7 +1405,7 @@ void PythonQt::stdErrRedirectCB(const QString& str)`
`1405`	`1405`	`std::cerr << str.toLatin1().data() << std::endl;`
`1406`	`1406`	`return;`
`1407`	`1407`	`}`
`1408`		`- emit PythonQt::self()->pythonStdErr(str);`
	`1408`	`+ Q_EMIT PythonQt::self()->pythonStdErr(str);`
`1409`	`1409`	`}`
`1410`	`1410`
`1411`	`1411`	`void PythonQt::setQObjectWrappedCallback(PythonQtQObjectWrappedCB* cb)`
`@@ -1641,7 +1641,7 @@ void PythonQtPrivate::handleVirtualOverloadReturnError(const char* signature, co`
`1641`	`1641`	`PyObject* PythonQt::helpCalled(PythonQtClassInfo* info)`
`1642`	`1642`	`{`
`1643`	`1643`	`if (_p->_initFlags & ExternalHelp) {`
`1644`		`- emit pythonHelpRequest(QByteArray(info->className()));`
	`1644`	`+ Q_EMIT pythonHelpRequest(QByteArray(info->className()));`
`1645`	`1645`	`return Py_BuildValue("");`
`1646`	`1646`	`} else {`
`1647`	`1647`	`return PyString_FromString(info->help().toLatin1().data());`
Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,7 @@ void PythonQtMethodInfo::cleanupCachedMethodInfos()`
`288`	`288`	`while (i.hasNext()) {`
`289`	`289`	`delete i.next().value();`
`290`	`290`	`}`
	`291`	`+ _cachedSignatures.clear();`
`291`	`292`	`}`
`292`	`293`
`293`	`294`	`void PythonQtMethodInfo::addParameterTypeAlias(const QByteArray& alias, const QByteArray& name)`