ObjQt  Diff

Annotate Patch Unified Diff

Differences From Artifact [b9c441bfd0]:

To Artifact [07b560bcd3]:

︙︙
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41

42
43
44
45
46
47
48

 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */

#import <ObjFW/ObjFW.h>

#include <QString>
#include <QSize>
#include <QRect>

#import "OFString+QString.h"

static OF_INLINE OFString*
toOF(const QString &qString)
{
	return [OFString stringWithQString: qString];
}

static OF_INLINE QString
toQt(OFString *string)
{
	return [string qString];
}


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









<



|
|
|
|
<
<
<
|
<
|
|
<
<
>








18
19
20
21
22
23
24

25
26
27
28
29
30
31



32

33
34


35
36
37
38
39
40
41
42

 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */

#import <ObjFW/ObjFW.h>


#include <QSize>
#include <QRect>

#import "QtObject.h"
#import "QtAction.h"
#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());
}
︙︙
72
73
74
75
76
77
78
79



}

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











>
>

66
67
68
69
70
71
72
73
74
75

}

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

}