Author: craig
Date: Sat Nov 7 22:49:31 2020
New Revision: 24206
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24206
Log:
Replace QLineF::intersect() with ::intersects()
Modified:
trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
Modified: trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24206&path=/trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp Sat Nov 7
22:49:31 2020
@@ -1642,7 +1642,7 @@
QLineF n_i = s_i.normalVector();
n_i.translate(s_i.pointAt(0.5) - s_i.p1());
QPointF center;
- if (n_s.intersect(n_i, ¢er) != QLineF::NoIntersection)
+ if (n_s.intersects(n_i, ¢er) != QLineF::NoIntersection)
{
QLineF rad1 = QLineF(center, pStart);
QLineF rad3 = QLineF(center, pInter);
@@ -1690,7 +1690,7 @@
QLineF n_i = s_i.normalVector();
n_i.translate(s_i.pointAt(0.5) - s_i.p1());
QPointF center;
- if (n_s.intersect(n_i, ¢er) != QLineF::NoIntersection)
+ if (n_s.intersects(n_i, ¢er) != QLineF::NoIntersection)
{
QLineF rad1 = QLineF(center, pStart);
QLineF rad3 = QLineF(center, pInter);
@@ -1930,7 +1930,7 @@
for (int a = 0; a < elPo.size() - 1; a++)
{
QPointF intersect;
- if (QLineF(elPo[a], elPo[a+1]).intersect(stv,
&intersect) == QLineF::BoundedIntersection)
+ if (QLineF(elPo[a], elPo[a+1]).intersects(stv,
&intersect) == QLineF::BoundedIntersection)
{
stP = intersect;
break;
@@ -1939,7 +1939,7 @@
for (int a = 0; a < elPo.size() - 1; a++)
{
QPointF intersect;
- if (QLineF(elPo[a], elPo[a+1]).intersect(env,
&intersect) == QLineF::BoundedIntersection)
+ if (QLineF(elPo[a], elPo[a+1]).intersects(env,
&intersect) == QLineF::BoundedIntersection)
{
enP = intersect;
break;
@@ -2027,7 +2027,7 @@
for (int a = 0; a < elPo.size() - 1; a++)
{
QPointF intersect;
- if (QLineF(elPo[a], elPo[a+1]).intersect(stv,
&intersect) == QLineF::BoundedIntersection)
+ if (QLineF(elPo[a], elPo[a+1]).intersects(stv,
&intersect) == QLineF::BoundedIntersection)
{
stP = intersect;
break;
@@ -2037,7 +2037,7 @@
for (int a = 0; a < elPo.size() - 1; a++)
{
QPointF intersect;
- if (QLineF(elPo[a], elPo[a+1]).intersect(env,
&intersect) == QLineF::BoundedIntersection)
+ if (QLineF(elPo[a], elPo[a+1]).intersects(env,
&intersect) == QLineF::BoundedIntersection)
{
enP = intersect;
break;
Modified: trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24206&path=/trunk/Scribus/scribus/plugins/import/emf/importemf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/emf/importemf.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/emf/importemf.cpp Sat Nov 7
22:49:31 2020
@@ -1973,13 +1973,13 @@
{
QPointF interPoint;
QPointF gradEnd;
- if (gradientVector.intersect(QLineF(0, 0, item->width(), 0),
&interPoint) == QLineF::BoundedIntersection)
+ if (gradientVector.intersects(QLineF(0, 0, item->width(), 0),
&interPoint) == QLineF::BoundedIntersection)
gradEnd = interPoint;
- else if (gradientVector.intersect(QLineF(item->width(), 0,
item->width(), item->height()), &interPoint) == QLineF::BoundedIntersection)
+ else if (gradientVector.intersects(QLineF(item->width(), 0,
item->width(), item->height()), &interPoint) == QLineF::BoundedIntersection)
gradEnd = interPoint;
- else if (gradientVector.intersect(QLineF(item->width(), item->height(),
0, item->height()), &interPoint) == QLineF::BoundedIntersection)
+ else if (gradientVector.intersects(QLineF(item->width(),
item->height(), 0, item->height()), &interPoint) == QLineF::BoundedIntersection)
gradEnd = interPoint;
- else if (gradientVector.intersect(QLineF(0, item->height(), 0, 0),
&interPoint) == QLineF::BoundedIntersection)
+ else if (gradientVector.intersects(QLineF(0, item->height(), 0, 0),
&interPoint) == QLineF::BoundedIntersection)
gradEnd = interPoint;
return gradEnd;
}
Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24206&path=/trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodg.cpp Sat Nov 7
22:49:31 2020
@@ -3341,13 +3341,13 @@
{
QPointF interPoint;
QPointF gradEnd;
- if (gradientVector.intersect(QLineF(0, 0, item->width(), 0),
&interPoint) == QLineF::BoundedIntersection)
+ if (gradientVector.intersects(QLineF(0, 0, item->width(), 0),
&interPoint) == QLineF::BoundedIntersection)
gradEnd = interPoint;
- else if (gradientVector.intersect(QLineF(item->width(), 0,
item->width(), item->height()), &interPoint) == QLineF::BoundedIntersection)
+ else if (gradientVector.intersects(QLineF(item->width(), 0,
item->width(), item->height()), &interPoint) == QLineF::BoundedIntersection)
gradEnd = interPoint;
- else if (gradientVector.intersect(QLineF(item->width(), item->height(),
0, item->height()), &interPoint) == QLineF::BoundedIntersection)
+ else if (gradientVector.intersects(QLineF(item->width(),
item->height(), 0, item->height()), &interPoint) == QLineF::BoundedIntersection)
gradEnd = interPoint;
- else if (gradientVector.intersect(QLineF(0, item->height(), 0, 0),
&interPoint) == QLineF::BoundedIntersection)
+ else if (gradientVector.intersects(QLineF(0, item->height(), 0, 0),
&interPoint) == QLineF::BoundedIntersection)
gradEnd = interPoint;
return gradEnd;
}
@@ -3689,7 +3689,7 @@
L1.setAngle(-45);
QLineF LCW = QLineF(0.0, item->height() / 2.0,
item->width(), item->height() / 2.0);
QPointF P5;
- LCW.intersect(L1, &P5);
+ LCW.intersects(L1, &P5);
QPointF P6 = QPointF(item->width() - P5.x(), P5.y());
QPolygonF pPoints;
pPoints << P1 << P2 << P3 << P4 << P5 << P6;
Modified: trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24206&path=/trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/svm/importsvm.cpp Sat Nov 7
22:49:31 2020
@@ -1177,13 +1177,13 @@
{
QPointF interPoint;
QPointF gradEnd;
- if (gradientVector.intersect(QLineF(0, 0, item->width(), 0),
&interPoint) == QLineF::BoundedIntersection)
+ if (gradientVector.intersects(QLineF(0, 0, item->width(), 0),
&interPoint) == QLineF::BoundedIntersection)
gradEnd = interPoint;
- else if (gradientVector.intersect(QLineF(item->width(), 0,
item->width(), item->height()), &interPoint) == QLineF::BoundedIntersection)
+ else if (gradientVector.intersects(QLineF(item->width(), 0,
item->width(), item->height()), &interPoint) == QLineF::BoundedIntersection)
gradEnd = interPoint;
- else if (gradientVector.intersect(QLineF(item->width(), item->height(),
0, item->height()), &interPoint) == QLineF::BoundedIntersection)
+ else if (gradientVector.intersects(QLineF(item->width(),
item->height(), 0, item->height()), &interPoint) == QLineF::BoundedIntersection)
gradEnd = interPoint;
- else if (gradientVector.intersect(QLineF(0, item->height(), 0, 0),
&interPoint) == QLineF::BoundedIntersection)
+ else if (gradientVector.intersects(QLineF(0, item->height(), 0, 0),
&interPoint) == QLineF::BoundedIntersection)
gradEnd = interPoint;
return gradEnd;
}
@@ -2368,7 +2368,7 @@
L1.setAngle(-45);
QLineF LCW = QLineF(0.0, ite->height() / 2.0, ite->width(),
ite->height() / 2.0);
QPointF P5;
- LCW.intersect(L1, &P5);
+ LCW.intersects(L1, &P5);
QPointF P6 = QPointF(ite->width() - P5.x(), P5.y());
QPolygonF pPoints;
pPoints << P1 << P2 << P3 << P4 << P5 << P6;
Modified: trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24206&path=/trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/viva/importviva.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/viva/importviva.cpp Sat Nov 7
22:49:31 2020
@@ -2367,13 +2367,13 @@
{
QPointF interPoint;
QPointF gradEnd;
- if (gradientVector.intersect(QLineF(0, 0, item->width(), 0),
&interPoint) == QLineF::BoundedIntersection)
+ if (gradientVector.intersects(QLineF(0, 0, item->width(), 0),
&interPoint) == QLineF::BoundedIntersection)
gradEnd = interPoint;
- else if (gradientVector.intersect(QLineF(item->width(), 0,
item->width(), item->height()), &interPoint) == QLineF::BoundedIntersection)
+ else if (gradientVector.intersects(QLineF(item->width(), 0,
item->width(), item->height()), &interPoint) == QLineF::BoundedIntersection)
gradEnd = interPoint;
- else if (gradientVector.intersect(QLineF(item->width(), item->height(),
0, item->height()), &interPoint) == QLineF::BoundedIntersection)
+ else if (gradientVector.intersects(QLineF(item->width(),
item->height(), 0, item->height()), &interPoint) == QLineF::BoundedIntersection)
gradEnd = interPoint;
- else if (gradientVector.intersect(QLineF(0, item->height(), 0, 0),
&interPoint) == QLineF::BoundedIntersection)
+ else if (gradientVector.intersects(QLineF(0, item->height(), 0, 0),
&interPoint) == QLineF::BoundedIntersection)
gradEnd = interPoint;
return gradEnd;
}
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
