summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-13 22:44:21 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-13 22:44:21 +0000
commit83ee79237f6141a1b7d5534db717a26d911112e4 (patch)
treec6614d32d6f760703f7f23687486425cf5fe565a
parent969673f24ba313cb42262200403ccac2b4316328 (diff)
downloadpytde-3.5.13.tar.gz
pytde-3.5.13.zip
Fix a number of invalid references to temporary variables in python-trinityv3.5.13
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/libraries/python-trinity@1258860 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--sip/kdecore/kmountpoint.sip2
-rw-r--r--sip/kdeui/kkeydialog.sip3
-rw-r--r--sip/kio/kfilemetainfo.sip6
-rw-r--r--sip/kio/kservice.sip3
-rw-r--r--sip/kio/kservicegroup.sip3
-rw-r--r--sip/kio/kservicetype.sip3
-rw-r--r--sip/kio/ksycocaentry.sip3
-rw-r--r--sip/kmdi/kmdichildfrm.sip3
8 files changed, 17 insertions, 9 deletions
diff --git a/sip/kdecore/kmountpoint.sip b/sip/kdecore/kmountpoint.sip
index 87323be..8f98b34 100644
--- a/sip/kdecore/kmountpoint.sip
+++ b/sip/kdecore/kmountpoint.sip
@@ -136,7 +136,7 @@ private:
KMountPoint::List::Iterator it;
for( it = cList->begin(); it != cList->end(); ++it )
{
- inst = sipConvertFromType(&(KMountPoint::Ptr)(*it), sipType_KMountPoint_Ptr, sipTransferObj);
+ inst = sipConvertFromType(static_cast<KMountPoint::Ptr>(*it), sipType_KMountPoint_Ptr, sipTransferObj);
if ((inst == NULL) || (PyList_Append (plist, inst) < 0))
{
diff --git a/sip/kdeui/kkeydialog.sip b/sip/kdeui/kkeydialog.sip
index eb6b8e6..b716a28 100644
--- a/sip/kdeui/kkeydialog.sip
+++ b/sip/kdeui/kkeydialog.sip
@@ -204,7 +204,8 @@ typedef QDict<int> IntDict;
while (it.current ())
{
- PyObject *a0 = sipConvertFromInstance (&it.currentKey (), sipClass_QCString, sipTransferObj);
+ QString current_key = it.currentKey ();
+ PyObject *a0 = sipConvertFromInstance (&current_key, sipClass_QCString, sipTransferObj);
PyObject *a1 = PyInt_FromLong ((long) it.current ());
if ((a0 == NULL) || (a1 == NULL) || (PyDict_SetItem (dict, a0, a1) < 0))
diff --git a/sip/kio/kfilemetainfo.sip b/sip/kio/kfilemetainfo.sip
index 77b5871..b0418be 100644
--- a/sip/kio/kfilemetainfo.sip
+++ b/sip/kio/kfilemetainfo.sip
@@ -256,7 +256,8 @@ public:
%MethodCode
//returns (KFileMetaInfoItem)
//takes key | (QString)
- sipRes = &((*sipCpp) [(const QString&) *a0]);
+ KFileMetaInfoItem sipResObj = ((*sipCpp) [*static_cast<const QString*>(a0)]);
+ sipRes = &sipResObj;
%End
%End
@@ -339,7 +340,8 @@ public:
%MethodCode
//returns (KFileMetaInfoGroup)
//takes key | (QString)
- sipRes = &((*sipCpp) [(const QString&)*a0]);
+ KFileMetaInfoGroup sipResObj = ((*sipCpp) [*static_cast<const QString*>(a0)]);
+ sipRes = &sipResObj;
%End
%End
diff --git a/sip/kio/kservice.sip b/sip/kio/kservice.sip
index 3712f91..fcb0aaf 100644
--- a/sip/kio/kservice.sip
+++ b/sip/kio/kservice.sip
@@ -235,7 +235,8 @@ typedef QValueList<KService::Ptr> List;
KService::List::Iterator it;
for( it = cList->begin(); it != cList->end(); ++it )
{
- svc = &(KService::Ptr)(*it);
+ KSharedPtr <KService> svcptr = static_cast<KService::Ptr>(*it);
+ svc = &svcptr;
inst = sipConvertFromType(svc, sipType_KService_Ptr, sipTransferObj);
if ((inst == NULL) || (PyList_Append (plist, inst) < 0))
diff --git a/sip/kio/kservicegroup.sip b/sip/kio/kservicegroup.sip
index a6d5128..bbe1847 100644
--- a/sip/kio/kservicegroup.sip
+++ b/sip/kio/kservicegroup.sip
@@ -235,7 +235,8 @@ public:
KServiceGroup::List::Iterator it;
for( it = cList->begin(); it != cList->end(); ++it )
{
- svcGroupType = &(KServiceGroup::SPtr)(*it);
+ KSharedPtr<KSycocaEntry> svcptr = static_cast<KServiceGroup::SPtr>(*it);
+ svcGroupType = &svcptr;
inst = sipConvertFromType(svcGroupType, sipType_KSycocaEntry_Ptr, sipTransferObj);
if ((inst == NULL) || (PyList_Append (plist, inst) < 0))
diff --git a/sip/kio/kservicetype.sip b/sip/kio/kservicetype.sip
index 3bed1dc..adb6897 100644
--- a/sip/kio/kservicetype.sip
+++ b/sip/kio/kservicetype.sip
@@ -240,7 +240,8 @@ protected:
QValueList<KServiceType::Ptr>::Iterator it;
for( it = cList->begin(); it != cList->end(); ++it )
{
- svc = &(KServiceType::Ptr)(*it);
+ KSharedPtr <KServiceType> svcptr = static_cast<KServiceType::Ptr>(*it);
+ svc = &svcptr;
inst = sipConvertFromType(svc, sipType_KServiceType_Ptr, sipTransferObj);
if ((inst == NULL) || (PyList_Append (plist, inst) < 0))
diff --git a/sip/kio/ksycocaentry.sip b/sip/kio/ksycocaentry.sip
index dc60fdb..d2e7e8d 100644
--- a/sip/kio/ksycocaentry.sip
+++ b/sip/kio/ksycocaentry.sip
@@ -144,7 +144,8 @@ protected:
KSycocaEntry::List::Iterator it;
for( it = cList->begin(); it != cList->end(); ++it )
{
- svc = &(KSycocaEntry::Ptr)(*it);
+ KSharedPtr<KSycocaEntry> svcptr = static_cast<KSycocaEntry::Ptr>(*it);
+ svc = &svcptr;
if (svc->data ()->sycocaType () == KST_KService)
{
svcType = (KSharedPtr<KService> *)svc;
diff --git a/sip/kmdi/kmdichildfrm.sip b/sip/kmdi/kmdichildfrm.sip
index 8cf16ef..62f78fb 100644
--- a/sip/kmdi/kmdichildfrm.sip
+++ b/sip/kmdi/kmdichildfrm.sip
@@ -218,7 +218,8 @@ protected:
while (it.current ())
{
- PyObject *a0 = sipConvertFromInstance (&it.currentKey (), sipClass_QString, sipTransferObj);
+ QString current_key = it.currentKey ();
+ PyObject *a0 = sipConvertFromInstance (&current_key, sipClass_QString, sipTransferObj);
PyObject *a1 = PyInt_FromLong ((long) it.current ());
if ((a0 == NULL) || (a1 == NULL) || (PyDict_SetItem (dict, a0, a1) < 0))