[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/kstars/kstars/htmesh
From:       Alexey Khudyakov <alexey.skladnoy () gmail ! com>
Date:       2011-02-20 18:03:22
Message-ID: 20110220180322.71404AC8C7 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1221842 by khudyakov:

Remove unused code from RangeConvex

 M  +0 -30     RangeConvex.cpp  
 M  +6 -20     RangeConvex.h  


--- trunk/KDE/kdeedu/kstars/kstars/htmesh/RangeConvex.cpp #1221841:1221842
@@ -28,36 +28,6 @@
   varlen_ = false;
 }
 
-RangeConvex::RangeConvex(const RangeConvex & c) :
-  index_(c.index_),
-  boundingCircle_(c.boundingCircle_),
-  addlevel_(c.addlevel_),
-  plist_(c.plist_)
-{
-  varlen_       = c.varlen_;
-  constraints_	= c.constraints_;
-  corners_		= c.corners_;
-  sign_			= c.sign_;
-}
-
-/////////////ASSIGNMENT///////////////////////////////////
-//
-RangeConvex&
-RangeConvex::operator =(const RangeConvex & c)
-{
-  if(&c == this) return *this;
-
-  varlen_       = c.varlen_;
-  index_	= c.index_;
-  addlevel_ = c.addlevel_;
-  plist_	= c.plist_;
-  boundingCircle_ = c.boundingCircle_;
-  constraints_	= c.constraints_;
-  corners_		= c.corners_;
-  sign_			= c.sign_;
-  return *this;
-}
-
 /////////////CONSTRUCTOR FROM A TRIANGLE//////////////////
 //
 // Initialize convex from a triangle. The corners of these vectors
--- trunk/KDE/kdeedu/kstars/kstars/htmesh/RangeConvex.h #1221841:1221842
@@ -72,34 +72,16 @@
 		const SpatialVector * v3,
 		const SpatialVector * v4);
 
-  /// Copy constructor
-  RangeConvex(const RangeConvex &);
-
-  /// Assignment
-  RangeConvex& operator =(const RangeConvex &);
-
   /// Add a constraint
   void add(SpatialConstraint &);
 
   /// Simplify the convex, remove redundancies
   void simplify();
 
-  /** 
-      Intersect with index.
-      result is given in a list of nodes.
-  */
+  /** Intersect with index. Result is given in a list of nodes. */
   void intersect(const SpatialIndex * index, HtmRange *hr, bool varlen);
 
-  /** 
-      Intersect with index.
-      Now only a single list of IDs is returned. The IDs need not be
-      level.
-  */
-  void intersect(const SpatialIndex * index,
-		 ValueVectorUint64 * idList);
-
   void setOlevel(int level) { olevel = level; };
-  int getOlevel()           { return olevel;  };
 
 protected:
   HtmRange *hr;
@@ -121,8 +103,8 @@
   // test each quadnode for intersections. Calls testTriangle after having
   // tested the vertices using testVertex.
   SpatialMarkup testNode(uint64 id);
-  // SpatialMarkup testNode(const struct SpatialIndex::QuadNode *indexNode);
 
+  // SpatialMarkup testNode(const struct SpatialIndex::QuadNode *indexNode);
   SpatialMarkup testNode(const SpatialVector & v0, 
 			 const SpatialVector & v1, 
 			 const SpatialVector & v2);
@@ -219,6 +201,10 @@
   SpatialConstraint boundingCircle_; // For zERO convexes, the bc.
   size_t addlevel_;		// additional levels to calculate
   ValueVectorUint64 * plist_;	// list of partial node ids
+private:
+  // Disallow copying and assignemnt
+  RangeConvex(const RangeConvex &);
+  RangeConvex& operator =(const RangeConvex &);
 };
 
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]