svn commit: r329034 - head/german/tipp10/files

[John Marino]

Author: marino
Date: Wed Oct  2 10:41:05 2013
New Revision: 329034
URL: http://svnweb.freebsd.org/changeset/ports/329034

Log:
  german/tipp10: Fix c++ -fpermissive errors on gcc 4.7+
  
  Approved by:	portmgr (bapt, implicit)

Added:
  head/german/tipp10/files/patch-widget_tickerboard.cpp   (contents, props changed)

Added: head/german/tipp10/files/patch-widget_tickerboard.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/german/tipp10/files/patch-widget_tickerboard.cpp	Wed Oct  2 10:41:05 2013	(r329034)
@@ -0,0 +1,46 @@
+--- widget/tickerboard.cpp.orig	2013-10-02 09:55:42.000000000 +0000
++++ widget/tickerboard.cpp
+@@ -97,7 +97,7 @@ void TickerBoard::startTicker(bool wasPa
+ 
+ 		if (tickerSpeed == 50) {
+ 			scrollOffset = 290;
+-			scroll(-290, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());
++			scroll(-290, 0, QRect(10, 15, 590, 35)); //contentsRect());
+ 		}
+ 
+ 		startFlag = true;
+@@ -153,7 +153,7 @@ void TickerBoard::changeChar() {
+ 			scrollOffset = 0;
+ 		} else {
+ 			scrollOffset = 290;
+-			scroll(-290, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());
++			scroll(-290, 0, QRect(10, 15, 590, 35)); //contentsRect());
+ 		}
+ 		splitLesson();
+ 	}
+@@ -242,7 +242,7 @@ void TickerBoard::progress() {
+ 
+ 				// Move ticker 1 pixel to left
+ 				scrollOffset++;
+-				scroll(-1, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());
++				scroll(-1, 0, QRect(10, 15, 590, 35)); //contentsRect());
+ 
+ 				if ((lessonOffset - scrollOffset) <= 30) {
+ 					setSpeed(tickerSpeed);
+@@ -265,14 +265,14 @@ void TickerBoard::progress() {
+ 			// 160 pixels overage (because the user must see at least the next word)
+ 			if ((lessonOffset - scrollOffset) > 200) {
+ 				scrollOffset += (lessonOffset - scrollOffset) - 200;
+-				scroll(-((lessonOffset - scrollOffset) - 200), 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());
++				scroll(-((lessonOffset - scrollOffset) - 200), 0, QRect(10, 15, 590, 35)); //contentsRect());
+ 			}
+ 		} else {
+ 			// If the user types faster than the ticker, move ticker faster after
+ 			// 160 pixels overage (because the user must see at least the next word)
+ 			if ((lessonOffset - scrollOffset) > 280) {
+ 				scrollOffset += 570;
+-				scroll(-570, 0, QRect::QRect(10, 15, 590, 35)); //contentsRect());
++				scroll(-570, 0, QRect(10, 15, 590, 35)); //contentsRect());
+ 			}
+ 
+ 		}