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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit c20b4738368dd5c0aa12bffc98abd01d5e610c76
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 24 18:30:31 2001 +0000

    Various small tweaks and fixes made as a result of writing test programs
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@181 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/qt/_qarray.h b/WebCore/kwq/qt/_qarray.h
index f6c5c82..0fe505c 100644
--- a/WebCore/kwq/qt/_qarray.h
+++ b/WebCore/kwq/qt/_qarray.h
@@ -115,5 +115,25 @@ public:
     ConstIterator end() const { return data() + size(); }
 };
 
+#ifdef _KWQ_IOSTREAM_
+template<class T>
+inline ostream &operator<<(ostream &o, const QArray<T>&p)
+{
+    o <<
+        "QArray: [size: " <<
+         (Q_UINT32)p.count() <<
+         "; items: ";
+        const T* it = p.begin();
+        while (it != p.end()) {
+            o << *it;
+                if (++it != p.end()) {
+                    o << ", ";
+                }
+            }
+        o << "]";
+
+    return o;
+}
+#endif
 
 #endif // QARRAY_H
diff --git a/WebCore/kwq/qt/_qcstring.cpp b/WebCore/kwq/qt/_qcstring.cpp
index d2962c4..140e893 100644
--- a/WebCore/kwq/qt/_qcstring.cpp
+++ b/WebCore/kwq/qt/_qcstring.cpp
@@ -1934,3 +1934,11 @@ QDataStream &operator>>( QDataStream &s, QCString &str )
   \relates QCString
   Returns the concatenated string of c and s.
 */
+
+#ifdef _KWQ_IOSTREAM_
+ostream &operator<<(ostream &o, const QCString &s)
+{
+    return o << (const char *)s.data();
+}
+#endif
+
diff --git a/WebCore/kwq/qt/_qcstring.h b/WebCore/kwq/qt/_qcstring.h
index 8f82183..efc5fed 100644
--- a/WebCore/kwq/qt/_qcstring.h
+++ b/WebCore/kwq/qt/_qcstring.h
@@ -46,6 +46,7 @@
 #endif
 
 #include <KWQDef.h>
+#include <iostream>
 
 // -------------------------------------------------------------------------
 
@@ -266,6 +267,11 @@ public:
 /*****************************************************************************
   QCString stream functions
  *****************************************************************************/
+
+#ifdef _KWQ_IOSTREAM_
+ostream &operator<<(ostream &, const QCString &);
+#endif
+
 #ifndef QT_NO_DATASTREAM
 Q_EXPORT QDataStream &operator<<( QDataStream &, const QCString & );
 Q_EXPORT QDataStream &operator>>( QDataStream &, QCString & );
diff --git a/WebCore/kwq/qt/_qregexp.cpp b/WebCore/kwq/qt/_qregexp.cpp
index f33e82f..5127c56 100644
--- a/WebCore/kwq/qt/_qregexp.cpp
+++ b/WebCore/kwq/qt/_qregexp.cpp
@@ -1097,3 +1097,5 @@ void QRegExp::compile()
     //dump( rxdata );	// uncomment this line for debugging
 #endif
 }
+
+
diff --git a/WebCore/kwq/qt/_qregexp.h b/WebCore/kwq/qt/_qregexp.h
index 99e2447..4b3db10 100644
--- a/WebCore/kwq/qt/_qregexp.h
+++ b/WebCore/kwq/qt/_qregexp.h
@@ -45,6 +45,7 @@
 #endif
 
 #include <KWQDef.h>
+#include <iostream>
 
 // -------------------------------------------------------------------------
 
@@ -86,6 +87,7 @@ public:
     int		find( const QString& str, int index )
 					{ return match( str, index ); }
 
+
 protected:
     void	compile();
     const QChar *matchstr( uint *, const QChar *, uint, const QChar * ) const;
diff --git a/WebCore/src/kwq/qt/_qarray.h b/WebCore/src/kwq/qt/_qarray.h
index f6c5c82..0fe505c 100644
--- a/WebCore/src/kwq/qt/_qarray.h
+++ b/WebCore/src/kwq/qt/_qarray.h
@@ -115,5 +115,25 @@ public:
     ConstIterator end() const { return data() + size(); }
 };
 
+#ifdef _KWQ_IOSTREAM_
+template<class T>
+inline ostream &operator<<(ostream &o, const QArray<T>&p)
+{
+    o <<
+        "QArray: [size: " <<
+         (Q_UINT32)p.count() <<
+         "; items: ";
+        const T* it = p.begin();
+        while (it != p.end()) {
+            o << *it;
+                if (++it != p.end()) {
+                    o << ", ";
+                }
+            }
+        o << "]";
+
+    return o;
+}
+#endif
 
 #endif // QARRAY_H
diff --git a/WebCore/src/kwq/qt/_qcstring.cpp b/WebCore/src/kwq/qt/_qcstring.cpp
index d2962c4..140e893 100644
--- a/WebCore/src/kwq/qt/_qcstring.cpp
+++ b/WebCore/src/kwq/qt/_qcstring.cpp
@@ -1934,3 +1934,11 @@ QDataStream &operator>>( QDataStream &s, QCString &str )
   \relates QCString
   Returns the concatenated string of c and s.
 */
+
+#ifdef _KWQ_IOSTREAM_
+ostream &operator<<(ostream &o, const QCString &s)
+{
+    return o << (const char *)s.data();
+}
+#endif
+
diff --git a/WebCore/src/kwq/qt/_qcstring.h b/WebCore/src/kwq/qt/_qcstring.h
index 8f82183..efc5fed 100644
--- a/WebCore/src/kwq/qt/_qcstring.h
+++ b/WebCore/src/kwq/qt/_qcstring.h
@@ -46,6 +46,7 @@
 #endif
 
 #include <KWQDef.h>
+#include <iostream>
 
 // -------------------------------------------------------------------------
 
@@ -266,6 +267,11 @@ public:
 /*****************************************************************************
   QCString stream functions
  *****************************************************************************/
+
+#ifdef _KWQ_IOSTREAM_
+ostream &operator<<(ostream &, const QCString &);
+#endif
+
 #ifndef QT_NO_DATASTREAM
 Q_EXPORT QDataStream &operator<<( QDataStream &, const QCString & );
 Q_EXPORT QDataStream &operator>>( QDataStream &, QCString & );
diff --git a/WebCore/src/kwq/qt/_qregexp.cpp b/WebCore/src/kwq/qt/_qregexp.cpp
index f33e82f..5127c56 100644
--- a/WebCore/src/kwq/qt/_qregexp.cpp
+++ b/WebCore/src/kwq/qt/_qregexp.cpp
@@ -1097,3 +1097,5 @@ void QRegExp::compile()
     //dump( rxdata );	// uncomment this line for debugging
 #endif
 }
+
+
diff --git a/WebCore/src/kwq/qt/_qregexp.h b/WebCore/src/kwq/qt/_qregexp.h
index 99e2447..4b3db10 100644
--- a/WebCore/src/kwq/qt/_qregexp.h
+++ b/WebCore/src/kwq/qt/_qregexp.h
@@ -45,6 +45,7 @@
 #endif
 
 #include <KWQDef.h>
+#include <iostream>
 
 // -------------------------------------------------------------------------
 
@@ -86,6 +87,7 @@ public:
     int		find( const QString& str, int index )
 					{ return match( str, index ); }
 
+
 protected:
     void	compile();
     const QChar *matchstr( uint *, const QChar *, uint, const QChar * ) const;

-- 
WebKit Debian packaging