# HG changeset patch
# User insilmaril
# Date 1260464688 0
# Node ID 3086ee01554a85bb3cee4389bf717051261989ed
# Parent  2881c44241909e519c79ce50b03fa457be2de8bf
minor fixes

diff -r 2881c4424190 -r 3086ee01554a linkablemapobj.cpp
--- a/linkablemapobj.cpp	Mon Dec 07 21:56:46 2009 +0000
+++ b/linkablemapobj.cpp	Thu Dec 10 17:04:48 2009 +0000
@@ -436,7 +436,7 @@
 	// updateLinkGeometry is called from move, but called from constructor we don't
 	// have parents yet...
 
-//cout <<"LMO::updateLinkGeometry: "<<treeItem->getHeadingStd()<<"  "<<parObj<<endl;
+	//cout <<"LMO::updateLinkGeometry: "<<treeItem->getHeadingStd()<<"  "<<parObj<<endl;
 	if (!parObj)	
 	{
 		// If I am a mapcenter, set childPos to middle of MapCenterObj
diff -r 2881c4424190 -r 3086ee01554a macros/macro-7.vys
--- a/macros/macro-7.vys	Mon Dec 07 21:56:46 2009 +0000
+++ b/macros/macro-7.vys	Thu Dec 10 17:04:48 2009 +0000
@@ -1,3 +1,2 @@
 # Macro F7
 colorSubtree ("#0000ff");
-toggleFlag ("info");
diff -r 2881c4424190 -r 3086ee01554a mainwindow.cpp
--- a/mainwindow.cpp	Mon Dec 07 21:56:46 2009 +0000
+++ b/mainwindow.cpp	Thu Dec 10 17:04:48 2009 +0000
@@ -24,7 +24,7 @@
 #include "warningdialog.h"
 #include "xlinkitem.h"
 
-#include <modeltest.h>	// FIXME-3
+//#include <modeltest.h>	// FIXME-3
 
 #if defined(Q_OS_WIN32)
 // Define only this structure as opposed to
@@ -58,7 +58,6 @@
 QMenu* branchRemoveContextMenu;
 QMenu* branchLinksContextMenu;
 QMenu* branchXLinksContextMenuEdit;
-QMenu* branchXLinksContextMenuFollow;
 QMenu* floatimageContextMenu;
 QMenu* canvasContextMenu;
 QMenu* fileLastMapsMenu;
@@ -1627,8 +1626,6 @@
 	// This will be populated "on demand" in MapEditor::updateActions
 	branchContextMenu->addSeparator();	
 	branchXLinksContextMenuEdit =branchContextMenu->addMenu (tr ("Edit XLink","Context menu name"));
-	branchXLinksContextMenuFollow =branchContextMenu->addMenu (tr ("Follow XLink","Context menu name"));
-	connect( branchXLinksContextMenuFollow, SIGNAL( triggered(QAction *) ), this, SLOT( editFollowXLink(QAction * ) ) );
 	connect( branchXLinksContextMenuEdit, SIGNAL( triggered(QAction *) ), this, SLOT( editEditXLink(QAction * ) ) );
 
 
@@ -1760,7 +1757,7 @@
 	VymModel *vm=new VymModel;
 
 	/////////////////////////////////////
-	new ModelTest(vm, this);	//FIXME-3
+//	new ModelTest(vm, this);	//FIXME-3
 	/////////////////////////////////////
 
 	VymView *vv=new VymView (vm);
@@ -2977,14 +2974,6 @@
 	if (m) m->saveFloatImage();
 }
 
