ObjQt  Check-in [860515ac5a]

Overview
Comment:Update to recent ObjFW changes
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 860515ac5a679e872004d1e402754566398a38dc766f327ca3f90330fffa3ebc
User & Date: js on 2017-05-08 00:11:18
Other Links: manifest | tags
Context
2017-05-14
00:50
Make all properties nonatomic check-in: b2aa2ffc1d user: js tags: trunk
2017-05-08
00:11
Update to recent ObjFW changes check-in: 860515ac5a user: js tags: trunk
2017-04-30
11:49
configure: Fix the OBJCFLAGS vs OBJCXXFLAGS mess check-in: 820b470b77 user: js tags: trunk
Changes

Modified src/QtCore/QtChildEvent.h from [53abd485c2] to [c15e46d342].

27
28
29
30
31
32
33

34
35
36
37
38
39
40
@interface QtChildEvent: QtEvent
@property (readonly) QChildEvent *qChildEvent;
@property (readonly, getter=isAdded) bool added;
@property (readonly, retain) QtObject *child;
@property (readonly, getter=isPolished) bool polished;
@property (readonly, getter=isRemoved) bool removed;


- initWithQChildEvent: (QChildEvent*)qChildEvent;
- initWithType: (QChildEvent::Type)type
	 child: (QtObject*)child;
@end

