diff -r 62d621e3e550 -r 5ecd0462f76b mapeditor.h --- a/mapeditor.h Mon Mar 15 15:32:37 2010 +0000 +++ b/mapeditor.h Thu Mar 18 11:31:02 2010 +0000 @@ -4,7 +4,7 @@ #include #include -#include +#include #include "attribute.h" #include "ornamentedobj.h" @@ -31,7 +31,7 @@ protected: QPointF scrollBarPos; QPointF scrollBarPosTarget; - QtPropertyAnimation scrollBarPosAnimation; + QPropertyAnimation scrollBarPosAnimation; public: void scrollTo (const QModelIndex &index); void setScrollBarPosTarget (const QRectF &rect); //! ensureVisible of rect @@ -42,7 +42,7 @@ protected: qreal zoomFactor; qreal zoomFactorTarget; - QtPropertyAnimation zoomAnimation; + QPropertyAnimation zoomAnimation; public: void setZoomFactorTarget (const qreal &zf); qreal getZoomFactorTarget(); @@ -56,6 +56,7 @@ void setAntiAlias (bool); //!< Set or unset antialiasing void setSmoothPixmap(bool); //!< Set or unset smoothing of pixmaps void setHideTmp (bool); //!< Hide parts temporary +public slots: void autoLayout(); //!< Auto layout of map by using collision detection public: TreeItem *findMapItem (QPointF p,TreeItem *exclude); //! find item in map at position p. Ignore item exclude