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

List:       kde-commits
Subject:    KDE/kdelibs/khtml (silent)
From:       Germain Garand <germain () ebooksfrance ! org>
Date:       2007-11-14 6:57:00
Message-ID: 1195023420.316036.28260.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 736414 by ggarand:

SVN_SILENT: compile


 M  +13 -13    test_regression.cpp  
 M  +8 -8      test_regression.h  


--- trunk/KDE/kdelibs/khtml/test_regression.cpp #736413:736414
@@ -374,9 +374,9 @@
     return true;
 }
 
-ValueImp* RegTestFunction::callAsFunction(ExecState *exec, ObjectImp* /*thisObj*/, \
const List &args) +JSValue* RegTestFunction::callAsFunction(ExecState *exec, \
JSObject* /*thisObj*/, const List &args)  {
-    ValueImp* result = jsUndefined();
+    JSValue* result = jsUndefined();
     if ( m_regTest->ignore_errors )
         return result;
 
@@ -450,13 +450,13 @@
     putDirect("processEvents", new \
KHTMLPartFunction(exec,m_part,KHTMLPartFunction::ProcessEvents,0), DontEnum);  }
 
-KJS::ValueImp *KHTMLPartObject::winGetter(KJS::ExecState *, KJS::JSObject*, const \
KJS::Identifier&, const KJS::PropertySlot& slot) +KJS::JSValue \
*KHTMLPartObject::winGetter(KJS::ExecState *, KJS::JSObject*, const KJS::Identifier&, \
const KJS::PropertySlot& slot)  {
     KHTMLPartObject* thisObj = static_cast<KHTMLPartObject*>(slot.slotBase());
     return KJS::Window::retrieveWindow(thisObj->m_part);
 }
 
-KJS::ValueImp *KHTMLPartObject::docGetter(KJS::ExecState *exec, KJS::JSObject*, \
const KJS::Identifier&, const KJS::PropertySlot& slot) +KJS::JSValue \
*KHTMLPartObject::docGetter(KJS::ExecState *exec, KJS::JSObject*, const \
KJS::Identifier&, const KJS::PropertySlot& slot)  {
     KHTMLPartObject* thisObj = static_cast<KHTMLPartObject*>(slot.slotBase());
     return getDOMNode(exec, thisObj->m_part->document().handle());
@@ -473,7 +473,7 @@
         slot.setCustom(this, winGetter);
         return true;
     }
-    return ObjectImp::getOwnPropertySlot(exec, propertyName, slot);
+    return JSObject::getOwnPropertySlot(exec, propertyName, slot);
 }
 
 KHTMLPartFunction::KHTMLPartFunction(ExecState */*exec*/, KHTMLPart *_part, int _id, \
int length) @@ -488,9 +488,9 @@
     return true;
 }
 
