File noteedit-2.8.1_gcc43_misc_fixes.patch of Package noteedit

Index: noteedit/musicxmlimport.h
===================================================================
--- noteedit/musicxmlimport.h.orig	2007-11-16 01:23:41.393992383 +0100
+++ noteedit/musicxmlimport.h	2007-11-16 01:23:41.618005686 +0100
@@ -127,7 +127,7 @@ private:
 	void handlePedal(NChord * chord);
 	void handleTuplet(NMusElement * elem);
 	void handleVoice(int staff, int voice);
-	void handleVoiceDoStaff(int staff, int voice, NStaff * & staff, bool & mapped);
+	void handleVoiceDoStaff(int staff_nr, int voice_nr, NStaff * & staff, bool & mapped);
 	int current_max_voice_nr; /* the maximum voice number reached until now */
 	void handleWords();
 	void initStAttributes();
Index: noteedit/resource.cpp
===================================================================
--- noteedit/resource.cpp.orig	2006-05-01 08:41:24.000000000 +0200
+++ noteedit/resource.cpp	2007-11-16 01:23:41.622005924 +0100
@@ -64,8 +64,8 @@
 #include "uiconnect.h"
 #include "lilytest.h"
 #define HELP_LINE_COLOR (20, 250, 20)
-#define DUMMY_NOTE_COLOR (100, 100, 100)
-#define DUMMY_NOTE_WIDTH 2
+#define RES_DUMMY_NOTE_COLOR (100, 100, 100)
+#define RES_DUMMY_NOTE_WIDTH 2
 
 using namespace std;
 
@@ -761,7 +761,7 @@ NResource::NResource() {
 	greyPen_  = QPen(QColor(128, 128, 128));
 	helpLinePen_ = QPen(QColor HELP_LINE_COLOR );
 
-	dummyNotePen_ = QPen(QColor DUMMY_NOTE_COLOR, DUMMY_NOTE_WIDTH );
+	dummyNotePen_ = QPen(QColor RES_DUMMY_NOTE_COLOR, RES_DUMMY_NOTE_WIDTH );
 
 	exportWarning_ = new expWrn( 0 );
 
Index: configure.in.in
===================================================================
--- configure.in.in.orig	2006-03-27 08:07:18.000000000 +0200
+++ configure.in.in	2007-11-16 01:34:42.701299858 +0100
@@ -275,10 +275,10 @@ then
 
 	fi
 	cat >tse3vtest.cc << EOF
-#include <istream.h>
+#include <iostream>
 #include <tse3/TSE3.h>
 int main() {
-	cout << TSE3::TSE3_Version() << endl;
+	std::cout << TSE3::TSE3_Version() << std::endl;
 	return 0;
 }
 EOF
Index: noteedit/midimapper.cpp
===================================================================
--- noteedit/midimapper.cpp.orig	2006-03-26 22:54:52.000000000 +0200
+++ noteedit/midimapper.cpp	2007-11-16 01:40:51.735257753 +0100
@@ -31,7 +31,7 @@
 #ifndef WITH_TSE3
 #include <iostream.h>
 #else
-#include <istream.h>
+#include <iostream>
 #endif
 #endif
 #include <unistd.h>
Index: noteedit/multistaffinfo.cpp
===================================================================
--- noteedit/multistaffinfo.cpp.orig	2006-03-26 22:54:53.000000000 +0200
+++ noteedit/multistaffinfo.cpp	2007-11-16 01:28:24.590810653 +0100
@@ -20,7 +20,7 @@
 /*											*/
 /****************************************************************************************/
 
-#include <istream.h>
+#include <istream>
 #include <cstdlib>
 #include "multistaffinfo.h"
 #include "mainframewidget.h"
Index: configure
===================================================================
--- configure.orig	2006-08-09 19:11:30.000000000 +0200
+++ configure	2007-11-16 01:34:14.675632314 +0100
@@ -31565,10 +31565,10 @@ then
 
 	fi
 	cat >tse3vtest.cc << EOF
-#include <istream.h>
+#include <iostream>
 #include <tse3/TSE3.h>
 int main() {
-	cout << TSE3::TSE3_Version() << endl;
+	std::cout << TSE3::TSE3_Version() << std::endl;
 	return 0;
 }
 EOF
Index: configure.in
===================================================================
--- configure.in.orig	2006-08-09 19:11:21.000000000 +0200
+++ configure.in	2007-11-16 01:34:29.504514641 +0100
@@ -332,10 +332,10 @@ then
 
 	fi
 	cat >tse3vtest.cc << EOF
-#include <istream.h>
+#include <iostream>
 #include <tse3/TSE3.h>
 int main() {
-	cout << TSE3::TSE3_Version() << endl;
+	std::cout << TSE3::TSE3_Version() << std::endl;
 	return 0;
 }
 EOF
Index: noteedit/keyoffs.cpp
===================================================================
--- noteedit/keyoffs.cpp.orig	2006-03-26 22:54:52.000000000 +0200
+++ noteedit/keyoffs.cpp	2007-11-16 01:39:29.550367631 +0100
@@ -22,7 +22,7 @@
 
 #include <qbuttongroup.h>
 #include <qradiobutton.h>
-#include <iostream.h>
+#include <iostream>
 #include "keyoffs.h"
 #include "resource.h"
 #include "keysig.h"