1.1 --- a/xml.cpp Mon Nov 20 12:12:00 2006 +0000
1.2 +++ b/xml.cpp Mon Nov 20 12:12:02 2006 +0000
1.3 @@ -3,14 +3,12 @@
1.4 #include <qmessagebox.h>
1.5 #include <qcolor.h>
1.6 #include <q3stylesheet.h>
1.7 -//Added by qt3to4:
1.8 #include <QTextStream>
1.9 #include <iostream>
1.10
1.11 #include "misc.h"
1.12 #include "settings.h"
1.13 #include "linkablemapobj.h"
1.14 -
1.15 #include "version.h"
1.16
1.17 static BranchObj *lastBranch;
1.18 @@ -18,6 +16,7 @@
1.19 static OrnamentedObj *lastOO;
1.20
1.21 extern Settings settings;
1.22 +extern QString vymVersion;
1.23
1.24 mapBuilderHandler::mapBuilderHandler() {}
1.25
1.26 @@ -67,7 +66,7 @@
1.27 "<h3>Map is newer than VYM</h3>"
1.28 "<p>The map you are just trying to load was "
1.29 "saved using vym " +atts.value("version")+". "
1.30 - "The version of this vym is " __VYM_VERSION
1.31 + "The version of this vym is " + vymVersion +
1.32 ". If you run into problems after pressing "
1.33 "the ok-button below, updating vym should help.");
1.34 else