-void Main::editFollowXLink(QAction *a)
-{
-
-	VymModel *m=currentModel();
-	if (m)
-		m->followXLink(branchXLinksContextMenuFollow->actions().indexOf(a));
-}
-
 void Main::editEditXLink(QAction *a)
 {
 	VymModel *m=currentModel();
@@ -3461,7 +3450,6 @@
 			{
 				// Take care of xlinks  
 				branchXLinksContextMenuEdit->clear();
-				branchXLinksContextMenuFollow->clear();
 				if (selbi->xlinkCount()>0)
 				{
 					BranchItem *bi;
@@ -3474,7 +3462,6 @@
 							s=bi->getHeading();
 							if (s.length()>xLinkMenuWidth)
 								s=s.left(xLinkMenuWidth)+"...";
-							branchXLinksContextMenuFollow->addAction (s);
 							branchXLinksContextMenuEdit->addAction (s);
 						}	
 					}
diff -r 2881c4424190 -r 3086ee01554a mainwindow.h
--- a/mainwindow.h	Mon Dec 07 21:56:46 2009 +0000
+++ b/mainwindow.h	Thu Dec 10 17:04:48 2009 +0000
@@ -164,7 +164,6 @@
     void editDeleteSelection();
     void editLoadImage();
     void editSaveImage();
-    void editFollowXLink (QAction *);
     void editEditXLink (QAction *);
 
     void formatSelectColor();
diff -r 2881c4424190 -r 3086ee01554a mapeditor.cpp
--- a/mapeditor.cpp	Mon Dec 07 21:56:46 2009 +0000
+++ b/mapeditor.cpp	Thu Dec 10 17:04:48 2009 +0000
@@ -23,11 +23,6 @@
 extern bool debug;
 
 extern QMenu* branchContextMenu;
-extern QMenu* branchAddContextMenu;
-extern QMenu* branchRemoveContextMenu;
-extern QMenu* branchLinksContextMenu;
-extern QMenu* branchXLinksContextMenuEdit;
-extern QMenu* branchXLinksContextMenuFollow;
 extern QMenu* floatimageContextMenu;
 extern QMenu* canvasContextMenu;
 
diff -r 2881c4424190 -r 3086ee01554a parser.cpp
--- a/parser.cpp	Mon Dec 07 21:56:46 2009 +0000
+++ b/parser.cpp	Thu Dec 10 17:04:48 2009 +0000
@@ -294,7 +294,7 @@
 {
 	int start=current;
 	if (current<0) runScript();
-	if (current>=script.length()-1) return false;
+	if (current+1>=script.length()) return false;
 
 	bool inBracket=false;
 	while (true)
@@ -316,7 +316,7 @@
 			while (script.at(current)!='\n')
 			{
 				current++;
-				if (current>=script.length()) 
+				if (current+1>=script.length()) 
 					return false;
 			}
 			start=current;
@@ -331,7 +331,7 @@
 		}
 		
 		// Check for end of script
-		if (current==script.length() )
+		if (current+1>=script.length() )
 		{
 			if (inBracket)
 			{
diff -r 2881c4424190 -r 3086ee01554a version.h
--- a/version.h	Mon Dec 07 21:56:46 2009 +0000
+++ b/version.h	Thu Dec 10 17:04:48 2009 +0000
@@ -7,7 +7,7 @@
 #define __VYM_VERSION "1.13.0"
 //#define __VYM_CODENAME "Codename: RC-1"
 #define __VYM_CODENAME "Codename: development version, not for production!"
-#define __VYM_BUILD_DATE "2009-12-07"
+#define __VYM_BUILD_DATE "2009-12-10"
 
 
 bool checkVersion(const QString &);
diff -r 2881c4424190 -r 3086ee01554a vym.pro
--- a/vym.pro	Mon Dec 07 21:56:46 2009 +0000
+++ b/vym.pro	Thu Dec 10 17:04:48 2009 +0000
@@ -6,8 +6,6 @@
 CONFIG += qdbus
 
 # Only needed with Qt < 4.6
-include (/data/qtanimationframework-2.3-opensource/src/gui-animation.pri)
-include (/data/qtanimationframework-2.3-opensource/src/corelib-animation.pri)
 include (/data/qtanimationframework-2.3-opensource/src/qtanimationframework.pri)
 
 TRANSLATIONS += lang/vym_de.ts
diff -r 2881c4424190 -r 3086ee01554a vymmodel.cpp
--- a/vymmodel.cpp	Mon Dec 07 21:56:46 2009 +0000
+++ b/vymmodel.cpp	Thu Dec 10 17:04:48 2009 +0000
@@ -2339,11 +2339,20 @@
 	if (branch && dst)
 	{
 		unselect();
-
+ 
 		emit (layoutAboutToBeChanged() );
 		BranchItem *branchpi=(BranchItem*)branch->parent();
 		// Remove at current position
 		int n=branch->childNum();
+
+/* FIXME-4 seg since 20091207, if ModelTest active. strange.
+		// error occured if relinking branch to empty mainbranch
+		cout<<"VM::relinkBranch:\n";
+		cout<<"    b="<<branch->getHeadingStd()<<endl;
+		cout<<"  dst="<<dst->getHeadingStd()<<endl;
+		cout<<"  pos="<<pos<<endl;
+		cout<<"   n1="<<n<<endl;
+*/		
 		beginRemoveRows (index(branchpi),n,n);
 		branchpi->removeChild (n);
 		endRemoveRows();