Changeset 1623 in webkit for trunk/JavaScriptCore/kjs/internal.cpp

Timestamp:

Jul 21, 2002, 10:38:39 PM (23 years ago)

Author:

darin

Message:

JavaScriptCore:

• kjs/*: Roll KDE 3.0.2 changes in. Also switch to not using APPLE_CHANGES for some of the changes that we definitely want to contribute upstream.

WebCore:

• khtml/*: Roll KDE 3.0.2 changes in. Also switch to not using APPLE_CHANGES for some of the changes that we definitely want to contribute upstream.

• WebCore.pbproj/project.pbxproj: Add KWQStyle.mm, remove KWQStyle.h, moving contents into qstyle.h.

• kwq/KWQApplication.mm: (QApplication::globalStrut): Remove _logNotYetImplemented().

• kwq/KWQButton.mm: (QButton::QButton): Use plain release, not autorelease.
• kwq/KWQComboBox.mm: (QComboBox::init): Use plain release, not autorelease.
• kwq/KWQListBox.mm: (QListBox::QListBox): Use plain release, not autorelease.
• kwq/KWQPainter.mm: (QPainter::drawArc): Use plain release, not autorelease.

• kwq/KWQKHTMLPartBrowserExtension.mm: Remove import of KWQKHTMLPartImpl.h, now that it's always part of khtml_part.h.
• kwq/KWQKHTMLPartImpl.cpp: Simplify.
• kwq/KWQKHTMLPartImpl.h: Add wrapper to allow multiple inclusion. Don't include khtml_part.h any more, since that file now includes this one to minimize changes to KDE code that needs to get to functions in here.
• kwq/KWQKHTMLPartImpl.mm: (KHTMLPart::onURL), (KHTMLPart::nodeActivated), (KHTMLPart::setStatusBarText): Moved here from khtml_part.cpp.
• kwq/KWQLoaderImpl.mm: Include khtml_part.h instead of KWQKHTMLPartImpl.h.

• kwq/KWQPushButton.mm: (buttonFontMetrics), (QPushButton::fontMetrics): Added. Used by the form code to size buttons.
• kwq/KWQStyle.mm: Added. (QStyle::sizeFromContents): Added. Used by the form code to size buttons.

• kwq/KWQStyle.h: Removed.
• kwq/qt/qstyle.h: Moved contents of KWQStyle.h in here.
• kwq/qt/qwidget.h: Include <qstyle.h> rather than KWQStyle.h.

• kwq/WebCoreBridge.mm: (-[WebCoreBridge isFrameSet]): Call straight to impl.

• kwq/kdeui/klineedit.h: Add KLineEdit::frameWidth().
• kwq/qt/qnamespace.h: Remove GUIStyle, MacStyle, and WindowsStyle.
• kwq/qt/qpaintdevice.h: Add QInternal, QInternal::Printer, and QPaintDevice::devType().
• kwq/qt/qpainter.h: Add QPainter::device().
• kwq/qt/qpushbutton.h: Add QPushButton::fontMetrics().

File:

• trunk/JavaScriptCore/kjs/internal.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/internal.cpp

@@ -2 +2 @@
 /*
  *  This file is part of the KDE libraries
- *  Copyright (C) 1999-2001 Harri Porten ([email protected])
+ *  Copyright (C) 1999-2002 Harri Porten ([email protected])
  *  Copyright (C) 2001 Peter Kelly ([email protected])
  *
@@ -837 +837 @@
 
   // Constructors (Object, Array, etc.)
-
-  ObjectObjectImp *objectObj = new ObjectObjectImp(globExec,objProto,funcProto);
-  b_Object = Object(objectObj);
-  FunctionObjectImp *funcObj = new FunctionObjectImp(globExec,funcProto);
-  b_Function = Object(funcObj);
-  ArrayObjectImp *arrayObj = new ArrayObjectImp(globExec,funcProto,arrayProto);
-  b_Array = Object(arrayObj);
-  StringObjectImp *stringObj = new StringObjectImp(globExec,funcProto,stringProto);
-  b_String = Object(stringObj);
-  BooleanObjectImp *booleanObj = new BooleanObjectImp(globExec,funcProto,booleanProto);
-  b_Boolean = Object(booleanObj);
-  NumberObjectImp *numberObj = new NumberObjectImp(globExec,funcProto,numberProto);
-  b_Number = Object(numberObj);
-  DateObjectImp *dateObj = new DateObjectImp(globExec,funcProto,dateProto);
-  b_Date = Object(dateObj);
-  RegExpObjectImp *regexpObj = new RegExpObjectImp(globExec,regexpProto,funcProto);
-  b_RegExp = Object(regexpObj);
-  ErrorObjectImp *errorObj = new ErrorObjectImp(globExec,funcProto,errorProto);
-  b_Error = Object(errorObj);
+  b_Object = Object(new ObjectObjectImp(globExec, objProto, funcProto));
+  b_Function = Object(new FunctionObjectImp(globExec, funcProto));
+  b_Array = Object(new ArrayObjectImp(globExec, funcProto, arrayProto));
+  b_String = Object(new StringObjectImp(globExec, funcProto, stringProto));
+  b_Boolean = Object(new BooleanObjectImp(globExec, funcProto, booleanProto));
+  b_Number = Object(new NumberObjectImp(globExec, funcProto, numberProto));
+  b_Date = Object(new DateObjectImp(globExec, funcProto, dateProto));
+  b_RegExp = Object(new RegExpObjectImp(globExec, funcProto, regexpProto));
+  b_Error = Object(new ErrorObjectImp(globExec, funcProto, errorProto));
 
   // Error object prototypes
@@ -1017 +1007 @@
   }
 
-  // no program node means a syntax occurred
+  // no program node means a syntax error occurred
   if (!progNode) {
     Object err = Error::create(globExec,SyntaxError,errMsg.ascii(),errLine);