Menu
▾
▴
[Seq-cvs-commit] SF.net SVN: seq:[1073] showeq/branches/pre_6_0_beta/src
|
From: <cn...@us...> - 2020-10-25 23:56:34
|
Revision: 1073
http://sourceforge.net/p/seq/svn/1073
Author: cn187
Date: 2020-10-25 23:56:27 +0000 (Sun, 25 Oct 2020)
Log Message:
-----------
Replace Q3PointArray with QPolygon
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/src/map.cpp
showeq/branches/pre_6_0_beta/src/mapcore.cpp
showeq/branches/pre_6_0_beta/src/mapcore.h
showeq/branches/pre_6_0_beta/src/mapicon.cpp
showeq/branches/pre_6_0_beta/src/pointarray.h
Modified: showeq/branches/pre_6_0_beta/src/map.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/map.cpp 2020-10-25 23:56:03 UTC (rev 1072)
+++ showeq/branches/pre_6_0_beta/src/map.cpp 2020-10-25 23:56:27 UTC (rev 1073)
@@ -75,7 +75,7 @@
#include <Q3BoxLayout>
#include <QPaintEvent>
#include <Q3VBoxLayout>
-#include <Q3PointArray>
+#include <QPolygon>
#include <Q3Frame>
#include <QResizeEvent>
#include <QLabel>
@@ -3703,7 +3703,7 @@
const ItemMap& itemMap = m_spawnShell->spawns();
ItemConstIterator it(itemMap);
const Item* item;
- Q3PointArray atri(3);
+ QPolygon atri(3);
QString spawnNameText;
QFontMetrics fm(param.font());
EQPoint spawnOffset;
Modified: showeq/branches/pre_6_0_beta/src/mapcore.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/mapcore.cpp 2020-10-25 23:56:03 UTC (rev 1072)
+++ showeq/branches/pre_6_0_beta/src/mapcore.cpp 2020-10-25 23:56:27 UTC (rev 1073)
@@ -43,7 +43,7 @@
#include <QFileInfo>
#include <QFile>
#include <QRegExp>
-#include <Q3PointArray>
+#include <QPolygon>
#include <QByteArray>
#include <QPixmap>
@@ -308,7 +308,7 @@
const QString& color,
uint32_t size)
: MapCommon(name, color),
- Q3PointArray(size),
+ QPolygon(size),
m_z(0),
m_heightSet(false)
{
@@ -319,7 +319,7 @@
uint32_t size,
int16_t z)
: MapCommon(name, color),
- Q3PointArray(size),
+ QPolygon(size),
m_z(z),
m_heightSet(true)
{
Modified: showeq/branches/pre_6_0_beta/src/mapcore.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/mapcore.h 2020-10-25 23:56:03 UTC (rev 1072)
+++ showeq/branches/pre_6_0_beta/src/mapcore.h 2020-10-25 23:56:27 UTC (rev 1073)
@@ -46,7 +46,7 @@
#include <QFont>
#include <QPixmap>
#include <QList>
-#include <Q3PointArray>
+#include <QPolygon>
#include "point.h"
#include "pointarray.h"
@@ -449,7 +449,7 @@
//----------------------------------------------------------------------
// MapLineL
-class MapLineL : public MapCommon, public Q3PointArray
+class MapLineL : public MapCommon, public QPolygon
{
public:
MapLineL();
@@ -463,7 +463,7 @@
void setZPos(uint16_t z)
{ m_z = z; m_heightSet = true; }
- void calcBounds() { m_bounds = Q3PointArray::boundingRect(); }
+ void calcBounds() { m_bounds = QPolygon::boundingRect(); }
private:
int16_t m_z;
Modified: showeq/branches/pre_6_0_beta/src/mapicon.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/mapicon.cpp 2020-10-25 23:56:03 UTC (rev 1072)
+++ showeq/branches/pre_6_0_beta/src/mapicon.cpp 2020-10-25 23:56:27 UTC (rev 1073)
@@ -32,7 +32,7 @@
#include <QPoint>
#include <QTimer>
#include <Q3TextStream>
-#include <Q3PointArray>
+#include <QPolygon>
//----------------------------------------------------------------------
// constants
@@ -511,7 +511,7 @@
void MapIcon::paintUpTriangle(QPainter&p, const QPoint& point,
int size, int sizeWH)
{
- Q3PointArray atri(3);
+ QPolygon atri(3);
atri.setPoint(0, point.x(), point.y() - size);
atri.setPoint(1, point.x() + size, point.y() + size);
atri.setPoint(2, point.x() - size, point.y() + size);
@@ -521,7 +521,7 @@
void MapIcon::paintRightTriangle(QPainter&p, const QPoint& point,
int size, int sizeWH)
{
- Q3PointArray atri(3);
+ QPolygon atri(3);
atri.setPoint(0, point.x() + size, point.y());
atri.setPoint(1, point.x() - size, point.y() + size);
atri.setPoint(2, point.x() - size, point.y() - size);
@@ -531,7 +531,7 @@
void MapIcon::paintDownTriangle(QPainter&p, const QPoint& point,
int size, int sizeWH)
{
- Q3PointArray atri(3);
+ QPolygon atri(3);
atri.setPoint(0, point.x(), point.y() + size);
atri.setPoint(1, point.x() + size, point.y() - size);
atri.setPoint(2, point.x() - size, point.y() - size);
@@ -541,7 +541,7 @@
void MapIcon::paintLeftTriangle(QPainter&p, const QPoint& point,
int size, int sizeWH)
{
- Q3PointArray atri(3);
+ QPolygon atri(3);
atri.setPoint(0, point.x() - size, point.y());
atri.setPoint(1, point.x() + size, point.y() + size);
atri.setPoint(2, point.x() + size, point.y() - size);
@@ -561,7 +561,7 @@
void MapIcon::paintDiamond(QPainter&p, const QPoint& point,
int size, int sizeWH)
{
- Q3PointArray diamond(4);
+ QPolygon diamond(4);
diamond.setPoint(0, point.x(), point.y() + size);
diamond.setPoint(1, point.x() + size, point.y());
diamond.setPoint(2, point.x(), point.y() - size);
Modified: showeq/branches/pre_6_0_beta/src/pointarray.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/pointarray.h 2020-10-25 23:56:03 UTC (rev 1072)
+++ showeq/branches/pre_6_0_beta/src/pointarray.h 2020-10-25 23:56:27 UTC (rev 1073)
@@ -41,7 +41,7 @@
#endif
#include <QVector>
#include <QPoint>
-#include <Q3PointArray>
+#include <QPolygon>
// Point3DArray
template <class _T>
@@ -69,7 +69,7 @@
bool setPoints(uint32_t nPoints, _T firstx, _T firsty, _T firstz, ...);
bool putPoints(uint32_t index, uint32_t nPoints, const _T* points);
bool putPoints(uint32_t index, uint32_t nPoints, _T firstx, _T firsty, _T firstz, ...);
- Q3PointArray getQPointArray();
+ QPolygon getQPointArray();
};
template <class _T> inline
@@ -228,10 +228,10 @@
}
template <class _T> inline
-Q3PointArray Point3DArray<_T>::getQPointArray()
+QPolygon Point3DArray<_T>::getQPointArray()
{
// create a temporary QPointArray of the same size as this array
- Q3PointArray tmp(QVector<Point3D<_T> >::size());
+ QPolygon tmp(QVector<Point3D<_T> >::size());
// copy each Point3D<_T> as a QPoint into the temporary QPointArray
for (uint32_t i = 0; i < QVector<Point3D<_T> >::size(); i++)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
