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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit ddf24218ef220563e926fdf2d4470a4c8d6868a9
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 15 05:55:26 2002 +0000

            Assign getView() results to variable of appropriate type to work
    	around apparent ObjC++ compiler bug. I wonder why other people
    	aren't running into this (and why I haven't run into it before).
    
    	* kwq/KWQButton.mm:
            (QButton::setText):
            (QButton::text):
            * kwq/KWQLineEdit.mm:
            (QLineEdit::setEchoMode):
            (QLineEdit::setText):
            (QLineEdit::text):
            (QLineEdit::setMaxLength):
            (QLineEdit::isReadOnly):
            (QLineEdit::setReadOnly):
            (QLineEdit::maxLength):
            (QLineEdit::selectAll):
            (QLineEdit::edited):
            (QLineEdit::setEdited):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1556 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index ecd2a8b..4f52bcc 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,24 @@
+2002-07-14  Maciej Stachowiak  <mjs at apple.com>
+
+        Assign getView() results to variable of appropriate type to work
+	around apparent ObjC++ compiler bug. I wonder why other people
+	aren't running into this (and why I haven't run into it before).
+
+	* kwq/KWQButton.mm:
+        (QButton::setText):
+        (QButton::text):
+        * kwq/KWQLineEdit.mm:
+        (QLineEdit::setEchoMode):
+        (QLineEdit::setText):
+        (QLineEdit::text):
+        (QLineEdit::setMaxLength):
+        (QLineEdit::isReadOnly):
+        (QLineEdit::setReadOnly):
+        (QLineEdit::maxLength):
+        (QLineEdit::selectAll):
+        (QLineEdit::edited):
+        (QLineEdit::setEdited):
+
 2002-07-14  Darin Adler  <darin at apple.com>
 
         * WebCore-tests.exp: Tests needed access to QPoint, QString, and KURL symbols
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ecd2a8b..4f52bcc 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,24 @@
+2002-07-14  Maciej Stachowiak  <mjs at apple.com>
+
+        Assign getView() results to variable of appropriate type to work
+	around apparent ObjC++ compiler bug. I wonder why other people
+	aren't running into this (and why I haven't run into it before).
+
+	* kwq/KWQButton.mm:
+        (QButton::setText):
+        (QButton::text):
+        * kwq/KWQLineEdit.mm:
+        (QLineEdit::setEchoMode):
+        (QLineEdit::setText):
+        (QLineEdit::text):
+        (QLineEdit::setMaxLength):
+        (QLineEdit::isReadOnly):
+        (QLineEdit::setReadOnly):
+        (QLineEdit::maxLength):
+        (QLineEdit::selectAll):
+        (QLineEdit::edited):
+        (QLineEdit::setEdited):
+
 2002-07-14  Darin Adler  <darin at apple.com>
 
         * WebCore-tests.exp: Tests needed access to QPoint, QString, and KURL symbols
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ecd2a8b..4f52bcc 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,24 @@
+2002-07-14  Maciej Stachowiak  <mjs at apple.com>
+
+        Assign getView() results to variable of appropriate type to work
+	around apparent ObjC++ compiler bug. I wonder why other people
+	aren't running into this (and why I haven't run into it before).
+
+	* kwq/KWQButton.mm:
+        (QButton::setText):
+        (QButton::text):
+        * kwq/KWQLineEdit.mm:
+        (QLineEdit::setEchoMode):
+        (QLineEdit::setText):
+        (QLineEdit::text):
+        (QLineEdit::setMaxLength):
+        (QLineEdit::isReadOnly):
+        (QLineEdit::setReadOnly):
+        (QLineEdit::maxLength):
+        (QLineEdit::selectAll):
+        (QLineEdit::edited):
+        (QLineEdit::setEdited):
+
 2002-07-14  Darin Adler  <darin at apple.com>
 
         * WebCore-tests.exp: Tests needed access to QPoint, QString, and KURL symbols
