Make toOF/toQt more powerful and complete QtWidget

common/OFDataArray+QByteArray.h

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2017, Jonathan Schleifer <js@heap.zone>
+ *
+ * https://heap.zone/git/objqt.git
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice is present in all copies.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * 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 <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)
+{
+	return [dataArray qByteArray];
+}
+
+}

common/OFDataArray+QByteArray.mm

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2017, Jonathan Schleifer <js@heap.zone>
+ *
+ * https://heap.zone/git/objqt.git
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice is present in all copies.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * 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 "OFDataArray+QByteArray.h"
+
+@implementation OFDataArray (QByteArray)
++ (instancetype)dataArrayWithQByteArray: (const QByteArray&)qByteArray
+{
+	OFDataArray *ret = [OFDataArray dataArray];
+	[ret addItems: qByteArray.data()
+		count: qByteArray.count()];
+
+	return ret;
+}
+
+- (QByteArray)qByteArray
+{
+	return QByteArray((char*)[self items], [self count] * [self itemSize]);
+}
+@end

common/OFString+QString.h

@@ -29,3 +29,19 @@
 - initWithQString: (const QString&)qString;
 - (QString)qString;
 @end
+
+namespace ObjQt {
+
+static OF_INLINE OFString*
+toOF(const QString &qString)
+{
+	return [OFString stringWithQString: qString];
+}
+
+static OF_INLINE QString
+toQt(OFString *string)
+{
+	return [string qString];
+}
+
+}

common/helpers.h

@@ -22,23 +22,17 @@
 
 #import <ObjFW/ObjFW.h>
 
-#include <QString>
 #include <QSize>
 #include <QRect>
 
-#import "OFString+QString.h"
+#import "QtObject.h"
+#import "QtAction.h"
+#import "QtEvent.h"
+#import "QtChildEvent.h"
+#import "QtThread.h"
+#import "QtWidget.h"
 
-static OF_INLINE OFString*
-toOF(const QString &qString)
-{
-	return [OFString stringWithQString: qString];
-}
-
-static OF_INLINE QString
-toQt(OFString *string)
-{
-	return [string qString];
-}
+namespace ObjQt {
 
 static OF_INLINE of_point_t
 toOF(const QPoint &qPoint)
@@ -77,3 +71,5 @@ toQt(of_rectangle_t rectangle)
 	return QRect(rectangle.origin.x, rectangle.origin.y,
 	    rectangle.size.width, rectangle.size.height);
 }
+
+}