ObjQt  Diff

Differences From Artifact [f43313841c]:

• File common/OFDataArray+QByteArray.h — part of check-in [3ece549448] at 2017-04-15 17:18:52 on branch trunk — Make toOF/toQt more powerful and complete QtWidget (user: js, size: 1552) [annotate] [blame] [check-ins using]
• File src/common/OFDataArray+QByteArray.h — part of check-in [baf52ea3b1] at 2017-04-17 23:25:45 on branch trunk — Add a proper build system

  Also lowers the minimum required Qt version to 5.5. (user: js, size: 1552) [annotate] [blame] [check-ins using]

To Artifact [f833005f89]:

• File src/common/OFDataArray+QByteArray.h — part of check-in [860515ac5a] at 2017-05-08 00:11:18 on branch trunk — Update to recent ObjFW changes (user: js, size: 1554) [annotate] [blame] [check-ins using]

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

 */

#import <ObjFW/ObjFW.h>

#include <QByteArray>

@interface OFDataArray (QByteArray)
+ (instancetype)dataArrayWithQByteArray: (const QByteArray&)qByteArray;
- (QByteArray)qByteArray;
@end

namespace ObjQt {

static OF_INLINE OFDataArray*
toOF(const QByteArray &qByteArray)
{
	return [OFDataArray dataArrayWithQByteArray: qByteArray];
}

static OF_INLINE QByteArray
toQt(OFDataArray *dataArray)

|





|

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

 */

#import <ObjFW/ObjFW.h>

#include <QByteArray>

@interface OFDataArray (QByteArray)
+ (instancetype)dataArrayWithQByteArray: (const QByteArray &)qByteArray;
- (QByteArray)qByteArray;
@end

namespace ObjQt {

static OF_INLINE OFDataArray *
toOF(const QByteArray &qByteArray)
{
	return [OFDataArray dataArrayWithQByteArray: qByteArray];
}

static OF_INLINE QByteArray
toQt(OFDataArray *dataArray)