diff -r 5b6f2a396979 -r 626fd85b1f69 xml.cpp
--- a/xml.cpp	Wed May 31 12:27:39 2006 +0000
+++ b/xml.cpp	Tue Sep 05 15:05:18 2006 +0000
@@ -2,7 +2,9 @@
 
 #include <qmessagebox.h>
 #include <qcolor.h>
-#include <qstylesheet.h>
+#include <q3stylesheet.h>
+//Added by qt3to4:
+#include <QTextStream>
 #include <iostream>
 
 #include "misc.h"
@@ -503,26 +505,26 @@
 		QFile file (fn);
 		QString s;						// Reading a note
 
-		if ( !file.open( IO_ReadOnly) )
+		if ( !file.open( QIODevice::ReadOnly) )
 		{
 			qWarning ("mapBuilderHandler::readNoteAttr:  Couldn't load "+fn);
 			return false;
 		}	
 		QTextStream stream( &file );
 		QString lines;
-		while ( !stream.eof() ) {
+		while ( !stream.atEnd() ) {
 			lines += stream.readLine()+"\n"; 
 		}
 		file.close();
 		// Convert to richtext
-		if ( !QStyleSheet::mightBeRichText( lines ) )
+		if ( !Q3StyleSheet::mightBeRichText( lines ) )
 		{
 			// Here we are workarounding the QT conversion method:
 			// convertFromPlainText does not generate valid xml, needed
 			// for the parser, but just <p> and <br> without closing tags.
 			// So we have to add those by ourselves
 			//lines=quotemeta (lines);
-			lines = QStyleSheet::convertFromPlainText( lines, QStyleSheetItem::WhiteSpaceNormal );
+			lines = Q3StyleSheet::convertFromPlainText( lines, Q3StyleSheetItem::WhiteSpaceNormal );
 			lines.replace ("<br>","<br />");
 		}