[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 0fb83b20093d1d315757acba58c65743de828eab
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 3 17:38:56 2001 +0000

    Fun, fun, fun with operator overloading
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@258 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 540ecb8..e6c68cd 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -249,15 +249,14 @@ public:
     // operators ---------------------------------------------------------------
 
     bool operator!() const;
-    operator QChar () const;
+
     operator const char *() const;
+
     QChar operator[](int) const;
-    QString &operator+(char);
-    QString &operator+(QChar);
-    QString &operator+(const QString &);
-    QString &operator+=(char);
-    QString &operator+=(QChar);
+
     QString &operator+=(const QString &);
+    QString &operator+=(QChar);
+    QString &operator+=(char);
 
     // data members ------------------------------------------------------------
 
@@ -275,19 +274,19 @@ public:
 }; // class QString ============================================================
 
 
-// operators associated with QChar and QString =================================
+// operators associated with QString ===========================================
 
-bool operator==(const QString &, QChar);
 bool operator==(const QString &, const QString &);
 bool operator==(const QString &, const char *);
 bool operator==(const char *, const QString &);
-bool operator!=(const QString &, QChar);
+
 bool operator!=(const QString &, const QString &);
 bool operator!=(const QString &, const char *);
 bool operator!=(const char *, const QString &);
-QString operator+(char, const QString &);
+
+QString operator+(const QString &, const QString &);
+QString operator+(const QString &, const char *);
 QString operator+(const char *, const QString &);
-QString operator+(QChar, const QString &);
 
 
 // class QConstString ==========================================================
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 540ecb8..e6c68cd 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -249,15 +249,14 @@ public:
     // operators ---------------------------------------------------------------
 
     bool operator!() const;
-    operator QChar () const;
+
     operator const char *() const;
+
     QChar operator[](int) const;
-    QString &operator+(char);
-    QString &operator+(QChar);
-    QString &operator+(const QString &);
-    QString &operator+=(char);
-    QString &operator+=(QChar);
+
     QString &operator+=(const QString &);
+    QString &operator+=(QChar);
+    QString &operator+=(char);
 
     // data members ------------------------------------------------------------
 
@@ -275,19 +274,19 @@ public:
 }; // class QString ============================================================
 
 
-// operators associated with QChar and QString =================================
+// operators associated with QString ===========================================
 
-bool operator==(const QString &, QChar);
 bool operator==(const QString &, const QString &);
 bool operator==(const QString &, const char *);
 bool operator==(const char *, const QString &);
-bool operator!=(const QString &, QChar);
+
 bool operator!=(const QString &, const QString &);
 bool operator!=(const QString &, const char *);
 bool operator!=(const char *, const QString &);
-QString operator+(char, const QString &);
+
+QString operator+(const QString &, const QString &);
+QString operator+(const QString &, const char *);
 QString operator+(const char *, const QString &);
-QString operator+(QChar, const QString &);
 
 
 // class QConstString ==========================================================
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 540ecb8..e6c68cd 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -249,15 +249,14 @@ public:
     // operators ---------------------------------------------------------------
 
     bool operator!() const;
-    operator QChar () const;
+
     operator const char *() const;
+
     QChar operator[](int) const;
-    QString &operator+(char);
-    QString &operator+(QChar);
-    QString &operator+(const QString &);
-    QString &operator+=(char);
-    QString &operator+=(QChar);
+
     QString &operator+=(const QString &);
+    QString &operator+=(QChar);
+    QString &operator+=(char);
 
     // data members ------------------------------------------------------------
 
@@ -275,19 +274,19 @@ public:
 }; // class QString ============================================================
 
 
-// operators associated with QChar and QString =================================
+// operators associated with QString ===========================================
 
-bool operator==(const QString &, QChar);
 bool operator==(const QString &, const QString &);
 bool operator==(const QString &, const char *);
 bool operator==(const char *, const QString &);
-bool operator!=(const QString &, QChar);
+
 bool operator!=(const QString &, const QString &);
 bool operator!=(const QString &, const char *);
 bool operator!=(const char *, const QString &);
-QString operator+(char, const QString &);
+
+QString operator+(const QString &, const QString &);
+QString operator+(const QString &, const char *);
 QString operator+(const char *, const QString &);
-QString operator+(QChar, const QString &);
 
 
 // class QConstString ==========================================================

-- 
WebKit Debian packaging