diff -r 922d7f6c4e6c -r 1cc7bbf75f0b mapeditor.h --- a/mapeditor.h Fri Dec 29 13:52:19 2006 +0000 +++ b/mapeditor.h Fri Jan 05 11:17:32 2007 +0000 @@ -126,10 +126,9 @@ void setMapBackgroundColor(QColor); QColor getMapBackgroundColor(); QColor getCurrentHeadingColor(); - void colorItem(QColor); void colorBranch(QColor); + void colorSubtree(QColor); void toggleStandardFlag(QString); - virtual void setViewCenter(); // needed for zooming BranchObj* findText(QString,bool); // Find object void findReset(); // Reset Find void setURL(const QString &); // set the URL @@ -185,7 +184,6 @@ protected: void ensureSelectionVisible(); - virtual void updateViewCenter(); // needed for zooming virtual void contextMenuEvent ( QContextMenuEvent *e ); virtual void keyPressEvent(QKeyEvent*); virtual void keyReleaseEvent(QKeyEvent*); @@ -194,11 +192,11 @@ virtual void mouseDoubleClickEvent(QMouseEvent*); virtual void mouseMoveEvent(QMouseEvent*); - virtual void dragEnterEvent (QDragEnterEvent *); - virtual void dropEvent (QDropEvent *); + void dragEnterEvent (QDragEnterEvent *); + void dragMoveEvent (QDragMoveEvent *); + void dragLeaveEvent (QDragLeaveEvent *); + void dropEvent (QDropEvent *); - virtual void contentsDragEnterEvent(QDragEnterEvent *event); - virtual void contentsDropEvent(QDropEvent *event); private: QGraphicsScene *mapScene; MapCenterObj* mapCenter; @@ -231,7 +229,6 @@ QPointF movingObj_start; // rel. pos of mouse to absPos QPointF movingCont_start; // inital pos of moving Content or QPointF movingVec; // how far has Content moved - QPointF movingCenter; // used when zooming QPrinter* printer; // Printing bool mapDefault; // Flag if map is untouched