r18113 by jghali - remove unused member in FPointArray

scribus-commit scribus-commit at lists.scribus.net
Thu Jan 24 21:28:57 UTC 2013


Author: jghali
Date: Thu Jan 24 21:28:56 2013
New Revision: 18113

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18113
Log:
remove unused member in FPointArray

Modified:
    branches/Version14x/Scribus/scribus/fpointarray.cpp
    branches/Version14x/Scribus/scribus/fpointarray.h

Modified: branches/Version14x/Scribus/scribus/fpointarray.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18113&path=/branches/Version14x/Scribus/scribus/fpointarray.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/fpointarray.cpp (original)
+++ branches/Version14x/Scribus/scribus/fpointarray.cpp Thu Jan 24 21:28:56 2013
@@ -42,7 +42,6 @@
 	FPointArray tmp;
 	tmp << *this;
 	tmp.count = count;
-	tmp.capacity = capacity;
 	return tmp; 
 }
 
@@ -51,7 +50,6 @@
 { 
 	QVector<FPoint>::operator=(a);
 	count = a.count; 
-	capacity = a.capacity;
 	svgState = NULL;
 	return *this; 
 }
@@ -65,7 +63,6 @@
 	}
 	else
 		QVector<FPoint>::resize(newCount);
-	capacity = newCount;
 	count = newCount;
 	return true;
 }
@@ -448,15 +445,12 @@
 bool FPointArray::operator==(const FPointArray &rhs) const
 {
 	return count == rhs.count && 
-	       capacity == rhs.capacity &&
 	       QVector<FPoint>::operator==(rhs);
 }
 
 bool FPointArray::operator!=(const FPointArray &rhs) const
 {
 	if (count != rhs.count)
-		return true;
-	if (capacity != rhs.capacity)
 		return true;
 	return QVector<FPoint>::operator!=(rhs);
 }

Modified: branches/Version14x/Scribus/scribus/fpointarray.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18113&path=/branches/Version14x/Scribus/scribus/fpointarray.h
==============================================================================
--- branches/Version14x/Scribus/scribus/fpointarray.h (original)
+++ branches/Version14x/Scribus/scribus/fpointarray.h Thu Jan 24 21:28:56 2013
@@ -42,9 +42,9 @@
 class SCRIBUS_API FPointArray : private QVector<FPoint>
 {
 public: 
-	FPointArray() : count(0), capacity(0), svgState(NULL) {};
-	FPointArray(int size) : QVector<FPoint>(size), count(size), capacity(size), svgState(NULL) {};
-	FPointArray(const FPointArray &a) : QVector<FPoint>(a), count(a.count), capacity(a.capacity), svgState(NULL) {};
+	FPointArray() : count(0), svgState(NULL) {};
+	FPointArray(int size) : QVector<FPoint>(size), count(size), svgState(NULL) {};
+	FPointArray(const FPointArray &a) : QVector<FPoint>(a), count(a.count), svgState(NULL) {};
 	uint size() const { return count; };
 	bool resize(uint newCount);
 	void setPoint(uint i, double x, double y) { Iterator p = begin(); p+=i; p->xp = x; p->yp = y; };
@@ -89,7 +89,6 @@
 	void fromQPainterPath(QPainterPath &path);
 private:
 	uint count;
-	uint capacity;
 	SVGState * svgState;
 };
 




More information about the scribus-commit mailing list