# HG changeset patch
# User insilmaril
# Date 1207643317 0
# Node ID 7df0b7986274c4f72fd79d2008418332dbadcf66
# Parent  16af22e2c1552cfd9e3dcf95cff59796f63480bf
1.11.7: Fixed hanging find function

diff -r 16af22e2c155 -r 7df0b7986274 floatimageobj.cpp
--- a/floatimageobj.cpp	Tue Apr 08 08:28:37 2008 +0000
+++ b/floatimageobj.cpp	Tue Apr 08 08:28:37 2008 +0000
@@ -225,7 +225,8 @@
 	//TODO abstract in linkablemapobj.h
 }
 
-QString FloatImageObj::getSelectString()
+/*
+QString FloatImageObj::getSelectString()  //FIXME move to selection
 {
 	QString s;
 	if (parObj)
@@ -240,4 +241,5 @@
 	return s;
 
 }
+*/
 
diff -r 16af22e2c155 -r 7df0b7986274 floatimageobj.h
--- a/floatimageobj.h	Tue Apr 08 08:28:37 2008 +0000
+++ b/floatimageobj.h	Tue Apr 08 08:28:37 2008 +0000
@@ -35,7 +35,6 @@
 	virtual void calcBBoxSizeWithChilds();	// calc size of  BBox including childs recursivly
 	virtual QString saveToDir(const QString &,const QString&);
 	virtual void resetSaveCounter();
-	virtual QString getSelectString();
 
 
 protected:
diff -r 16af22e2c155 -r 7df0b7986274 highlighter.cpp
--- a/highlighter.cpp	Tue Apr 08 08:28:37 2008 +0000
+++ b/highlighter.cpp	Tue Apr 08 08:28:37 2008 +0000
@@ -38,6 +38,7 @@
     QStringList keywordPatterns;
     keywordPatterns << "\\baddBranch\\b" 
 					<< "\\baddBranchBefore\\b" 
+                    << "\\baddMapCenter\\b" 
                     << "\\baddMapInsert\\b" 
 					<< "\\baddMapReplace\\b"
                     << "\\bcolorBranch\\b" 
diff -r 16af22e2c155 -r 7df0b7986274 linkablemapobj.h
--- a/linkablemapobj.h	Tue Apr 08 08:28:37 2008 +0000
+++ b/linkablemapobj.h	Tue Apr 08 08:28:37 2008 +0000
@@ -102,21 +102,16 @@
 	virtual MapEditor* getMapEditor();		// get MapEditor (usually from parent);
 	virtual QPointF getRandPos();			// make randomised position
 
-    //virtual void alignRelativeTo(const QPointF );
 	virtual void reposition();
 	virtual void requestReposition();		// do reposition after next user event
 	virtual void forceReposition();			// to force a reposition now (outside
 											// of mapeditor e.g. in noteeditor
 	virtual bool repositionRequested();
 
-	//virtual QRectF getTotalBBox();			// return BBox including childs			
-	//virtual QRectF getBBoxSizeWithChilds();// return size of BBox including childs  
 	virtual void calcBBoxSizeWithChilds()=0;// calc size of  BBox including childs recursivly
 
     virtual void select();
     virtual void unselect();
-	virtual	QString getSelectString()=0;
-	//virtual QString saveToDir (const QString&,const QString&, const QPointF&);// Save data to XML
 
 protected:
 	void parabel(QPolygonF &,double,double,double,double);	// Create Parabel connecting two points