Adjust to ObjFW changes

configure.ac

@@ -35,6 +35,8 @@ AX_CHECK_COMPILER_FLAGS(-pipe, [OBJCXXFLAGS="$OBJCXXFLAGS -pipe"])
 AX_CHECK_COMPILER_FLAGS(-fno-common, [OBJCXXFLAGS="$OBJCXXFLAGS -fno-common"])
 AX_CHECK_COMPILER_FLAGS(-Wobjc-missing-property-synthesis -Werror,
 	[OBJCXXFLAGS="$OBJCXXFLAGS -Wobjc-missing-property-synthesis"])
+AX_CHECK_COMPILER_FLAGS(-Watomic-properties,
+	[OBJCXXFLAGS="$OBJCXXFLAGS -Watomic-properties"])
 AX_CHECK_COMPILER_FLAGS(-Wno-ignored-attributes -Werror,
 	[OBJCXXFLAGS="$OBJCXXFLAGS -Wno-ignored-attributes"])
 

src/QtCore/QtObject.h

@@ -55,7 +55,7 @@
 				 method: (OFString *)method;
 - (void)dumpObjectInfo;
 - (void)dumpObjectTree;
-- (OFArray OF_GENERIC(OFDataArray *) *)dynamicPropertyNames;
+- (OFArray OF_GENERIC(OFData *) *)dynamicPropertyNames;
 - (bool)handleEvent: (QtEvent *)event;
 - (bool)filterEvent: (QtEvent *)event
 	  forObject: (QtObject *)watched;

src/QtCore/QtObject.mm

@@ -24,7 +24,7 @@
 #import "QtEvent.h"
 #import "QtThread.h"
 #import "OFString+QString.h"
-#import "OFDataArray+QByteArray.h"
+#import "OFData+QByteArray.h"
 
 #include <QVariant>
 
@@ -133,7 +133,7 @@ using ObjQt::toQt;
 	_qObject->dumpObjectTree();
 }
 
-- (OFArray OF_GENERIC(OFDataArray *) *)dynamicPropertyNames
+- (OFArray OF_GENERIC(OFData *) *)dynamicPropertyNames
 {
 	const QList<QByteArray> &dynamicPropertyNames =
 	    _qObject->dynamicPropertyNames();

src/QtWidgets/QtWidget.h

@@ -169,8 +169,8 @@
 		    flags: (QWidget::RenderFlags)renderFlags;
 - (void)repaintInRectangle: (of_rectangle_t)rect;
 - (void)repaintInRegion: (const QRegion &)region;
-- (bool)restoreGeometry: (OFDataArray *)geometry;
+- (bool)restoreGeometry: (OFData *)geometry;
-- (OFDataArray *)saveGeometry;
+- (OFData *)saveGeometry;
 - (void)scrollRight: (int)dx
 	       down: (int)dy;
 - (void)scrollRight: (int)dx

src/QtWidgets/QtWidget.mm

@@ -23,7 +23,7 @@
 #import "QtWidget.h"
 #import "QtAction.h"
 #import "OFString+QString.h"
-#import "OFDataArray+QByteArray.h"
+#import "OFData+QByteArray.h"
 
 #import "helpers.h"
 
@@ -913,12 +913,12 @@ using ObjQt::toQt;
 	toQt(self)->repaint(region);
 }
 
-- (bool)restoreGeometry: (OFDataArray *)geometry
+- (bool)restoreGeometry: (OFData *)geometry
 {
 	return toQt(self)->restoreGeometry(toQt(geometry));
 }
 
-- (OFDataArray *)saveGeometry
+- (OFData *)saveGeometry
 {
 	return toOF(toQt(self)->saveGeometry());
 }

src/common/Makefile

@@ -3,7 +3,7 @@ include ../../extra.mk
 STATIC_PIC_LIB_NOINST = ${COMMON_LIB_A}
 STATIC_LIB_NOINST = ${COMMON_A}
 
-SRCS = OFDataArray+QByteArray.mm	\
+SRCS = OFData+QByteArray.mm	\
        OFString+QString.mm
 
 include ../../buildsys.mk

src/common/OFData+QByteArray.h

@@ -24,29 +24,29 @@
 
 #include <QByteArray>
 
-@interface OFDataArray (QByteArray)
+@interface OFData (QByteArray)
-+ (instancetype)dataArrayWithQByteArray: (const QByteArray &)qByteArray;
++ (instancetype)dataWithQByteArray: (const QByteArray &)qByteArray;
 - (QByteArray)qByteArray;
 @end
 
 namespace ObjQt {
 
-static OF_INLINE OFDataArray *
+static OF_INLINE OFData *
 toOF(const QByteArray &qByteArray)
 {
 	if (qByteArray.isNull())
 		return nil;
 
-	return [OFDataArray dataArrayWithQByteArray: qByteArray];
+	return [OFData dataWithQByteArray: qByteArray];
 }
 
 static OF_INLINE QByteArray
-toQt(OFDataArray *dataArray)
+toQt(OFData *data)
 {
-	if (dataArray == nil)
+	if (data == nil)
 		return QByteArray();
 
-	return [dataArray qByteArray];
+	return [data qByteArray];
 }
 
 }

src/common/OFData+QByteArray.mm

@@ -20,20 +20,18 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "OFDataArray+QByteArray.h"
+#import "OFData+QByteArray.h"
 
-@implementation OFDataArray (QByteArray)
+@implementation OFData (QByteArray)
-+ (instancetype)dataArrayWithQByteArray: (const QByteArray &)qByteArray
++ (instancetype)dataWithQByteArray: (const QByteArray &)qByteArray
 {
-	OFDataArray *ret = [OFDataArray dataArray];
+	return [OFData dataWithItems: qByteArray.data()
-	[ret addItems: qByteArray.data()
+			       count: qByteArray.count()];
-		count: qByteArray.count()];
-
-	return ret;
 }
 
 - (QByteArray)qByteArray
 {
-	return QByteArray((char *)[self items], [self count] * [self itemSize]);
+	return QByteArray((const char *)[self items],
+	    [self count] * [self itemSize]);
 }
 @end