fixed deployment build bustage that John Louch ran into
authorsullivan <sullivan@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Dec 2004 01:48:44 +0000 (01:48 +0000)
committersullivan <sullivan@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Dec 2004 01:48:44 +0000 (01:48 +0000)
        * kwq/KWQTextEdit.mm:
        (QTextEdit::setScrollBarModes):
        move bool declaration inside exception-handling block to avoid obscure
        compiler error

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8192 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog-2005-08-23
WebCore/kwq/KWQTextEdit.mm

index 3b1e5d1..2fa9e54 100644 (file)
@@ -1,3 +1,12 @@
+2004-12-10  John Sullivan  <sullivan@apple.com>
+
+        fixed deployment build bustage that John Louch ran into
+
+        * kwq/KWQTextEdit.mm:
+        (QTextEdit::setScrollBarModes):
+        move bool declaration inside exception-handling block to avoid obscure
+        compiler error
+
 2004-12-10  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Richard.
index a6aed5c..9db2740 100644 (file)
@@ -122,13 +122,14 @@ void QTextEdit::setScrollBarModes(ScrollBarMode hMode, ScrollBarMode vMode)
 {
     KWQTextArea *textView = (KWQTextArea *)getView();
 
+    KWQ_BLOCK_EXCEPTIONS;
+
+    // this declaration must be inside the KWQ_BLOCK_EXCEPTIONS block or the deployment build fails
     bool autohides = hMode == Auto || vMode == Auto;
     
     ASSERT(!autohides || hMode != AlwaysOn);
     ASSERT(!autohides || vMode != AlwaysOn);
 
-    KWQ_BLOCK_EXCEPTIONS;
-
     [textView setHasHorizontalScroller:hMode != AlwaysOff];
     [textView setHasVerticalScroller:vMode != AlwaysOff];
     [textView setAutohidesScrollers:autohides];