[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 0494dca115facb713cc905c7a86c70f7dd43d385
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed May 15 20:59:22 2002 +0000

    	* kwq/qt/qguardedptr.h: Fix reversed sense of check in isNull. Fixes
    	a bug that was causing a lot of DHTML not to work.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1156 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index aa3b9d1..0842b36 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,8 @@
+2002-05-15  Darin Adler  <darin at apple.com>
+
+	* kwq/qt/qguardedptr.h: Fix reversed sense of check in isNull. Fixes
+	a bug that was causing a lot of DHTML not to work.
+
 2002-05-15  Kenneth Kocienda  <kocienda at apple.com>
 
 	* kwq/KWQInvisibleButton.h: Changed an #include of Cocoa.h to an #import
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index aa3b9d1..0842b36 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,8 @@
+2002-05-15  Darin Adler  <darin at apple.com>
+
+	* kwq/qt/qguardedptr.h: Fix reversed sense of check in isNull. Fixes
+	a bug that was causing a lot of DHTML not to work.
+
 2002-05-15  Kenneth Kocienda  <kocienda at apple.com>
 
 	* kwq/KWQInvisibleButton.h: Changed an #include of Cocoa.h to an #import
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index aa3b9d1..0842b36 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,8 @@
+2002-05-15  Darin Adler  <darin at apple.com>
+
+	* kwq/qt/qguardedptr.h: Fix reversed sense of check in isNull. Fixes
+	a bug that was causing a lot of DHTML not to work.
+
 2002-05-15  Kenneth Kocienda  <kocienda at apple.com>
 
 	* kwq/KWQInvisibleButton.h: Changed an #include of Cocoa.h to an #import
diff --git a/WebCore/khtml/ecma/kjs_window.cpp b/WebCore/khtml/ecma/kjs_window.cpp
index ebd7b6d..3a4921a 100644
--- a/WebCore/khtml/ecma/kjs_window.cpp
+++ b/WebCore/khtml/ecma/kjs_window.cpp
@@ -262,6 +262,8 @@ Window::Window(KHTMLPart *p)
 {
   winq = new WindowQObject(this);
   //kdDebug(6070) << "Window::Window this=" << this << " part=" << m_part << " " << m_part->name() << endl;
+  fprintf(stderr, "pointer was %p\n", p);
+  fprintf(stderr, "m_part is %p\n", (KHTMLPart *)m_part);
 }
 
 Window::~Window()
@@ -350,6 +352,9 @@ UString Window::toString(ExecState *) const
 
 Value Window::get(ExecState *exec, const UString &p) const
 {
+  fprintf(stderr, "Window::get: m_part is %p\n", (KHTMLPart *)m_part);
+  fprintf(stderr, "Window::get: m_part is null? %s\n", m_part.isNull() ? "yes" : "no");
+
 #ifdef KJS_VERBOSE
   kdDebug(6070) << "Window("<<this<<")::get " << p.qstring() << endl;
 #endif
diff --git a/WebCore/kwq/KWQColorGroup.mm b/WebCore/kwq/KWQColorGroup.mm
index 86ddf86..4dcb189 100644
--- a/WebCore/kwq/KWQColorGroup.mm
+++ b/WebCore/kwq/KWQColorGroup.mm
@@ -35,21 +35,19 @@ friend class QColorGroup;
 public:
     QColorGroupPrivate() {
         brushes = new QBrush[QCOLOR_GROUP_SIZE];    
-        //brushes[QColorGroup::Foreground] = QColor(0,0,0);    
-        //brushes[QColorGroup::Shadow] = QColor(0,0,0);    
-        brushes[QColorGroup::Foreground] = QColor(255,255,255);    
-        brushes[QColorGroup::Shadow] = QColor(255,255,255);    
-        brushes[QColorGroup::Light] = QColor(224,224,224);    
-        brushes[QColorGroup::Midlight] = QColor(192,192,192);    
-        brushes[QColorGroup::Mid] = QColor(128,128,128);    
-        brushes[QColorGroup::Dark] = QColor(64,64,64);    
-        brushes[QColorGroup::Base] = QColor(255,255,255);    
-        brushes[QColorGroup::ButtonText] = QColor(0,0,0);    
-        brushes[QColorGroup::Button] = QColor(192,192,192);    
-        brushes[QColorGroup::Background] = QColor(255,255,255);    
-        brushes[QColorGroup::Text] = QColor(0,0,0);    
-        brushes[QColorGroup::Highlight] = QColor(64,64,64);    
-        brushes[QColorGroup::HighlightedText] = QColor(0,0,0);    
+        brushes[QColorGroup::Foreground] = QColor(255,255,255);
+        brushes[QColorGroup::Shadow] = QColor(255,255,255);
+        brushes[QColorGroup::Light] = QColor(224,224,224);
+        brushes[QColorGroup::Midlight] = QColor(192,192,192);
+        brushes[QColorGroup::Mid] = QColor(128,128,128);
+        brushes[QColorGroup::Dark] = QColor(64,64,64);
+        brushes[QColorGroup::Base] = QColor(255,255,255);
+        brushes[QColorGroup::ButtonText] = QColor(0,0,0);
+        brushes[QColorGroup::Button] = QColor(192,192,192);
+        brushes[QColorGroup::Background] = QColor(255,255,255);
+        brushes[QColorGroup::Text] = QColor(0,0,0);
+        brushes[QColorGroup::Highlight] = QColor(64,64,64);
+        brushes[QColorGroup::HighlightedText] = QColor(0,0,0);
     }
 
     QColorGroupPrivate(const QColorGroupPrivate *other) {
diff --git a/WebCore/kwq/KWQGuardedPtr.h b/WebCore/kwq/KWQGuardedPtr.h
index a3cab39..6bf51e6 100644
--- a/WebCore/kwq/KWQGuardedPtr.h
+++ b/WebCore/kwq/KWQGuardedPtr.h
@@ -33,7 +33,7 @@ public:
     KWQGuardedPtrBase(QObject* = 0);
     
     QObject* pointer() const { return iterator.current(); }
-    bool isNull() const { return pointer() != 0; }
+    bool isNull() const { return pointer() == 0; }
     
 private:
     QPtrListIterator<QObject> iterator;
diff --git a/WebCore/kwq/qt/qguardedptr.h b/WebCore/kwq/qt/qguardedptr.h
index a3cab39..6bf51e6 100644
--- a/WebCore/kwq/qt/qguardedptr.h
+++ b/WebCore/kwq/qt/qguardedptr.h
@@ -33,7 +33,7 @@ public:
     KWQGuardedPtrBase(QObject* = 0);
     
     QObject* pointer() const { return iterator.current(); }
-    bool isNull() const { return pointer() != 0; }
+    bool isNull() const { return pointer() == 0; }
     
 private:
     QPtrListIterator<QObject> iterator;

-- 
WebKit Debian packaging