namespace ObjQt {








>







27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
@interface QtChildEvent: QtEvent
@property (readonly) QChildEvent *qChildEvent;
@property (readonly, getter=isAdded) bool added;
@property (readonly, retain) QtObject *child;
@property (readonly, getter=isPolished) bool polished;
@property (readonly, getter=isRemoved) bool removed;

- initWithQEvent: (QEvent *)event OF_UNAVAILABLE;
- initWithQChildEvent: (QChildEvent*)qChildEvent;
- initWithType: (QChildEvent::Type)type
	 child: (QtObject*)child;
@end

namespace ObjQt {

Modified src/QtCore/QtChildEvent.mm from [0050860fa4] to [77e90608b8].

whitespace changes only

Modified src/QtCore/QtCoreApplication.h from [dfc55ef348] to [96e4d8b08f].

26
27
28
29
30
31
32

33
34
35
36
37
38
39

@interface QtCoreApplication: QtObject
@property (readonly) QCoreApplication *qCoreApplication;
@property (copy) OFString *applicationName, *applicationVersion;
@property (copy) OFString *organizationDomain, *organizationName;
@property (getter=isQuitLockEnabled) bool quitLockEnabled;


- initWithQCoreApplication: (QCoreApplication*)qCoreApplication;
- (void)installNativeEventFilter: (QAbstractNativeEventFilter*)filterObject;
- (void)quit;
- (void)removeNativeEventFilter: (QAbstractNativeEventFilter*)filterObject;
- (bool)sendEvent: (QtEvent*)event
	 receiver: (QtObject*)receiver;
@end







>







26
27
28
29
30
31
32
33
34
35
36
37
38
39
40

@interface QtCoreApplication: QtObject
@property (readonly) QCoreApplication *qCoreApplication;
@property (copy) OFString *applicationName, *applicationVersion;
@property (copy) OFString *organizationDomain, *organizationName;
@property (getter=isQuitLockEnabled) bool quitLockEnabled;

- initWithQObject: (QObject *)qObject OF_UNAVAILABLE;
- initWithQCoreApplication: (QCoreApplication*)qCoreApplication;
- (void)installNativeEventFilter: (QAbstractNativeEventFilter*)filterObject;
- (void)quit;
- (void)removeNativeEventFilter: (QAbstractNativeEventFilter*)filterObject;
- (bool)sendEvent: (QtEvent*)event
	 receiver: (QtObject*)receiver;
@end

Modified src/QtCore/QtCoreApplication.mm from [b055a533da] to [efe4224b0c].

whitespace changes only

Modified src/QtCore/QtEvent.h from [6eeefe4604] to [6e6d3c6c45].

34
35
36
37
38
39
40

41
42
43
44
45
46
47

@property (readonly) QEvent *qEvent;
@property (getter=isAccepted) bool accepted;
@property (readonly, getter=isSpontaneous) bool spontaneous;
@property (readonly) QEvent::Type type;

+ (int)registerEventType: (int)hint;

- initWithQEvent: (QEvent*)qEvent;
- (void)accept;
- (void)ignore;
@end

namespace ObjQt {








>







34
35
36
37
38
39
40
41
42
43
44
45
46
47
48

@property (readonly) QEvent *qEvent;
@property (getter=isAccepted) bool accepted;
@property (readonly, getter=isSpontaneous) bool spontaneous;
@property (readonly) QEvent::Type type;

+ (int)registerEventType: (int)hint;
- init OF_UNAVAILABLE;
- initWithQEvent: (QEvent*)qEvent;
- (void)accept;
- (void)ignore;
@end

namespace ObjQt {

Modified src/QtCore/QtEvent.mm from [a8eec8c991] to [8e511e2d99].

whitespace changes only

Modified src/QtCore/QtObject.h from [6c34637edf] to [ba457e33e9].

36
37
38
39
40
41
42

43
44
45
46
47
48
49
}

@property (readonly) QObject *qObject;
@property (readonly) const QMetaObject *metaObject;
@property (retain) QtObject *parent;
@property (copy) OFString *objectName;


- initWithQObject: (QObject*)qObject;
- (bool)setBlockSignals: (bool)block;
- (OFArray OF_GENERIC(QtObject*)*)children;
- (QMetaObject::Connection)connectSignal: (OFString*)signal
				  sender: (QtObject*)sender
				  method: (OFString*)method
				    type: (Qt::ConnectionType)type;







>







36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
}

@property (readonly) QObject *qObject;
@property (readonly) const QMetaObject *metaObject;
@property (retain) QtObject *parent;
@property (copy) OFString *objectName;

- init OF_UNAVAILABLE;
- initWithQObject: (QObject*)qObject;
- (bool)setBlockSignals: (bool)block;
- (OFArray OF_GENERIC(QtObject*)*)children;
- (QMetaObject::Connection)connectSignal: (OFString*)signal
				  sender: (QtObject*)sender
				  method: (OFString*)method
				    type: (Qt::ConnectionType)type;

Modified src/QtCore/QtObject.mm from [c04c6365a3] to [e59a1442ac].

whitespace changes only

Modified src/QtCore/QtThread.h from [c9467afda7] to [43325aa0ce].

30
31
32
33
34
35
36

37
38
39
40
41
42
43
@property (readonly, getter=isFinished) bool finished;
@property (readonly, getter=isInterruptionRequested) bool interruptionRequested;
@property (readonly, getter=isRunning) bool running;
@property (readonly) int loopLevel;
@property QThread::Priority priority;
@property unsigned int stackSize;


- initWithQThread: (QThread*)qThread;
- (void)exitWithReturnCode: (int)returnCode;
- (void)requestInterruption;
- (bool)waitForMilliseconds: (unsigned long)time;
- (void)quit;
- (void)startWithPriority: (QThread::Priority)priority;
- (void)terminate;







>







30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
@property (readonly, getter=isFinished) bool finished;
@property (readonly, getter=isInterruptionRequested) bool interruptionRequested;
@property (readonly, getter=isRunning) bool running;
@property (readonly) int loopLevel;
@property QThread::Priority priority;
@property unsigned int stackSize;

- initWithQObject: (QObject *)qObject OF_UNAVAILABLE;
- initWithQThread: (QThread*)qThread;
- (void)exitWithReturnCode: (int)returnCode;
- (void)requestInterruption;
- (bool)waitForMilliseconds: (unsigned long)time;
- (void)quit;
- (void)startWithPriority: (QThread::Priority)priority;
- (void)terminate;

Modified src/QtCore/QtThread.mm from [117e62c463] to [fd57508770].

whitespace changes only

Modified src/QtGui/QtGUIApplication.h from [39d7116def] to [8f1cb558e8].

32
33
34
35
36
37
38

39
40
41
42
43
44
45
#endif
@property Qt::LayoutDirection layoutDirection;
@property (readonly, copy) OFString *platformName;
@property (readonly) QScreen *primaryScreen;
@property bool quitsOnLastWindowClosed;
@property QIcon windowIcon;


- initWithQGuiApplication: (QGuiApplication*)qGuiApplication;
- (double)devicePixelRatio;
- (bool)isSavingSession;
- (bool)isSessionRestored;
- (OFString*)sessionID;
- (OFString*)sessionKey;
@end







>







32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
#endif
@property Qt::LayoutDirection layoutDirection;
@property (readonly, copy) OFString *platformName;
@property (readonly) QScreen *primaryScreen;
@property bool quitsOnLastWindowClosed;
@property QIcon windowIcon;

- initWithQCoreApplication: (QCoreApplication *)qCoreApplication OF_UNAVAILABLE;
- initWithQGuiApplication: (QGuiApplication*)qGuiApplication;
- (double)devicePixelRatio;
- (bool)isSavingSession;
- (bool)isSessionRestored;
- (OFString*)sessionID;
- (OFString*)sessionKey;
@end

Modified src/QtGui/QtGUIApplication.mm from [f0fdef84ef] to [69d747a94f].

whitespace changes only

Modified src/QtGui/QtPaintDevice.h from [de5420f5ab] to [ac14220fb1].

whitespace changes only

Modified src/QtGui/QtPaintDevice.mm from [16b48401ce] to [dfb9eb98ed].

whitespace changes only

Modified src/QtWidgets/QtAbstractButton.h from [de5ca4911a] to [b2c785da49].

34
35
36
37
38
39
40

41
42
43
44
45
46
47
@property (getter=isChecked) bool checked;
@property (getter=isDown) bool down;
@property QIcon icon;
@property of_dimension_t iconSize;
@property QKeySequence shortcut;
@property (copy) OFString *text;


- initWithQAbstractButton: (QAbstractButton*)qAbstractButton;
- (QButtonGroup*)group;
@end

namespace ObjQt {

static OF_INLINE QtAbstractButton*







>







34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
@property (getter=isChecked) bool checked;
@property (getter=isDown) bool down;
@property QIcon icon;
@property of_dimension_t iconSize;
@property QKeySequence shortcut;
@property (copy) OFString *text;

- initWithQWidget: (QWidget *)qWidget OF_UNAVAILABLE;
- initWithQAbstractButton: (QAbstractButton*)qAbstractButton;
- (QButtonGroup*)group;
@end

namespace ObjQt {

static OF_INLINE QtAbstractButton*

Modified src/QtWidgets/QtAbstractButton.mm from [7722808b16] to [16048af6f6].

whitespace changes only

Modified src/QtWidgets/QtAction.h from [f6acd86617] to [786b963eba].

42
43
44
45
46
47
48

49
50
51
52
53
54
55
@property Qt::ShortcutContext shortcutContext;
@property (copy) OFString *statusTip;
@property (copy) OFString *text;
@property (copy) OFString *toolTip;
@property (getter=isVisible) bool visible;
@property (copy) OFString *whatsThis;


- initWithQAction: (QAction*)qAction;
- (QActionGroup*)actionGroup;
- (void)activate: (QAction::ActionEvent)event;
- (QList<QGraphicsWidget*>)associatedGraphicsWidgets;
- (OFArray OF_GENERIC(QtWidget*)*)associatedWidgets;
- (QVariant)data;
- (bool)isSeparator;







>







42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
@property Qt::ShortcutContext shortcutContext;
@property (copy) OFString *statusTip;
@property (copy) OFString *text;
@property (copy) OFString *toolTip;
@property (getter=isVisible) bool visible;
@property (copy) OFString *whatsThis;

- initWithQObject: (QObject *)qObject OF_UNAVAILABLE;
- initWithQAction: (QAction*)qAction;
- (QActionGroup*)actionGroup;
- (void)activate: (QAction::ActionEvent)event;
- (QList<QGraphicsWidget*>)associatedGraphicsWidgets;
- (OFArray OF_GENERIC(QtWidget*)*)associatedWidgets;
- (QVariant)data;
- (bool)isSeparator;

Modified src/QtWidgets/QtAction.mm from [d6c33d3e64] to [7055d441a2].

whitespace changes only

Modified src/QtWidgets/QtApplication.h from [4e836c2280] to [f8eefb765d].

32
33
34
35
36
37
38

39
40
41
42
43
44
45
@property of_dimension_t globalStrut;
@property int keyboardInputInterval;
@property int startDragDistance;
@property int startDragTime;
@property (copy) OFString *styleSheet;
@property int wheelScrollLines;


- initWithQApplication: (QApplication*)qApplication;
- (void)aboutQt;
- (void)closeAllWindows;
@end

namespace ObjQt {








>







32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
@property of_dimension_t globalStrut;
@property int keyboardInputInterval;
@property int startDragDistance;
@property int startDragTime;
@property (copy) OFString *styleSheet;
@property int wheelScrollLines;

- initWithQGuiApplication: (QGuiApplication *)qGuiApplication OF_UNAVAILABLE;
- initWithQApplication: (QApplication*)qApplication;
- (void)aboutQt;
- (void)closeAllWindows;
@end

namespace ObjQt {

Modified src/QtWidgets/QtApplication.mm from [56fa6f8c8c] to [579279b5d5].

whitespace changes only

Modified src/QtWidgets/QtPushButton.h from [7a67030b98] to [6a47526835].

29
30
31
32
33
34
35

36
37
38
39
40
41
42
@interface QtPushButton: QtAbstractButton
@property (readonly) QPushButton *qPushButton;
@property QMenu* menu;
@property bool autoDefault;
@property (getter=isDefault, setter=setDefault:) bool default_;
@property (getter=isFlat) bool flat;


- initWithQPushButton: (QPushButton*)qPushButton;
- initWithText: (OFString*)text;
- initWithIcon: (QIcon)icon
	  text: (OFString*)text;
@end

namespace ObjQt {







>







29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
@interface QtPushButton: QtAbstractButton
@property (readonly) QPushButton *qPushButton;
@property QMenu* menu;
@property bool autoDefault;
@property (getter=isDefault, setter=setDefault:) bool default_;
@property (getter=isFlat) bool flat;

- initWithQAbstractButton: (QAbstractButton *)qAbstractButton OF_UNAVAILABLE;
- initWithQPushButton: (QPushButton*)qPushButton;
- initWithText: (OFString*)text;
- initWithIcon: (QIcon)icon
	  text: (OFString*)text;
@end

namespace ObjQt {

Modified src/QtWidgets/QtPushButton.mm from [9e8bdaad72] to [ddd71ab879].

26
27
28
29
30
31
32
33
34
35
36
37
38
39
40

#import "helpers.h"

using ObjQt::toOF;
using ObjQt::toQt;

@implementation QtPushButton

- initWithQAbstractButton: (QAbstractButton*)qAbstractButton
{
	OF_INVALID_INIT_METHOD
}

- initWithQPushButton: (QPushButton*)qPushButton
{







<







26
27
28
29
30
31
32

33
34
35
36
37
38
39

#import "helpers.h"

using ObjQt::toOF;
using ObjQt::toQt;

@implementation QtPushButton

- initWithQAbstractButton: (QAbstractButton*)qAbstractButton
{
	OF_INVALID_INIT_METHOD
}

- initWithQPushButton: (QPushButton*)qPushButton
{

Modified src/QtWidgets/QtWidget.h from [986333abc0] to [5ea63b6548].

82
83
84
85
86
87
88

89
90
91
92
93
94
95
@property Qt::WindowModality windowModality;
@property (getter=isWindowModified) bool windowModified;
@property double windowOpacity;
@property (copy) OFString *windowTitle;
@property (readonly) int x;
@property (readonly) int y;


- initWithQWidget: (QWidget*)qWidget;
- (OFArray OF_GENERIC(QtAction*)*)actions;
- (void)activateWindow;
- (void)addAction: (QtAction*)action;
- (void)addActions: (OFArray OF_GENERIC(QtAction*)*)actions;
- (void)adjustSize;
- (QPalette::ColorRole)backgroundRole;







>







82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
@property Qt::WindowModality windowModality;
@property (getter=isWindowModified) bool windowModified;
@property double windowOpacity;
@property (copy) OFString *windowTitle;
@property (readonly) int x;
@property (readonly) int y;

- initWithQObject: (QObject *)qObject OF_UNAVAILABLE;
- initWithQWidget: (QWidget*)qWidget;
- (OFArray OF_GENERIC(QtAction*)*)actions;
- (void)activateWindow;
- (void)addAction: (QtAction*)action;
- (void)addActions: (OFArray OF_GENERIC(QtAction*)*)actions;
- (void)adjustSize;
- (QPalette::ColorRole)backgroundRole;

Modified src/QtWidgets/QtWidget.mm from [f374133c3b] to [df0e867276].

whitespace changes only

Modified src/common/OFDataArray+QByteArray.h from [f43313841c] to [f833005f89].

whitespace changes only

Modified src/common/OFDataArray+QByteArray.mm from [37ebb8afd0] to [d8eb348c3a].

whitespace changes only

Modified src/common/OFString+QString.h from [dd6dc45afe] to [fc2a76aadc].

whitespace changes only

Modified src/common/OFString+QString.mm from [0c44cda950] to [5b64399c2b].

26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
+ stringWithQString: (const QString&)qString
{
	return [[[self alloc] initWithQString: qString] autorelease];
}

- initWithQString: (const QString&)qString
{
	static_assert(sizeof(QChar) == sizeof(of_char16_t),
	    "QChar and of_char16_t have a different size!");

	return [self initWithUTF16String: (of_char16_t*)qString.data()
				  length: qString.length()];
}

- (QString)qString
{
	static_assert(sizeof(of_char16_t) == sizeof(QChar),
	    "of_char16_t and QChar have a different size!");

	void *pool = objc_autoreleasePoolPush();
	QString ret = QString((QChar*)[self UTF16String]);

	objc_autoreleasePoolPop(pool);

	return ret;
}
@end







|
|

|





|
|









26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
+ stringWithQString: (const QString&)qString
{
	return [[[self alloc] initWithQString: qString] autorelease];
}

- initWithQString: (const QString&)qString
{
	static_assert(sizeof(QChar) == sizeof(char16_t),
	    "QChar and char16_t have a different size!");

	return [self initWithUTF16String: (char16_t *)qString.data()
				  length: qString.length()];
}

- (QString)qString
{
	static_assert(sizeof(char16_t) == sizeof(QChar),
	    "char16_t and QChar have a different size!");

	void *pool = objc_autoreleasePoolPush();
	QString ret = QString((QChar*)[self UTF16String]);

	objc_autoreleasePoolPop(pool);

	return ret;
}
@end