[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdegraphics/kpovmodeler
From: Andreas Zehender <az () azweb ! de>
Date: 2006-10-23 20:07:22
Message-ID: 1161634042.443456.1906.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 598521 by azehende:
removed Q3MemArray
M +2 -2 pmbicubicpatch.cpp
M +2 -2 pmblobcylinder.cpp
M +2 -2 pmblobsphere.cpp
M +2 -2 pmcone.cpp
M +2 -2 pmcylinder.cpp
M +1 -1 pmdisc.cpp
M +2 -2 pmlathe.cpp
M +3 -4 pmline.h
M +2 -2 pmpoint.h
M +2 -2 pmprism.cpp
M +2 -2 pmsor.cpp
M +2 -2 pmsphere.cpp
M +2 -2 pmsqe.cpp
M +2 -2 pmtext.cpp
M +2 -2 pmtorus.cpp
--- trunk/KDE/kdegraphics/kpovmodeler/pmbicubicpatch.cpp #598520:598521
@@ -436,9 +436,9 @@
}
else
{
- if( m_pViewStructure->points( ).size( ) != ( unsigned ) np )
+ if( m_pViewStructure->points( ).size( ) != np )
m_pViewStructure->points( ).resize( np );
- if( m_pViewStructure->lines( ).size( ) != ( unsigned ) nl )
+ if( m_pViewStructure->lines( ).size( ) != nl )
m_pViewStructure->lines( ).resize( nl );
}
--- trunk/KDE/kdegraphics/kpovmodeler/pmblobcylinder.cpp #598520:598521
@@ -217,8 +217,8 @@
int uStep = (int)( ( (float)s_uStep / 2 ) * ( displayDetail( ) + 1 ) );
int vStep = (int)( ( (float)s_vStep / 2 ) * ( displayDetail( ) + 1 ) );
- unsigned ptsSize = vStep * uStep * 2 + 2;
- unsigned lineSize = vStep * uStep * 4 + vStep;
+ int ptsSize = vStep * uStep * 2 + 2;
+ int lineSize = vStep * uStep * 4 + vStep;
if( ptsSize != m_pViewStructure->points( ).size( ) )
m_pViewStructure->points( ).resize( ptsSize );
--- trunk/KDE/kdegraphics/kpovmodeler/pmblobsphere.cpp #598520:598521
@@ -207,8 +207,8 @@
int uStep = (int)( ( (float)s_uStep / 2 ) * ( displayDetail( ) + 1 ) );
int vStep = (int)( ( (float)s_vStep / 2 ) * ( displayDetail( ) + 1 ) );
- unsigned ptsSize = vStep * ( uStep - 1 ) + 2;
- unsigned lineSize = vStep * ( uStep - 1 ) * 2 + vStep;
+ int ptsSize = vStep * ( uStep - 1 ) + 2;
+ int lineSize = vStep * ( uStep - 1 ) * 2 + vStep;
if( ptsSize != m_pViewStructure->points( ).size( ) )
m_pViewStructure->points( ).resize( ptsSize );
--- trunk/KDE/kdegraphics/kpovmodeler/pmcone.cpp #598520:598521
@@ -235,8 +235,8 @@
}
int steps = (int)( ( (float)s_numSteps / 2 ) * ( displayDetail( ) + 1 ) );
- unsigned ptsSize = steps * 2;
- unsigned lineSize = steps * 3;
+ int ptsSize = steps * 2;
+ int lineSize = steps * 3;
if( ptsSize != m_pViewStructure->points( ).size( ) )
m_pViewStructure->points( ).resize( ptsSize );
--- trunk/KDE/kdegraphics/kpovmodeler/pmcylinder.cpp #598520:598521
@@ -216,8 +216,8 @@
}
int steps = (int)( ( (float)s_numSteps / 2 ) * ( displayDetail( ) + 1 ) );
- unsigned ptsSize = steps * 2;
- unsigned lineSize = steps * 3;
+ int ptsSize = steps * 2;
+ int lineSize = steps * 3;
if( ptsSize != m_pViewStructure->points( ).size( ) )
m_pViewStructure->points( ).resize( ptsSize );
--- trunk/KDE/kdegraphics/kpovmodeler/pmdisc.cpp #598520:598521
@@ -232,7 +232,7 @@
}
int steps = (int)( ( (float)s_numSteps / 2 ) * ( displayDetail( ) + 1 ) );
- unsigned size = steps * 2;
+ int size = steps * 2;
if( size != m_pViewStructure->points( ).size( ) )
{
--- trunk/KDE/kdegraphics/kpovmodeler/pmlathe.cpp #598520:598521
@@ -353,9 +353,9 @@
if( m_pViewStructure )
{
- if( m_pViewStructure->points( ).size( ) != ( unsigned ) vsp )
+ if( m_pViewStructure->points( ).size( ) != vsp )
m_pViewStructure->points( ).resize( vsp );
- if( m_pViewStructure->lines( ).size( ) != ( unsigned ) vsl )
+ if( m_pViewStructure->lines( ).size( ) != vsl )
m_pViewStructure->lines( ).resize( vsl );
}
else
--- trunk/KDE/kdegraphics/kpovmodeler/pmline.h #598520:598521
@@ -3,7 +3,7 @@
**************************************************************************
description
--------------------
- copyright : (C) 2000-2001 by Andreas Zehender
+ copyright : (C) 2000-2006 by Andreas Zehender
email : zehender@kde.org
**************************************************************************
@@ -21,8 +21,7 @@
#define PMLINES_H
#include <QList>
-//Added by qt3to4:
-#include <Q3MemArray>
+#include <QVector>
#include <GL/gl.h>
#include "pmdebug.h"
@@ -99,6 +98,6 @@
* described by a start and end point. Only the indices in a @ref PMPointArray
* are stored.
*/
-typedef Q3MemArray<PMLine> PMLineArray;
+typedef QVector<PMLine> PMLineArray;
#endif
--- trunk/KDE/kdegraphics/kpovmodeler/pmpoint.h #598520:598521
@@ -21,7 +21,7 @@
#define PMPOINT_H
#include "GL/gl.h"
-#include <q3memarray.h>
+#include <QVector>
class PMVector;
class PMMatrix;
@@ -116,7 +116,7 @@
/**
* @ref QMemArray of PMPoints
*/
-typedef Q3MemArray<PMPoint> PMPointArray;
+typedef QVector<PMPoint> PMPointArray;
#endif
--- trunk/KDE/kdegraphics/kpovmodeler/pmprism.cpp #598520:598521
@@ -479,9 +479,9 @@
if( m_pViewStructure )
{
- if( m_pViewStructure->points( ).size( ) != ( unsigned ) np )
+ if( m_pViewStructure->points( ).size( ) != np )
m_pViewStructure->points( ).resize( np );
- if( m_pViewStructure->lines( ).size( ) != ( unsigned ) nl )
+ if( m_pViewStructure->lines( ).size( ) != nl )
m_pViewStructure->lines( ).resize( nl );
}
else
--- trunk/KDE/kdegraphics/kpovmodeler/pmsor.cpp #598520:598521
@@ -320,9 +320,9 @@
if( m_pViewStructure )
{
- if( m_pViewStructure->points( ).size( ) != ( unsigned ) vsp )
+ if( m_pViewStructure->points( ).size( ) != vsp )
m_pViewStructure->points( ).resize( vsp );
- if( m_pViewStructure->lines( ).size( ) != ( unsigned ) vsl )
+ if( m_pViewStructure->lines( ).size( ) != vsl )
m_pViewStructure->lines( ).resize( vsl );
}
else
--- trunk/KDE/kdegraphics/kpovmodeler/pmsphere.cpp #598520:598521
@@ -196,8 +196,8 @@
int uStep = (int)( ( (float)s_uStep / 2 ) * ( displayDetail( ) + 1 ) );
int vStep = (int)( ( (float)s_vStep / 2 ) * ( displayDetail( ) + 1 ) );
- unsigned ptsSize = vStep * ( uStep - 1 ) + 2;
- unsigned lineSize = vStep * ( uStep - 1 ) * 2 + vStep;
+ int ptsSize = vStep * ( uStep - 1 ) + 2;
+ int lineSize = vStep * ( uStep - 1 ) * 2 + vStep;
int faceSize = vStep * uStep;
if( ptsSize != m_pViewStructure->points( ).size( ) )
--- trunk/KDE/kdegraphics/kpovmodeler/pmsqe.cpp #598520:598521
@@ -187,8 +187,8 @@
int vStep = (int)( ( (float)s_vStep / 2 ) * ( displayDetail( ) + 1 ) );
int uStep2 = uStep * 4;
int vStep2 = vStep * 8;
- unsigned ptsSize = vStep2 * ( uStep2 - 1 ) + 2;
- unsigned lineSize = vStep2 * ( uStep2 - 1 ) * 2 + vStep2;
+ int ptsSize = vStep2 * ( uStep2 - 1 ) + 2;
+ int lineSize = vStep2 * ( uStep2 - 1 ) * 2 + vStep2;
if( ptsSize != m_pViewStructure->points( ).size( ) )
m_pViewStructure->points( ).resize( ptsSize );
--- trunk/KDE/kdegraphics/kpovmodeler/pmtext.cpp #598520:598521
@@ -232,9 +232,9 @@
m_pViewStructure = new PMViewStructure( npoints, nlines );
else
{
- if( m_pViewStructure->points( ).size( ) != ( unsigned ) npoints )
+ if( m_pViewStructure->points( ).size( ) != npoints )
m_pViewStructure->points( ).resize( npoints );
- if( m_pViewStructure->lines( ).size( ) != ( unsigned ) nlines )
+ if( m_pViewStructure->lines( ).size( ) != nlines )
m_pViewStructure->lines( ).resize( nlines );
}
--- trunk/KDE/kdegraphics/kpovmodeler/pmtorus.cpp #598520:598521
@@ -225,8 +225,8 @@
int uStep = (int)( ( (float)s_uStep / 2 ) * ( displayDetail( ) + 1 ) );
int vStep = (int)( ( (float)s_vStep / 2 ) * ( displayDetail( ) + 1 ) );
- unsigned ptsSize = vStep * uStep;
- unsigned lineSize = vStep * uStep * 2;
+ int ptsSize = vStep * uStep;
+ int lineSize = vStep * uStep * 2;
if( ptsSize != m_pViewStructure->points( ).size( ) )
m_pViewStructure->points( ).resize( ptsSize );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic