Trailing whitespace and tab/space fixes for src/gui

6 files changed, 161 insertions, 164 deletions

diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index d153215..1f52422 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -233,7 +233,7 @@ contains(QMAKE_MAC_XARCH, no) {
 
     win32-g++|!win32:!*-icc* {
         mmx {
-            mmx_compiler.commands = $$QMAKE_CXX -c -Winline 
+            mmx_compiler.commands = $$QMAKE_CXX -c -Winline
 
             mac {
                 mmx_compiler.commands += -Xarch_i386 -mmmx
@@ -375,7 +375,7 @@ symbian {
         "SOURCE			qblendfunctions_armv6_rvct.s" \
         "SOURCE			qdrawhelper_armv6_rvct.s" \
         "$${LITERAL_HASH}endif"
-                
+
         MMP_RULES += armccIfdefBlock
         QMAKE_CXXFLAGS.ARMCC *= -O3
 }
diff --git a/src/gui/painting/qblendfunctions_armv6_rvct.s b/src/gui/painting/qblendfunctions_armv6_rvct.s
index 312bd07..64d5aa5 100644
--- a/src/gui/painting/qblendfunctions_armv6_rvct.s
+++ b/src/gui/painting/qblendfunctions_armv6_rvct.s
@@ -54,13 +54,13 @@
 		ARM
 		PRESERVE8
 
-		INCLUDE		qdrawhelper_armv6_rvct.inc	
+		INCLUDE		qdrawhelper_armv6_rvct.inc
 
 
 ;-----------------------------------------------------------------------------
 ; qt_blend_rgb32_on_rgb32_arm
-; 
-; @brief 
+;
+; @brief
 ;
 ; @param dest			Destination	pixels						(r0)
 ; @param dbpl			Destination bytes per line				(r1)
@@ -69,25 +69,25 @@
 ; @param w				Width							  (s0 -> r4)
 ; @param h				Height							  (s1 -> r5)
 ; @param const_alpha	Constant alpha					  (s2 -> r6)
-; 
+;
 ;---------------------------------------------------------------------------
 qt_blend_rgb32_on_rgb32_armv6 Function
 		stmfd	sp!, {r4-r12, r14}
-		
+
 		; read arguments off the stack
 		add		r8, sp, #10 * 4
 		ldmia	r8, {r9-r11}
-		
+
 		; Reorganize registers
-		
+
 		mov		r4, r10
 		mov		r5, r1
 		mov		r6, r3
-		
+
 		mov		r1, r2
 		mov		r2, r9
 		mov		r3, r11
-		
+
 		; Now we have registers
 		; @param dest			Destination	pixels						(r0)
 		; @param src			Source pixels							(r1)
@@ -96,53 +96,53 @@ qt_blend_rgb32_on_rgb32_armv6 Function
 		; @param h				Height							  		(r4)
 		; @param dbpl			Destination bytes per line				(r5)
 		; @param sbpl			Source bytes per line					(r6)
-		
+
 		cmp		r3, #256 ; test if we have fully opaque constant alpha value
 		bne		rgb32_blend_const_alpha ; branch if not
-		
+
 rgb32_blend_loop
 
 		subs	r4, r4, #1
 		bmi		rgb32_blend_exit	; while(h--)
-		
-rgb321	PixCpySafe r0, r1, r2		
+
+rgb321	PixCpySafe r0, r1, r2
 
 		add		r0, r0, r5 ; dest = dest + dbpl
-		add		r1, r1, r6 ; src = src + sbpl		
+		add		r1, r1, r6 ; src = src + sbpl
+
+		b		rgb32_blend_loop
+
 
-		b		rgb32_blend_loop	
-		
-		
 rgb32_blend_const_alpha
 
 		;ldr		r14, =ComponentHalf ; load 0x800080 to r14
 		mov		r14, #0x800000
 		add		r14, r14, #0x80
-		
+
 		sub		r3, r3, #1	; const_alpha -= 1;
 
 rgb32_blend_loop_const_alpha
 
 		subs	r4, r4, #1
 		bmi		rgb32_blend_exit	; while(h--)
-		
+
 rgb322	BlendRowSafe PixelSourceOverConstAlpha
 
 		add		r0, r0, r5 ; dest = dest + dbpl
-		add		r1, r1, r6 ; src = src + sbpl		
+		add		r1, r1, r6 ; src = src + sbpl
 
 		b		rgb32_blend_loop_const_alpha
-		
-rgb32_blend_exit		
-		
+
+rgb32_blend_exit
+
 		ldmfd	sp!, {r4-r12, pc}		; pop and return
-	
-	
-	
+
+
+
 ;-----------------------------------------------------------------------------
 ; qt_blend_argb32_on_argb32_arm
-; 
-; @brief 
+;
+; @brief
 ;
 ; @param dest			Destination	pixels						(r0)
 ; @param dbpl			Destination bytes per line				(r1)
@@ -151,25 +151,25 @@ rgb32_blend_exit
 ; @param w				Width							  (s0 -> r4)
 ; @param h				Height							  (s1 -> r5)
 ; @param const_alpha	Constant alpha					  (s2 -> r6)
-; 
+;
 ;---------------------------------------------------------------------------
 qt_blend_argb32_on_argb32_armv6 Function
 		stmfd	sp!, {r4-r12, r14}
-		
+
 	 	; read arguments off the stack
 		add		r8, sp, #10 * 4
 		ldmia	r8, {r9-r11}
-		
+
 		; Reorganize registers
-		
+
 		mov		r4, r10
 		mov		r5, r1
 		mov		r6, r3
-		
+
 		mov		r1, r2
 		mov		r2, r9
 		mov		r3, r11
-		
+
 		; Now we have registers
 		; @param dest			Destination	pixels						(r0)
 		; @param src			Source pixels							(r1)
@@ -178,14 +178,14 @@ qt_blend_argb32_on_argb32_armv6 Function
 		; @param h				Height							  		(r4)
 		; @param dbpl			Destination bytes per line				(r5)
 		; @param sbpl			Source bytes per line					(r6)
-		
+
 		;ldr		r14, =ComponentHalf ; load 0x800080 to r14
 		mov		r14, #0x800000
 		add		r14, r14, #0x80
-		
+
 		cmp		r3, #256 ; test if we have fully opaque constant alpha value
 		bne		argb32_blend_const_alpha ; branch if not
-		
+
 argb32_blend_loop
 
 		subs	r4, r4, #1
@@ -194,10 +194,10 @@ argb32_blend_loop
 argb321	 BlendRowSafe PixelSourceOver
 
 		add		r0, r0, r5 ; dest = dest + dbpl
-		add		r1, r1, r6 ; src = src + sbpl	
+		add		r1, r1, r6 ; src = src + sbpl
 
 		b		argb32_blend_loop
-		
+
 argb32_blend_const_alpha
 
 		sub		r3, r3, #1	; const_alpha -= 1;
@@ -206,18 +206,17 @@ argb32_blend_loop_const_alpha
 
 		subs	r4, r4, #1
 		bmi		argb32_blend_exit	; while(h--)
-		
+
 argb322	 BlendRowSafe PixelSourceOverConstAlpha
 
 		add		r0, r0, r5 ; dest = dest + dbpl
-		add		r1, r1, r6 ; src = src + sbpl		
+		add		r1, r1, r6 ; src = src + sbpl
 
 		b		argb32_blend_loop_const_alpha
-		
-argb32_blend_exit		
-		
+
+argb32_blend_exit
+
 		ldmfd	sp!, {r4-r12, pc}		; pop and return
-		
-		
+
+
 		END ; File end
-		
diff --git a/src/gui/painting/qcolormap_s60.cpp b/src/gui/painting/qcolormap_s60.cpp
index 1b58598..29d340f 100644
--- a/src/gui/painting/qcolormap_s60.cpp
+++ b/src/gui/painting/qcolormap_s60.cpp
@@ -105,4 +105,3 @@ QColormap &QColormap::operator=(const QColormap &colormap)
 { qAtomicAssign(d, colormap.d); return *this; }
 
 QT_END_NAMESPACE
-
diff --git a/src/gui/painting/qdrawhelper_armv6_rvct.inc b/src/gui/painting/qdrawhelper_armv6_rvct.inc
index b3e0605..1cb316a 100644
--- a/src/gui/painting/qdrawhelper_armv6_rvct.inc
+++ b/src/gui/painting/qdrawhelper_armv6_rvct.inc
@@ -52,10 +52,10 @@
 
 ;-----------------------------------------------------------------------------
 ; Globals.
-; Earch marcro expects that caller has loaded 0x800080 to r14. 
+; Earch marcro expects that caller has loaded 0x800080 to r14.
 ;-----------------------------------------------------------------------------
 
-ComponentHalf	EQU	0x800080		
+ComponentHalf	EQU	0x800080
 
 ;-----------------------------------------------------------------------------
 ; ARM assembly implementations of accelerated graphics operations.
@@ -65,7 +65,7 @@ ComponentHalf	EQU	0x800080
 ; 	- r0 = Target buffer pointer
 ;	- r1 = Source buffer pointer
 ; 	- r2 = Length of the buffer to blend
-;	- r3 = Constant alpha for source buffer 
+;	- r3 = Constant alpha for source buffer
 ;
 ;-----------------------------------------------------------------------------
 
@@ -78,8 +78,8 @@ $func	Function
 		CODE32
 $func
 		MEND
-		
-		
+
+
 ;-----------------------------------------------------------------------------
 ; Armv6 boosted implementation of BYTE_MUL(...) function found in qdrawhelper_p.h.
 ;
@@ -98,29 +98,29 @@ $func
 		; uint r8 = (x & 0xff00ff) * a + 0x800080
 		uxtb16	r8, $x	; r8 = r8 & 0x00FF00FF
 		mla		r8, r8, $a, r14
-		
+
 		; x = ((r >> 8) & 0xff00ff) * a + 0x800080
 		uxtb16	$x, $x, ror #8
 		mla		$x, $x, $a, r14
 
-				
+
 		; r8 = (r8 + ((r8 >> 8) & 0xff00ff) ) >> 8
 		; r8 &= 0xff00ff
 		uxtab16	r8, r8, r8, ror #8
 		uxtb16	r8, r8, ror #8
-			
+
 		; x = x + ((x >>8) & 0xff00ff)
 		uxtab16	$x, $x, $x, ror #8
-		
+
 		; x &= 0xff00ff00
 		; x |= r8
 		uxtb16	$x, $x, ror #8
 		orr		$dst, r8, $x, lsl #8
-		
+
 		MEND
-		
+
 ;-----------------------------------------------------------------------------
-; Armv6 boosted implementation of INTERPOLATE_PIXEL_255(...) function found in 
+; Armv6 boosted implementation of INTERPOLATE_PIXEL_255(...) function found in
 ; qdrawhelper_p.h.
 ;
 ;  @param dst	Destination register where to store the result
@@ -129,7 +129,7 @@ $func
 ;  @param y     Second value to multiply
 ;  @param b     Multiplicator byte for second value
 ;  @param r14   Component half 0x800080
-;  
+;
 ;
 ;  @note Trashes x, r8, r14
 ;-----------------------------------------------------------------------------
@@ -143,40 +143,40 @@ $func
 		; uint r8 = (((x & 0xff00ff) * a) + 0x800080)
 		uxtb16	r8, $x	; r8 = r8 & 0x00FF00FF
 		mla		r8, r8, $a, r14
-		
+
 		; x = ((((x >> 8) & 0xff00ff) * a) + 0x800080)
 		uxtb16	$x, $x, ror #8
 		mla		$x, $x, $a, r14
-		
+
 		; Now we are trashing r14 to free it for other purposes
-		
+
 		; uint r14 = (y & 0xff00ff) * b
 		uxtb16	r14, $y	; r14 = y & 0x00FF00FF
 		mul		r14, r14, $b
-		
+
 		; r8 = r8 + r14
 		add		r8, r8, r14
-		
+
 		; r8 = (r8 + ((r8 >> 8) & 0xff00ff) ) >> 8
 		; r8 &= 0xff00ff
 		uxtab16	r8, r8, r8, ror #8
 		uxtb16	r8, r8, ror #8
-		
+
 		; r14 = ((y >> 8) & 0xff00ff) * b
 		uxtb16	r14, $y, ror #8	; r14 = ((y >> 8) & 0xFF00FF)
 		mul		r14, r14, $b
-		
+
 		; x = x + r14
 		add		$x, $x, r14
-			
+
 		; x = x + ((x >>8) & 0xff00ff)
 		uxtab16	$x, $x, $x, ror #8
-		
+
 		; x &= 0xff00ff00
 		; x |= r8
 		uxtb16	$x, $x, ror #8
 		orr		$dst, r8, $x, lsl #8
-		
+
 		MEND
 
 ;-----------------------------------------------------------------------------
@@ -184,19 +184,19 @@ $func
 ;-----------------------------------------------------------------------------
 		MACRO
 $label	Blend4Pixels $BlendPixel
-		
-		; Blend first 4 pixels		
-		
+
+		; Blend first 4 pixels
+
 		ldmia	r1!, {r4-r7}
 		ldm		r0, {r9-r12}
-		
+
 b4p1_$label	$BlendPixel r9, r4, r3
 b4p2_$label	$BlendPixel r10, r5, r3
 b4p3_$label	$BlendPixel r11, r6, r3
 b4p4_$label	$BlendPixel r12, r7, r3
-		
+
 		stmia 	r0!, {r9-r12}
-		
+
 		MEND
 
 ;-----------------------------------------------------------------------------
@@ -204,43 +204,43 @@ b4p4_$label	$BlendPixel r12, r7, r3
 ;-----------------------------------------------------------------------------
 		MACRO
 $label	Blend8Pixels $BlendPixel
-		
+
 b8p1_$label Blend4Pixels $BlendPixel
-b8p2_$label Blend4Pixels $BlendPixel		
-				
+b8p2_$label Blend4Pixels $BlendPixel
+
 		MEND
-		
+
 ;-----------------------------------------------------------------------------
 ;
 ;-----------------------------------------------------------------------------
 		MACRO
 $label	Blend16Pixels $BlendPixel
-		
+
 b16p1_$label Blend8Pixels $BlendPixel
-b16p2_$label Blend8Pixels $BlendPixel		
-				
+b16p2_$label Blend8Pixels $BlendPixel
+
 		MEND
-		
+
 ;-----------------------------------------------------------------------------
 ;
 ;-----------------------------------------------------------------------------
 		MACRO
 $label	Blend32Pixels $BlendPixel
-		
+
 b32p1_$label Blend16Pixels $BlendPixel
-b32p2_$label Blend16Pixels $BlendPixel		
-				
+b32p2_$label Blend16Pixels $BlendPixel
+
 		MEND
 
 ;-----------------------------------------------------------------------------
-; A macro for source over compositing one row of pixels and saving the results 
+; A macro for source over compositing one row of pixels and saving the results
 ; to destination buffer.
 ;
 ; @param dest			Destination	buffer						(r0)
 ; @param src			Source buffer							(r1)
 ; @param length			Length									(r2)
 ; @param const_alpha	Constant alpha					  		(r3)
-; @param r14 			Component Half (0x800080)		  		(r14)	
+; @param r14 			Component Half (0x800080)		  		(r14)
 ;
 ;  @note Advances r0, r1
 ;  @note Trashes r2, r4-r12
@@ -260,73 +260,73 @@ brp1_$label	Blend32Pixels $BlendPixel
 		b		bloop_$label
 
 b_remaining_$label
-		
+
 		; Remaining 31 pixels
-		
+
 		addmi	r2, r2, #32
 
 		; Blend 16 pixels
 		tst		r2, #16
 		beq		b_remaining8_$label
-		
+
 brp2_$label Blend16Pixels $BlendPixel
-	
-b_remaining8_$label	
-		
+
+b_remaining8_$label
+
 		; Blend 8 pixels
 		tst		r2, #8
 		beq		b_remaining4_$label
-		
-brp3_$label Blend8Pixels $BlendPixel			
-		
-b_remaining4_$label		
-		
+
+brp3_$label Blend8Pixels $BlendPixel
+
+b_remaining4_$label
+
 		; Blend 4 pixels
 		tst		r2, #4
 		beq		b_remaining3_$label
-		
-brp4_$label Blend4Pixels $BlendPixel			
+
+brp4_$label Blend4Pixels $BlendPixel
 
 b_remaining3_$label
 
 		; Remaining 3 pixels
-	
+
 		tst		r2, #2
 		beq		b_last_$label
-		
+
 		ldmia 	r1!, {r4-r5}
 		ldm	  	r0,  {r9-r10}
-		
+
 brp5_$label	$BlendPixel r9, r4, r3
 brp6_$label	$BlendPixel r10, r5, r3
-		
+
 		stmia 	r0!, {r9-r10}
 
 b_last_$label
-		
+
 		tst		r2, #1
 		beq		bexit_$label
-		
+
 		ldr		r4, [r1]
 		ldr		r9, [r0]
 
 bpl_$label	$BlendPixel r9, r4, r3
-		
+
 		str 	r9, [r0]
 
 bexit_$label
 
 		MEND
-		
+
 ;-----------------------------------------------------------------------------
-; A macro for source over compositing one row of pixels and saving the results 
+; A macro for source over compositing one row of pixels and saving the results
 ; to destination buffer. Restores all registers.
 ;
 ; @param dest			Destination	buffer						(r0)
 ; @param src			Source buffer							(r1)
 ; @param length			Length									(r2)
 ; @param const_alpha	Constant alpha					  		(r3)
-; @param r14 			Component Half (0x800080)		  		(r14)	
+; @param r14 			Component Half (0x800080)		  		(r14)
 ;
 ;  @note Advances r0, r1
 ;  @note Trashes r2, r4-r12
@@ -336,16 +336,16 @@ $label	BlendRowSafe $BlendPixel
 
 		stmfd	sp!, {r0-r6} ; Preserves registers only up to r6
 
-brs_$label  BlendRow $BlendPixel		
+brs_$label  BlendRow $BlendPixel
 
 		ldmfd	sp!, {r0-r6}
 
-		MEND		
-		
+		MEND
+
 
 ;-----------------------------------------------------------------------------
-; Pix Copy. 
-; NOTE! Cache line size of ARM1136JF-S and ARM1136J-S is 32 bytes (8 pixels). 
+; Pix Copy.
+; NOTE! Cache line size of ARM1136JF-S and ARM1136J-S is 32 bytes (8 pixels).
 ;
 ; @param dst			Destination	pixels						(r0)
 ; @param src			Source pixels							(r1)
@@ -369,7 +369,7 @@ pcpy_loop_$label
 pcpy_remaining_$label
 
 		; Copy up to 7 remaining pixels
-		
+
 		; Copy 4 pixels
 		tst		$len, #4
 		ldmneia	$src!, {r3-r6}
@@ -384,9 +384,9 @@ pcpy_remaining_$label
 		strne 	r3, [$dst]
 
 		MEND
-		
+
 ;-----------------------------------------------------------------------------
-; General Pix Copy. Maximum 8 pixels at time. Restores all registers. 
+; General Pix Copy. Maximum 8 pixels at time. Restores all registers.
 ;
 ; @param dst			Destination	pixels						(r0)
 ; @param src			Source pixels							(r1)
@@ -402,10 +402,10 @@ $label	PixCpySafe $dst, $src, $len
 pcs_$label  PixCpy $dst, $src, $len
 
 		ldmfd	sp!, {r0-r6}		; pop
-		
+
 		MEND
-		
-		
+
+
 ;-----------------------------------------------------------------------------
 ; A macro for source over compositing one pixel and saving the result to
 ; dst register.
@@ -422,7 +422,7 @@ $label	PixelSourceOver $dst, $src, $const_alpha
 
 		; Negate src and extract alpha
 		mvn		$const_alpha, $src ; bitwise not
-		uxtb	$const_alpha, $const_alpha, ror #24	; r3 = ((r3 & 0xFF000000) >> 24);  
+		uxtb	$const_alpha, $const_alpha, ror #24	; r3 = ((r3 & 0xFF000000) >> 24);
 
 		;cmp		$const_alpha, #255	; test for full transparency ( negated )
 		;beq		exit_$label
@@ -430,12 +430,12 @@ $label	PixelSourceOver $dst, $src, $const_alpha
 		moveq	$dst, $src
 		beq		exit_$label
 
-		ByteMul	$dst, $dst, $const_alpha	
+		ByteMul	$dst, $dst, $const_alpha
 		add		$dst, $src, $dst
-		
+
 exit_$label
 		MEND
-		
+
 ;-----------------------------------------------------------------------------
 ; A macro for source over compositing one pixel and saving the result to
 ; dst register.
@@ -457,7 +457,7 @@ $label	PixelSourceOverConstAlpha $dst, $src, $const_alpha
 
 		; Negate src and extract alpha
 		mvn		$const_alpha, $src ; bitwise not
-		uxtb	$const_alpha, $const_alpha, ror #24	; r3 = ((r3 & 0xFF000000) >> 24);  
+		uxtb	$const_alpha, $const_alpha, ror #24	; r3 = ((r3 & 0xFF000000) >> 24);
 
 		ByteMul	$dst, $dst, $const_alpha
 
@@ -466,8 +466,8 @@ $label	PixelSourceOverConstAlpha $dst, $src, $const_alpha
 		; recover alpha
 		ldmfd	sp!, {$const_alpha}
 
-		MEND		
-		
+		MEND
+
 ;-----------------------------------------------------------------------------
 ; A macro for source over compositing one pixel and saving the result to
 ; a register.
@@ -491,6 +491,6 @@ $label	PixelSourceConstAlpha $dst, $src, $const_alpha
 		; recover r2 and r14
 		ldmfd	sp!, {r2, r14}
 
-		MEND		
-		
+		MEND
+
 		END ; File end
diff --git a/src/gui/painting/qdrawhelper_armv6_rvct.s b/src/gui/painting/qdrawhelper_armv6_rvct.s
index 3ffe48b..dd29f80 100644
--- a/src/gui/painting/qdrawhelper_armv6_rvct.s
+++ b/src/gui/painting/qdrawhelper_armv6_rvct.s
@@ -52,22 +52,22 @@
 
 		ARM
 		PRESERVE8
-		
+
 		INCLUDE		qdrawhelper_armv6_rvct.inc
-		
+
 ;-----------------------------------------------------------------------------
 ; qt_memfill32_armv6
-; 
+;
 ; @brief Not yet in use!
 ;
 ; @param dest			Destination	buffer						(r0)
 ; @param value			Value									(r1)
 ; @param count			Count									(r2)
-; 
+;
 ;---------------------------------------------------------------------------
 qt_memfill32_armv6 Function
 		stmfd	sp!, {r4-r12, r14}
-		
+
 		mov		r3, r1
 		mov		r4, r1
 		mov		r5, r1
@@ -75,7 +75,7 @@ qt_memfill32_armv6 Function
 		mov		r7, r1
 		mov		r8, r1
 		mov		r9, r1
-	
+
 mfill_loop
 		; Fill 32 pixels per loop iteration
 		subs	r2, r2, #32
@@ -88,16 +88,16 @@ mfill_loop
 mfill_remaining
 
 		; Fill up to 31 remaining pixels
-		
+
 		; Fill 16 pixels
 		tst		r2, #16
 		stmneia	r0!, {r1, r3, r4, r5, r6, r7, r8, r9}
 		stmneia	r0!, {r1, r3, r4, r5, r6, r7, r8, r9}
-		
+
 		; Fill 8 pixels
 		tst		r2, #8
 		stmneia	r0!, {r1, r3, r4, r5, r6, r7, r8, r9}
-		
+
 		; Fill 4 pixels
 		tst		r2, #4
 		stmneia	r0!, {r1, r3, r4, r5}
@@ -109,31 +109,31 @@ mfill_remaining
 		; Fill last one
 		tst		r2, #1
 		strne 	r1, [r0]
-		
+
 		ldmfd	sp!, {r4-r12, pc}		; pop and return
-					
+
 ;-----------------------------------------------------------------------------
 ; comp_func_Source_arm
-; 
-; @brief 
+;
+; @brief
 ;
 ; @param dest			Destination	buffer						(r0)
 ; @param src			Source buffer							(r1)
 ; @param length			Length									(r2)
 ; @param const_alpha	Constant alpha							(r3)
-; 
+;
 ;---------------------------------------------------------------------------
 comp_func_Source_armv6 Function
 		stmfd	sp!, {r4-r12, r14}
-	
+
 		cmp		r3, #255 ; if(r3 == 255)
 		bne		src2 ; branch if not
-	
+
 src1	PixCpy	r0, r1, r2
 
 		ldmfd	sp!, {r4-r12, pc}		; pop and return
 
-src2	
+src2
 		;ldr		r14, =ComponentHalf ; load 0x800080 to r14
 		mov		r14, #0x800000
 		add		r14, r14, #0x80
@@ -144,35 +144,34 @@ src22   BlendRow PixelSourceConstAlpha
 
 ;-----------------------------------------------------------------------------
 ; comp_func_SourceOver_arm
-; 
-; @brief 
+;
+; @brief
 ;
 ; @param dest			Destination	buffer						(r0)
 ; @param src			Source buffer							(r1)
 ; @param length			Length									(r2)
 ; @param const_alpha	Constant alpha							(r3)
-; 
+;
 ;---------------------------------------------------------------------------
 comp_func_SourceOver_armv6 Function
 		stmfd	sp!, {r4-r12, r14}
-	
+
 		;ldr		r14, =ComponentHalf ; load 0x800080 to r14
 		mov		r14, #0x800000
 		add		r14, r14, #0x80
-	
+
 		cmp		r3, #255 ; if(r3 == 255)
 		bne		srcovr2 ; branch if not
-	
+
 srcovr1	 BlendRow PixelSourceOver
-		
+
 		ldmfd	sp!, {r4-r12, pc}		; pop and return
 
 srcovr2
- 
+
 srcovr22  BlendRow PixelSourceOverConstAlpha
 
 		ldmfd	sp!, {r4-r12, pc}		; pop and return
-		
 
-		END	; File end		
-		
+
+		END	; File end
diff --git a/src/gui/painting/qwindowsurface_s60_p.h b/src/gui/painting/qwindowsurface_s60_p.h
index 40a866d..6a31ced 100644
--- a/src/gui/painting/qwindowsurface_s60_p.h
+++ b/src/gui/painting/qwindowsurface_s60_p.h
@@ -81,7 +81,7 @@ public:
     static void unlockBitmapHeap();
 
     CFbsBitmap *symbianBitmap() const;
-    
+
 private:
     void updatePaintDeviceOnBitmap();