From f5e8fe652b1c99b281d0a638521acfab4f82c244 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Sat, 3 Oct 2026 17:48:28 -0300 Subject: Replace NULL pointer constants with nullptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastião Guerra --- sip/tdeabc/addressbook.sip | 12 ++-- sip/tdeabc/addressee.sip | 24 +++---- sip/tdeabc/distributionlist.sip | 12 ++-- sip/tdeabc/field.sip | 12 ++-- sip/tdeabc/key.sip | 12 ++-- sip/tdeabc/ldapclient.sip | 12 ++-- sip/tdeabc/phonenumber.sip | 12 ++-- sip/tdecore/bytearray.sip | 134 +++++++++++++++++++------------------- sip/tdecore/kcompletion.sip | 12 ++-- sip/tdecore/klockfile.sip | 6 +- sip/tdecore/kmacroexpander.sip | 34 +++++----- sip/tdecore/kmountpoint.sip | 18 ++--- sip/tdecore/kshell.sip | 4 +- sip/tdecore/ktimezones.sip | 22 +++---- sip/tdecore/netwm.sip | 8 +-- sip/tdecore/tdeaboutdata.sip | 24 +++---- sip/tdecore/tdeaccel.sip | 10 +-- sip/tdecore/tdeapplication.sip | 16 ++--- sip/tdecore/tdecmdlineargs.sip | 28 ++++---- sip/tdecore/tdeconfig.sip | 20 +++--- sip/tdecore/tdeconfigbase.sip | 4 +- sip/tdecore/tdeconfigdata.sip | 22 +++---- sip/tdecore/tdeconfigskeleton.sip | 20 +++--- sip/tdecore/twinmodule.sip | 8 +-- sip/tdefile/knotifydialog.sip | 16 ++--- sip/tdefile/tdefilebookmark.sip | 12 ++-- sip/tdefile/tdefiletreebranch.sip | 24 +++---- sip/tdehtml/tdehtml_settings.sip | 12 ++-- sip/tdeio/authinfo.sip | 10 +-- sip/tdeio/global.sip | 34 +++++----- sip/tdeio/jobclasses.sip | 12 ++-- sip/tdeio/kacl.sip | 10 +-- sip/tdeio/kdatatool.sip | 12 ++-- sip/tdeio/kdirlister.sip | 24 +++---- sip/tdeio/kmimetype.sip | 32 ++++----- sip/tdeio/kprotocolinfo.sip | 18 ++--- sip/tdeio/kservice.sip | 18 ++--- sip/tdeio/kservicegroup.sip | 18 ++--- sip/tdeio/kservicetype.sip | 28 ++++---- sip/tdeio/ktrader.sip | 10 +-- sip/tdeio/kuserprofile.sip | 24 +++---- sip/tdeio/tdesycocaentry.sip | 20 +++--- sip/tdemdi/tdemdichildfrm.sip | 10 +-- sip/tdemdi/tdemdimainfrm.sip | 24 +++---- sip/tdeparts/browserextension.sip | 46 ++++++------- sip/tdeparts/part.sip | 4 +- sip/tdeparts/partmanager.sip | 12 ++-- sip/tdeparts/plugin.sip | 24 +++---- sip/tdeprint/kmjobmanager.sip | 12 ++-- sip/tdeprint/kmmanager.sip | 12 ++-- sip/tdeprint/kprintdialog.sip | 12 ++-- sip/tderesources/selectdialog.sip | 12 ++-- sip/tdeui/keditlistbox.sip | 14 ++-- sip/tdeui/kkeydialog.sip | 10 +-- sip/tdeui/kstdguiitem.sip | 20 +++--- sip/tdeui/kxmlguifactory.sip | 36 +++++----- sip/tdeui/qxembed.sip | 6 +- sip/tdeui/tdeaction.sip | 12 ++-- sip/tdeui/tdecmodule.sip | 12 ++-- sip/tdeui/tdelistview.sip | 12 ++-- sip/tdeui/tdemainwindow.sip | 12 ++-- sip/tdeutils/kplugininfo.sip | 12 ++-- 62 files changed, 567 insertions(+), 567 deletions(-) diff --git a/sip/tdeabc/addressbook.sip b/sip/tdeabc/addressbook.sip index bed18cc..21f1359 100644 --- a/sip/tdeabc/addressbook.sip +++ b/sip/tdeabc/addressbook.sip @@ -172,8 +172,8 @@ protected: // Create the list - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; // Get it. @@ -184,11 +184,11 @@ protected: // the loop depends on the type of iterator the tmeplate makes available for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () ) { - if (((inst = sipConvertFromInstance (cpp, sipClass_TDEABC_Resource, sipTransferObj)) == NULL) + if (!(inst = sipConvertFromInstance (cpp, sipClass_TDEABC_Resource, sipTransferObj)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -196,7 +196,7 @@ protected: %End %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *cpplist = new TQPtrList; @@ -208,7 +208,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEABC::Resource *)sipForceConvertToType(elem, sipType_TDEABC_Resource, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEABC::Resource *)sipForceConvertToType(elem, sipType_TDEABC_Resource, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeabc/addressee.sip b/sip/tdeabc/addressee.sip index 77667e7..a8aa886 100644 --- a/sip/tdeabc/addressee.sip +++ b/sip/tdeabc/addressee.sip @@ -346,8 +346,8 @@ public: // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -356,11 +356,11 @@ public: TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new TDEABC::Addressee (*it), sipType_TDEABC_Addressee, NULL)) == NULL) + if (!(inst = sipConvertFromNewType(new TDEABC::Addressee (*it), sipType_TDEABC_Addressee, nullptr)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -369,7 +369,7 @@ public: %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -381,7 +381,7 @@ public: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEABC::Addressee *)sipForceConvertToType(elem, sipType_TDEABC_Addressee, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEABC::Addressee *)sipForceConvertToType(elem, sipType_TDEABC_Addressee, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -413,8 +413,8 @@ public: // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -423,11 +423,11 @@ public: TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new TDEABC::Address (*it), sipType_TDEABC_Address, NULL)) == NULL) + if (!(inst = sipConvertFromNewType(new TDEABC::Address (*it), sipType_TDEABC_Address, nullptr)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -436,7 +436,7 @@ public: %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -448,7 +448,7 @@ public: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEABC::Address *)sipForceConvertToType(elem, sipType_TDEABC_Address, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEABC::Address *)sipForceConvertToType(elem, sipType_TDEABC_Address, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeabc/distributionlist.sip b/sip/tdeabc/distributionlist.sip index f7cf84e..0a3a493 100644 --- a/sip/tdeabc/distributionlist.sip +++ b/sip/tdeabc/distributionlist.sip @@ -119,8 +119,8 @@ protected: // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -129,11 +129,11 @@ protected: TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new TDEABC::DistributionList::Entry (*it), sipType_TDEABC_DistributionList_Entry, NULL)) == NULL) + if (!(inst = sipConvertFromNewType(new TDEABC::DistributionList::Entry (*it), sipType_TDEABC_DistributionList_Entry, nullptr)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -142,7 +142,7 @@ protected: %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -154,7 +154,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEABC::DistributionList::Entry *)sipForceConvertToType(elem, sipType_TDEABC_DistributionList_Entry, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEABC::DistributionList::Entry *)sipForceConvertToType(elem, sipType_TDEABC_DistributionList_Entry, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeabc/field.sip b/sip/tdeabc/field.sip index bc1a5a9..4a423cd 100644 --- a/sip/tdeabc/field.sip +++ b/sip/tdeabc/field.sip @@ -103,8 +103,8 @@ private: // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -113,11 +113,11 @@ private: TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromType((TDEABC::Field *)(*it), sipType_TDEABC_Field, NULL)) == NULL) + if (!(inst = sipConvertFromType((TDEABC::Field *)(*it), sipType_TDEABC_Field, nullptr)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -126,7 +126,7 @@ private: %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -138,7 +138,7 @@ private: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEABC::Field *)sipForceConvertToType(elem, sipType_TDEABC_Field, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEABC::Field *)sipForceConvertToType(elem, sipType_TDEABC_Field, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeabc/key.sip b/sip/tdeabc/key.sip index 5008658..47d3af8 100644 --- a/sip/tdeabc/key.sip +++ b/sip/tdeabc/key.sip @@ -87,8 +87,8 @@ public: // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -97,11 +97,11 @@ public: TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new TDEABC::Key(*it), sipType_TDEABC_Key, NULL)) == NULL) + if (!(inst = sipConvertFromNewType(new TDEABC::Key(*it), sipType_TDEABC_Key, nullptr)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -110,7 +110,7 @@ public: %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -122,7 +122,7 @@ public: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEABC::Key *)sipForceConvertToType(elem, sipType_TDEABC_Key, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEABC::Key *)sipForceConvertToType(elem, sipType_TDEABC_Key, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeabc/ldapclient.sip b/sip/tdeabc/ldapclient.sip index 737c3dd..e196389 100644 --- a/sip/tdeabc/ldapclient.sip +++ b/sip/tdeabc/ldapclient.sip @@ -186,8 +186,8 @@ signals: // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -196,11 +196,11 @@ signals: TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new TDEABC::LdapResult(*it), sipType_TDEABC_LdapResult, NULL)) == NULL) + if (!(inst = sipConvertFromNewType(new TDEABC::LdapResult(*it), sipType_TDEABC_LdapResult, nullptr)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -209,7 +209,7 @@ signals: %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -221,7 +221,7 @@ signals: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEABC::LdapResult *)sipForceConvertToType(elem, sipType_TDEABC_LdapResult, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEABC::LdapResult *)sipForceConvertToType(elem, sipType_TDEABC_LdapResult, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeabc/phonenumber.sip b/sip/tdeabc/phonenumber.sip index a73b06e..a7229b0 100644 --- a/sip/tdeabc/phonenumber.sip +++ b/sip/tdeabc/phonenumber.sip @@ -134,8 +134,8 @@ public: // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -144,11 +144,11 @@ public: TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new TDEABC::PhoneNumber(*it), sipType_TDEABC_PhoneNumber, NULL)) == NULL) + if (!(inst = sipConvertFromNewType(new TDEABC::PhoneNumber(*it), sipType_TDEABC_PhoneNumber, nullptr)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -157,7 +157,7 @@ public: %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -169,7 +169,7 @@ public: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEABC::PhoneNumber *)sipForceConvertToType(elem, sipType_TDEABC_PhoneNumber, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEABC::PhoneNumber *)sipForceConvertToType(elem, sipType_TDEABC_PhoneNumber, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdecore/bytearray.sip b/sip/tdecore/bytearray.sip index 046939b..7b2233e 100644 --- a/sip/tdecore/bytearray.sip +++ b/sip/tdecore/bytearray.sip @@ -68,8 +68,8 @@ void dcop_add (TQDataStream&, SIP_PYDICT, TQCString); int iserr = 0; void *map_v; - map_v = sipForceConvertToType(a1, map_td, NULL, - SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + map_v = sipForceConvertToType(a1, map_td, nullptr, + SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -112,8 +112,8 @@ void dcop_add (TQDataStream&, SIP_PYLIST, TQCString); int iserr = 0; void *list_v; - list_v = sipForceConvertToType(a1, list_td, NULL, - SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + list_v = sipForceConvertToType(a1, list_td, nullptr, + SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -219,97 +219,97 @@ void dcop_next (TQDataStream&, TQCString&); { TQString res; *a0 >> res; - return sipConvertFromNewType(new TQString(res), sipType_TQString, NULL); + return sipConvertFromNewType(new TQString(res), sipType_TQString, nullptr); } else if (*a1 == "TQStringList") { TQStringList res; *a0 >> res; - return sipConvertFromNewType(new TQStringList(res), sipType_TQStringList, NULL); + return sipConvertFromNewType(new TQStringList(res), sipType_TQStringList, nullptr); } else if (*a1 == "TQCString") { TQCString res; *a0 >> res; - return sipConvertFromNewType(new TQCString(res), sipType_TQCString, NULL); + return sipConvertFromNewType(new TQCString(res), sipType_TQCString, nullptr); } else if (*a1 == "KURL") { KURL res; *a0 >> res; - return sipConvertFromNewType(new KURL(res), sipType_KURL, NULL); + return sipConvertFromNewType(new KURL(res), sipType_KURL, nullptr); } else if (*a1 == "KURL::List") { KURL::List res; *a0 >> res; - return sipConvertFromNewType(new KURL::List(res), sipType_KURL_List, NULL); + return sipConvertFromNewType(new KURL::List(res), sipType_KURL_List, nullptr); } else if (*a1 == "TQSize") { TQSize res; *a0 >> res; - return sipConvertFromNewType(new TQSize(res), sipType_TQSize, NULL); + return sipConvertFromNewType(new TQSize(res), sipType_TQSize, nullptr); } else if (*a1 == "TQRect") { TQRect res; *a0 >> res; - return sipConvertFromNewType(new TQRect(res), sipType_TQRect, NULL); + return sipConvertFromNewType(new TQRect(res), sipType_TQRect, nullptr); } else if (*a1 == "TQRegion") { TQRect res; *a0 >> res; - return sipConvertFromNewType(new TQRegion(res), sipType_TQRegion, NULL); + return sipConvertFromNewType(new TQRegion(res), sipType_TQRegion, nullptr); } else if (*a1 == "TQPoint") { TQPoint res; *a0 >> res; - return sipConvertFromNewType(new TQPoint(res), sipType_TQPoint, NULL); + return sipConvertFromNewType(new TQPoint(res), sipType_TQPoint, nullptr); } else if (*a1 == "TQFont") { TQFont res; *a0 >> res; - return sipConvertFromNewType(new TQFont(res), sipType_TQFont, NULL); + return sipConvertFromNewType(new TQFont(res), sipType_TQFont, nullptr); } else if (*a1 == "TQCursor") { TQCursor res; *a0 >> res; - return sipConvertFromNewType(new TQCursor(res), sipType_TQCursor, NULL); + return sipConvertFromNewType(new TQCursor(res), sipType_TQCursor, nullptr); } else if (*a1 == "TQPixmap") { TQPixmap res; *a0 >> res; - return sipConvertFromNewType(new TQPixmap(res), sipType_TQPixmap, NULL); + return sipConvertFromNewType(new TQPixmap(res), sipType_TQPixmap, nullptr); } else if (*a1 == "TQColor") { TQColor res; *a0 >> res; - return sipConvertFromNewType(new TQColor(res), sipType_TQColor, NULL); + return sipConvertFromNewType(new TQColor(res), sipType_TQColor, nullptr); } else if (*a1 == "TQColorGroup") { TQColorGroup res; *a0 >> res; - return sipConvertFromNewType(new TQColorGroup(res), sipType_TQColorGroup, NULL); + return sipConvertFromNewType(new TQColorGroup(res), sipType_TQColorGroup, nullptr); } else if (*a1 == "TQPalette") { TQPalette res; *a0 >> res; - return sipConvertFromNewType(new TQPalette(res), sipType_TQPalette, NULL); + return sipConvertFromNewType(new TQPalette(res), sipType_TQPalette, nullptr); } else if (*a1 == "TQBrush") { TQBrush res; *a0 >> res; - return sipConvertFromNewType(new TQBrush(res), sipType_TQBrush, NULL); + return sipConvertFromNewType(new TQBrush(res), sipType_TQBrush, nullptr); } else if (*a1 == "FocusPolicy") { @@ -321,103 +321,103 @@ void dcop_next (TQDataStream&, TQCString&); { DCOPRef res; *a0 >> res; - return sipConvertFromNewType(new DCOPRef(res), sipType_DCOPRef, NULL); + return sipConvertFromNewType(new DCOPRef(res), sipType_DCOPRef, nullptr); } else if (*a1 == "TQVariant") { TQVariant res; *a0 >> res; - return sipConvertFromNewType(new TQVariant(res), sipType_TQVariant, NULL); + return sipConvertFromNewType(new TQVariant(res), sipType_TQVariant, nullptr); } else if (*a1 == "TQDate") { TQDate res; *a0 >> res; - return sipConvertFromNewType(new TQDate(res), sipType_TQDate, NULL); + return sipConvertFromNewType(new TQDate(res), sipType_TQDate, nullptr); } else if (*a1 == "TQTime") { TQTime res; *a0 >> res; - return sipConvertFromNewType(new TQTime(res), sipType_TQTime, NULL); + return sipConvertFromNewType(new TQTime(res), sipType_TQTime, nullptr); } else if (*a1 == "TQDateTime") { TQDateTime res; *a0 >> res; - return sipConvertFromNewType(new TQDateTime(res), sipType_TQDateTime, NULL); + return sipConvertFromNewType(new TQDateTime(res), sipType_TQDateTime, nullptr); } else if (*a1 == "TQImage") { TQImage res; *a0 >> res; - return sipConvertFromNewType(new TQImage(res), sipType_TQImage, NULL); + return sipConvertFromNewType(new TQImage(res), sipType_TQImage, nullptr); } else if (*a1 == "TQKeySequence") { TQKeySequence res; *a0 >> res; - return sipConvertFromNewType(new TQKeySequence(res), sipType_TQKeySequence, NULL); + return sipConvertFromNewType(new TQKeySequence(res), sipType_TQKeySequence, nullptr); } else if (*a1 == "TQPen") { TQPen res; *a0 >> res; - return sipConvertFromNewType(new TQPen(res), sipType_TQPen, NULL); + return sipConvertFromNewType(new TQPen(res), sipType_TQPen, nullptr); } else if (*a1 == "TQPicture") { TQPicture res; *a0 >> res; - return sipConvertFromNewType(new TQPicture(res), sipType_TQPicture, NULL); + return sipConvertFromNewType(new TQPicture(res), sipType_TQPicture, nullptr); } else if (*a1 == "TQPointArray") { TQPointArray res; *a0 >> res; - return sipConvertFromNewType(new TQPointArray(res), sipType_TQPointArray, NULL); + return sipConvertFromNewType(new TQPointArray(res), sipType_TQPointArray, nullptr); } else if (*a1 == "TQByteArray") { TQByteArray res; *a0 >> res; - return sipConvertFromNewType(new TQByteArray(res), sipType_TQByteArray, NULL); + return sipConvertFromNewType(new TQByteArray(res), sipType_TQByteArray, nullptr); } else if (*a1 == "TQMap") { TQMap res; *a0 >> res; - return sipConvertFromType(&res, sipFindType(*a1), NULL); + return sipConvertFromType(&res, sipFindType(*a1), nullptr); } else if (*a1 == "TQMap") { TQMap res; *a0 >> res; - return sipConvertFromType(&res, sipFindType(*a1), NULL); + return sipConvertFromType(&res, sipFindType(*a1), nullptr); } else if (*a1 == "TQMap") { TQMap res; *a0 >> res; - return sipConvertFromType(&res, sipFindType(*a1), NULL); + return sipConvertFromType(&res, sipFindType(*a1), nullptr); } else if (*a1 == "TQMap") { TQMap res; *a0 >> res; - return sipConvertFromType(&res, sipFindType(*a1), NULL); + return sipConvertFromType(&res, sipFindType(*a1), nullptr); } else if (*a1 == "TQValueList") { TQValueList res; *a0 >> res; - return sipConvertFromType(&res, sipFindType(*a1), NULL); + return sipConvertFromType(&res, sipFindType(*a1), nullptr); } else if (*a1 == "TQValueList" || *a1 == "QCStringList") { TQValueList res; *a0 >> res; - return sipConvertFromType(&res, sipFindType(*a1), NULL); + return sipConvertFromType(&res, sipFindType(*a1), nullptr); } %End @@ -631,8 +631,8 @@ void dcop_add (TQDataStream& s, TQByteArray value) // Create the dictionary. - if ((dict = PyDict_New()) == NULL) - return NULL; + if (!(dict = PyDict_New())) + return nullptr; // Get it. @@ -644,15 +644,15 @@ void dcop_add (TQDataStream& s, TQByteArray value) TQCString acpp = it.key (); DCOPRef bcpp = it.data (); PyObject *ainst; - PyObject *binst = NULL; - if (((ainst = sipConvertFromNewType(new TQCString(acpp), sipType_TQCString, NULL)) == NULL) - || ((binst = sipConvertFromNewType(new DCOPRef(bcpp), sipType_DCOPRef, NULL)) == NULL) + PyObject *binst = nullptr; + if (!(ainst = sipConvertFromNewType(new TQCString(acpp), sipType_TQCString, nullptr)) + || !(binst = sipConvertFromNewType(new DCOPRef(bcpp), sipType_DCOPRef, nullptr)) || (PyDict_SetItem (dict, ainst, binst) < 0)) { Py_XDECREF (ainst); Py_XDECREF (binst); Py_DECREF (dict); - return NULL; + return nullptr; } } @@ -663,7 +663,7 @@ void dcop_add (TQDataStream& s, TQByteArray value) %ConvertToTypeCode // Convert a Python dictionary to a TQMap on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyDict_Check(sipPy); TQMap *cppmap = new TQMap; @@ -677,8 +677,8 @@ void dcop_add (TQDataStream& s, TQByteArray value) { int iserr = 0; - acpp = (TQCString *)sipForceConvertToType(aelem, sipType_TQCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); - bcpp = (DCOPRef *)sipForceConvertToType(belem, sipType_DCOPRef, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + acpp = (TQCString *)sipForceConvertToType(aelem, sipType_TQCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); + bcpp = (DCOPRef *)sipForceConvertToType(belem, sipType_DCOPRef, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -714,8 +714,8 @@ void dcop_add (TQDataStream& s, TQByteArray value) // Create the dictionary. - if ((dict = PyDict_New()) == NULL) - return NULL; + if (!(dict = PyDict_New())) + return nullptr; // Get it. @@ -727,15 +727,15 @@ void dcop_add (TQDataStream& s, TQByteArray value) TQString acpp = it.key (); DCOPRef bcpp = it.data (); PyObject *ainst; - PyObject *binst = NULL; - if (((ainst = sipConvertFromNewType(new TQString(acpp), sipType_TQString, sipTransferObj)) == NULL) - || ((binst = sipConvertFromNewType(new DCOPRef(bcpp), sipType_DCOPRef, sipTransferObj)) == NULL) + PyObject *binst = nullptr; + if (!(ainst = sipConvertFromNewType(new TQString(acpp), sipType_TQString, sipTransferObj)) + || !(binst = sipConvertFromNewType(new DCOPRef(bcpp), sipType_DCOPRef, sipTransferObj)) || (PyDict_SetItem (dict, ainst, binst) < 0)) { Py_XDECREF (ainst); Py_XDECREF (binst); Py_DECREF (dict); - return NULL; + return nullptr; } } @@ -746,7 +746,7 @@ void dcop_add (TQDataStream& s, TQByteArray value) %ConvertToTypeCode // Convert a Python dictionary to a TQMap on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyDict_Check(sipPy); TQMap *cppmap = new TQMap; @@ -761,7 +761,7 @@ void dcop_add (TQDataStream& s, TQByteArray value) int iserr = 0, acpp_state; acpp = (TQString *)sipForceConvertToType(aelem, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &acpp_state, &iserr); - bcpp = (DCOPRef *)sipForceConvertToType(belem, sipType_DCOPRef, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + bcpp = (DCOPRef *)sipForceConvertToType(belem, sipType_DCOPRef, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -805,8 +805,8 @@ void dcop_add (TQDataStream& s, TQByteArray value) // Create the dictionary. - if ((dict = PyDict_New()) == NULL) - return NULL; + if (!(dict = PyDict_New())) + return nullptr; // Get it. @@ -818,15 +818,15 @@ void dcop_add (TQDataStream& s, TQByteArray value) TQString acpp = it.key (); TQByteArray bcpp = it.data (); PyObject *ainst; - PyObject *binst = NULL; - if (((ainst = sipConvertFromNewType(new TQString(acpp), sipType_TQString, sipTransferObj)) == NULL) - || ((binst = sipConvertFromNewType(new TQByteArray(bcpp), sipType_TQByteArray, sipTransferObj)) == NULL) + PyObject *binst = nullptr; + if (!(ainst = sipConvertFromNewType(new TQString(acpp), sipType_TQString, sipTransferObj)) + || !(binst = sipConvertFromNewType(new TQByteArray(bcpp), sipType_TQByteArray, sipTransferObj)) || (PyDict_SetItem (dict, ainst, binst) < 0)) { Py_XDECREF (ainst); Py_XDECREF (binst); Py_DECREF (dict); - return NULL; + return nullptr; } } @@ -837,7 +837,7 @@ void dcop_add (TQDataStream& s, TQByteArray value) %ConvertToTypeCode // Convert a Python dictionary to a TQMap on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyDict_Check(sipPy); TQMap *cppmap = new TQMap; @@ -891,8 +891,8 @@ void dcop_add (TQDataStream& s, TQByteArray value) // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -901,11 +901,11 @@ void dcop_add (TQDataStream& s, TQByteArray value) TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new DCOPRef(*it), sipType_DCOPRef, NULL)) == NULL) + if (!(inst = sipConvertFromNewType(new DCOPRef(*it), sipType_DCOPRef, nullptr)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -914,7 +914,7 @@ void dcop_add (TQDataStream& s, TQByteArray value) %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -926,7 +926,7 @@ void dcop_add (TQDataStream& s, TQByteArray value) for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (DCOPRef *)sipForceConvertToType(elem, sipType_DCOPRef, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (DCOPRef *)sipForceConvertToType(elem, sipType_DCOPRef, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { *sipIsErr = 1; diff --git a/sip/tdecore/kcompletion.sip b/sip/tdecore/kcompletion.sip index a19fc24..fae7e97 100644 --- a/sip/tdecore/kcompletion.sip +++ b/sip/tdecore/kcompletion.sip @@ -162,8 +162,8 @@ protected: // Create the dictionary. - if ((dict = PyDict_New()) == NULL) - return NULL; + if (!(dict = PyDict_New())) + return nullptr; // Get it. @@ -177,12 +177,12 @@ protected: { key = PyLong_FromLong ((int) it.key ()); value = sipConvertFromInstance ((void *)&(it.data ()), sipClass_TDEShortcut, sipTransferObj); - if ((value == NULL) || (PyDict_SetItem (dict, key, value) < 0)) + if ((!value) || (PyDict_SetItem (dict, key, value) < 0)) { Py_XDECREF (key); Py_XDECREF (value); Py_DECREF (dict); - return NULL; + return nullptr; } } @@ -194,7 +194,7 @@ protected: %ConvertToTypeCode // Convert a Python dictionary to a KeyBindingMap on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyDict_Check(sipPy); TQMap *kbmap = new TQMap; @@ -206,7 +206,7 @@ protected: while (PyDict_Next(sipPy, &pos, &key, &value)) { - cValue = (TDEShortcut *)sipForceConvertToType(value, sipType_TDEShortcut, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cValue = (TDEShortcut *)sipForceConvertToType(value, sipType_TDEShortcut, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr || !PyLong_Check (key)) { diff --git a/sip/tdecore/klockfile.sip b/sip/tdecore/klockfile.sip index 2e067ee..6917263 100644 --- a/sip/tdecore/klockfile.sip +++ b/sip/tdecore/klockfile.sip @@ -78,7 +78,7 @@ public: // Convert to a Python instance if (!sipCpp) - return NULL; + return nullptr; TDESharedPtr *cPtr = new TDESharedPtr (*(TDESharedPtr *)sipCpp); TDELockFile *cpp = cPtr->data (); @@ -90,11 +90,11 @@ public: %ConvertToTypeCode // Convert a Python instance to a Ptr on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyType_Check(sipPy); int iserr = 0; - TDELockFile *cpp = (TDELockFile *)sipForceConvertToType(sipPy, sipType_TDELockFile, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + TDELockFile *cpp = (TDELockFile *)sipForceConvertToType(sipPy, sipType_TDELockFile, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdecore/kmacroexpander.sip b/sip/tdecore/kmacroexpander.sip index 8d0d3d0..abe04c3 100644 --- a/sip/tdecore/kmacroexpander.sip +++ b/sip/tdecore/kmacroexpander.sip @@ -132,8 +132,8 @@ TQString expandMacrosShellQuote (const TQString&, const TQMap - if (sipIsErr == NULL) + if (!sipIsErr) return PyDict_Check(sipPy); TQMap *map = new TQMap; @@ -221,8 +221,8 @@ TQString expandMacrosShellQuote (const TQString&, const TQMap on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyDict_Check(sipPy); TQMap *map = new TQMap; @@ -310,8 +310,8 @@ TQString expandMacrosShellQuote (const TQString&, const TQMap on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyDict_Check(sipPy); TQMap *map = new TQMap; diff --git a/sip/tdecore/kmountpoint.sip b/sip/tdecore/kmountpoint.sip index 066b1e6..016c7d2 100644 --- a/sip/tdecore/kmountpoint.sip +++ b/sip/tdecore/kmountpoint.sip @@ -79,7 +79,7 @@ private: // Convert to a Python instance if (!sipCpp) - return NULL; + return nullptr; TDESharedPtr *cPtr = new TDESharedPtr (*(TDESharedPtr *)sipCpp); KMountPoint *cpp = cPtr->data (); @@ -91,11 +91,11 @@ private: %ConvertToTypeCode // Convert a Python instance to a Ptr on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyType_Check(sipPy); int iserr = 0; - KMountPoint *cpp = (KMountPoint *)sipForceConvertToType(sipPy, sipType_KMountPoint, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + KMountPoint *cpp = (KMountPoint *)sipForceConvertToType(sipPy, sipType_KMountPoint, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -126,8 +126,8 @@ private: PyObject *plist; // Create the list - if ((plist = PyList_New(0)) == NULL) - return NULL; + if (!(plist = PyList_New(0))) + return nullptr; // Get it. KMountPoint::List *cList = (KMountPoint::List *)sipCpp; @@ -138,11 +138,11 @@ private: { inst = sipConvertFromType(static_cast(*it), sipType_KMountPoint_Ptr, sipTransferObj); - if ((inst == NULL) || (PyList_Append (plist, inst) < 0)) + if ((!inst) || (PyList_Append (plist, inst) < 0)) { Py_XDECREF (inst); Py_DECREF (plist); - return NULL; + return nullptr; } } @@ -151,7 +151,7 @@ private: %ConvertToTypeCode // Convert a Python list to List on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); KMountPoint::List *cList = new KMountPoint::List; @@ -163,7 +163,7 @@ private: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - mtpt = (KMountPoint *)sipForceConvertToType(elem, sipType_KMountPoint, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + mtpt = (KMountPoint *)sipForceConvertToType(elem, sipType_KMountPoint, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); KMountPoint::Ptr *ptr = new KMountPoint::Ptr (mtpt); diff --git a/sip/tdecore/kshell.sip b/sip/tdecore/kshell.sip index befb606..2895143 100644 --- a/sip/tdecore/kshell.sip +++ b/sip/tdecore/kshell.sip @@ -60,8 +60,8 @@ TQString joinArgs (SIP_PYLIST) [TQString (const char**, int = -1)]; // Convert the list. - if ((argv = pyArgvToC(a0, &argc)) == NULL) - return NULL; + if (!(argv = pyArgvToC(a0, &argc))) + return nullptr; Py_BEGIN_ALLOW_THREADS sipRes = new TQString (KShell::joinArgs (argv, argc)); diff --git a/sip/tdecore/ktimezones.sip b/sip/tdecore/ktimezones.sip index 7876587..0d5ad17 100644 --- a/sip/tdecore/ktimezones.sip +++ b/sip/tdecore/ktimezones.sip @@ -146,7 +146,7 @@ private: // Convert to a Python instance if (!sipCpp) - return NULL; + return nullptr; TDESharedPtr *cPtr = new TDESharedPtr (*(TDESharedPtr *)sipCpp); KTimezoneSource *cpp = cPtr->data (); @@ -158,11 +158,11 @@ private: %ConvertToTypeCode // Convert a Python instance to a Ptr on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyType_Check(sipPy); int iserr = 0; - KTimezoneSource *cpp = (KTimezoneSource *)sipForceConvertToType(sipPy, sipType_KTimezoneSource, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + KTimezoneSource *cpp = (KTimezoneSource *)sipForceConvertToType(sipPy, sipType_KTimezoneSource, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -198,8 +198,8 @@ private: // Create the dictionary. - if ((dict = PyDict_New()) == NULL) - return NULL; + if (!(dict = PyDict_New())) + return nullptr; // Get it. @@ -211,15 +211,15 @@ private: TQString acpp = it.key (); KTimezone *bcpp = it.data (); PyObject *ainst; - PyObject *binst = NULL; - if (((ainst = sipConvertFromNewType(new TQString(acpp), sipType_TQString, sipTransferObj)) == NULL) - || ((binst = sipConvertFromType(bcpp, sipType_KTimezone, sipTransferObj)) == NULL) + PyObject *binst = nullptr; + if (!(ainst = sipConvertFromNewType(new TQString(acpp), sipType_TQString, sipTransferObj)) + || !(binst = sipConvertFromType(bcpp, sipType_KTimezone, sipTransferObj)) || (PyDict_SetItem (dict, ainst, binst) < 0)) { Py_XDECREF (ainst); Py_XDECREF (binst); Py_DECREF (dict); - return NULL; + return nullptr; } } @@ -230,7 +230,7 @@ private: %ConvertToTypeCode // Convert a Python dictionary to a TQMap on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyDict_Check(sipPy); TQMap *cppmap = new TQMap; @@ -245,7 +245,7 @@ private: int iserr = 0, acpp_state; acpp = (TQString *)sipForceConvertToType(aelem, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &acpp_state, &iserr); - bcpp = (KTimezone *)sipForceConvertToType(belem, sipType_KTimezone, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + bcpp = (KTimezone *)sipForceConvertToType(belem, sipType_KTimezone, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdecore/netwm.sip b/sip/tdecore/netwm.sip index ac27f60..2ecf76e 100644 --- a/sip/tdecore/netwm.sip +++ b/sip/tdecore/netwm.sip @@ -223,7 +223,7 @@ public: { elem = PyList_GetItem (a0, i); if (!PyLong_Check (elem)) - return NULL; + return nullptr; array [i] = (Window) PyLong_AsUnsignedLong (elem); } @@ -245,7 +245,7 @@ public: { elem = PyList_GetItem (a0, i); if (!PyLong_Check (elem)) - return NULL; + return nullptr; array [i] = (Window) PyLong_AsUnsignedLong (elem); } @@ -267,7 +267,7 @@ public: { elem = PyList_GetItem (a0, i); if (!PyLong_Check (elem)) - return NULL; + return nullptr; array [i] = (Window) PyLong_AsUnsignedLong (elem); } @@ -301,7 +301,7 @@ public: { elem = PyList_GetItem (a0, i); if (!PyLong_Check (elem)) - return NULL; + return nullptr; array [i] = (Window) PyLong_AsUnsignedLong (elem); } diff --git a/sip/tdecore/tdeaboutdata.sip b/sip/tdecore/tdeaboutdata.sip index 0bdcc60..2480be0 100644 --- a/sip/tdecore/tdeaboutdata.sip +++ b/sip/tdecore/tdeaboutdata.sip @@ -181,8 +181,8 @@ public: // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -191,11 +191,11 @@ public: TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new TDEAboutPerson(*it), sipType_TDEAboutPerson, NULL)) == NULL) + if (!(inst = sipConvertFromNewType(new TDEAboutPerson(*it), sipType_TDEAboutPerson, nullptr)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -204,7 +204,7 @@ public: %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -216,7 +216,7 @@ public: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEAboutPerson *)sipForceConvertToType(elem, sipType_TDEAboutPerson, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEAboutPerson *)sipForceConvertToType(elem, sipType_TDEAboutPerson, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -248,8 +248,8 @@ public: // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -258,11 +258,11 @@ public: TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new TDEAboutTranslator(*it), sipType_TDEAboutTranslator, NULL)) == NULL) + if (!(inst = sipConvertFromNewType(new TDEAboutTranslator(*it), sipType_TDEAboutTranslator, nullptr)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -271,7 +271,7 @@ public: %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -283,7 +283,7 @@ public: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEAboutTranslator *)sipForceConvertToType(elem, sipType_TDEAboutTranslator, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEAboutTranslator *)sipForceConvertToType(elem, sipType_TDEAboutTranslator, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdecore/tdeaccel.sip b/sip/tdecore/tdeaccel.sip index aaeaa16..03430aa 100644 --- a/sip/tdecore/tdeaccel.sip +++ b/sip/tdecore/tdeaccel.sip @@ -171,8 +171,8 @@ public: // Create the dictionary. - if ((dict = PyDict_New()) == NULL) - return NULL; + if (!(dict = PyDict_New())) + return nullptr; // Get it. @@ -184,12 +184,12 @@ public: PyObject *iKey = PyLong_FromLong (((long) it.key ())); PyObject *sData = PyBytes_FromString ((char *)((TQString *)&it.data ())); - if ((iKey == NULL) || (sData == NULL) || (PyDict_SetItem (dict, iKey, sData) < 0)) + if ((!iKey) || (!sData) || (PyDict_SetItem (dict, iKey, sData) < 0)) { Py_XDECREF (iKey); Py_XDECREF (sData); Py_DECREF (dict); - return NULL; + return nullptr; } } @@ -200,7 +200,7 @@ public: %ConvertToTypeCode // Convert a Python dictionary to a KKeyMapOrder on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyDict_Check(sipPy); TQMap *map = new TQMap; diff --git a/sip/tdecore/tdeapplication.sip b/sip/tdecore/tdeapplication.sip index 4a241c4..207b942 100644 --- a/sip/tdecore/tdeapplication.sip +++ b/sip/tdecore/tdeapplication.sip @@ -59,8 +59,8 @@ public: // Convert the list. - if ((argv = pyArgvToC(a0, &argc)) == NULL) - return NULL; + if (!(argv = pyArgvToC(a0, &argc))) + return nullptr; // Create it now the arguments are right. @@ -70,7 +70,7 @@ public: // The following two lines simulate the actual ctor call // which is commented out below - TDECmdLineArgs::init (nargc, argv, (char *)"unknown", (char *)"KDE Application", NULL, false); + TDECmdLineArgs::init (nargc, argv, (char *)"unknown", (char *)"KDE Application", nullptr, false); sipCpp = new sipTDEApplication((bool)a1,(bool)a2); // This method calls TDECmdLineArgs::initIgnore, which is a private method @@ -406,8 +406,8 @@ char **pyArgvToC(PyObject *argvlist,int *argcp) // Allocate space for two copies of the argument pointers, plus the // terminating NULL. - if ((argv = (char **)sipMalloc(2 * (argc + 1) * sizeof (char *))) == NULL) - return NULL; + if (!(argv = (char **)sipMalloc(2 * (argc + 1) * sizeof (char *)))) + return nullptr; // Convert the list. for (int a = 0; a < argc; ++a) @@ -425,13 +425,13 @@ char **pyArgvToC(PyObject *argvlist,int *argcp) } else { - return NULL; + return nullptr; } argv[a] = argv[a + argc + 1] = arg; } - argv[argc] = argv[argc + argc + 1] = NULL; + argv[argc] = argv[argc + argc + 1] = nullptr; if (argcp) { *argcp = argc; @@ -450,7 +450,7 @@ void updatePyArgv(PyObject *argvlist,int argc,char **argv) if (argv[na] == argv[a + argc + 1]) ++na; else - PyList_SetSlice(argvlist,na,na + 1,NULL); + PyList_SetSlice(argvlist,na,na + 1,nullptr); } } %End diff --git a/sip/tdecore/tdecmdlineargs.sip b/sip/tdecore/tdecmdlineargs.sip index acd051b..3149736 100644 --- a/sip/tdecore/tdecmdlineargs.sip +++ b/sip/tdecore/tdecmdlineargs.sip @@ -66,8 +66,8 @@ public: // Convert the list. - if ((argv = pyArgvToC(a0, &argc)) == NULL) - return NULL; + if (!(argv = pyArgvToC(a0, &argc))) + return nullptr; // Create it now the arguments are right. nargc = argc; @@ -92,8 +92,8 @@ public: // Convert the list. - if ((argv = pyArgvToC(a0, &argc)) == NULL) - return NULL; + if (!(argv = pyArgvToC(a0, &argc))) + return nullptr; // Create it now the arguments are right. nargc = argc; @@ -116,8 +116,8 @@ public: // Convert the list. - if ((argv = pyArgvToC (a0, &argc)) == NULL) - return NULL; + if (!(argv = pyArgvToC (a0, &argc))) + return nullptr; // Create it now the arguments are right. nargc = argc; @@ -145,7 +145,7 @@ public: int n; if ((n = PyList_Size (a0)) == 0) - return NULL; + return nullptr; // opts is persistent TDECmdLineOptions *opts; @@ -159,7 +159,7 @@ public: { PyObject *tuple; - if ((tuple = PyList_GetItem (a0, i)) != NULL) + if ((tuple = PyList_GetItem (a0, i))) { tsz = PyTuple_Size (tuple); PyObject *member; @@ -198,7 +198,7 @@ public: } } else - opts [i].description = NULL; + opts [i].description = nullptr; if (tsz > 2) @@ -218,16 +218,16 @@ public: } } else - opts [i].def = NULL; + opts [i].def = nullptr; } else goto errorExit; } // mark the end of the list - opts[n].name = NULL; - opts[n].description = NULL; - opts[n].def = NULL; + opts[n].name = nullptr; + opts[n].description = nullptr; + opts[n].def = nullptr; Py_BEGIN_ALLOW_THREADS TDECmdLineArgs::addCmdLineOptions (opts, a1, a2, a3); @@ -238,7 +238,7 @@ public: errorExit: delete opts; - return NULL; + return nullptr; %End static TDECmdLineArgs* parsedArgs (const char* = 0); diff --git a/sip/tdecore/tdeconfig.sip b/sip/tdecore/tdeconfig.sip index c955aaa..ae14f38 100644 --- a/sip/tdecore/tdeconfig.sip +++ b/sip/tdecore/tdeconfig.sip @@ -119,8 +119,8 @@ private: // Create the dictionary. - if ((dict = PyDict_New()) == NULL) - return NULL; + if (!(dict = PyDict_New())) + return nullptr; // Get it. @@ -132,15 +132,15 @@ private: TQString acpp = it.key (); TQString bcpp = it.data (); PyObject *ainst; - PyObject *binst = NULL; - if (((ainst = sipConvertFromNewType(new TQString(acpp), sipType_TQString, sipTransferObj)) == NULL) - || ((binst = sipConvertFromNewType(new TQString(bcpp), sipType_TQString, sipTransferObj)) == NULL) + PyObject *binst = nullptr; + if (!(ainst = sipConvertFromNewType(new TQString(acpp), sipType_TQString, sipTransferObj)) + || !(binst = sipConvertFromNewType(new TQString(bcpp), sipType_TQString, sipTransferObj)) || (PyDict_SetItem (dict, ainst, binst) < 0)) { Py_XDECREF (ainst); Py_XDECREF (binst); Py_DECREF (dict); - return NULL; + return nullptr; } } @@ -151,7 +151,7 @@ private: %ConvertToTypeCode // Convert a Python dictionary to a TQMap on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyDict_Check(sipPy); TQMap *cppmap = new TQMap; @@ -204,7 +204,7 @@ private: // Convert to a Python instance if (!sipCpp) - return NULL; + return nullptr; TDESharedPtr *cPtr = new TDESharedPtr (*(TDESharedPtr *)sipCpp); TDESharedConfig *cpp = cPtr->data (); @@ -216,11 +216,11 @@ private: %ConvertToTypeCode // Convert a Python instance to a Ptr on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyType_Check(sipPy); int iserr = 0; - TDESharedConfig *cpp = (TDESharedConfig *)sipForceConvertToType(sipPy, sipType_TDESharedConfig, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + TDESharedConfig *cpp = (TDESharedConfig *)sipForceConvertToType(sipPy, sipType_TDESharedConfig, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdecore/tdeconfigbase.sip b/sip/tdecore/tdeconfigbase.sip index 26b392f..51d76bc 100644 --- a/sip/tdecore/tdeconfigbase.sip +++ b/sip/tdecore/tdeconfigbase.sip @@ -271,7 +271,7 @@ protected: %End %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyLong_Check (sipPy); long long *ll = new long long; @@ -300,7 +300,7 @@ protected: %End %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyLong_Check (sipPy); unsigned long long *ul = new unsigned long long; diff --git a/sip/tdecore/tdeconfigdata.sip b/sip/tdecore/tdeconfigdata.sip index 6c20ab9..77c3399 100644 --- a/sip/tdecore/tdeconfigdata.sip +++ b/sip/tdecore/tdeconfigdata.sip @@ -74,10 +74,10 @@ KEntryMap testKEntryMap (SIP_PYOBJECT) [KEntryMap (KEntryMap)]; //returns (TQMap(sipCpp)) sipClass = sipClass_TDEConfigSkeleton_ItemULong; else - sipClass = NULL; + sipClass = nullptr; %End //end @@ -389,7 +389,7 @@ public: %MethodCode //returns a Python list of int //takes name | (TQString) | reference | (a Python list of int) | defaultValue | (a Python list of int = []) | key | (TQString = TQString::null) - if (a2 == NULL) *(TQValueList *)a2 = TQValueList(); + if (!a2) *(TQValueList *)a2 = TQValueList(); Py_BEGIN_ALLOW_THREADS sipRes = sipCpp->addItemIntList (*a0, *a1, *a2, *a3); Py_END_ALLOW_THREADS @@ -409,7 +409,7 @@ public: int n = list.count (); if (n > 0) for (int i = 0; i < n; i++) - PyList_Append (sipRes, sipConvertFromInstance (&(list [i]), sipClass_TDEConfigSkeletonItem, NULL)); + PyList_Append (sipRes, sipConvertFromInstance (&(list [i]), sipClass_TDEConfigSkeletonItem, nullptr)); %End bool isImmutable (const TQString&); @@ -1048,7 +1048,7 @@ public: ItemIntList (const TQString&, const TQString&, TQValueList&, const TQValueList& = IntList ()); %MethodCode //takes group | (TQString) | key | (TQString) | reference | (a Python list of int) | defaultValue | (a Python list of int = 0) - if (a3 == NULL) *(TQValueList *)a3 = TQValueList(); + if (!a3) *(TQValueList *)a3 = TQValueList(); Py_BEGIN_ALLOW_THREADS sipCpp = (sipTDEConfigSkeleton_ItemIntList *) new TDEConfigSkeleton::ItemIntList (*a0, *a1, *a2, *a3); Py_END_ALLOW_THREADS @@ -1089,8 +1089,8 @@ public: // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -1099,11 +1099,11 @@ public: TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new TDEConfigSkeleton::ItemEnum::Choice(*it), sipType_TDEConfigSkeleton_ItemEnum_Choice, NULL)) == NULL) + if (!(inst = sipConvertFromNewType(new TDEConfigSkeleton::ItemEnum::Choice(*it), sipType_TDEConfigSkeleton_ItemEnum_Choice, nullptr)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -1112,7 +1112,7 @@ public: %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -1124,7 +1124,7 @@ public: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEConfigSkeleton::ItemEnum::Choice *)sipForceConvertToType(elem, sipType_TDEConfigSkeleton_ItemEnum_Choice, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEConfigSkeleton::ItemEnum::Choice *)sipForceConvertToType(elem, sipType_TDEConfigSkeleton_ItemEnum_Choice, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdecore/twinmodule.sip b/sip/tdecore/twinmodule.sip index e9d5e97..5497d2e 100644 --- a/sip/tdecore/twinmodule.sip +++ b/sip/tdecore/twinmodule.sip @@ -104,8 +104,8 @@ protected: // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; @@ -117,7 +117,7 @@ protected: if (PyList_Append (pylist, PyLong_FromLong ((int) cpp)) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -126,7 +126,7 @@ protected: %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; diff --git a/sip/tdefile/knotifydialog.sip b/sip/tdefile/knotifydialog.sip index eabcd84..bf3aa09 100644 --- a/sip/tdefile/knotifydialog.sip +++ b/sip/tdefile/knotifydialog.sip @@ -192,7 +192,7 @@ public: for (app = applist.first (); app != 0; app = applist.next () ) { - inst = sipConvertFromInstance (app, sipClass_KNotify_Application, NULL); + inst = sipConvertFromInstance (app, sipClass_KNotify_Application, nullptr); PyList_Append (sipRes, inst); } %End @@ -211,7 +211,7 @@ public: for(app = applist.first (); app != 0; app = applist.next () ) { - inst = sipConvertFromInstance (app, sipClass_KNotify_Application, NULL); + inst = sipConvertFromInstance (app, sipClass_KNotify_Application, nullptr); PyList_Append (sipRes, inst); } %End @@ -256,8 +256,8 @@ class ApplicationList // Create the list - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; // Get it. @@ -268,11 +268,11 @@ class ApplicationList // the loop depends on the type of iterator the tmeplate makes available for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () ) { - if (((inst = sipConvertFromInstance (cpp, sipClass_KNotify_Event, sipTransferObj)) == NULL) + if (!(inst = sipConvertFromInstance (cpp, sipClass_KNotify_Event, sipTransferObj)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -280,7 +280,7 @@ class ApplicationList %End %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *cpplist = new TQPtrList; @@ -292,7 +292,7 @@ class ApplicationList for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KNotify::Event *)sipForceConvertToType(elem, sipType_KNotify_Event, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (KNotify::Event *)sipForceConvertToType(elem, sipType_KNotify_Event, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdefile/tdefilebookmark.sip b/sip/tdefile/tdefilebookmark.sip index 9623a7a..627bc42 100644 --- a/sip/tdefile/tdefilebookmark.sip +++ b/sip/tdefile/tdefilebookmark.sip @@ -97,8 +97,8 @@ signals: // Create the list - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; // Get it. @@ -109,11 +109,11 @@ signals: // the loop depends on the type of iterator the tmeplate makes available for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () ) { - if (((inst = sipConvertFromInstance (cpp, sipClass_KFileBookmark, sipTransferObj)) == NULL) + if (!(inst = sipConvertFromInstance (cpp, sipClass_KFileBookmark, sipTransferObj)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -121,7 +121,7 @@ signals: %End %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *cpplist = new TQPtrList; @@ -133,7 +133,7 @@ signals: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KFileBookmark *)sipForceConvertToType(elem, sipType_KFileBookmark, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (KFileBookmark *)sipForceConvertToType(elem, sipType_KFileBookmark, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdefile/tdefiletreebranch.sip b/sip/tdefile/tdefiletreebranch.sip index 75e7874..ee25913 100644 --- a/sip/tdefile/tdefiletreebranch.sip +++ b/sip/tdefile/tdefiletreebranch.sip @@ -99,8 +99,8 @@ typedef TQPtrList KFileTreeViewItemList; // Create the list - if ((ftvilist = PyList_New(0)) == NULL) - return NULL; + if (!(ftvilist = PyList_New(0))) + return nullptr; // Get it. @@ -111,11 +111,11 @@ typedef TQPtrList KFileTreeViewItemList; for( ftvi = cList->first(); ftvi; ftvi = cList->next ()) { item = sipConvertFromInstance (ftvi, sipClass_KFileTreeViewItem, sipTransferObj); - if ((item == NULL) || (PyList_Append (ftvilist, item) < 0)) + if ((!item) || (PyList_Append (ftvilist, item) < 0)) { Py_XDECREF (item); Py_DECREF (ftvilist); - return NULL; + return nullptr; } } @@ -125,7 +125,7 @@ typedef TQPtrList KFileTreeViewItemList; %ConvertToTypeCode // Convert a Python list to a KFileTreeViewItemList on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *cList = new TQPtrList; @@ -137,7 +137,7 @@ typedef TQPtrList KFileTreeViewItemList; for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - ftvi = (KFileTreeViewItem *)sipForceConvertToType(elem, sipType_KFileTreeViewItem, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + ftvi = (KFileTreeViewItem *)sipForceConvertToType(elem, sipType_KFileTreeViewItem, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -174,8 +174,8 @@ typedef TQPtrList KFileTreeViewItemList; // Create the list - if ((ftblist = PyList_New(0)) == NULL) - return NULL; + if (!(ftblist = PyList_New(0))) + return nullptr; // Get it. @@ -186,11 +186,11 @@ typedef TQPtrList KFileTreeViewItemList; for( ftb = cList->first(); ftb; ftb = cList->next ()) { item = sipConvertFromInstance (ftb, sipClass_KFileTreeBranch, sipTransferObj); - if ((item == NULL) || (PyList_Append (ftblist, item) < 0)) + if ((!item) || (PyList_Append (ftblist, item) < 0)) { Py_XDECREF (item); Py_DECREF (ftblist); - return NULL; + return nullptr; } } @@ -200,7 +200,7 @@ typedef TQPtrList KFileTreeViewItemList; %ConvertToTypeCode // Convert a Python list to a KFileTreeBranchList on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *cList = new TQPtrList; @@ -212,7 +212,7 @@ typedef TQPtrList KFileTreeViewItemList; for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - ftb = (KFileTreeBranch *)sipForceConvertToType(elem, sipType_KFileTreeBranch, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + ftb = (KFileTreeBranch *)sipForceConvertToType(elem, sipType_KFileTreeBranch, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdehtml/tdehtml_settings.sip b/sip/tdehtml/tdehtml_settings.sip index f467586..7a22cc9 100644 --- a/sip/tdehtml/tdehtml_settings.sip +++ b/sip/tdehtml/tdehtml_settings.sip @@ -223,8 +223,8 @@ typedef TQPair AssignPair; // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; @@ -232,19 +232,19 @@ typedef TQPair AssignPair; TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - PyObject *inst = NULL; + PyObject *inst = nullptr; TQString s = (*it).first; TQChar c = (*it).second; PyObject *pys = sipConvertFromNewType(new TQString(s), sipType_TQString, sipTransferObj); PyObject *pyc = sipConvertFromNewType(new TQChar(c), sipType_TQChar, sipTransferObj); - if ((pys == NULL) || ((inst = Py_BuildValue ("NN", pys, pyc)) == NULL) + if (!pys || !(inst = Py_BuildValue ("NN", pys, pyc)) || PyList_Append (pylist, inst) < 0) { Py_XDECREF (inst); Py_XDECREF (pys); Py_XDECREF (pyc); Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -253,7 +253,7 @@ typedef TQPair AssignPair; %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; diff --git a/sip/tdeio/authinfo.sip b/sip/tdeio/authinfo.sip index e3b5a07..7485cd9 100644 --- a/sip/tdeio/authinfo.sip +++ b/sip/tdeio/authinfo.sip @@ -141,8 +141,8 @@ typedef TQMap KStringListMap; // Create the dictionary. - if ((dict = PyDict_New()) == NULL) - return NULL; + if (!(dict = PyDict_New())) + return nullptr; // Get it. @@ -154,12 +154,12 @@ typedef TQMap KStringListMap; PyObject *sKey = PyBytes_FromString ((const char *)((TQString)it.key ())); PyObject *sData = sipConvertFromInstance ((void *)&it.data (), sipClass_TQStringList, sipTransferObj); - if ((sKey == NULL) || (sData == NULL) || (PyDict_SetItem (dict, sKey, sData) < 0)) + if ((!sKey) || (!sData) || (PyDict_SetItem (dict, sKey, sData) < 0)) { Py_XDECREF (sKey); Py_XDECREF (sData); Py_DECREF (dict); - return NULL; + return nullptr; } } @@ -168,7 +168,7 @@ typedef TQMap KStringListMap; %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyDict_Check(sipPy); TQMap *map = new TQMap; diff --git a/sip/tdeio/global.sip b/sip/tdeio/global.sip index 5426bc6..54af7cb 100644 --- a/sip/tdeio/global.sip +++ b/sip/tdeio/global.sip @@ -497,8 +497,8 @@ TDEIO::MetaData testTDEIOMetaData (TDEIO::MetaData); // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -507,11 +507,11 @@ TDEIO::MetaData testTDEIOMetaData (TDEIO::MetaData); TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new TDEIO::UDSAtom(*it), sipType_TDEIO_UDSAtom, NULL)) == NULL) + if (!(inst = sipConvertFromNewType(new TDEIO::UDSAtom(*it), sipType_TDEIO_UDSAtom, nullptr)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -520,7 +520,7 @@ TDEIO::MetaData testTDEIOMetaData (TDEIO::MetaData); %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -532,7 +532,7 @@ TDEIO::MetaData testTDEIOMetaData (TDEIO::MetaData); for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEIO::UDSAtom *)sipForceConvertToType(elem, sipType_TDEIO_UDSAtom, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEIO::UDSAtom *)sipForceConvertToType(elem, sipType_TDEIO_UDSAtom, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -565,8 +565,8 @@ TDEIO::MetaData testTDEIOMetaData (TDEIO::MetaData); // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -581,7 +581,7 @@ TDEIO::MetaData testTDEIOMetaData (TDEIO::MetaData); if (PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -590,7 +590,7 @@ TDEIO::MetaData testTDEIOMetaData (TDEIO::MetaData); %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -602,7 +602,7 @@ TDEIO::MetaData testTDEIOMetaData (TDEIO::MetaData); for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEIO::UDSEntry *)sipForceConvertToType(elem, sipType_TDEIO_UDSEntry, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEIO::UDSEntry *)sipForceConvertToType(elem, sipType_TDEIO_UDSEntry, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -639,8 +639,8 @@ TDEIO::MetaData testTDEIOMetaData (TDEIO::MetaData); // Create the dictionary. - if ((dict = PyDict_New()) == NULL) - return NULL; + if (!(dict = PyDict_New())) + return nullptr; // Get it. @@ -653,14 +653,14 @@ TDEIO::MetaData testTDEIOMetaData (TDEIO::MetaData); TQString bcpp = it.data (); PyObject *ainst; PyObject *binst; - if (((ainst = sipConvertFromNewType(new TQString(acpp), sipType_TQString, sipTransferObj)) == NULL) - || ((binst = sipConvertFromNewType(new TQString(bcpp), sipType_TQString, sipTransferObj)) == NULL) + if (!(ainst = sipConvertFromNewType(new TQString(acpp), sipType_TQString, sipTransferObj)) + || !(binst = sipConvertFromNewType(new TQString(bcpp), sipType_TQString, sipTransferObj)) || (PyDict_SetItem (dict, ainst, binst) < 0)) { Py_XDECREF (ainst); Py_XDECREF (binst); Py_DECREF (dict); - return NULL; + return nullptr; } } @@ -671,7 +671,7 @@ TDEIO::MetaData testTDEIOMetaData (TDEIO::MetaData); %ConvertToTypeCode // Convert a Python dictionary to a TQMap on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyDict_Check(sipPy); diff --git a/sip/tdeio/jobclasses.sip b/sip/tdeio/jobclasses.sip index d1e2474..0c78bc9 100644 --- a/sip/tdeio/jobclasses.sip +++ b/sip/tdeio/jobclasses.sip @@ -692,8 +692,8 @@ protected: // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -702,11 +702,11 @@ protected: TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new TDEIO::CopyInfo(*it), sipType_TDEIO_CopyInfo, NULL)) == NULL) + if (!(inst = sipConvertFromNewType(new TDEIO::CopyInfo(*it), sipType_TDEIO_CopyInfo, nullptr)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -715,7 +715,7 @@ protected: %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -727,7 +727,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEIO::CopyInfo *)sipForceConvertToType(elem, sipType_TDEIO_CopyInfo, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEIO::CopyInfo *)sipForceConvertToType(elem, sipType_TDEIO_CopyInfo, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeio/kacl.sip b/sip/tdeio/kacl.sip index 31059f0..cde7a40 100644 --- a/sip/tdeio/kacl.sip +++ b/sip/tdeio/kacl.sip @@ -102,8 +102,8 @@ typedef ACLUserPermissionsList ACLGroupPermissionsList; // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -115,13 +115,13 @@ typedef ACLUserPermissionsList ACLGroupPermissionsList; TQString s = (*it).first; ushort u = (*it).second; PyObject *pys = sipConvertFromNewType(new TQString(s), sipType_TQString, sipTransferObj); - if ((pys == NULL) || ((inst = Py_BuildValue ("Ni", pys, u)) == NULL) + if (!pys || !(inst = Py_BuildValue ("Ni", pys, u)) || PyList_Append (pylist, inst) < 0) { Py_XDECREF (inst); Py_XDECREF (pys); Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -130,7 +130,7 @@ typedef ACLUserPermissionsList ACLGroupPermissionsList; %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; diff --git a/sip/tdeio/kdatatool.sip b/sip/tdeio/kdatatool.sip index 522e8c4..2b05bdc 100644 --- a/sip/tdeio/kdatatool.sip +++ b/sip/tdeio/kdatatool.sip @@ -112,8 +112,8 @@ protected: // Create the list - if ((dtiList = PyList_New(0)) == NULL) - return NULL; + if (!(dtiList = PyList_New(0))) + return nullptr; // Get it. @@ -124,11 +124,11 @@ protected: TQValueList::Iterator it; for( it = dlist->begin(); it != dlist->end(); ++it ) { - if ((inst = sipConvertFromNewType(new KDataToolInfo(*it), sipType_KDataToolInfo, NULL)) == NULL + if (!(inst = sipConvertFromNewType(new KDataToolInfo(*it), sipType_KDataToolInfo, nullptr)) || PyList_Append (dtiList, inst) < 0) { Py_DECREF (dtiList); - return NULL; + return nullptr; } } @@ -139,7 +139,7 @@ protected: %ConvertToTypeCode // Convert a Python list to a KDataToolInfoVList on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *dList = new TQValueList; @@ -151,7 +151,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - d = (KDataToolInfo *)sipForceConvertToType(elem, sipType_KDataToolInfo, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + d = (KDataToolInfo *)sipForceConvertToType(elem, sipType_KDataToolInfo, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeio/kdirlister.sip b/sip/tdeio/kdirlister.sip index 953e75a..50758e2 100644 --- a/sip/tdeio/kdirlister.sip +++ b/sip/tdeio/kdirlister.sip @@ -140,8 +140,8 @@ protected: // Create the list - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; // Get it. @@ -152,11 +152,11 @@ protected: // the loop depends on the type of iterator the tmeplate makes available for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () ) { - if (((inst = sipConvertFromInstance (cpp, sipClass_KFileItem, sipTransferObj)) == NULL) + if (!(inst = sipConvertFromInstance (cpp, sipClass_KFileItem, sipTransferObj)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -164,7 +164,7 @@ protected: %End %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *cpplist = new TQPtrList; @@ -176,7 +176,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KFileItem *)sipForceConvertToType(elem, sipType_KFileItem, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (KFileItem *)sipForceConvertToType(elem, sipType_KFileItem, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -210,8 +210,8 @@ protected: // Create the list - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; // Get it. @@ -222,11 +222,11 @@ protected: // the loop depends on the type of iterator the tmeplate makes available for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () ) { - if (((inst = sipConvertFromInstance (cpp, sipClass_TQRegExp, sipTransferObj)) == NULL) + if (!(inst = sipConvertFromInstance (cpp, sipClass_TQRegExp, sipTransferObj)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -234,7 +234,7 @@ protected: %End %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *cpplist = new TQPtrList; @@ -246,7 +246,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TQRegExp *)sipForceConvertToType(elem, sipType_TQRegExp, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TQRegExp *)sipForceConvertToType(elem, sipType_TQRegExp, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeio/kmimetype.sip b/sip/tdeio/kmimetype.sip index 467a1d8..4f0b05e 100644 --- a/sip/tdeio/kmimetype.sip +++ b/sip/tdeio/kmimetype.sip @@ -250,7 +250,7 @@ protected: // Convert to a Python instance if (!sipCpp) - return NULL; + return nullptr; TDESharedPtr *cPtr = (TDESharedPtr *)sipCpp; KMimeType *cpp = new KMimeType (*cPtr->data ()); @@ -262,11 +262,11 @@ protected: %ConvertToTypeCode // Convert a Python instance to a Ptr on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return sipCanConvertToType(sipPy, sipType_KMimeType, SIP_NO_CONVERTORS); int iserr = 0; - KMimeType *cpp = (KMimeType *)sipConvertToType(sipPy, sipType_KMimeType, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + KMimeType *cpp = (KMimeType *)sipConvertToType(sipPy, sipType_KMimeType, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -295,8 +295,8 @@ protected: // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -305,11 +305,11 @@ protected: TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new KDEDesktopMimeType::Service(*it), sipType_KDEDesktopMimeType_Service, NULL)) == NULL) + if (!(inst = sipConvertFromNewType(new KDEDesktopMimeType::Service(*it), sipType_KDEDesktopMimeType_Service, nullptr)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -318,7 +318,7 @@ protected: %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -330,7 +330,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KDEDesktopMimeType::Service *)sipForceConvertToType(elem, sipType_KDEDesktopMimeType_Service, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (KDEDesktopMimeType::Service *)sipForceConvertToType(elem, sipType_KDEDesktopMimeType_Service, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -366,8 +366,8 @@ protected: // Create the list - if ((plist = PyList_New(0)) == NULL) - return NULL; + if (!(plist = PyList_New(0))) + return nullptr; // Get it. @@ -379,12 +379,12 @@ protected: for( it = cList->begin(); it != cList->end(); ++it ) { svc = new KMimeType (*(KMimeType *)((KMimeType::Ptr)(*it)).data ()); - inst = sipConvertFromNewType(svc, sipType_KMimeType, NULL); - if ((inst == NULL) || (PyList_Append (plist, inst) < 0)) + inst = sipConvertFromNewType(svc, sipType_KMimeType, nullptr); + if ((!inst) || (PyList_Append (plist, inst) < 0)) { Py_XDECREF (inst); Py_DECREF (plist); - return NULL; + return nullptr; } } @@ -394,7 +394,7 @@ protected: %ConvertToTypeCode // Convert a Python list to List on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cList = new TQValueList; @@ -405,7 +405,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - service = (KMimeType *)sipForceConvertToType(elem, sipType_KMimeType, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + service = (KMimeType *)sipForceConvertToType(elem, sipType_KMimeType, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); KMimeType::Ptr *ptr = new KMimeType::Ptr (service); diff --git a/sip/tdeio/kprotocolinfo.sip b/sip/tdeio/kprotocolinfo.sip index 566f1a8..0532adb 100644 --- a/sip/tdeio/kprotocolinfo.sip +++ b/sip/tdeio/kprotocolinfo.sip @@ -185,7 +185,7 @@ protected: // Convert to a Python instance if (!sipCpp) - return NULL; + return nullptr; TDESharedPtr *cPtr = new TDESharedPtr(*(TDESharedPtr *)sipCpp); KProtocolInfo *cpp = cPtr->data (); @@ -197,11 +197,11 @@ protected: %ConvertToTypeCode // Convert a Python instance to a Ptr on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return sipCanConvertToType(sipPy, sipType_KProtocolInfo, SIP_NO_CONVERTORS); int iserr = 0; - KProtocolInfo *cpp = (KProtocolInfo *)sipConvertToType(sipPy, sipType_KProtocolInfo, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + KProtocolInfo *cpp = (KProtocolInfo *)sipConvertToType(sipPy, sipType_KProtocolInfo, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -230,8 +230,8 @@ protected: // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -240,11 +240,11 @@ protected: TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new KProtocolInfo::ExtraField(*it), sipType_KProtocolInfo_ExtraField, sipTransferObj)) == NULL) + if (!(inst = sipConvertFromNewType(new KProtocolInfo::ExtraField(*it), sipType_KProtocolInfo_ExtraField, sipTransferObj)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -253,7 +253,7 @@ protected: %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -265,7 +265,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KProtocolInfo::ExtraField *)sipForceConvertToType(elem, sipType_KProtocolInfo_ExtraField, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (KProtocolInfo::ExtraField *)sipForceConvertToType(elem, sipType_KProtocolInfo_ExtraField, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeio/kservice.sip b/sip/tdeio/kservice.sip index f0b8c8d..b7a2278 100644 --- a/sip/tdeio/kservice.sip +++ b/sip/tdeio/kservice.sip @@ -172,7 +172,7 @@ protected: // Convert to a Python instance if (!sipCpp) - return NULL; + return nullptr; TDESharedPtr *cPtr = new TDESharedPtr (*(TDESharedPtr *)sipCpp); KService *cpp = cPtr->data (); @@ -184,11 +184,11 @@ protected: %ConvertToTypeCode // Convert a Python instance to a Ptr on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return sipCanConvertToType(sipPy, sipType_KService, SIP_NO_CONVERTORS); int iserr = 0; - KService *cpp = (KService *)sipConvertToType(sipPy, sipType_KService, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + KService *cpp = (KService *)sipConvertToType(sipPy, sipType_KService, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -224,8 +224,8 @@ typedef TQValueList List; PyObject *plist; // Create the list - if ((plist = PyList_New(0)) == NULL) - return NULL; + if (!(plist = PyList_New(0))) + return nullptr; // Get it. KService::List *cList = (KService::List *)sipCpp; @@ -239,11 +239,11 @@ typedef TQValueList List; svc = &svcptr; inst = sipConvertFromType(svc, sipType_KService_Ptr, sipTransferObj); - if ((inst == NULL) || (PyList_Append (plist, inst) < 0)) + if ((!inst) || (PyList_Append (plist, inst) < 0)) { Py_XDECREF (inst); Py_DECREF (plist); - return NULL; + return nullptr; } } @@ -252,7 +252,7 @@ typedef TQValueList List; %ConvertToTypeCode // Convert a Python list to List on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); KService::List *cList = new KService::List; @@ -264,7 +264,7 @@ typedef TQValueList List; for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - service = (KService *)sipForceConvertToType(elem, sipType_KService, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + service = (KService *)sipForceConvertToType(elem, sipType_KService, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeio/kservicegroup.sip b/sip/tdeio/kservicegroup.sip index f322b18..3fec329 100644 --- a/sip/tdeio/kservicegroup.sip +++ b/sip/tdeio/kservicegroup.sip @@ -171,7 +171,7 @@ public: // Convert to a Python instance if (!sipCpp) - return NULL; + return nullptr; TDESharedPtr *cPtr = new TDESharedPtr (*(TDESharedPtr *)sipCpp); KServiceGroup *cpp = cPtr->data (); @@ -183,11 +183,11 @@ public: %ConvertToTypeCode // Convert a Python instance to a Ptr on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return sipCanConvertToType(sipPy, sipType_KServiceGroup, SIP_NO_CONVERTORS); int iserr = 0; - KServiceGroup *cpp = (KServiceGroup *)sipConvertToType(sipPy, sipType_KServiceGroup, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + KServiceGroup *cpp = (KServiceGroup *)sipConvertToType(sipPy, sipType_KServiceGroup, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -223,8 +223,8 @@ public: PyObject *plist; - if ((plist = PyList_New(0)) == NULL) - return NULL; + if (!(plist = PyList_New(0))) + return nullptr; // Get it. @@ -239,11 +239,11 @@ public: svcGroupType = &svcptr; inst = sipConvertFromType(svcGroupType, sipType_KSycocaEntry_Ptr, sipTransferObj); - if ((inst == NULL) || (PyList_Append (plist, inst) < 0)) + if ((!inst) || (PyList_Append (plist, inst) < 0)) { Py_XDECREF (inst); Py_DECREF (plist); - return NULL; + return nullptr; } } @@ -253,7 +253,7 @@ public: %ConvertToTypeCode // Convert a Python list to List on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); KServiceGroup::List *cList = new KServiceGroup::List; @@ -265,7 +265,7 @@ public: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - service = (KSycocaEntry *)sipForceConvertToType(elem, sipType_KSycocaEntry, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + service = (KSycocaEntry *)sipForceConvertToType(elem, sipType_KSycocaEntry, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeio/kservicetype.sip b/sip/tdeio/kservicetype.sip index df72c8d..46ec109 100644 --- a/sip/tdeio/kservicetype.sip +++ b/sip/tdeio/kservicetype.sip @@ -93,7 +93,7 @@ protected: // Convert to a Python instance if (!sipCpp) - return NULL; + return nullptr; KServiceType::Ptr *cPtr = new KServiceType::Ptr (*(KServiceType::Ptr *)sipCpp); KServiceType *cpp = cPtr->data (); @@ -105,11 +105,11 @@ protected: %ConvertToTypeCode // Convert a Python instance to a Ptr on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return sipCanConvertToType(sipPy, sipType_KServiceType, SIP_NO_CONVERTORS); int iserr = 0; - KServiceType *cpp = (KServiceType *)sipConvertToType(sipPy, sipType_KServiceType, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + KServiceType *cpp = (KServiceType *)sipConvertToType(sipPy, sipType_KServiceType, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -142,8 +142,8 @@ protected: // Create the dictionary. - if ((dict = PyDict_New()) == NULL) - return NULL; + if (!(dict = PyDict_New())) + return nullptr; // Get it. @@ -156,13 +156,13 @@ protected: int bcpp = (int) it.data (); PyObject *ainst; PyObject *binst = PyLong_FromLong (bcpp); - if (((ainst = sipConvertFromNewType(new TQString (acpp), sipType_TQString, sipTransferObj)) == NULL) + if (!(ainst = sipConvertFromNewType(new TQString (acpp), sipType_TQString, sipTransferObj)) || (PyDict_SetItem (dict, ainst, binst) < 0)) { Py_XDECREF (ainst); Py_XDECREF (binst); Py_DECREF (dict); - return NULL; + return nullptr; } } @@ -173,7 +173,7 @@ protected: %ConvertToTypeCode // Convert a Python dictionary to a TQMap on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyDict_Check(sipPy); TQMap *cppmap = new TQMap; @@ -229,8 +229,8 @@ protected: PyObject *plist; // Create the list - if ((plist = PyList_New(0)) == NULL) - return NULL; + if (!(plist = PyList_New(0))) + return nullptr; // Get it. TQValueList *cList = (TQValueList *)sipCpp; @@ -244,11 +244,11 @@ protected: svc = &svcptr; inst = sipConvertFromType(svc, sipType_KServiceType_Ptr, sipTransferObj); - if ((inst == NULL) || (PyList_Append (plist, inst) < 0)) + if ((!inst) || (PyList_Append (plist, inst) < 0)) { Py_XDECREF (inst); Py_DECREF (plist); - return NULL; + return nullptr; } } @@ -258,7 +258,7 @@ protected: %ConvertToTypeCode // Convert a Python list to List on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cList = new TQValueList; @@ -270,7 +270,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - service = (KServiceType *)sipForceConvertToType(elem, sipType_KServiceType, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + service = (KServiceType *)sipForceConvertToType(elem, sipType_KServiceType, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeio/ktrader.sip b/sip/tdeio/ktrader.sip index 9f4780f..1bf435a 100644 --- a/sip/tdeio/ktrader.sip +++ b/sip/tdeio/ktrader.sip @@ -66,8 +66,8 @@ protected: // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -82,7 +82,7 @@ protected: if (PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -91,7 +91,7 @@ protected: %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -103,7 +103,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KService::Ptr *)sipForceConvertToType(elem, sipType_KService_Ptr, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (KService::Ptr *)sipForceConvertToType(elem, sipType_KService_Ptr, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeio/kuserprofile.sip b/sip/tdeio/kuserprofile.sip index e0f780a..3742518 100644 --- a/sip/tdeio/kuserprofile.sip +++ b/sip/tdeio/kuserprofile.sip @@ -91,8 +91,8 @@ protected: // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -101,11 +101,11 @@ protected: TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new KServiceOffer(*it), sipType_KServiceOffer, NULL)) == NULL) + if (!(inst = sipConvertFromNewType(new KServiceOffer(*it), sipType_KServiceOffer, nullptr)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -113,7 +113,7 @@ protected: %End %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -125,7 +125,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KServiceOffer *)sipForceConvertToType(elem, sipType_KServiceOffer, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (KServiceOffer *)sipForceConvertToType(elem, sipType_KServiceOffer, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -163,8 +163,8 @@ protected: // Create the list - if ((plist = PyList_New(0)) == NULL) - return NULL; + if (!(plist = PyList_New(0))) + return nullptr; // Get it. @@ -175,11 +175,11 @@ protected: for( svc = cList->first (); svc; svc = cList->next ()) { inst = sipConvertFromInstance (svc, sipClass_KServiceTypeProfile, sipTransferObj); - if ((inst == NULL) || (PyList_Append (plist, inst) < 0)) + if ((!inst) || (PyList_Append (plist, inst) < 0)) { Py_XDECREF (inst); Py_DECREF (plist); - return NULL; + return nullptr; } } @@ -189,7 +189,7 @@ protected: %ConvertToTypeCode // Convert a Python list to SvcTypeProfileList on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *cList = new TQPtrList; @@ -201,7 +201,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - service = (KServiceTypeProfile *)sipForceConvertToType(elem, sipType_KServiceTypeProfile, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + service = (KServiceTypeProfile *)sipForceConvertToType(elem, sipType_KServiceTypeProfile, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeio/tdesycocaentry.sip b/sip/tdeio/tdesycocaentry.sip index b11484c..f533c64 100644 --- a/sip/tdeio/tdesycocaentry.sip +++ b/sip/tdeio/tdesycocaentry.sip @@ -77,7 +77,7 @@ protected: // Convert to a Python instance if (!sipCpp) - return NULL; + return nullptr; TDESharedPtr *cPtr = new TDESharedPtr (*(TDESharedPtr *)sipCpp); KSycocaEntry *cpp = cPtr->data (); @@ -89,11 +89,11 @@ protected: %ConvertToTypeCode // Convert a Python instance to a Ptr on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return sipCanConvertToType(sipPy, sipType_KSycocaEntry, SIP_NO_CONVERTORS); int iserr = 0; - KSycocaEntry *cpp = (KSycocaEntry *)sipConvertToType(sipPy, sipType_KSycocaEntry, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + KSycocaEntry *cpp = (KSycocaEntry *)sipConvertToType(sipPy, sipType_KSycocaEntry, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -130,8 +130,8 @@ protected: // Create the list - if ((plist = PyList_New(0)) == NULL) - return NULL; + if (!(plist = PyList_New(0))) + return nullptr; // Get it. @@ -157,13 +157,13 @@ protected: inst = sipConvertFromType(svcGroupType, sipType_KServiceGroup_Ptr, sipTransferObj); } else - inst = NULL; + inst = nullptr; - if ((inst == NULL) || (PyList_Append (plist, inst) < 0)) + if ((!inst) || (PyList_Append (plist, inst) < 0)) { Py_XDECREF (inst); Py_DECREF (plist); - return NULL; + return nullptr; } } @@ -173,7 +173,7 @@ protected: %ConvertToTypeCode // Convert a Python list to List on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); KSycocaEntry::List *cList = new KSycocaEntry::List; @@ -185,7 +185,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - service = (KSycocaEntry *)sipForceConvertToType(elem, sipType_KSycocaEntry, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + service = (KSycocaEntry *)sipForceConvertToType(elem, sipType_KSycocaEntry, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdemdi/tdemdichildfrm.sip b/sip/tdemdi/tdemdichildfrm.sip index 0975ea5..5ecac01 100644 --- a/sip/tdemdi/tdemdichildfrm.sip +++ b/sip/tdemdi/tdemdichildfrm.sip @@ -208,8 +208,8 @@ protected: // Create the dictionary. - if ((dict = PyDict_New()) == NULL) - return NULL; + if (!(dict = PyDict_New())) + return nullptr; // Get it. @@ -222,12 +222,12 @@ protected: PyObject *a0 = sipConvertFromInstance (¤t_key, sipClass_TQString, sipTransferObj); PyObject *a1 = PyLong_FromLong ((long) it.current ()); - if ((a0 == NULL) || (a1 == NULL) || (PyDict_SetItem (dict, a0, a1) < 0)) + if ((!a0) || (!a1) || (PyDict_SetItem (dict, a0, a1) < 0)) { Py_XDECREF (a0); Py_XDECREF (a1); Py_DECREF (dict); - return NULL; + return nullptr; } } @@ -238,7 +238,7 @@ protected: %ConvertToTypeCode // Convert a Python dictionary to a TQDict on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyDict_Check(sipPy); TQDict* tqdict = new TQDict; diff --git a/sip/tdemdi/tdemdimainfrm.sip b/sip/tdemdi/tdemdimainfrm.sip index df213b4..359d834 100644 --- a/sip/tdemdi/tdemdimainfrm.sip +++ b/sip/tdemdi/tdemdimainfrm.sip @@ -215,8 +215,8 @@ signals: // Create the list - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; // Get it. @@ -227,11 +227,11 @@ signals: // the loop depends on the type of iterator the tmeplate makes available for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () ) { - if (((inst = sipConvertFromInstance (cpp, sipClass_KDockWidget, sipTransferObj)) == NULL) + if (!(inst = sipConvertFromInstance (cpp, sipClass_KDockWidget, sipTransferObj)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -239,7 +239,7 @@ signals: %End %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *cpplist = new TQPtrList; @@ -251,7 +251,7 @@ signals: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KDockWidget *)sipForceConvertToType(elem, sipType_KDockWidget, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (KDockWidget *)sipForceConvertToType(elem, sipType_KDockWidget, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -283,8 +283,8 @@ signals: // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -293,11 +293,11 @@ signals: TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new TQRect(*it), sipType_TQRect, NULL)) == NULL) + if (!(inst = sipConvertFromNewType(new TQRect(*it), sipType_TQRect, nullptr)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -306,7 +306,7 @@ signals: %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -318,7 +318,7 @@ signals: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TQRect *)sipForceConvertToType(elem, sipType_TQRect, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TQRect *)sipForceConvertToType(elem, sipType_TQRect, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeparts/browserextension.sip b/sip/tdeparts/browserextension.sip index 88e3f4c..0ed3d9c 100644 --- a/sip/tdeparts/browserextension.sip +++ b/sip/tdeparts/browserextension.sip @@ -379,8 +379,8 @@ TQMap testTQMapTQCStringInt (TQMap); // Create the dictionary. - if ((dict = PyDict_New()) == NULL) - return NULL; + if (!(dict = PyDict_New())) + return nullptr; // Get it. @@ -392,15 +392,15 @@ TQMap testTQMapTQCStringInt (TQMap); TQCString acpp = it.key (); TQCString bcpp = it.data (); PyObject *ainst; - PyObject *binst = NULL; - if (((ainst = sipConvertFromNewType(new TQCString (acpp), sipType_TQCString, NULL)) == NULL) - || ((binst = sipConvertFromNewType(new TQCString (bcpp), sipType_TQCString, NULL)) == NULL) + PyObject *binst = nullptr; + if (!(ainst = sipConvertFromNewType(new TQCString (acpp), sipType_TQCString, nullptr)) + || !(binst = sipConvertFromNewType(new TQCString (bcpp), sipType_TQCString, nullptr)) || (PyDict_SetItem (dict, ainst, binst) < 0)) { Py_XDECREF (ainst); Py_XDECREF (binst); Py_DECREF (dict); - return NULL; + return nullptr; } } @@ -411,7 +411,7 @@ TQMap testTQMapTQCStringInt (TQMap); %ConvertToTypeCode // Convert a Python dictionary to a TQMap on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyDict_Check(sipPy); TQMap *cppmap = new TQMap; @@ -425,8 +425,8 @@ TQMap testTQMapTQCStringInt (TQMap); { int iserr = 0; - acpp = (TQCString *)sipForceConvertToType(aelem, sipType_TQCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); - bcpp = (TQCString *)sipForceConvertToType(belem, sipType_TQCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + acpp = (TQCString *)sipForceConvertToType(aelem, sipType_TQCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); + bcpp = (TQCString *)sipForceConvertToType(belem, sipType_TQCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -462,8 +462,8 @@ TQMap testTQMapTQCStringInt (TQMap); // Create the dictionary. - if ((dict = PyDict_New()) == NULL) - return NULL; + if (!(dict = PyDict_New())) + return nullptr; // Get it. @@ -475,15 +475,15 @@ TQMap testTQMapTQCStringInt (TQMap); TQCString acpp = it.key (); int bcpp = it.data (); PyObject *ainst; - PyObject *binst = NULL; - if (((ainst = sipConvertFromNewType(new TQCString (acpp), sipType_TQCString, NULL)) == NULL) - || ((binst = PyLong_FromLong (bcpp)) == NULL) + PyObject *binst = nullptr; + if (!(ainst = sipConvertFromNewType(new TQCString (acpp), sipType_TQCString, nullptr)) + || !(binst = PyLong_FromLong (bcpp)) || (PyDict_SetItem (dict, ainst, binst) < 0)) { Py_XDECREF (ainst); Py_XDECREF (binst); Py_DECREF (dict); - return NULL; + return nullptr; } } @@ -494,7 +494,7 @@ TQMap testTQMapTQCStringInt (TQMap); %ConvertToTypeCode // Convert a Python dictionary to a TQMap on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyDict_Check(sipPy); TQMap *cppmap = new TQMap; @@ -508,7 +508,7 @@ TQMap testTQMapTQCStringInt (TQMap); { int iserr = 0; - acpp = (TQCString *)sipForceConvertToType(aelem, sipType_TQCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + acpp = (TQCString *)sipForceConvertToType(aelem, sipType_TQCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr || !PyLong_Check (belem)) { @@ -544,8 +544,8 @@ TQMap testTQMapTQCStringInt (TQMap); // Create the list - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; // Get it. @@ -556,11 +556,11 @@ TQMap testTQMapTQCStringInt (TQMap); // the loop depends on the type of iterator the tmeplate makes available for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () ) { - if (((inst = sipConvertFromInstance (cpp, sipClass_KParts_ReadOnlyPart, sipTransferObj)) == NULL) + if (!(inst = sipConvertFromInstance (cpp, sipClass_KParts_ReadOnlyPart, sipTransferObj)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -568,7 +568,7 @@ TQMap testTQMapTQCStringInt (TQMap); %End %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *cpplist = new TQPtrList; @@ -580,7 +580,7 @@ TQMap testTQMapTQCStringInt (TQMap); for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KParts::ReadOnlyPart *)sipForceConvertToType(elem, sipType_KParts_ReadOnlyPart, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (KParts::ReadOnlyPart *)sipForceConvertToType(elem, sipType_KParts_ReadOnlyPart, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeparts/part.sip b/sip/tdeparts/part.sip index 310152a..49462c6 100644 --- a/sip/tdeparts/part.sip +++ b/sip/tdeparts/part.sip @@ -285,7 +285,7 @@ KParts::ReadWritePart* createReadWritePart (const TQString&, TQObject* = 0, cons KParts::ReadOnlyPart *createReadOnlyPart (const TQString& lib, TQObject *parent, const TQString& name, const char *className, const TQStringList &args) { - KParts::ReadOnlyPart *res = NULL; + KParts::ReadOnlyPart *res = nullptr; KLibFactory *factory = KLibLoader::self ()->factory ((const char *)lib); @@ -298,7 +298,7 @@ KParts::ReadOnlyPart *createReadOnlyPart (const TQString& lib, TQObject *parent, KParts::ReadWritePart *createReadWritePart (const TQString& lib, TQObject *parent, const TQString& name, const char *className, const TQStringList &args) { - KParts::ReadWritePart *res = NULL; + KParts::ReadWritePart *res = nullptr; KLibFactory *factory = KLibLoader::self ()->factory ((const char *)lib); diff --git a/sip/tdeparts/partmanager.sip b/sip/tdeparts/partmanager.sip index c4ebc86..3aa3978 100644 --- a/sip/tdeparts/partmanager.sip +++ b/sip/tdeparts/partmanager.sip @@ -124,8 +124,8 @@ protected: // Create the list - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; // Get it. @@ -136,11 +136,11 @@ protected: // the loop depends on the type of iterator the tmeplate makes available for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () ) { - if (((inst = sipConvertFromInstance (cpp, sipClass_KParts_Part, sipTransferObj)) == NULL) + if (!(inst = sipConvertFromInstance (cpp, sipClass_KParts_Part, sipTransferObj)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -148,7 +148,7 @@ protected: %End %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *cpplist = new TQPtrList; @@ -160,7 +160,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KParts::Part *)sipForceConvertToType(elem, sipType_KParts_Part, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (KParts::Part *)sipForceConvertToType(elem, sipType_KParts_Part, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeparts/plugin.sip b/sip/tdeparts/plugin.sip index 670ef6b..73561ff 100644 --- a/sip/tdeparts/plugin.sip +++ b/sip/tdeparts/plugin.sip @@ -84,8 +84,8 @@ protected: // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -94,11 +94,11 @@ protected: TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromNewType(new KParts::Plugin::PluginInfo(*it), sipType_KParts_Plugin_PluginInfo, NULL)) == NULL) + if (!(inst = sipConvertFromNewType(new KParts::Plugin::PluginInfo(*it), sipType_KParts_Plugin_PluginInfo, nullptr)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -107,7 +107,7 @@ protected: %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -119,7 +119,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KParts::Plugin::PluginInfo *)sipForceConvertToType(elem, sipType_KParts_Plugin_PluginInfo, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (KParts::Plugin::PluginInfo *)sipForceConvertToType(elem, sipType_KParts_Plugin_PluginInfo, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -153,8 +153,8 @@ protected: // Create the list - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; // Get it. @@ -165,11 +165,11 @@ protected: // the loop depends on the type of iterator the tmeplate makes available for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () ) { - if (((inst = sipConvertFromInstance (cpp, sipClass_KParts_Plugin, sipTransferObj)) == NULL) + if (!(inst = sipConvertFromInstance (cpp, sipClass_KParts_Plugin, sipTransferObj)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -177,7 +177,7 @@ protected: %End %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *cpplist = new TQPtrList; @@ -189,7 +189,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KParts::Plugin *)sipForceConvertToType(elem, sipType_KParts_Plugin, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (KParts::Plugin *)sipForceConvertToType(elem, sipType_KParts_Plugin, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeprint/kmjobmanager.sip b/sip/tdeprint/kmjobmanager.sip index 8382303..a399433 100644 --- a/sip/tdeprint/kmjobmanager.sip +++ b/sip/tdeprint/kmjobmanager.sip @@ -139,8 +139,8 @@ typedef TQPtrList KMJobList; // Create the list - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; // Get it. @@ -151,11 +151,11 @@ typedef TQPtrList KMJobList; // the loop depends on the type of iterator the tmeplate makes available for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () ) { - if (((inst = sipConvertFromInstance (cpp, sipClass_KMJob, sipTransferObj)) == NULL) + if (!(inst = sipConvertFromInstance (cpp, sipClass_KMJob, sipTransferObj)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -163,7 +163,7 @@ typedef TQPtrList KMJobList; %End %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *cpplist = new TQPtrList; @@ -175,7 +175,7 @@ typedef TQPtrList KMJobList; for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KMJob *)sipForceConvertToType(elem, sipType_KMJob, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (KMJob *)sipForceConvertToType(elem, sipType_KMJob, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeprint/kmmanager.sip b/sip/tdeprint/kmmanager.sip index 5fc4b94..a799b52 100644 --- a/sip/tdeprint/kmmanager.sip +++ b/sip/tdeprint/kmmanager.sip @@ -161,8 +161,8 @@ protected: // Create the list - if ((plist = PyList_New(0)) == NULL) - return NULL; + if (!(plist = PyList_New(0))) + return nullptr; // Get it. @@ -173,11 +173,11 @@ protected: for(p = kpList->first (); p; p = kpList->next ()) { inst = sipConvertFromInstance (p, sipClass_KMPrinter, sipTransferObj); - if ((inst == NULL) || (PyList_Append (plist, inst) < 0)) + if ((!inst) || (PyList_Append (plist, inst) < 0)) { Py_XDECREF (inst); Py_DECREF (plist); - return NULL; + return nullptr; } } @@ -187,7 +187,7 @@ protected: %ConvertToTypeCode // Convert a Python list to TQPtrList on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *kpList = new TQPtrList; @@ -199,7 +199,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - p = (KMPrinter *)sipForceConvertToType(elem, sipType_KMPrinter, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + p = (KMPrinter *)sipForceConvertToType(elem, sipType_KMPrinter, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeprint/kprintdialog.sip b/sip/tdeprint/kprintdialog.sip index 87def99..68c8bb0 100644 --- a/sip/tdeprint/kprintdialog.sip +++ b/sip/tdeprint/kprintdialog.sip @@ -110,8 +110,8 @@ public: // Create the list - if ((plist = PyList_New(0)) == NULL) - return NULL; + if (!(plist = PyList_New(0))) + return nullptr; // Get it. @@ -122,11 +122,11 @@ public: for(p = kpList->first (); p; p = kpList->next ()) { inst = sipConvertFromInstance (p, sipClass_KPrintDialogPage, sipTransferObj); - if ((inst == NULL) || (PyList_Append (plist, inst) < 0)) + if ((!inst) || (PyList_Append (plist, inst) < 0)) { Py_XDECREF (inst); Py_DECREF (plist); - return NULL; + return nullptr; } } @@ -136,7 +136,7 @@ public: %ConvertToTypeCode // Convert a Python list to TQPtrList on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *kpList = new TQPtrList; @@ -148,7 +148,7 @@ public: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - p = (KPrintDialogPage *)sipForceConvertToType(elem, sipType_KPrintDialogPage, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + p = (KPrintDialogPage *)sipForceConvertToType(elem, sipType_KPrintDialogPage, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tderesources/selectdialog.sip b/sip/tderesources/selectdialog.sip index bd61888..46252c3 100644 --- a/sip/tderesources/selectdialog.sip +++ b/sip/tderesources/selectdialog.sip @@ -74,8 +74,8 @@ private: // Create the list - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; // Get it. @@ -86,11 +86,11 @@ private: // the loop depends on the type of iterator the tmeplate makes available for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () ) { - if (((inst = sipConvertFromInstance (cpp, sipClass_KRES_Resource, sipTransferObj)) == NULL) + if (!(inst = sipConvertFromInstance (cpp, sipClass_KRES_Resource, sipTransferObj)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -98,7 +98,7 @@ private: %End %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *cpplist = new TQPtrList; @@ -110,7 +110,7 @@ private: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KRES::Resource *)sipForceConvertToType(elem, sipType_KRES_Resource, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (KRES::Resource *)sipForceConvertToType(elem, sipType_KRES_Resource, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeui/keditlistbox.sip b/sip/tdeui/keditlistbox.sip index 526db68..5e8b205 100644 --- a/sip/tdeui/keditlistbox.sip +++ b/sip/tdeui/keditlistbox.sip @@ -103,12 +103,12 @@ public: int n; if ((n = PyList_Size (a0)) == 0) - return NULL; + return nullptr; const char **strings; - if ((strings = PyTQtListToArray(a0)) == NULL) - return NULL; + if (!(strings = PyTQtListToArray(a0))) + return nullptr; Py_BEGIN_ALLOW_THREADS sipCpp->insertStrList (strings, n, a1); @@ -181,8 +181,8 @@ const char **PyTQtListToArray(PyObject *lst) nstr = PyList_Size(lst); - if ((str = (const char **)sipMalloc(nstr * sizeof (char *))) == NULL) - return NULL; + if (!(str = (const char **)sipMalloc(nstr * sizeof (char *)))) + return nullptr; // Convert the list. @@ -193,10 +193,10 @@ const char **PyTQtListToArray(PyObject *lst) PyObject *item = PyList_GetItem(lst, i); const char *item_ascii = sipString_AsASCIIString(&item); - if (item_ascii == NULL) + if (!item_ascii) { sipFree((void *)str); - return NULL; + return nullptr; } *sp++ = item_ascii; diff --git a/sip/tdeui/kkeydialog.sip b/sip/tdeui/kkeydialog.sip index 0f081b6..9ca9a57 100644 --- a/sip/tdeui/kkeydialog.sip +++ b/sip/tdeui/kkeydialog.sip @@ -194,8 +194,8 @@ typedef TQDict IntDict; // Create the dictionary. - if ((dict = PyDict_New()) == NULL) - return NULL; + if (!(dict = PyDict_New())) + return nullptr; // Get it. @@ -208,12 +208,12 @@ typedef TQDict IntDict; PyObject *a0 = sipConvertFromInstance (¤t_key, sipClass_TQCString, sipTransferObj); PyObject *a1 = PyLong_FromLong ((long) it.current ()); - if ((a0 == NULL) || (a1 == NULL) || (PyDict_SetItem (dict, a0, a1) < 0)) + if ((!a0) || (!a1) || (PyDict_SetItem (dict, a0, a1) < 0)) { Py_XDECREF (a0); Py_XDECREF (a1); Py_DECREF (dict); - return NULL; + return nullptr; } } @@ -224,7 +224,7 @@ typedef TQDict IntDict; %ConvertToTypeCode // Convert a Python dictionary to a TQDict on the heap. - if (sipIsErr == NULL) + if (!sipIsErr) return PyDict_Check(sipPy); TQDict* tqdict = new TQDict; diff --git a/sip/tdeui/kstdguiitem.sip b/sip/tdeui/kstdguiitem.sip index eb9d550..87f8f37 100644 --- a/sip/tdeui/kstdguiitem.sip +++ b/sip/tdeui/kstdguiitem.sip @@ -300,23 +300,23 @@ public: // Create the tuple PyObject *pytuple; - if ((pytuple = PyTuple_New(0)) == NULL) - return NULL; + if (!(pytuple = PyTuple_New(0))) + return nullptr; TQPair *cpp = (TQPair *)sipCpp; - PyObject *inst = NULL; + PyObject *inst = nullptr; // Get it. KGuiItem g1 = (*cpp).first; KGuiItem g2 = (*cpp).second; - PyObject *pyg1 = sipConvertFromNewType(new KGuiItem(g1), sipType_KGuiItem, NULL); - PyObject *pyg2 = sipConvertFromNewType(new KGuiItem(g2), sipType_KGuiItem, NULL); - if ((pyg1 == NULL) || (pyg2 == NULL) || ((inst = Py_BuildValue ("NN", pyg1, pyg2)) == NULL)) + PyObject *pyg1 = sipConvertFromNewType(new KGuiItem(g1), sipType_KGuiItem, nullptr); + PyObject *pyg2 = sipConvertFromNewType(new KGuiItem(g2), sipType_KGuiItem, nullptr); + if ((!pyg1) || (!pyg2) || !(inst = Py_BuildValue ("NN", pyg1, pyg2))) { Py_XDECREF (inst); Py_XDECREF (pyg1); Py_XDECREF (pyg2); - return NULL; + return nullptr; } return inst; @@ -324,7 +324,7 @@ public: %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyTuple_Check(sipPy); KGuiItem *g1, *g2; @@ -332,8 +332,8 @@ public: PyObject *pyg1 = PyTuple_GET_ITEM (sipPy, 0); PyObject *pyg2 = PyTuple_GET_ITEM (sipPy, 1); - g1 = (KGuiItem *)sipForceConvertToType(pyg1, sipType_KGuiItem, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); - g2 = (KGuiItem *)sipForceConvertToType(pyg2, sipType_KGuiItem, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); + g1 = (KGuiItem *)sipForceConvertToType(pyg1, sipType_KGuiItem, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); + g2 = (KGuiItem *)sipForceConvertToType(pyg2, sipType_KGuiItem, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeui/kxmlguifactory.sip b/sip/tdeui/kxmlguifactory.sip index e62e82c..3720f93 100644 --- a/sip/tdeui/kxmlguifactory.sip +++ b/sip/tdeui/kxmlguifactory.sip @@ -99,8 +99,8 @@ TQPtrList testTDEActionList (TQPtrList); // Create the list - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; // Get it. @@ -111,11 +111,11 @@ TQPtrList testTDEActionList (TQPtrList); // the loop depends on the type of iterator the tmeplate makes available for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () ) { - if (((inst = sipConvertFromInstance (cpp, sipClass_TDEAction, sipTransferObj)) == NULL) + if (!(inst = sipConvertFromInstance (cpp, sipClass_TDEAction, sipTransferObj)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -123,7 +123,7 @@ TQPtrList testTDEActionList (TQPtrList); %End %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *cpplist = new TQPtrList; @@ -135,7 +135,7 @@ TQPtrList testTDEActionList (TQPtrList); for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEAction *)sipForceConvertToType(elem, sipType_TDEAction, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEAction *)sipForceConvertToType(elem, sipType_TDEAction, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -170,8 +170,8 @@ TQPtrList testTDEActionList (TQPtrList); // Create the list - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; // Get it. @@ -182,11 +182,11 @@ TQPtrList testTDEActionList (TQPtrList); // the loop depends on the type of iterator the tmeplate makes available for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () ) { - if (((inst = sipConvertFromNewType(new KXMLGUIClient(*cpp), sipType_KXMLGUIClient, NULL)) == NULL) + if (!(inst = sipConvertFromNewType(new KXMLGUIClient(*cpp), sipType_KXMLGUIClient, nullptr)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -194,7 +194,7 @@ TQPtrList testTDEActionList (TQPtrList); %End %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *cpplist = new TQPtrList; @@ -206,7 +206,7 @@ TQPtrList testTDEActionList (TQPtrList); for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KXMLGUIClient *)sipForceConvertToType(elem, sipType_KXMLGUIClient, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (KXMLGUIClient *)sipForceConvertToType(elem, sipType_KXMLGUIClient, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { @@ -240,8 +240,8 @@ TQPtrList testTDEActionList (TQPtrList); // Create the list - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; // Get it. @@ -252,11 +252,11 @@ TQPtrList testTDEActionList (TQPtrList); // the loop depends on the type of iterator the tmeplate makes available for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () ) { - if (((inst = sipConvertFromInstance (cpp, sipClass_TQWidget, sipTransferObj)) == NULL) + if (!(inst = sipConvertFromInstance (cpp, sipClass_TQWidget, sipTransferObj)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -264,7 +264,7 @@ TQPtrList testTDEActionList (TQPtrList); %End %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *cpplist = new TQPtrList; @@ -276,7 +276,7 @@ TQPtrList testTDEActionList (TQPtrList); for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TQWidget *)sipForceConvertToType(elem, sipType_TQWidget, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TQWidget *)sipForceConvertToType(elem, sipType_TQWidget, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeui/qxembed.sip b/sip/tdeui/qxembed.sip index e4af5f3..4433c1f 100644 --- a/sip/tdeui/qxembed.sip +++ b/sip/tdeui/qxembed.sip @@ -61,12 +61,12 @@ public: int n; if ((n = PyList_Size (a1)) == 0) - return NULL; + return nullptr; char **strings; - if ((strings = (char **)PyTQtListToArray(a1)) == NULL) - return NULL; + if (!(strings = (char **)PyTQtListToArray(a1))) + return nullptr; Py_BEGIN_ALLOW_THREADS sipRes = QXEmbed::processClientCmdline (a0, n, strings); diff --git a/sip/tdeui/tdeaction.sip b/sip/tdeui/tdeaction.sip index 6a24c6e..3cbdcd0 100644 --- a/sip/tdeui/tdeaction.sip +++ b/sip/tdeui/tdeaction.sip @@ -702,8 +702,8 @@ protected: // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -712,11 +712,11 @@ protected: TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromInstance (*it, sipClass_TDEAction, sipTransferObj)) == NULL) + if (!(inst = sipConvertFromInstance (*it, sipClass_TDEAction, sipTransferObj)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -725,7 +725,7 @@ protected: %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -737,7 +737,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEAction *)sipForceConvertToType(elem, sipType_TDEAction, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEAction *)sipForceConvertToType(elem, sipType_TDEAction, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeui/tdecmodule.sip b/sip/tdeui/tdecmodule.sip index 446f992..d331bd2 100644 --- a/sip/tdeui/tdecmodule.sip +++ b/sip/tdeui/tdecmodule.sip @@ -125,8 +125,8 @@ protected: // Create the list - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; // Get it. @@ -137,11 +137,11 @@ protected: // the loop depends on the type of iterator the tmeplate makes available for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () ) { - if (((inst = sipConvertFromInstance (cpp, sipClass_TDEConfigDialogManager, sipTransferObj)) == NULL) + if (!(inst = sipConvertFromInstance (cpp, sipClass_TDEConfigDialogManager, sipTransferObj)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -149,7 +149,7 @@ protected: %End %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *cpplist = new TQPtrList; @@ -161,7 +161,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEConfigDialogManager *)sipForceConvertToType(elem, sipType_TDEConfigDialogManager, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEConfigDialogManager *)sipForceConvertToType(elem, sipType_TDEConfigDialogManager, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeui/tdelistview.sip b/sip/tdeui/tdelistview.sip index 1a59997..bbd7d7f 100644 --- a/sip/tdeui/tdelistview.sip +++ b/sip/tdeui/tdelistview.sip @@ -279,8 +279,8 @@ typedef TQPtrList ListViewItems; // Create the list - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; // Get it. @@ -291,11 +291,11 @@ typedef TQPtrList ListViewItems; // the loop depends on the type of iterator the template makes available for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () ) { - if (((inst = sipConvertFromInstance (cpp, sipClass_TQListViewItem, sipTransferObj)) == NULL) + if (!(inst = sipConvertFromInstance (cpp, sipClass_TQListViewItem, sipTransferObj)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -303,7 +303,7 @@ typedef TQPtrList ListViewItems; %End %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *cpplist = new TQPtrList; @@ -315,7 +315,7 @@ typedef TQPtrList ListViewItems; for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TQListViewItem *)sipForceConvertToType(elem, sipType_TQListViewItem, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TQListViewItem *)sipForceConvertToType(elem, sipType_TQListViewItem, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeui/tdemainwindow.sip b/sip/tdeui/tdemainwindow.sip index 02e19ed..eac8c16 100644 --- a/sip/tdeui/tdemainwindow.sip +++ b/sip/tdeui/tdemainwindow.sip @@ -216,8 +216,8 @@ protected: // Create the list - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; // Get it. @@ -228,11 +228,11 @@ protected: // the loop depends on the type of iterator the tmeplate makes available for(cpp = cpplist->first (); cpp != 0; cpp = cpplist->next () ) { - if (((inst = sipConvertFromInstance (cpp, sipClass_TDEMainWindow, sipTransferObj)) == NULL) + if (!(inst = sipConvertFromInstance (cpp, sipClass_TDEMainWindow, sipTransferObj)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -240,7 +240,7 @@ protected: %End %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQPtrList *cpplist = new TQPtrList; @@ -252,7 +252,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (TDEMainWindow *)sipForceConvertToType(elem, sipType_TDEMainWindow, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (TDEMainWindow *)sipForceConvertToType(elem, sipType_TDEMainWindow, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { diff --git a/sip/tdeutils/kplugininfo.sip b/sip/tdeutils/kplugininfo.sip index d71148d..ef346a7 100644 --- a/sip/tdeutils/kplugininfo.sip +++ b/sip/tdeutils/kplugininfo.sip @@ -91,8 +91,8 @@ private: // Create the list PyObject *pylist; - if ((pylist = PyList_New(0)) == NULL) - return NULL; + if (!(pylist = PyList_New(0))) + return nullptr; TQValueList *cpplist = (TQValueList *)sipCpp; PyObject *inst; @@ -101,11 +101,11 @@ private: TQValueList::Iterator it; for( it = cpplist->begin(); it != cpplist->end(); ++it ) { - if (((inst = sipConvertFromInstance ((KPluginInfo *)(*it), sipClass_KPluginInfo, sipTransferObj)) == NULL) + if (!(inst = sipConvertFromInstance ((KPluginInfo *)(*it), sipClass_KPluginInfo, sipTransferObj)) || PyList_Append (pylist, inst) < 0) { Py_DECREF (pylist); - return NULL; + return nullptr; } } @@ -114,7 +114,7 @@ private: %ConvertToTypeCode - if (sipIsErr == NULL) + if (!sipIsErr) return PyList_Check(sipPy); TQValueList *cpplist = new TQValueList; @@ -126,7 +126,7 @@ private: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (KPluginInfo *)sipForceConvertToType(elem, sipType_KPluginInfo, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); + cpp = (KPluginInfo *)sipForceConvertToType(elem, sipType_KPluginInfo, sipTransferObj, SIP_NO_CONVERTORS, nullptr, &iserr); if (iserr) { -- cgit v1.2.3