# HG changeset patch
# User insilmaril
# Date 1193144722 0
# Node ID a1ae877b438d2e079f7c176c8b8c76d2799458a9
# Parent  ff98aee6fb9901fae9f854387686ed5e12a325da
Fixes for compiling with gcc 4.3

diff -r ff98aee6fb99 -r a1ae877b438d branchobj.cpp
--- a/branchobj.cpp	Mon Oct 22 09:50:09 2007 +0000
+++ b/branchobj.cpp	Tue Oct 23 13:05:22 2007 +0000
@@ -366,10 +366,12 @@
 	// BranchObj can use color of heading
 
 	if (mapEditor)
+	{
 		if (mapEditor->getMapLinkColorHint()==HeadingColor)
 			LinkableMapObj::setLinkColor (heading->getColor() );
 		else	
 			LinkableMapObj::setLinkColor ();
+	}		
 }
 
 void BranchObj::setColorSubtree(QColor col)
diff -r ff98aee6fb99 -r a1ae877b438d demos/vym-projectplan.vym
Binary file demos/vym-projectplan.vym has changed
diff -r ff98aee6fb99 -r a1ae877b438d exports.h
--- a/exports.h	Mon Oct 22 09:50:09 2007 +0000
+++ b/exports.h	Tue Oct 23 13:05:22 2007 +0000
@@ -46,6 +46,7 @@
 public:
 	ExportASCII();
 	virtual void doExport();
+	virtual QString underline (QString &text, QString &line);
 };
 
 ///////////////////////////////////////////////////////////////////////
diff -r ff98aee6fb99 -r a1ae877b438d mainwindow.cpp
--- a/mainwindow.cpp	Mon Oct 22 09:50:09 2007 +0000
+++ b/mainwindow.cpp	Tue Oct 23 13:05:22 2007 +0000
@@ -3,6 +3,7 @@
 #include <QtGui>
 
 #include <iostream>
+#include <typeinfo>
 
 #include "aboutdialog.h"
 #include "branchpropwindow.h"
diff -r ff98aee6fb99 -r a1ae877b438d ornamentedobj.cpp
--- a/ornamentedobj.cpp	Mon Oct 22 09:50:09 2007 +0000
+++ b/ornamentedobj.cpp	Tue Oct 23 13:05:22 2007 +0000
@@ -1,3 +1,5 @@
+#include <typeinfo> 
+
 #include "ornamentedobj.h"
 #include "texteditor.h"
 #include "mapeditor.h"
diff -r ff98aee6fb99 -r a1ae877b438d selection.cpp
--- a/selection.cpp	Mon Oct 22 09:50:09 2007 +0000
+++ b/selection.cpp	Tue Oct 23 13:05:22 2007 +0000
@@ -1,3 +1,5 @@
+#include <typeinfo>
+
 #include "selection.h"
 
 #include "mainwindow.h"
diff -r ff98aee6fb99 -r a1ae877b438d tex/vym.changelog
--- a/tex/vym.changelog	Mon Oct 22 09:50:09 2007 +0000
+++ b/tex/vym.changelog	Tue Oct 23 13:05:22 2007 +0000
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 23 13:11:52 CEST 2007 - uwedr@suse.de
+
+- Bugfix: included more <typeinfo> for compiling with new gcc 4.3
+
 -------------------------------------------------------------------
 Fri Oct 19 18:08:27 CEST 2007 - uwedr@suse.de
 
diff -r ff98aee6fb99 -r a1ae877b438d xml-vym.cpp
--- a/xml-vym.cpp	Mon Oct 22 09:50:09 2007 +0000
+++ b/xml-vym.cpp	Tue Oct 23 13:05:22 2007 +0000
@@ -4,6 +4,7 @@
 #include <QColor>
 #include <QTextStream>
 #include <iostream>
+#include <typeinfo>
 
 #include "misc.h"
 #include "settings.h"