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

List:       kde-commits
Subject:    KDE/kdelibs/kjsembed/kjsembed
From:       Sebastian Sauer <mail () dipe ! org>
Date:       2008-03-27 1:57:24
Message-ID: 1206583044.033888.2950.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 790627 by sebsauer:

fix handling of QVariant's

 M  +7 -2      qobject_binding.cpp  
 M  +1 -0      variant_binding.cpp  


--- trunk/KDE/kdelibs/kjsembed/kjsembed/qobject_binding.cpp #790626:790627
@@ -545,6 +545,12 @@
                     }
                 }
             }
+            else {
+                QVariant v = KJSEmbed::extractVariant(exec, args[idx]);
+                if (! v.isNull()) {
+                    return new Value<QVariant>(v);
+                }
+            }
             break;
     }
 
@@ -665,8 +671,6 @@
     }
 
     switch( returnTypeId ) {
-        case QVariant::Invalid:
-            return KJS::jsNull();
         case QVariant::UserType: {
             int tp = QMetaType::type( metaMember.typeName() );
             switch( tp ) {
@@ -685,6 +689,7 @@
                 default: break;
             }
         } // fall through
+        case QVariant::Invalid: // fall through
         default:
             return KJSEmbed::convertToValue(exec, returnValue);
     }
--- trunk/KDE/kdelibs/kjsembed/kjsembed/variant_binding.cpp #790626:790627
@@ -319,6 +319,7 @@
 
 KJS::JSValue *KJSEmbed::convertToValue( KJS::ExecState *exec, const QVariant &value \
)  {
+    //qDebug()<<"KJSEmbed::convertToValue \
typeid="<<value.type()<<"typename="<<value.typeName()<<"toString="<<value.toString(); \
KJS::JSValue *returnValue;  switch( value.type() )
     {


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