diff --git a/WebCore/kwq/KWQButton.mm b/WebCore/kwq/KWQButton.mm
index 8c48dbf..266f12f 100644
--- a/WebCore/kwq/KWQButton.mm
+++ b/WebCore/kwq/KWQButton.mm
@@ -34,10 +34,12 @@ QButton::QButton(QWidget *parent)
 
 void QButton::setText(const QString &s)
 {
-    [(KWQNSButton *)getView() setTitle:s.getNSString()];
+    KWQNSButton *button = (KWQNSButton *)getView();
+    [button setTitle:s.getNSString()];
 }
 
 QString QButton::text() const
 {
-    return QString::fromNSString([(KWQNSButton *)getView() title]);
+    KWQNSButton *button = (KWQNSButton *)getView();
+    return QString::fromNSString([button title]);
 }
diff --git a/WebCore/kwq/KWQLineEdit.mm b/WebCore/kwq/KWQLineEdit.mm
index 7dad899..5b74738 100644
--- a/WebCore/kwq/KWQLineEdit.mm
+++ b/WebCore/kwq/KWQLineEdit.mm
@@ -37,7 +37,8 @@ QLineEdit::QLineEdit(QWidget *parent)
 
 void QLineEdit::setEchoMode(EchoMode mode)
 {
-    [(KWQNSTextField *)getView() setPasswordMode:mode == Password];
+    KWQNSTextField *textField = (KWQNSTextField *)getView();
+    [textField setPasswordMode:mode == Password];
 }
 
 void QLineEdit::setCursorPosition(int)
@@ -53,27 +54,32 @@ int QLineEdit::cursorPosition() const
 
 void QLineEdit::setText(const QString &s)
 {
-    [(KWQNSTextField *)getView() setStringValue:s.getNSString()];
+    KWQNSTextField *textField = (KWQNSTextField *)getView();
+    [textField setStringValue:s.getNSString()];
 }
 
 QString QLineEdit::text()
 {
-    return QString::fromNSString([(KWQNSTextField *)getView() stringValue]);
+    KWQNSTextField *textField = (KWQNSTextField *)getView();
+    return QString::fromNSString([textField stringValue]);
 }
 
 void QLineEdit::setMaxLength(int len)
 {
-    [(KWQNSTextField *)getView() setMaximumLength:len];
+    KWQNSTextField *textField = (KWQNSTextField *)getView();
+    [textField setMaximumLength:len];
 }
 
 bool QLineEdit::isReadOnly() const
 {
-    return ![(KWQNSTextField *)getView() isEditable];
+    KWQNSTextField *textField = (KWQNSTextField *)getView();
+    return ![textField isEditable];
 }
 
 void QLineEdit::setReadOnly(bool flag)
 {
-    return [(KWQNSTextField *)getView() setEditable:!flag];
+    KWQNSTextField *textField = (KWQNSTextField *)getView();
+    return [textField setEditable:!flag];
 }
 
 bool QLineEdit::frame() const
@@ -84,20 +90,24 @@ bool QLineEdit::frame() const
 
 int QLineEdit::maxLength() const
 {
-    return [(KWQNSTextField *)getView() maximumLength];
+    KWQNSTextField *textField = (KWQNSTextField *)getView();
+    return [textField maximumLength];
 }
 
 void QLineEdit::selectAll()
 {
-    return [(KWQNSTextField *)getView() selectText:nil];
+    KWQNSTextField *textField = (KWQNSTextField *)getView();
+    return [textField selectText:nil];
 }
 
 bool QLineEdit::edited() const
 {
-    return [(KWQNSTextField *)getView() edited];
+    KWQNSTextField *textField = (KWQNSTextField *)getView();
+    return [textField edited];
 }
 
 void QLineEdit::setEdited(bool flag)
 {
-    return [(KWQNSTextField *)getView() setEdited:flag];
+    KWQNSTextField *textField = (KWQNSTextField *)getView();
+    return [textField setEdited:flag];
 }

-- 
WebKit Debian packaging