Mercurial > projects > qtd

diff qt/QGlobal.d @ 167:ae06da58ec25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed hacky conversion of arguments when emmitting a signal
author eldar
date Sat, 20 Jun 2009 19:14:29 +0000
parents 875d313c2778
children d66bbb9a5053
line wrap: on
line diff
--- a/qt/QGlobal.d	Thu Jun 18 16:09:18 2009 +0000
+++ b/qt/QGlobal.d	Sat Jun 20 19:14:29 2009 +0000
@@ -401,9 +401,15 @@
 
 void qSwap(T)(ref T value1, ref T value2)
 {
+<<<<<<< .mine
+    const T.nativeId t = value1.nativeId;
+    value1.nativeId = value2.nativeId;
+    value2.nativeId = t;
+=======
     T t = value1;
     value1 = value2;
     value2 = t;
+>>>>>>> .r170
 }
 
 /*