Attachment #81658 for bug #116922

View | Details | Raw Unified | Return to bug 116922
Collapse All | Expand All

Lines 7-13 Link Here

(-)cad/qfsm/Makefile (-1 / +1 lines)
7	#	7	#
8		8
9	PORTNAME= qfsm	9	PORTNAME= qfsm
10	PORTVERSION= 0.44	10	PORTVERSION= 0.45
11	CATEGORIES= cad	11	CATEGORIES= cad
12	MASTER_SITES= SF	12	MASTER_SITES= SF
13		13

Lines 1-3 Link Here

(-)cad/qfsm/distinfo (-3 / +3 lines)
1	MD5 (qfsm-0.44.tar.gz) = f955963bd41be19689c5e948ed124551	1	MD5 (qfsm-0.45.tar.gz) = 235a0fdb7b8c98985a0db0acd0bf4762
2	SHA256 (qfsm-0.44.tar.gz) = c73a1f617e80130bba16b27ae7f4da178cba5e24cc53b1c04f9cfb119a685198	2	SHA256 (qfsm-0.45.tar.gz) = b06357eb35c924f2d63fa6f053206c9cd32d1f76682ad12082bd4f7eff91b222
3	SIZE (qfsm-0.44.tar.gz) = 814943	3	SIZE (qfsm-0.45.tar.gz) = 820425




--- src/Draw.cpp.orig	Fri Aug 17 05:07:21 2007
+++ src/Draw.cpp	Wed Oct  3 14:30:19 2007
@@ -16,8 +16,8 @@
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
-#include <math.h>
-#include <float.h>
+#include <cmath>
+#include <cfloat>
 #include <qnamespace.h>
 #include <qptrlist.h>
 #include <qpainter.h>




--- src/GState.cpp.orig	Fri Aug 17 05:05:36 2007
+++ src/GState.cpp	Wed Oct  3 14:33:54 2007
@@ -16,7 +16,7 @@
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 
 #include <qpen.h>
 #include <qbrush.h>
@@ -196,9 +196,9 @@
     t->getCPoint2(c2x, c2y);
     info = t->getInfo();
 
-    qDebug("Adresse:     %d", (int)t);
-    qDebug("Start:       %d", (int)t->getStart());
-    qDebug("Ende:        %d", (int)t->getEnd());
+    qDebug("Adresse:     %d", (intptr_t)t);
+    qDebug("Start:       %d", (intptr_t)t->getStart());
+    qDebug("Ende:        %d", (intptr_t)t->getEnd());
     qDebug("Inputs:      %s", info->getInputsStrBin(/*numin*/).latin1());
     qDebug("Outputs:     %s", info->getOutputsStrBin(/*numout*/).latin1());
     qDebug(" ");
@@ -215,9 +215,9 @@
     t->getCPoint2(c2x, c2y);
     info = t->getInfo();
 
-    qDebug("Adresse:     %d", (int)t);
-    qDebug("Start:       %d", (int)t->getStart());
-    qDebug("Ende:        %d", (int)t->getEnd());
+    qDebug("Adresse:     %d", (intptr_t)t);
+    qDebug("Start:       %d", (intptr_t)t->getStart());
+    qDebug("Ende:        %d", (intptr_t)t->getEnd());
     qDebug("Inputs:      %s", info->getInputsStrBin(/*numin*/).latin1());
     qDebug("Outputs:     %s", info->getOutputsStrBin(/*numout*/).latin1());
     qDebug(" ");

Lines 1-11 Link Here

(-)cad/qfsm/files/patch-src::Machine.h (-3 / +3 lines)
1	--- src/Machine.h.orig Sat Mar 6 22:27:09 2004	1	--- src/Machine.h.orig Fri Aug 17 05:06:26 2007
2	+++ src/Machine.h Wed Mar 17 00:11:08 2004	2	+++ src/Machine.h Wed Oct 3 14:34:14 2007
3	@@ -19,7 +19,7 @@	3	@@ -19,7 +19,7 @@
4	#ifndef MACHINE_H	4	#ifndef MACHINE_H
5	#define MACHINE_H	5	#define MACHINE_H
6		6
7	-#include <math.h>	7	-#include <math.h>
8	+#include <cmath>	8	+#include <cmath>
9	#include <qlist.h>	9	#include <qptrlist.h>
10	#include <qobject.h>	10	#include <qobject.h>
11	#include <qstringlist.h>	11	#include <qstringlist.h>

Return to bug 116922

Lines 1-11 Link Here

(-)cad/qfsm/files/patch-src::Draw.cpp (-4 / +6 lines)
1	--- src/Draw.cpp.orig Sun Feb 29 21:38:23 2004	1	--- src/Draw.cpp.orig Fri Aug 17 05:07:21 2007
2	+++ src/Draw.cpp Tue Mar 16 23:46:29 2004	2	+++ src/Draw.cpp Wed Oct 3 14:30:19 2007
3	@@ -16,7 +16,7 @@	3	@@ -16,8 +16,8 @@
4	Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.	4	Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
5	*/	5	*/
6		6
7	-#include <math.h>	7	-#include <math.h>
		8	-#include <float.h>
8	+#include <cmath>	9	+#include <cmath>
		10	+#include <cfloat>
9	#include <qnamespace.h>	11	#include <qnamespace.h>
10	#include <qlist.h>	12	#include <qptrlist.h>
11	#include <qpainter.h>	13	#include <qpainter.h>

Lines 1-5 Link Here

(-)cad/qfsm/files/patch-src::GState.cpp (-28 / +2 lines)
1	--- src/GState.cpp.orig 2004-11-21 14:48:41.000000000 +0100	1	--- src/GState.cpp.orig Fri Aug 17 05:05:36 2007
2	+++ src/GState.cpp 2007-08-02 14:07:00.000000000 +0200	2	+++ src/GState.cpp Wed Oct 3 14:33:54 2007
3	@@ -16,7 +16,7 @@	3	@@ -16,7 +16,7 @@
4	Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.	4	Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
5	*/	5	*/
Lines 9-37 Link Here
9		9
10	#include <qpen.h>	10	#include <qpen.h>
11	#include <qbrush.h>	11	#include <qbrush.h>
12	@@ -196,9 +196,9 @@
13	t->getCPoint2(c2x, c2y);
14	info = t->getInfo();
15
16	- qDebug("Adresse: %d", (int)t);
17	- qDebug("Start: %d", (int)t->getStart());
18	- qDebug("Ende: %d", (int)t->getEnd());
19	+ qDebug("Adresse: %d", (intptr_t)t);
20	+ qDebug("Start: %d", (intptr_t)t->getStart());
21	+ qDebug("Ende: %d", (intptr_t)t->getEnd());
22	qDebug("Inputs: %s", info->getInputsStrBin(/numin/).latin1());
23	qDebug("Outputs: %s", info->getOutputsStrBin(/numout/).latin1());
24	qDebug(" ");
25	@@ -215,9 +215,9 @@
26	t->getCPoint2(c2x, c2y);
27	info = t->getInfo();
28
29	- qDebug("Adresse: %d", (int)t);
30	- qDebug("Start: %d", (int)t->getStart());
31	- qDebug("Ende: %d", (int)t->getEnd());
32	+ qDebug("Adresse: %d", (intptr_t)t);
33	+ qDebug("Start: %d", (intptr_t)t->getStart());
34	+ qDebug("Ende: %d", (intptr_t)t->getEnd());
35	qDebug("Inputs: %s", info->getInputsStrBin(/numin/).latin1());
36	qDebug("Outputs: %s", info->getOutputsStrBin(/numout/).latin1());
37	qDebug(" ");