head	1.4;
access;
symbols
	pkgsrc-2019Q3:1.3.0.28
	pkgsrc-2019Q3-base:1.3
	pkgsrc-2019Q2:1.3.0.26
	pkgsrc-2019Q2-base:1.3
	pkgsrc-2019Q1:1.3.0.24
	pkgsrc-2019Q1-base:1.3
	pkgsrc-2018Q4:1.3.0.22
	pkgsrc-2018Q4-base:1.3
	pkgsrc-2018Q3:1.3.0.20
	pkgsrc-2018Q3-base:1.3
	pkgsrc-2018Q2:1.3.0.18
	pkgsrc-2018Q2-base:1.3
	pkgsrc-2018Q1:1.3.0.16
	pkgsrc-2018Q1-base:1.3
	pkgsrc-2017Q4:1.3.0.14
	pkgsrc-2017Q4-base:1.3
	pkgsrc-2017Q3:1.3.0.12
	pkgsrc-2017Q3-base:1.3
	pkgsrc-2017Q2:1.3.0.8
	pkgsrc-2017Q2-base:1.3
	pkgsrc-2017Q1:1.3.0.6
	pkgsrc-2017Q1-base:1.3
	pkgsrc-2016Q4:1.3.0.4
	pkgsrc-2016Q4-base:1.3
	pkgsrc-2016Q3:1.3.0.2
	pkgsrc-2016Q3-base:1.3
	pkgsrc-2014Q3:1.1.0.6
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.4
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.2
	pkgsrc-2014Q1-base:1.1;
locks; strict;
comment	@// @;


1.4
date	2019.11.24.04.01.14;	author markd;	state dead;
branches;
next	1.3;
commitid	WY2ncJ10kdL1y3MB;

1.3
date	2016.07.16.03.36.51;	author markd;	state Exp;
branches;
next	1.2;
commitid	09VLturk2N31Puez;

1.2
date	2014.11.14.08.03.31;	author markd;	state dead;
branches;
next	1.1;
commitid	BuARrTqTLcK5U7Yx;

1.1
date	2014.02.08.12.53.32;	author wiedi;	state Exp;
branches;
next	;
commitid	XU7EyExVot49tiox;


desc
@@


1.4
log
@umbrello: update to 19.08.3   qt5/kf5 version
@
text
@$NetBSD: patch-umbrello_widgets_associationwidget.cpp,v 1.3 2016/07/16 03:36:51 markd Exp $

make gcc6 happy

--- umbrello/widgets/associationwidget.cpp.orig	2014-11-04 06:47:37.000000000 +0000
+++ umbrello/widgets/associationwidget.cpp
@@@@ -2118,9 +2118,9 @@@@ void AssociationWidget::updatePointsExce
     p1.setX(xmil + (xfin - xmil)*1/2); p1.setY(ymil + (yfin - ymil)*1/3);
     p2.setX(xmil - (xmil - xdeb)*1/2); p2.setY(ymil - (ymil - ydeb)*1/3);
 
-    if (abs(p1.x() - p2.x()) <= 10)
+    if (std::abs(p1.x() - p2.x()) <= 10)
         ESPACEX = 15;
-    if (abs(p1.y() - p2.y()) <= 10)
+    if (std::abs(p1.y() - p2.y()) <= 10)
         ESPACEY = 15;
 
     m_associationLine->setEndPoints(QPointF(xdeb, ydeb), QPointF(xfin, yfin));
@@@@ -2688,8 +2688,8 @@@@ void AssociationWidget::constrainTextPos
         r = textWidth;
     // swap textCenter{X,Y} to convert from Qt coord.system.
     const QPointF origTextCenter(textCenterY, textCenterX);
-    const int relX = abs(origTextCenter.x() - midP.x());
-    const int relY = abs(origTextCenter.y() - midP.y());
+    const int relX = std::abs(origTextCenter.x() - midP.x());
+    const int relY = std::abs(origTextCenter.y() - midP.y());
     const double negativeWhenInsideCircle = relX * relX + relY * relY - r * r;
     if (negativeWhenInsideCircle <= 0.0) {
         return;
@


1.3
log
@Fix build with gcc6
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
log
@Update to KDE SC 4.14.3
@
text
@d1 1
a1 1
$NetBSD: patch-umbrello_widgets_associationwidget.cpp,v 1.1 2014/02/08 12:53:32 wiedi Exp $
d3 3
a5 1
--- umbrello/widgets/associationwidget.cpp.orig	2014-01-02 19:37:28.000000000 +0000
d7 13
a19 7
@@@@ -2561,7 +2561,7 @@@@ void AssociationWidget::constrainTextPos
     const int y0 = p0.y();
     const int x1 = p1.x();
     const int y1 = p1.y();
-    double r = sqrt((x1 - x0) * (x1 - x0) + (y1 - y0) * (y1 - y0)) / 2;
+    double r = sqrt((double) ((x1 - x0) * (x1 - x0) + (y1 - y0) * (y1 - y0))) / 2;
     if (textWidth > r)
d22 8
@


1.1
log
@fix build on SunOS (math is ambiguous)
@
text
@d1 1
a1 1
$NetBSD$
@