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

[gramps]

The following commit has been merged in the debian/unstable branch:
commit 2abee06323fdd906e1408135f412688ce0881cae
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 10 16:27:48 2001 +0000

    Begin implementation
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@120 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index f439d34..1307407 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -26,6 +26,7 @@
 #ifndef QSTRING_H_
 #define QSTRING_H_
 
+#include <CoreFoundation/CFString.h>
 #include "qcstring.h"
 
 class QString;
@@ -93,6 +94,11 @@ public:
     friend int operator!=(QChar, char);
     operator char() const;
 
+    // data members ------------------------------------------------------------
+
+// NOTE: this is NOT private:
+    UniChar c;
+
 // protected -------------------------------------------------------------------
 // private ---------------------------------------------------------------------
 
@@ -202,6 +208,11 @@ public:
     QString &operator+=(const QString &);
     operator QChar () const;
 
+    // data members ------------------------------------------------------------
+
+// NOTE: this is NOT private:
+    CFMutableStringRef s;
+    
 // protected -------------------------------------------------------------------
 // private ---------------------------------------------------------------------
     
@@ -225,7 +236,7 @@ QString operator+(char, const QString &);
 
 // class QConstString ==========================================================
 
-class QConstString {
+class QConstString : /* NOTE: this is NOT private */ QString {
 public:
 
     // typedefs ----------------------------------------------------------------
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index f439d34..1307407 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -26,6 +26,7 @@
 #ifndef QSTRING_H_
 #define QSTRING_H_
 
+#include <CoreFoundation/CFString.h>
 #include "qcstring.h"
 
 class QString;
@@ -93,6 +94,11 @@ public:
     friend int operator!=(QChar, char);
     operator char() const;
 
+    // data members ------------------------------------------------------------
+
+// NOTE: this is NOT private:
+    UniChar c;
+
 // protected -------------------------------------------------------------------
 // private ---------------------------------------------------------------------
 
@@ -202,6 +208,11 @@ public:
     QString &operator+=(const QString &);
     operator QChar () const;
 
+    // data members ------------------------------------------------------------
+
+// NOTE: this is NOT private:
+    CFMutableStringRef s;
+    
 // protected -------------------------------------------------------------------
 // private ---------------------------------------------------------------------
     
@@ -225,7 +236,7 @@ QString operator+(char, const QString &);
 
 // class QConstString ==========================================================
 
-class QConstString {
+class QConstString : /* NOTE: this is NOT private */ QString {
 public:
 
     // typedefs ----------------------------------------------------------------
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index f439d34..1307407 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -26,6 +26,7 @@
 #ifndef QSTRING_H_
 #define QSTRING_H_
 
+#include <CoreFoundation/CFString.h>
 #include "qcstring.h"
 
 class QString;
@@ -93,6 +94,11 @@ public:
     friend int operator!=(QChar, char);
     operator char() const;
 
+    // data members ------------------------------------------------------------
+
+// NOTE: this is NOT private:
+    UniChar c;
+
 // protected -------------------------------------------------------------------
 // private ---------------------------------------------------------------------
 
@@ -202,6 +208,11 @@ public:
     QString &operator+=(const QString &);
     operator QChar () const;
 
+    // data members ------------------------------------------------------------
+
+// NOTE: this is NOT private:
+    CFMutableStringRef s;
+    
 // protected -------------------------------------------------------------------
 // private ---------------------------------------------------------------------
     
@@ -225,7 +236,7 @@ QString operator+(char, const QString &);
 
 // class QConstString ==========================================================
 
-class QConstString {
+class QConstString : /* NOTE: this is NOT private */ QString {
 public:
 
     // typedefs ----------------------------------------------------------------

-- 
WebKit Debian packaging