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

List:       kde-commits
Subject:    KDE/kdelibs/kjs
From:       Harri Porten <porten () kde ! org>
Date:       2005-05-16 12:08:59
Message-ID: 1116245339.139393.24565.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 414589 by porten:

removed remaining uses of deprecated Value::isNull() function


 M  +4 -0      trunk/KDE/kdelibs/kjs/ChangeLog  
 M  +3 -3      trunk/KDE/kdelibs/kjs/object.cpp  
 M  +1 -1      trunk/KDE/kdelibs/kjs/reference.cpp  
 M  +1 -1      trunk/KDE/kdelibs/kjs/value.cpp  


--- trunk/KDE/kdelibs/kjs/ChangeLog #414588:414589
@@ -1,3 +1,7 @@
+2005-05-16  Harri Porten  <porten@kde.org>
+
+	* removed remaining use of deprecated Value::isNull(). 
+
 2005-04-24  Harri Porten  <porten@kde.org>
 
 	* lexer.cpp (isIdentLetter): allow umlauts, accents as well as
--- trunk/KDE/kdelibs/kjs/object.cpp #414588:414589
@@ -176,7 +176,7 @@
       return Value(proto);
   }
 
-  if (proto.isNull())
+  if (!proto.isValid())
     return Undefined();
 
   return proto.get(exec,propertyName);
@@ -192,7 +192,7 @@
 void ObjectImp::put(ExecState *exec, const Identifier &propertyName,
                      const Value &value, int attr)
 {
-  assert(!value.isNull());
+  assert(value.isValid());
 
   // non-standard netscape extension
   if (propertyName == specialPrototypePropertyName) {
@@ -256,7 +256,7 @@
 
   // Look in the prototype
   Object proto = Object::dynamicCast(prototype());
-  return !proto.isNull() && proto.hasProperty(exec,propertyName);
+  return proto.isValid() && proto.hasProperty(exec,propertyName);
 }
 
 bool ObjectImp::hasPropertyByIndex(ExecState *exec, unsigned propertyName) const
--- trunk/KDE/kdelibs/kjs/reference.cpp #414588:414589
@@ -123,7 +123,7 @@
 
   Value o = getBase(exec);
 
-  if (o.isNull() || o.type() == NullType) {
+  if (!o.isValid() || o.type() == NullType) {
     UString m = I18N_NOOP("Can't find variable: ") + getPropertyName(exec).ustring();
     Object err = Error::create(exec, ReferenceError, m.ascii());
     exec->setException(err);
--- trunk/KDE/kdelibs/kjs/value.cpp #414588:414589
@@ -376,7 +376,7 @@
 
 Number Number::dynamicCast(const Value &v)
 {
-  if (v.isNull() || v.type() != NumberType)
+  if (!v.isValid() || v.type() != NumberType)
     return Number((NumberImp*)0);
 
   return Number(static_cast<NumberImp*>(v.imp()));
[prev in list] [next in list] [prev in thread] [next in thread]