From 8febea385ecbf6aa997e6053e592af87a889bc99 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sun, 23 Jul 2017 14:15:23 +0200 Subject: [PATCH] Adjust to ObjFW changes --- configure.ac | 2 ++ src/QtCore/QtObject.h | 2 +- src/QtCore/QtObject.mm | 4 ++-- src/QtWidgets/QtWidget.h | 4 ++-- src/QtWidgets/QtWidget.mm | 6 +++--- src/common/Makefile | 2 +- ...ataArray+QByteArray.h => OFData+QByteArray.h} | 14 +++++++------- ...aArray+QByteArray.mm => OFData+QByteArray.mm} | 16 +++++++--------- 8 files changed, 25 insertions(+), 25 deletions(-) rename src/common/{OFDataArray+QByteArray.h => OFData+QByteArray.h} (82%) rename src/common/{OFDataArray+QByteArray.mm => OFData+QByteArray.mm} (77%) diff --git a/configure.ac b/configure.ac index 7cfa01e..b393b43 100644 --- a/configure.ac +++ b/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"]) diff --git a/src/QtCore/QtObject.h b/src/QtCore/QtObject.h index 80800f4..573dfd7 100644 --- a/src/QtCore/QtObject.h +++ b/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; diff --git a/src/QtCore/QtObject.mm b/src/QtCore/QtObject.mm index 2db7dd9..cb0d369 100644 --- a/src/QtCore/QtObject.mm +++ b/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 @@ -133,7 +133,7 @@ using ObjQt::toQt; _qObject->dumpObjectTree(); } -- (OFArray OF_GENERIC(OFDataArray *) *)dynamicPropertyNames +- (OFArray OF_GENERIC(OFData *) *)dynamicPropertyNames { const QList &dynamicPropertyNames = _qObject->dynamicPropertyNames(); diff --git a/src/QtWidgets/QtWidget.h b/src/QtWidgets/QtWidget.h index 14b5622..46a95d5 100644 --- a/src/QtWidgets/QtWidget.h +++ b/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; -- (OFDataArray *)saveGeometry; +- (bool)restoreGeometry: (OFData *)geometry; +- (OFData *)saveGeometry; - (void)scrollRight: (int)dx down: (int)dy; - (void)scrollRight: (int)dx diff --git a/src/QtWidgets/QtWidget.mm b/src/QtWidgets/QtWidget.mm index 53e6fe2..6a4c9bc 100644 --- a/src/QtWidgets/QtWidget.mm +++ b/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()); } diff --git a/src/common/Makefile b/src/common/Makefile index 2a3b78c..13e5718 100644 --- a/src/common/Makefile +++ b/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 diff --git a/src/common/OFDataArray+QByteArray.h b/src/common/OFData+QByteArray.h similarity index 82% rename from src/common/OFDataArray+QByteArray.h rename to src/common/OFData+QByteArray.h index 946419b..ba2d129 100644 --- a/src/common/OFDataArray+QByteArray.h +++ b/src/common/OFData+QByteArray.h @@ -24,29 +24,29 @@ #include -@interface OFDataArray (QByteArray) -+ (instancetype)dataArrayWithQByteArray: (const QByteArray &)qByteArray; +@interface OFData (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]; } } diff --git a/src/common/OFDataArray+QByteArray.mm b/src/common/OFData+QByteArray.mm similarity index 77% rename from src/common/OFDataArray+QByteArray.mm rename to src/common/OFData+QByteArray.mm index 0456fb1..41acae3 100644 --- a/src/common/OFDataArray+QByteArray.mm +++ b/src/common/OFData+QByteArray.mm @@ -20,20 +20,18 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#import "OFDataArray+QByteArray.h" +#import "OFData+QByteArray.h" -@implementation OFDataArray (QByteArray) -+ (instancetype)dataArrayWithQByteArray: (const QByteArray &)qByteArray +@implementation OFData (QByteArray) ++ (instancetype)dataWithQByteArray: (const QByteArray &)qByteArray { - OFDataArray *ret = [OFDataArray dataArray]; - [ret addItems: qByteArray.data() - count: qByteArray.count()]; - - return ret; + return [OFData dataWithItems: qByteArray.data() + count: qByteArray.count()]; } - (QByteArray)qByteArray { - return QByteArray((char *)[self items], [self count] * [self itemSize]); + return QByteArray((const char *)[self items], + [self count] * [self itemSize]); } @end