1.1 --- a/floatimageobj.cpp Tue Apr 08 08:28:37 2008 +0000
1.2 +++ b/floatimageobj.cpp Tue Apr 08 08:28:37 2008 +0000
1.3 @@ -225,7 +225,8 @@
1.4 //TODO abstract in linkablemapobj.h
1.5 }
1.6
1.7 -QString FloatImageObj::getSelectString()
1.8 +/*
1.9 +QString FloatImageObj::getSelectString() //FIXME move to selection
1.10 {
1.11 QString s;
1.12 if (parObj)
1.13 @@ -240,4 +241,5 @@
1.14 return s;
1.15
1.16 }
1.17 +*/
1.18
2.1 --- a/floatimageobj.h Tue Apr 08 08:28:37 2008 +0000
2.2 +++ b/floatimageobj.h Tue Apr 08 08:28:37 2008 +0000
2.3 @@ -35,7 +35,6 @@
2.4 virtual void calcBBoxSizeWithChilds(); // calc size of BBox including childs recursivly
2.5 virtual QString saveToDir(const QString &,const QString&);
2.6 virtual void resetSaveCounter();
2.7 - virtual QString getSelectString();
2.8
2.9
2.10 protected:
3.1 --- a/highlighter.cpp Tue Apr 08 08:28:37 2008 +0000
3.2 +++ b/highlighter.cpp Tue Apr 08 08:28:37 2008 +0000
3.3 @@ -38,6 +38,7 @@
3.4 QStringList keywordPatterns;
3.5 keywordPatterns << "\\baddBranch\\b"
3.6 << "\\baddBranchBefore\\b"
3.7 + << "\\baddMapCenter\\b"
3.8 << "\\baddMapInsert\\b"
3.9 << "\\baddMapReplace\\b"
3.10 << "\\bcolorBranch\\b"
4.1 --- a/linkablemapobj.h Tue Apr 08 08:28:37 2008 +0000
4.2 +++ b/linkablemapobj.h Tue Apr 08 08:28:37 2008 +0000
4.3 @@ -102,21 +102,16 @@
4.4 virtual MapEditor* getMapEditor(); // get MapEditor (usually from parent);
4.5 virtual QPointF getRandPos(); // make randomised position
4.6
4.7 - //virtual void alignRelativeTo(const QPointF );
4.8 virtual void reposition();
4.9 virtual void requestReposition(); // do reposition after next user event
4.10 virtual void forceReposition(); // to force a reposition now (outside
4.11 // of mapeditor e.g. in noteeditor
4.12 virtual bool repositionRequested();
4.13
4.14 - //virtual QRectF getTotalBBox(); // return BBox including childs
4.15 - //virtual QRectF getBBoxSizeWithChilds();// return size of BBox including childs
4.16 virtual void calcBBoxSizeWithChilds()=0;// calc size of BBox including childs recursivly
4.17
4.18 virtual void select();
4.19 virtual void unselect();
4.20 - virtual QString getSelectString()=0;
4.21 - //virtual QString saveToDir (const QString&,const QString&, const QPointF&);// Save data to XML
4.22
4.23 protected:
4.24 void parabel(QPolygonF &,double,double,double,double); // Create Parabel connecting two points