[webkit-changes] cvs commit: WebCore/kwq KWQLineEdit.mm KWQTextEdit.mm

[Timothy]

thatcher    05/11/16 18:01:20

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               kwq      Tag: Safari-2-0-branch KWQLineEdit.mm
                        KWQTextEdit.mm
  Log:
  More workarounds for <rdar://problem/4213314> WebCore build fails with gcc-5216 or later
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.67  +2 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.66
  retrieving revision 1.1.2.67
  diff -u -r1.1.2.66 -r1.1.2.67
  --- ChangeLog	17 Nov 2005 01:17:31 -0000	1.1.2.66
  +++ ChangeLog	17 Nov 2005 02:01:12 -0000	1.1.2.67
  @@ -1,3 +1,5 @@
  +=== WebCore-417.6 ===
  +
   2005-11-16  Timothy Hatcher  <timothy at apple.com>
   
           Merged fix from TOT to Safari-2-0-branch
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.65.8.3  +8 -2      WebCore/kwq/KWQLineEdit.mm
  
  Index: KWQLineEdit.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQLineEdit.mm,v
  retrieving revision 1.65.8.2
  retrieving revision 1.65.8.3
  diff -u -r1.65.8.2 -r1.65.8.3
  --- KWQLineEdit.mm	11 Nov 2005 06:39:34 -0000	1.65.8.2
  +++ KWQLineEdit.mm	17 Nov 2005 02:01:19 -0000	1.65.8.3
  @@ -78,7 +78,10 @@
   void QLineEdit::setCursorPosition(int pos)
   {
       KWQ_BLOCK_EXCEPTIONS;
  -    [m_controller setSelectedRange:NSMakeRange(pos, 0)];
  +    NSRange r;
  +    r.location = pos;
  +    r.length = 0;
  +    [m_controller setSelectedRange:r];
       KWQ_UNBLOCK_EXCEPTIONS;
   }
   
  @@ -213,7 +216,10 @@
   void QLineEdit::setSelection(int start, int length)
   {
       KWQ_BLOCK_EXCEPTIONS;
  -    [m_controller setSelectedRange:NSMakeRange(start, length)];
  +    NSRange r;
  +    r.location = start;
  +    r.length = length;
  +    [m_controller setSelectedRange:r];
       KWQ_UNBLOCK_EXCEPTIONS;
   }
   
  
  
  
  1.44.8.4  +6 -3      WebCore/kwq/KWQTextEdit.mm
  
  Index: KWQTextEdit.mm
  ===================================================================
  RCS file: /cvs/root/WebCore/kwq/KWQTextEdit.mm,v
  retrieving revision 1.44.8.3
  retrieving revision 1.44.8.4
  diff -u -r1.44.8.3 -r1.44.8.4
  --- KWQTextEdit.mm	11 Nov 2005 06:39:35 -0000	1.44.8.3
  +++ KWQTextEdit.mm	17 Nov 2005 02:01:20 -0000	1.44.8.4
  @@ -202,12 +202,12 @@
   long QTextEdit::selectionEnd()
   {
       KWQTextArea *textView = (KWQTextArea *)getView();
  -    
  +
       KWQ_BLOCK_EXCEPTIONS;
       NSRange range = [textView selectedRange];
       if (range.location == NSNotFound)
           return 0;
  -    return NSMaxRange(range);
  +    return (range.location + range.length);
       KWQ_UNBLOCK_EXCEPTIONS;
       
       return 0;
  @@ -309,7 +309,10 @@
       if (newStart + newLength > maxlen) {
           newLength = maxlen - newStart;
       }
  -    [textView setSelectedRange:NSMakeRange(newStart, newLength)];
  +    NSRange r;
  +    r.location = newStart;
  +    r.length = newLength;
  +    [textView setSelectedRange:r];
       KWQ_UNBLOCK_EXCEPTIONS;
   }