ObjQt  Diff

Differences From Artifact [b31e057a48]:

To Artifact [678ba15fab]:


30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
#import "QtEvent.h"
#import "QtChildEvent.h"
#import "QtThread.h"
#import "QtWidget.h"

namespace ObjQt {

static OF_INLINE of_point_t
toOF(const QPoint &qPoint)
{
	return of_point(qPoint.x(), qPoint.y());
}

static OF_INLINE QPoint
toQt(const of_point_t &point)
{
	return QPoint(point.x, point.y);
}

static OF_INLINE of_dimension_t
toOF(const QSize &qSize)
{
	return of_dimension(qSize.width(), qSize.height());
}

static OF_INLINE of_dimension_t
toOF(const QSizeF &qSizeF)
{
	return of_dimension(qSizeF.width(), qSizeF.height());
}

static OF_INLINE QSizeF
toQt(const of_dimension_t &dimension)
{
	return QSizeF(dimension.width, dimension.height);
}

static OF_INLINE of_rectangle_t
toOF(const QRect &qRect)
{
	return of_rectangle(qRect.x(), qRect.y(),
	    qRect.width(), qRect.height());
}

static OF_INLINE of_rectangle_t
toOF(const QRectF &qRectF)
{
	return of_rectangle(qRectF.x(), qRectF.y(),
	    qRectF.width(), qRectF.height());
}

static OF_INLINE QRectF
toQt(const of_rectangle_t &rectangle)
{
	return QRectF(rectangle.origin.x, rectangle.origin.y,
	    rectangle.size.width, rectangle.size.height);
}

}







|


|



|




|


|


|


|



|




|


<
|


|


|




|

|
|



30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69

70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
#import "QtEvent.h"
#import "QtChildEvent.h"
#import "QtThread.h"
#import "QtWidget.h"

namespace ObjQt {

static OF_INLINE OFPoint
toOF(const QPoint &qPoint)
{
	return OFPointMake(qPoint.x(), qPoint.y());
}

static OF_INLINE QPoint
toQt(const OFPoint &point)
{
	return QPoint(point.x, point.y);
}

static OF_INLINE OFSize
toOF(const QSize &qSize)
{
	return OFSizeMake(qSize.width(), qSize.height());
}

static OF_INLINE OFSize
toOF(const QSizeF &qSizeF)
{
	return OFSizeMake(qSizeF.width(), qSizeF.height());
}

static OF_INLINE QSizeF
toQt(const OFSize &dimension)
{
	return QSizeF(dimension.width, dimension.height);
}

static OF_INLINE OFRect
toOF(const QRect &qRect)
{

	return OFRectMake(qRect.x(), qRect.y(), qRect.width(), qRect.height());
}

static OF_INLINE OFRect
toOF(const QRectF &qRectF)
{
	return OFRectMake(qRectF.x(), qRectF.y(),
	    qRectF.width(), qRectF.height());
}

static OF_INLINE QRectF
toQt(const OFRect &rect)
{
	return QRectF(rect.origin.x, rect.origin.y,
	    rect.size.width, rect.size.height);
}

}