[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bperlqt=5D_qtcore/src=3A_Removed_unnecessary_code_fr?=
From:       Chris Burel <cburel () rhythm ! com>
Date:       2011-01-31 22:19:34
Message-ID: 20110131221934.E1675A60BE () git ! kde ! org
[Download RAW message or body]

Git commit abf9dddaefc7d4bd665a902651a9964aadd4dc31 by Chris Burel.
Pushed by burel into branch 'master'.

Removed unnecessary code from SlotReturnValue marshaller (it literally did nothing).

M  +0    -9    qtcore/src/marshall_types.cpp     

http://commits.kde.org/perlqt/abf9dddaefc7d4bd665a902651a9964aadd4dc31

diff --git a/qtcore/src/marshall_types.cpp b/qtcore/src/marshall_types.cpp
index a1de731..8376ab2 100644
--- a/qtcore/src/marshall_types.cpp
+++ b/qtcore/src/marshall_types.cpp
@@ -302,16 +302,7 @@ namespace PerlQt4 {
 		if (t == "QDBusVariant") {
 			*reinterpret_cast<QDBusVariant*>(o[0]) = *(QDBusVariant*) _stack[0].s_class;
 		} else {
-            // Save any address in zeroth element of the arrary of 'void*'s
-            // passed to qt_metacall()
-			void * ptr = o[0];
 			smokeStackToQt4Stack(_stack, o, 0, 1, _replyType);
-            // Only if the zeroth element of the array of 'void*'s passed to
-            // qt_metacall() contains an address, is the return value of the
-            // slot needed.
-			if (ptr != 0) {
-				*(void**)ptr = *(void**)(o[0]);
-			}
 		}
     }
 

[prev in list] [next in list] [prev in thread] [next in thread]