1.1 --- a/ornamentedobj.cpp Wed May 06 11:08:38 2009 +0000
1.2 +++ b/ornamentedobj.cpp Thu May 07 08:48:53 2009 +0000
1.3 @@ -189,13 +189,13 @@
1.4 ox=leftPad + d;
1.5 oy=topPad + d;
1.6
1.7 - //FIXME-2 systemFlags-> move (ox +x , oy + y );
1.8 + systemFlags-> move (ox +x , oy + y );
1.9
1.10 // vertical align heading to bottom
1.11 heading->move (ox + x + systemFlags->getBBox().width(),
1.12 oy + y + ornamentsBBox.height() - heading->getHeight()
1.13 );
1.14 - //FIXME-2 standardFlags->move (ox +x + heading->getWidth() + systemFlags->getBBox().width() , oy + y );
1.15 + standardFlags->move (ox +x + heading->getWidth() + systemFlags->getBBox().width() , oy + y );
1.16
1.17 ornamentsBBox.moveTopLeft ( QPointF ((int)(ox+x),(int)(oy+y)));
1.18 clickBox.moveTopLeft (QPointF ((int)(ox + x), (int)(oy + y)));
1.19 @@ -318,36 +318,36 @@
1.20 forceReposition();
1.21 }
1.22
1.23 -void OrnamentedObj::toggleStandardFlag(QString f, bool exclusive)
1.24 +void OrnamentedObj::toggleStandardFlag(const QString &name)
1.25 {
1.26 - standardFlags->toggle(f,exclusive);
1.27 + standardFlags->toggle(name);
1.28 calcBBoxSize();
1.29 positionBBox();
1.30 move (absPos.x(), absPos.y() );
1.31 forceReposition();
1.32 }
1.33
1.34 -void OrnamentedObj::activateStandardFlag(QString f)
1.35 +void OrnamentedObj::activateStandardFlag(const QString &name)
1.36 {
1.37 - standardFlags->activate(f);
1.38 + standardFlags->activate(name);
1.39 calcBBoxSize();
1.40 positionBBox();
1.41 move (absPos.x(), absPos.y() );
1.42 forceReposition();
1.43 }
1.44
1.45 -void OrnamentedObj::deactivateStandardFlag(QString f)
1.46 +void OrnamentedObj::deactivateStandardFlag(const QString &name)
1.47 {
1.48 - standardFlags->deactivate(f);
1.49 + standardFlags->deactivate(name);
1.50 calcBBoxSize();
1.51 positionBBox();
1.52 move (absPos.x(), absPos.y() );
1.53 forceReposition();
1.54 }
1.55
1.56 -bool OrnamentedObj::isSetStandardFlag (QString f)
1.57 +bool OrnamentedObj::isSetStandardFlag (const QString &name)
1.58 {
1.59 - return standardFlags->isActive(f);
1.60 + return standardFlags->isActive(name);
1.61 }
1.62
1.63 QString OrnamentedObj::getSystemFlagName(const QPointF &p)
1.64 @@ -355,9 +355,9 @@
1.65 return systemFlags->getFlagName(p);
1.66 }
1.67
1.68 -bool OrnamentedObj::isActiveFlag (const QString & fname)
1.69 +bool OrnamentedObj::isActiveFlag (const QString &name)
1.70 {
1.71 - if (standardFlags->isActive (fname) ) return true;
1.72 + if (standardFlags->isActive (name) ) return true;
1.73 return false;
1.74 }
1.75