[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    qt-copy/src/kernel
From:       Daniel Molkentin <molkentin () kde ! org>
Date:       2003-06-04 16:43:24
[Download RAW message or body]

CVS commit by danimo: 

Patch by Trolltech to fix accelerator escaping


  M +10 -12    qpainter.cpp   1.55


--- qt-copy/src/kernel/qpainter.cpp  #1.54:1.55
@@ -2843,5 +2843,5 @@ void qt_format_text( const QFont& font, 
             ++maxUnderlines;
         }
-        chr++;
+        ++chr;
     }
     if ( !expandtabs ) {
@@ -2850,5 +2850,5 @@ void qt_format_text( const QFont& font, 
             if ( *chr == '\t' )
                 *chr = ' ';
-            chr++;
+            ++chr;
         }
     }
@@ -2862,16 +2862,14 @@ void qt_format_text( const QFont& font, 
         while ( l ) {
             if ( *cin == '&' ) {
-                if ( l > 1 && *(cin+1) != '&' ) {
-                    cin++;
-                    if ( numUnderlines < 31 )
-                        underlinePositions[numUnderlines++] =
-                            cout - text.unicode();
-                    l--;
-                }
+                ++cin;
+                if ( --l )
+                    break;
+                if ( *cin != '&' )
+                    underlinePositions[numUnderlines++] = cout - text.unicode();
             }
             *cout = *cin;
-            cout++;
-            cin++;
-            l--;
+            ++cout;
+            ++cin;
+            --l;
         }
         if ( numUnderlines )


[prev in list] [next in list] [prev in thread] [next in thread]