-ValueImp* KHTMLPartFunction::callAsFunction(ExecState *exec, ObjectImp*/*thisObj*/, \
const List &args) +JSValue* KHTMLPartFunction::callAsFunction(ExecState *exec, \
JSObject*/*thisObj*/, const List &args)  {
-    ValueImp* result = jsUndefined();
+    JSValue* result = jsUndefined();
 
     switch (id) {
         case OpenPage: {
@@ -1484,7 +1484,7 @@
             if (comp.value() && comp.value()->type() == ObjectType &&
                comp.value()->toObject(exec)->className() == "Array" )
             {
-                ObjectImp* argArrayObj = comp.value()->toObject(exec);
+                JSObject* argArrayObj = comp.value()->toObject(exec);
                 unsigned int length = argArrayObj->
                                       get(exec, "length")->
                                       toUInt32(exec);
@@ -1501,8 +1501,8 @@
         bool success = ( comp2.complType() == ReturnValue || comp2.complType() == \
Normal );  QString description = "DOMTS";
         if ( comp2.complType() == Throw ) {
-            KJS::ValueImp*  val = comp2.value();
-            KJS::ObjectImp* obj = val->toObject(exec);
+            KJS::JSValue*  val = comp2.value();
+            KJS::JSObject* obj = val->toObject(exec);
             if ( obj && obj->hasProperty( exec, "jsUnitMessage" ) )
                 description = obj->get( exec, "jsUnitMessage" )->toString( exec \
).qstring();  else
@@ -1580,7 +1580,7 @@
             QString errmsg = c.value()->toString(exec).qstring();
             if ( !expected_failure ) {
                 int line = -1;
-                ObjectImp* obj = c.value()->toObject(exec);
+                JSObject* obj = c.value()->toObject(exec);
                 if (obj)
                     line = obj->get(exec, "line")->toUInt32(exec);
                 printf( "ERROR: %s (%s) at line:%d\n",qPrintable(filename), \
qPrintable(errmsg), line); @@ -1599,7 +1599,7 @@
     }
 }
 
-class GlobalImp : public ObjectImp {
+class GlobalImp : public JSObject {
 public:
   virtual UString className() const { return "global"; }
 };
@@ -1612,7 +1612,7 @@
     // create interpreter
     // note: this is different from the interpreter used by the part,
     // it contains regression test-specific objects & functions
-    ProtectedPtr<ObjectImp> global(new GlobalImp());
+    ProtectedPtr<JSObject> global(new GlobalImp());
     khtml::ChildFrame frame;
     frame.m_part = m_part;
     ScriptInterpreter interp(global,&frame);
--- trunk/KDE/kdelibs/khtml/test_regression.h #736413:736414
@@ -63,7 +63,7 @@
 /**
  * @internal
  */
-class RegTestObject : public KJS::ObjectImp
+class RegTestObject : public KJS::JSObject
 {
 public:
     RegTestObject(KJS::ExecState *exec, RegressionTest *_regTest);
@@ -75,13 +75,13 @@
 /**
  * @internal
  */
-class RegTestFunction : public KJS::ObjectImp
+class RegTestFunction : public KJS::JSObject
 {
 public:
     RegTestFunction(KJS::ExecState *exec, RegressionTest *_regTest, int _id, int \
length);  
     bool implementsCall() const;
-    KJS::ValueImp* callAsFunction(KJS::ExecState *exec, KJS::ObjectImp* thisObj, \
const KJS::List &args); +    KJS::JSValue* callAsFunction(KJS::ExecState *exec, \
KJS::JSObject* thisObj, const KJS::List &args);  
     enum { Print, ReportResult, CheckOutput, Quit };
 
@@ -93,28 +93,28 @@
 /**
  * @internal
  */
-class KHTMLPartObject : public KJS::ObjectImp
+class KHTMLPartObject : public KJS::JSObject
 {
 public:
     KHTMLPartObject(KJS::ExecState *exec, KHTMLPart *_part);
 
     virtual bool getOwnPropertySlot(KJS::ExecState *exec, const KJS::Identifier& \
propertyName, KJS::PropertySlot& slot);  private:
-    static KJS::ValueImp *winGetter(KJS::ExecState *, KJS::JSObject*, const \
                KJS::Identifier&, const KJS::PropertySlot&);
-    static KJS::ValueImp *docGetter(KJS::ExecState *, KJS::JSObject*, const \
KJS::Identifier&, const KJS::PropertySlot&); +    static KJS::JSValue \
*winGetter(KJS::ExecState *, KJS::JSObject*, const KJS::Identifier&, const \
KJS::PropertySlot&); +    static KJS::JSValue *docGetter(KJS::ExecState *, \
KJS::JSObject*, const KJS::Identifier&, const KJS::PropertySlot&);  KHTMLPart \
*m_part;  };
 
 /**
  * @internal
  */
-class KHTMLPartFunction : public KJS::ObjectImp
+class KHTMLPartFunction : public KJS::JSObject
 {
 public:
     KHTMLPartFunction(KJS::ExecState *exec, KHTMLPart *_part, int _id, int length);
 
     bool implementsCall() const;
-    KJS::ValueImp* callAsFunction(KJS::ExecState *exec, KJS::ObjectImp* thisObj, \
const KJS::List &args); +    KJS::JSValue* callAsFunction(KJS::ExecState *exec, \
KJS::JSObject* thisObj, const KJS::List &args);  
     enum { OpenPage, OpenPageAsUrl, Begin, Write, End, ExecuteScript, ProcessEvents \
};  private:


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