File canorus-0.7.3-gcc7.patch of Package canorus

Overview Repositories Revisions Requests Users Attributes Meta

File canorus-0.7.3-gcc7.patch of Package canorus

------------------------------------------------------------------------
r1482 | matevz | 2018-04-04 22:02:47 +0200 (Wed, 04 Apr 2018) | 2 lines

Fixed if/for guard compilation errors under GCC 7.2.

Index: src/export/lilypondexport.cpp
===================================================================
--- src/export/lilypondexport.cpp	(revision 1481)
+++ src/export/lilypondexport.cpp	(revision 1482)
@@ -240,7 +240,7 @@
 		    (note->isPartOfChord() && note->isLastInChord()) )
 			_curStreamTime += note->timeLength();
 
-			break;
+		break;
 	}
 	case CAMusElement::Rest: {
 		// CARest
Index: src/layout/drawablekeysignature.cpp
===================================================================
--- src/layout/drawablekeysignature.cpp	(revision 1481)
+++ src/layout/drawablekeysignature.cpp	(revision 1482)
@@ -113,7 +113,7 @@
 		if ( curIdx + (clef?clef->c1():-2) - 28  > drawableStaff->staff()->numberOfLines()*2-1 )
 			curIdx-=7;
 
-			CADrawableAccidental *acc = new CADrawableAccidental(1, keySig, drawableStaff, newX, drawableStaff->calculateCenterYCoord(curIdx, x));
+		CADrawableAccidental *acc = new CADrawableAccidental(1, keySig, drawableStaff, newX, drawableStaff->calculateCenterYCoord(curIdx, x));
 
 		_drawableAccidentalList << acc;
 
Index: src/layout/kdtree.h
===================================================================
--- src/layout/kdtree.h	(revision 1481)
+++ src/layout/kdtree.h	(revision 1482)
@@ -290,8 +290,8 @@
 */
 template <typename T>
 double CAKDTree<T>::getMaxX() {
-    if(_mapXW.constEnd() == _mapXW.constBegin())
-        return 0.0;
+	if(_mapXW.constEnd() == _mapXW.constBegin())
+		return 0.0;
 	for (typename QMultiMap<double, T>::const_iterator it=(--_mapXW.constEnd());
 	     it!=_mapXW.constBegin();
 	     it--) {
Index: src/score/tuplet.cpp
===================================================================
--- src/score/tuplet.cpp	(revision 1481)
+++ src/score/tuplet.cpp	(revision 1482)
@@ -280,8 +280,7 @@
 	int i;
 	for (i=0; i<noteList().size() && noteList()[i]->timeStart() <= p->timeStart() &&
 	     (noteList()[i]->musElementType()!=Note || noteList()[i]->timeStart() != p->timeStart() || static_cast<CANote*>(noteList()[i])->diatonicPitch().noteName() < static_cast<CANote*>(p)->diatonicPitch().noteName() ); i++);
-
-	 _noteList.insert(i, p);
+	_noteList.insert(i, p);
 }
 
 /*!
Index: src/ui/mainwin.cpp
===================================================================
--- src/ui/mainwin.cpp	(revision 1481)
+++ src/ui/mainwin.cpp	(revision 1482)
@@ -5490,12 +5490,13 @@
 		foreach( CAContext* context, contexts ) {
 			// create a new context if there isn't one of the right type.
 			// exception: if the context is a staff, skip lyrics contexts instead of inserting a staff before a lyrics context.
-			if(context->contextType() == CAContext::Staff)
+			if(context->contextType() == CAContext::Staff) {
 				while(currentContext && currentContext->contextType() == CAContext::LyricsContext)
 					if(currentContext != currentSheet->contextList().last())
 						currentContext = currentSheet->contextList()[currentSheet->contextList().indexOf(currentContext)+1];
 					else
 						currentContext = 0;
+			}
 
 			if(!currentContext || context->contextType() != currentContext->contextType())
 			{
@@ -5553,7 +5554,7 @@
 					// Can't have playables between two notes linked by a tie. Remove the tie in this case.
 					// FIXME this should be the behavior for insert as well.
 					CAMusElement* leftPl = right;
-				    while((leftPl = staff->voiceList()[i]->previous(leftPl)) && !leftPl->isPlayable());
+					while((leftPl = staff->voiceList()[i]->previous(leftPl)) && !leftPl->isPlayable());
 					CANote* leftNote = (leftPl&&leftPl->musElementType()==CAMusElement::Note)?static_cast<CANote*>(leftPl):0;
 					CASlur* tie = leftNote?leftNote->tieStart():0;

Places

File canorus-0.7.3-gcc7.patch of Package canorus

Places