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

List:       kde-commits
Subject:    branches/work/kde4/kdelibs/kdecore
From:       Laurent Montel <montel () kde ! org>
Date:       2005-06-28 13:38:25
Message-ID: 1119965905.510436.32153.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 429656 by mlaurent:

Byebye q3memarray


 M  +2 -2      kaccelmanager_private.h  
 M  +2 -2      kdebug.cpp  
 M  +2 -2      svgicons/ksvgiconengine.cpp  
 M  +4 -4      svgicons/ksvgiconpainter.cpp  


--- branches/work/kde4/kdelibs/kdecore/kaccelmanager_private.h #429655:429656
@@ -23,7 +23,7 @@
 
 
 #include <qstring.h>
-#include <q3memarray.h>
+
 #include <q3valuelist.h>
 #include <qobject.h>
 
@@ -72,7 +72,7 @@
 
   QString        m_pureText,  m_origText;
   int            m_accel, m_orig_accel;
-  Q3MemArray<int> m_weight;
+  QVector<int> m_weight;
 
 };
 
--- branches/work/kde4/kdelibs/kdecore/kdebug.cpp #429655:429656
@@ -36,7 +36,7 @@
 #include <klocale.h>
 #include <qfile.h>
 #include <q3intdict.h>
-#include <q3memarray.h>
+
 #include <qstring.h>
 #include <qdatetime.h>
 #include <qpoint.h>
@@ -454,7 +454,7 @@
 kdbgstream& kdbgstream::operator<<( const QRegion& reg ) {
     *this<< "[ ";
 
-    Q3MemArray<QRect>rs=reg.rects();
+    QVector<QRect>rs=reg.rects();
     for (uint i=0;i<rs.size();++i)
         *this << QString("[%1,%2 - %3x%4] \
").arg(rs[i].x()).arg(rs[i].y()).arg(rs[i].width()).arg(rs[i].height() ) ;  
--- branches/work/kde4/kdelibs/kdecore/svgicons/ksvgiconengine.cpp #429655:429656
@@ -23,7 +23,7 @@
 #include <qcolor.h>
 #include <qimage.h>
 #include <qmatrix.h>
-#include <Q3MemArray>
+#include <QVector>
 #include <Q3PointArray>
 #include <q3ptrlist.h>
 
@@ -53,7 +53,7 @@
 
 	ArtGradientStop *parseGradientStops(QDomElement element, int &offsets)
 	{
-		Q3MemArray<ArtGradientStop> *stopArray = new Q3MemArray<ArtGradientStop>();
+		QVector<ArtGradientStop> *stopArray = new QVector<ArtGradientStop>();
 
 		float oldOffset = -1, newOffset = -1;
 		for(QDomNode node = element.firstChild(); !node.isNull(); node = \
                node.nextSibling())
--- branches/work/kde4/kdelibs/kdecore/svgicons/ksvgiconpainter.cpp #429655:429656
@@ -18,7 +18,7 @@
     Boston, MA 02111-1307, USA.
 */
 
-#include <Q3MemArray>
+#include <QVector>
 #include <Q3PointArray>
 #include <q3valuevector.h>
 #include <qstringlist.h>
@@ -127,7 +127,7 @@
 		return art_new(ArtBpath, number);
 	}
 
-	void ensureSpace(Q3MemArray<ArtBpath> &vec, int index)
+	void ensureSpace(QVector<ArtBpath> &vec, int index)
 	{
 		if(vec.size() == (unsigned int) index)
 			vec.resize(index + 1);
@@ -677,7 +677,7 @@
 		  }
 	}
 
-	void calculateArc(bool relative, Q3MemArray<ArtBpath> &vec, int &index, double \
&curx, double &cury, double angle, double x, double y, double r1, double r2, bool \
largeArcFlag, bool sweepFlag) +	void calculateArc(bool relative, QVector<ArtBpath> \
&vec, int &index, double &curx, double &cury, double angle, double x, double y, \
double r1, double r2, bool largeArcFlag, bool sweepFlag)  {
 		double sin_th, cos_th;
 		double a00, a01, a10, a11;
@@ -1727,7 +1727,7 @@
 	{
 	QString value = data;
 
-	Q3MemArray<ArtBpath> vec;
+	QVector<ArtBpath> vec;
 	int index = -1;
 
 	double curx = 0.0, cury = 0.0, contrlx = 0.0, contrly = 0.0, xc, yc;


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