[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 8687c47247bed97d800067a4bbd854cbc1b5ad1a
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 29 15:17:17 2001 +0000

    More compile updates
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@39 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 1d7a0f4..5f487fb 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -43,14 +43,15 @@ public:
     bool isNull() const;
     bool isDigit() const;
     bool isSpace() const;
-    friend inline int operator==(QChar, QChar);
-    friend inline int operator!=(QChar, QChar);
+    friend int operator==(QChar, QChar);
+    friend int operator!=(QChar, QChar);
+    operator char() const;
 
     enum Direction {
-	DirL, DirR, DirEN, DirES, DirET, DirAN, DirCS, DirB, DirS, DirWS, DirON,
-	DirLRE, DirLRO, DirAL, DirRLE, DirRLO, DirPDF, DirNSM, DirBN
+        // NOTE: alphabetical order
+        DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
+        DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
     };
-
 };
 
 class QString {
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 1d7a0f4..5f487fb 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -43,14 +43,15 @@ public:
     bool isNull() const;
     bool isDigit() const;
     bool isSpace() const;
-    friend inline int operator==(QChar, QChar);
-    friend inline int operator!=(QChar, QChar);
+    friend int operator==(QChar, QChar);
+    friend int operator!=(QChar, QChar);
+    operator char() const;
 
     enum Direction {
-	DirL, DirR, DirEN, DirES, DirET, DirAN, DirCS, DirB, DirS, DirWS, DirON,
-	DirLRE, DirLRO, DirAL, DirRLE, DirRLO, DirPDF, DirNSM, DirBN
+        // NOTE: alphabetical order
+        DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
+        DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
     };
-
 };
 
 class QString {
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 1d7a0f4..5f487fb 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -43,14 +43,15 @@ public:
     bool isNull() const;
     bool isDigit() const;
     bool isSpace() const;
-    friend inline int operator==(QChar, QChar);
-    friend inline int operator!=(QChar, QChar);
+    friend int operator==(QChar, QChar);
+    friend int operator!=(QChar, QChar);
+    operator char() const;
 
     enum Direction {
-	DirL, DirR, DirEN, DirES, DirET, DirAN, DirCS, DirB, DirS, DirWS, DirON,
-	DirLRE, DirLRO, DirAL, DirRLE, DirRLO, DirPDF, DirNSM, DirBN
+        // NOTE: alphabetical order
+        DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
+        DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
     };
-
 };
 
 class QString {

-- 
WebKit Debian packaging