[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit e9981cd42f28d50d41eda6fac922a51c72f06705
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 5 03:31:11 2002 +0000

    	- fixed 2992187 -- Should use curly quotes in status bar messages,
    	window titles, and error dialogs
    
            * BrowserWindowController.m:
            (-[BrowserWindowController performQuickSearch:]):
            (-[BrowserWindowController goToToolbarLocation:]):
    	Change the last two straight apostrophes to curly ones.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2256 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/kjs/internal.h b/JavaScriptCore/kjs/internal.h
index c235938..b07213e 100644
--- a/JavaScriptCore/kjs/internal.h
+++ b/JavaScriptCore/kjs/internal.h
@@ -159,7 +159,8 @@ namespace KJS {
     friend class ListIterator;
     friend class List;
     friend class InterpreterImp;
-  public:
+    friend class ObjectImp;
+  private:
     ListImp();
     ~ListImp();
 
diff --git a/JavaScriptCore/kjs/interpreter.cpp b/JavaScriptCore/kjs/interpreter.cpp
index 4e8e377..791275a 100644
--- a/JavaScriptCore/kjs/interpreter.cpp
+++ b/JavaScriptCore/kjs/interpreter.cpp
@@ -309,7 +309,6 @@ void Interpreter::finalCheck()
   while( Collector::collect() )
     ;
 
-  fprintf(stderr,"ListImp::count = %d\n", KJS::ListImp::count);
   Node::finalCheck();
   Collector::finalCheck();
   Lexer::globalClear();
diff --git a/JavaScriptCore/kjs/types.cpp b/JavaScriptCore/kjs/types.cpp
index 38984d2..a616186 100644
--- a/JavaScriptCore/kjs/types.cpp
+++ b/JavaScriptCore/kjs/types.cpp
@@ -107,14 +107,6 @@ List::List()
   //fprintf(stderr,"List::List() this=%p imp=%p refcount=%d\n",this,rep,rep->refcount);
 }
 
-List List::dynamicCast(const Value &v)
-{
-  if (v.isNull() || v.type() != ListType)
-    return 0;
-
-  return static_cast<ListImp*>(v.imp());
-}
-
 void List::append(const Value& val)
 {
   static_cast<ListImp*>(rep)->append(val);
diff --git a/JavaScriptCore/kjs/types.h b/JavaScriptCore/kjs/types.h
index 27078d1..9f97bfb 100644
--- a/JavaScriptCore/kjs/types.h
+++ b/JavaScriptCore/kjs/types.h
@@ -101,26 +101,15 @@ namespace KJS {
    * intermediate results of expression evaluation and cannot be stored
    * as properties of objects.
    *
-   * The list is explicitly shared. Note that while copy() returns a deep
+   * The list is explicitly shared. Note that while copy() returns a
    * copy of the list the referenced objects are still shared.
    */
   class List : private Value {
     friend class ListIterator;
   public:
     List();
-    List(ListImp *);
 
     /**
-     * Converts a Value into an List. If the value's type is not
-     * ListType, a null object will be returned (i.e. one with it's
-     * internal pointer set to 0). If you do not know for sure whether the
-     * value is of type List, you should check the @ref isNull()
-     * methods afterwards before calling any methods on the returned value.
-     *
-     * @return The value converted to an List
-     */
-    static List dynamicCast(const Value &v);
-    /**
      * Append an object to the end of the list.
      *
      * @param val Pointer to object.
@@ -158,7 +147,7 @@ namespace KJS {
      */
     void clear();
     /**
-     * Returns a deep copy of the list. Ownership is passed to the user
+     * Returns a shallow copy of the list. Ownership is passed to the user
      * who is responsible for deleting the list then.
      */
     List copy() const;
@@ -192,8 +181,6 @@ namespace KJS {
      */
     Value operator[](int i) const;
 
-    ListImp *imp() const { return (ListImp *)Value::imp(); }
-
     /**
      * Returns a pointer to a static instance of an empty list. Useful if a
      * function has a @ref KJS::List parameter.
@@ -202,6 +189,11 @@ namespace KJS {
 #ifdef KJS_DEBUG_MEM
     static void globalClear();
 #endif
+
+  private:
+    List(ListImp *);
+    ListImp *imp() const { return (ListImp *)Value::imp(); }
+    friend class ObjectImp;
   };
 
 }; // namespace
diff --git a/WebCore/kwq/KWQFileButton.mm b/WebCore/kwq/KWQFileButton.mm
index 148b68c..631a5b6 100644
--- a/WebCore/kwq/KWQFileButton.mm
+++ b/WebCore/kwq/KWQFileButton.mm
@@ -80,7 +80,7 @@ void KWQFileButton::setFilename(const QString &f)
     if (_filename.isEmpty()) {
         _label = [NO_FILE_SELECTED retain];
     } else {
-        _label = [[[[NSFileManager defaultManager] componentsToDisplayForPath:_filename.getNSString()] lastObject] copy];
+        _label = [[[NSFileManager defaultManager] displayNameAtPath:_filename.getNSString()] copy];
     }
     
     // Get the icon.

-- 
WebKit Debian packaging