diff -r d7f79e51b00d -r 7a71a914afdb ornamentedobj.cpp
--- a/ornamentedobj.cpp	Wed May 06 11:08:38 2009 +0000
+++ b/ornamentedobj.cpp	Thu May 07 08:48:53 2009 +0000
@@ -189,13 +189,13 @@
 	ox=leftPad + d;
 	oy=topPad + d;
 	
-	//FIXME-2 systemFlags-> move (ox +x , oy + y );
+	systemFlags-> move (ox +x , oy + y );
 
 	// vertical align heading to bottom
     heading->move (ox + x + systemFlags->getBBox().width(),
 				   oy + y + ornamentsBBox.height() - heading->getHeight() 
 					);
-	//FIXME-2 standardFlags->move (ox +x + heading->getWidth() + systemFlags->getBBox().width() , oy + y );
+	standardFlags->move (ox +x + heading->getWidth() + systemFlags->getBBox().width() , oy + y );
 
 	ornamentsBBox.moveTopLeft ( QPointF ((int)(ox+x),(int)(oy+y)));
 	clickBox.moveTopLeft (QPointF ((int)(ox + x), (int)(oy + y)));
@@ -318,36 +318,36 @@
 	forceReposition();
 }
 
-void OrnamentedObj::toggleStandardFlag(QString f, bool exclusive)
+void OrnamentedObj::toggleStandardFlag(const QString &name)
 {
-	standardFlags->toggle(f,exclusive);
+	standardFlags->toggle(name);
 	calcBBoxSize();
 	positionBBox();
 	move (absPos.x(), absPos.y() );
 	forceReposition();
 }
 
-void OrnamentedObj::activateStandardFlag(QString f)
+void OrnamentedObj::activateStandardFlag(const QString &name)
 {
-	standardFlags->activate(f);
+	standardFlags->activate(name);
 	calcBBoxSize();
 	positionBBox();
 	move (absPos.x(), absPos.y() );
 	forceReposition();
 }
 
-void OrnamentedObj::deactivateStandardFlag(QString f)
+void OrnamentedObj::deactivateStandardFlag(const QString &name)
 {
-	standardFlags->deactivate(f);
+	standardFlags->deactivate(name);
 	calcBBoxSize();
 	positionBBox();
 	move (absPos.x(), absPos.y() );
 	forceReposition();
 }
 
-bool OrnamentedObj::isSetStandardFlag (QString f)
+bool OrnamentedObj::isSetStandardFlag (const QString &name)
 {
-	return standardFlags->isActive(f);
+	return standardFlags->isActive(name);
 }
 
 QString OrnamentedObj::getSystemFlagName(const QPointF &p)
@@ -355,9 +355,9 @@
 	return systemFlags->getFlagName(p);	
 }
 
-bool OrnamentedObj::isActiveFlag (const QString & fname)
+bool OrnamentedObj::isActiveFlag (const QString &name)
 {
-	if (standardFlags->isActive (fname) ) return true;
+	if (standardFlags->isActive (name) ) return true;
 	return false;
 }