[Kst] extragear/graphics/kst/kst

[Barth Netterfield]

SVN commit 460311 by netterfield:

Fix merge error...


 M  +2 -3      kstviewobject.h  


--- trunk/extragear/graphics/kst/kst/kstviewobject.h #460310:460311
@@ -218,6 +218,7 @@
     // draws a minimalistic shadow outline of this object at the given position
     virtual void drawShadow(QPainter& p, const QPoint& pos);
 
+
   public slots:
     virtual void paint(KstPaintType type, QPainter& p);
     virtual void updateFromAspect();
@@ -256,9 +257,6 @@
     
     KstObject::UpdateType KstViewObject::updateChildren(int counter);
     
-    // for checking hotpoints
-    bool pointsCloseEnough(const QPoint& point1, const QPoint& point2);
-
     KstViewObjectList _children;
     QRect _geom;
     QRect _geomOld;
@@ -289,6 +287,7 @@
     QMap<int, QString> _moveToMap;
     QMap<int, QString> _copyToMap;
     QSize _minimumSize;
+
 };