From 83ee79237f6141a1b7d5534db717a26d911112e4 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 13 Oct 2011 22:44:21 +0000
Subject: Fix a number of invalid references to temporary variables in
 python-trinity

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/libraries/python-trinity@1258860 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 sip/kio/kfilemetainfo.sip | 6 ++++--
 sip/kio/kservice.sip      | 3 ++-
 sip/kio/kservicegroup.sip | 3 ++-
 sip/kio/kservicetype.sip  | 3 ++-
 sip/kio/ksycocaentry.sip  | 3 ++-
 5 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'sip/kio')

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;
-- 
cgit v1.2.1