[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 68ecdaffc40bd225c2bb9685ceac653b2461db92
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 5 13:29:18 2001 +0000

    Added color and normal function members
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@93 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQPalette.h b/WebCore/kwq/KWQPalette.h
index 3dbbeb2..201d3b9 100644
--- a/WebCore/kwq/KWQPalette.h
+++ b/WebCore/kwq/KWQPalette.h
@@ -32,7 +32,8 @@ class QColorGroup {
 public:
     enum ColorRole { Foreground, Shadow, Light, Mid, Midlight, Dark, Base, ButtonText, Button, Background, Text };
 
-    void setColor(ColorRole role, const QColor &color);
+    const QColor &color(ColorRole) const;
+    void setColor(ColorRole, const QColor &);
     const QColor &foreground() const;
     const QColor &shadow() const;
     const QColor &light() const;
@@ -54,6 +55,7 @@ public:
     const QColorGroup &active() const;
     const QColorGroup &inactive() const;
     const QColorGroup &disabled() const;
+    const QColorGroup &normal() const;
 }; 
 
 #endif
diff --git a/WebCore/kwq/qt/qpalette.h b/WebCore/kwq/qt/qpalette.h
index 3dbbeb2..201d3b9 100644
--- a/WebCore/kwq/qt/qpalette.h
+++ b/WebCore/kwq/qt/qpalette.h
@@ -32,7 +32,8 @@ class QColorGroup {
 public:
     enum ColorRole { Foreground, Shadow, Light, Mid, Midlight, Dark, Base, ButtonText, Button, Background, Text };
 
-    void setColor(ColorRole role, const QColor &color);
+    const QColor &color(ColorRole) const;
+    void setColor(ColorRole, const QColor &);
     const QColor &foreground() const;
     const QColor &shadow() const;
     const QColor &light() const;
@@ -54,6 +55,7 @@ public:
     const QColorGroup &active() const;
     const QColorGroup &inactive() const;
     const QColorGroup &disabled() const;
+    const QColorGroup &normal() const;
 }; 
 
 #endif
diff --git a/WebCore/src/kwq/qt/qpalette.h b/WebCore/src/kwq/qt/qpalette.h
index 3dbbeb2..201d3b9 100644
--- a/WebCore/src/kwq/qt/qpalette.h
+++ b/WebCore/src/kwq/qt/qpalette.h
@@ -32,7 +32,8 @@ class QColorGroup {
 public:
     enum ColorRole { Foreground, Shadow, Light, Mid, Midlight, Dark, Base, ButtonText, Button, Background, Text };
 
-    void setColor(ColorRole role, const QColor &color);
+    const QColor &color(ColorRole) const;
+    void setColor(ColorRole, const QColor &);
     const QColor &foreground() const;
     const QColor &shadow() const;
     const QColor &light() const;
@@ -54,6 +55,7 @@ public:
     const QColorGroup &active() const;
     const QColorGroup &inactive() const;
     const QColorGroup &disabled() const;
+    const QColorGroup &normal() const;
 }; 
 
 #endif

-- 
WebKit Debian packaging