diff -r 7a71a914afdb -r 6d2b32f305f9 flagobj.cpp --- a/flagobj.cpp Thu May 07 08:48:53 2009 +0000 +++ b/flagobj.cpp Wed May 13 08:26:27 2009 +0000 @@ -20,6 +20,13 @@ copy (io); } +FlagObj::FlagObj (Flag* f) +{ + init(); + name=f->getName(); + icon->load(f->getPixmap()); +} + FlagObj::~FlagObj() { // cout << "Destr FlagObj this="<setPos (absPos.x(), absPos.y() ); state=false; - used=false; avis=true; - action=NULL; } void FlagObj::copy (FlagObj* other) { MapObj::copy(other); name=other->name; - group=other->group; - tooltip=other->tooltip; state=other->state; avis=other->avis; - used=other->used; icon->copy(other->icon); - action=other->action; setVisibility (other->isVisibleObj() ); } @@ -99,51 +99,6 @@ return name; } -void FlagObj::setGroup (const QString &n) -{ - group=n; -} - -const QString FlagObj::getGroup() -{ - return group; -} - -void FlagObj::unsetGroup() -{ - group="undefined"; -} - -void FlagObj::setToolTip(const QString &n) -{ - tooltip=n; -} - -const QString FlagObj::getToolTip() -{ - return tooltip; -} - -QPixmap FlagObj::getPixmap() -{ - return icon->pixmap(); -} - -void FlagObj::setAction (QAction* a) -{ - action=a; -} - -void FlagObj::updateAction () -{ - if (action) - { - action->setChecked(state); - if (!avis) - action->setVisible(state); - } -} - void FlagObj::setAlwaysVisible(bool b) { avis=b; @@ -189,16 +144,6 @@ } } -void FlagObj::setUsed (bool b) -{ - used=b; -} - -bool FlagObj::isUsed() -{ - return used; -} - void FlagObj::saveToDir (const QString &tmpdir, const QString &prefix) { QString fn=tmpdir + prefix + name + ".png";