ObjQt  Check-in [9c69939020]

Overview
Comment:Adjust to ObjFW changes
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | trunk
Files: files | file ages | folders
SHA3-256: 9c69939020d3573683bd3e3df6eb85a7e11a3696872253e59942b6c7905ead03
User & Date: js on 2021-04-29 23:37:37
Other Links: manifest | tags
Context
2021-04-29
23:37
Adjust to ObjFW changes Leaf check-in: 9c69939020 user: js tags: trunk
2019-03-15
00:07
Use dot syntax check-in: 4ae247a25d user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified src/QtCore/QtEvent.mm from [f106a26f16] to [82e43e6e41].

︙
50
51
52
53
54
55
56
57

58
59
60
61
62
63

64
65
66
67
68
69
70

50
51
52
53
54
55
56

57
58
59
60
61
62

63
64
65
66
67
68
69
70








-
+





-
+








		delete _qEvent;

	[super dealloc];
}

- (void)takeOwnership
{
	OF_ENSURE(!_ownsEvent);
	OFEnsure(!_ownsEvent);
	_ownsEvent = true;
}

- (void)giveUpOwnership
{
	OF_ENSURE(_ownsEvent);
	OFEnsure(_ownsEvent);
	_ownsEvent = false;
}

- (void)accept
{
	_qEvent->accept();
}
︙

Modified src/QtCore/QtObject.mm from [9c5a288510] to [784db2b371].

︙
54
55
56
57
58
59
60
61

62
63
64
65
66
67

68
69
70
71
72
73
74

54
55
56
57
58
59
60

61
62
63
64
65
66

67
68
69
70
71
72
73
74








-
+





-
+








		delete _qObject;

	[super dealloc];
}

- (void)takeOwnership
{
	OF_ENSURE(!_ownsObject);
	OFEnsure(!_ownsObject);
	_ownsObject = true;
}

- (void)giveUpOwnership
{
	OF_ENSURE(_ownsObject);
	OFEnsure(_ownsObject);
	_ownsObject = false;
}

- (OFString *)objectName
{
	return toOF(_qObject->objectName());
}
︙
237
238
239
240
241
242
243
244

245
246
247

237
238
239
240
241
242
243

244
245
246
247








-
+




- (QtThread *)thread
{
	return toOF(_qObject->thread());
}

- (void)deleteLater
{
	OF_ENSURE(!_ownsObject);
	OFEnsure(!_ownsObject);
	_qObject->deleteLater();
}
@end

Modified src/QtWidgets/QtAbstractButton.h from [4524430429] to [54866ca7d3].

︙
30
31
32
33
34
35
36
37

38
39
40
41
42
43
44

30
31
32
33
34
35
36

37
38
39
40
41
42
43
44








-
+








@property (nonatomic) bool autoRepeat;
@property (nonatomic) int autoRepeatDelay;
@property (nonatomic) int autoRepeatInterval;
@property (nonatomic, getter=isCheckable) bool checkable;
@property (nonatomic, getter=isChecked) bool checked;
@property (nonatomic, getter=isDown) bool down;
@property (nonatomic) QIcon icon;
@property (nonatomic) of_dimension_t iconSize;
@property (nonatomic) OFSize iconSize;
@property (nonatomic) QKeySequence shortcut;
@property (nonatomic, copy) OFString *text;
@property (readonly, nonatomic) QButtonGroup *group;

- (instancetype)initWithQWidget: (QWidget *)qWidget OF_UNAVAILABLE;
- (instancetype)initWithQAbstractButton: (QAbstractButton *)qAbstractButton
    OF_DESIGNATED_INITIALIZER;
︙

Modified src/QtWidgets/QtAbstractButton.mm from [4e3baa2d62] to [01e461b534].

︙
120
121
122
123
124
125
126
127

128
129
130
131
132

133
134
135
136
137
138
139

120
121
122
123
124
125
126

127
128
129
130
131

132
133
134
135
136
137
138
139








-
+




-
+








}

- (void)setIcon: (QIcon)icon
{
	toQt(self)->setIcon(icon);
}

- (of_dimension_t)iconSize
- (OFSize)iconSize
{
	return toOF(toQt(self)->iconSize());
}

- (void)setIconSize: (of_dimension_t)iconSize
- (void)setIconSize: (OFSize)iconSize
{
	toQt(self)->setIconSize(toQt(iconSize).toSize());
}

- (QKeySequence)shortcut
{
	return toQt(self)->shortcut();
︙

Modified src/QtWidgets/QtApplication.h from [40e6864610] to [84effc7b8a].

︙
25
26
27
28
29
30
31
32

33
34
35
36
37
38
39

25
26
27
28
29
30
31

32
33
34
35
36
37
38
39








-
+








#include <QApplication>

@interface QtApplication: QtGUIApplication
@property (readonly, nonatomic) QApplication *qApplication;
@property (nonatomic) bool autoSIPEnabled;
@property (nonatomic) int cursorFlashTime;
@property (nonatomic) int doubleClickInterval;
@property (nonatomic) of_dimension_t globalStrut;
@property (nonatomic) OFSize globalStrut;
@property (nonatomic) int keyboardInputInterval;
@property (nonatomic) int startDragDistance;
@property (nonatomic) int startDragTime;
@property (nonatomic, copy) OFString *styleSheet;
@property (nonatomic) int wheelScrollLines;

- (instancetype)initWithQGuiApplication: (QGuiApplication *)qGuiApplication
︙

Modified src/QtWidgets/QtApplication.mm from [18996e8953] to [cb2dcdfdc0].

︙
70
71
72
73
74
75
76
77

78
79
80
81
82

83
84
85
86
87
88
89

70
71
72
73
74
75
76

77
78
79
80
81

82
83
84
85
86
87
88
89








-
+




-
+








}

- (void)setDoubleClickInterval: (int)doubleClickInterval
{
	toQt(self)->setDoubleClickInterval(doubleClickInterval);
}

- (of_dimension_t)globalStrut
- (OFSize)globalStrut
{
	return toOF(toQt(self)->globalStrut());
}

- (void)setGlobalStrut: (of_dimension_t)globalStrut
- (void)setGlobalStrut: (OFSize)globalStrut
{
	toQt(self)->setGlobalStrut(toQt(globalStrut).toSize());
}

- (int)keyboardInputInterval
{
	return toQt(self)->keyboardInputInterval();
︙

Modified src/QtWidgets/QtGraphicsWidget.h from [cab64f2316] to [adab7bcf7c].

︙
31
32
33
34
35
36
37
38

39
40
41
42


43
44
45


46
47
48
49
50
51
52
53


54
55
56
57
58
59
60

31
32
33
34
35
36
37

38
39
40


41
42
43


44
45
46
47
48
49
50
51


52
53
54
55
56
57
58
59
60








-
+


-
-
+
+

-
-
+
+






-
-
+
+








@interface QtGraphicsObject: QtObject
@end

@interface QtGraphicsWidget: QtGraphicsObject
@property (readonly, nonatomic) QGraphicsWidget *qGraphicsWidget;
@property (nonatomic) bool autoFillBackground;
@property (nonatomic) Qt::FocusPolicy focusPolicy;
@property (nonatomic) of_rectangle_t geometry;
@property (nonatomic) OFRect geometry;
@property (nonatomic) QGraphicsLayout *layout;
@property (nonatomic) Qt::LayoutDirection layoutDirection;
@property (nonatomic) of_dimension_t maximumSize;
@property (nonatomic) of_dimension_t minimumSize;
@property (nonatomic) OFSize maximumSize;
@property (nonatomic) OFSize minimumSize;
@property (nonatomic) QPalette palette;
@property (nonatomic) of_dimension_t preferredSize;
@property (readonly, nonatomic) of_dimension_t size;
@property (nonatomic) OFSize preferredSize;
@property (readonly, nonatomic) OFSize size;
@property (nonatomic) QSizePolicy sizePolicy;
@property (nonatomic) Qt::WindowFlags windowFlags;
@property (copy, nonatomic) OFString *windowTitle;
@property (readonly, nonatomic) OFArray OF_GENERIC(QtAction *) *actions;
@property (readonly, nonatomic) bool isActiveWindow;
@property (nonatomic) QStyle *style;
@property (readonly, nonatomic) of_rectangle_t windowFrameGeometry;
@property (readonly, nonatomic) of_rectangle_t windowFrameRect;
@property (readonly, nonatomic) OFRect windowFrameGeometry;
@property (readonly, nonatomic) OFRect windowFrameRect;

- (instancetype)initWithQObject: (QObject *)qObject OF_UNAVAILABLE;
- (instancetype)initWithQGraphicsWidget: (QGraphicsWidget *)qGraphicsWidget
    OF_DESIGNATED_INITIALIZER;
- (void)addAction: (QtAction *)action;
- (void)addActions: (OFArray OF_GENERIC(QtAction *) *)actions;
- (void)adjustSize;
︙
72
73
74
75
76
77
78
79
80


81
82
83
84
85
86
87
88

72
73
74
75
76
77
78


79
80

81
82
83
84
85
86
87








-
-
+
+
-








- (void)insertActions: (OFArray OF_GENERIC(QtAction *) *)actions
	       before: (QtAction *)before;
- (void)paintWindowFrameWithPainter: (QPainter *)painter
			     option: (const QStyleOptionGraphicsItem *)option
			     widget: (QtWidget *)widget;
- (void)releaseShortcut: (int)ID;
- (void)removeAction: (QtAction *)action;
- (void)resizeTo: (of_dimension_t)size;
- (void)setAttribute: (Qt::WidgetAttribute)attribute
- (void)resizeTo: (OFSize)size;
- (void)setAttribute: (Qt::WidgetAttribute)attribute to: (bool)on;
		  to: (bool)on;
- (void)setContentsMarginsWithLeft: (qreal)left
			       top: (qreal)top
			     right: (qreal)right
			    bottom: (qreal)bottom;
- (void)setAutoRepeat: (bool)enabled
	  forShortcut: (int)ID;
- (void)setEnabled: (bool)enabled
︙

Modified src/QtWidgets/QtGraphicsWidget.mm from [1af5bd7cf4] to [8d46c8c245].

︙
64
65
66
67
68
69
70
71

72
73
74
75
76

77
78
79
80
81
82
83

64
65
66
67
68
69
70

71
72
73
74
75

76
77
78
79
80
81
82
83








-
+




-
+








}

- (void)setFocusPolicy: (Qt::FocusPolicy)focusPolicy
{
	toQt(self)->setFocusPolicy(focusPolicy);
}

- (of_rectangle_t)geometry
- (OFRect)geometry
{
	return toOF(toQt(self)->geometry());
}

- (void)setGeometry: (of_rectangle_t)geometry
- (void)setGeometry: (OFRect)geometry
{
	toQt(self)->setGeometry(toQt(geometry));
}

- (QGraphicsLayout *)layout
{
	return toQt(self)->layout();
︙
94
95
96
97
98
99
100
101

102
103
104
105
106

107
108
109
110
111

112
113
114
115
116

117
118
119
120
121
122
123
124
125
126
127
128
129
130
131

132
133
134
135
136

137
138
139
140
141

142
143
144
145
146
147
148

94
95
96
97
98
99
100

101
102
103
104
105

106
107
108
109
110

111
112
113
114
115

116
117
118
119
120
121
122
123
124
125
126
127
128
129
130

131
132
133
134
135

136
137
138
139
140

141
142
143
144
145
146
147
148








-
+




-
+




-
+




-
+














-
+




-
+




-
+








}

- (void)setLayoutDirection: (Qt::LayoutDirection)layoutDirection
{
	toQt(self)->setLayoutDirection(layoutDirection);
}

- (of_dimension_t)maximumSize
- (OFSize)maximumSize
{
	return toOF(toQt(self)->maximumSize());
}

- (void)setMaximumSize: (of_dimension_t)maximumSize
- (void)setMaximumSize: (OFSize)maximumSize
{
	toQt(self)->setMaximumSize(toQt(maximumSize));
}

- (of_dimension_t)minimumSize
- (OFSize)minimumSize
{
	return toOF(toQt(self)->minimumSize());
}

- (void)setMinimumSize: (of_dimension_t)minimumSize
- (void)setMinimumSize: (OFSize)minimumSize
{
	toQt(self)->setMinimumSize(toQt(minimumSize));
}

- (QPalette)palette
{
	return toQt(self)->palette();
}

- (void)setPalette: (QPalette)palette
{
	toQt(self)->setPalette(palette);
}

- (of_dimension_t)preferredSize
- (OFSize)preferredSize
{
	return toOF(toQt(self)->preferredSize());
}

- (void)setPreferredSize: (of_dimension_t)preferredSize
- (void)setPreferredSize: (OFSize)preferredSize
{
	toQt(self)->setPreferredSize(toQt(preferredSize));
}

- (of_dimension_t)size
- (OFSize)size
{
	return toOF(toQt(self)->size());
}

- (QSizePolicy)sizePolicy
{
	return toQt(self)->sizePolicy();
︙
201
202
203
204
205
206
207
208

209
210
211
212
213

214
215
216
217
218
219
220

201
202
203
204
205
206
207

208
209
210
211
212

213
214
215
216
217
218
219
220








-
+




-
+








}

- (void)setStyle: (QStyle *)style
{
	toQt(self)->setStyle(style);
}

- (of_rectangle_t)windowFrameGeometry
- (OFRect)windowFrameGeometry
{
	return toOF(toQt(self)->windowFrameGeometry());
}

- (of_rectangle_t)windowFrameRect
- (OFRect)windowFrameRect
{
	return toOF(toQt(self)->windowFrameRect());
}

- (void)addAction: (QtAction *)action
{
	toQt(self)->addAction(toQt(action));
︙
286
287
288
289
290
291
292
293

294
295
296
297
298

299
300
301
302
303
304
305
306

286
287
288
289
290
291
292

293
294
295
296
297

298

299
300
301
302
303
304
305








-
+




-
+
-








}

- (void)removeAction: (QtAction *)action
{
	toQt(self)->removeAction(toQt(action));
}

- (void)resizeTo: (of_dimension_t)size
- (void)resizeTo: (OFSize)size
{
	toQt(self)->resize(toQt(size));
}

- (void)setAttribute: (Qt::WidgetAttribute)attribute
- (void)setAttribute: (Qt::WidgetAttribute)attribute to: (bool)on
		  to: (bool)on
{
	toQt(self)->setAttribute(attribute, on);
}

- (void)setContentsMarginsWithLeft: (qreal)left
			       top: (qreal)top
			     right: (qreal)right
︙

Modified src/QtWidgets/QtWidget.h from [c24969fde7] to [9439c45113].

︙
29
30
31
32
33
34
35
36
37


38
39
40
41
42
43
44
45


46
47

48
49
50
51
52
53
54
55

56
57
58
59
60


61
62
63
64

65
66
67
68
69
70





71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89

90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109

110
111
112
113
114
115
116
117
118

119
120

121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137

138
139
140
141
142
143
144
145
146
147



148
149
150
151



152
153
154
155
156
157
158
159

160
161
162

163
164
165
166

167
168
169

170
171
172

173
174
175
176

177
178

179
180
181

182
183
184
185
186
187
188

189
190
191
192
193
194
195

29
30
31
32
33
34
35


36
37
38
39
40
41
42
43


44
45
46

47
48
49
50
51
52
53
54

55
56
57
58


59
60
61
62
63

64
65





66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88

89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108

109
110
111
112
113
114
115
116
117

118
119

120

121
122
123
124
125
126
127
128
129
130
131
132
133
134
135

136

137
138
139
140
141




142
143
144




145
146
147
148
149
150
151
152
153
154

155
156
157

158
159
160
161

162
163
164

165
166
167

168
169
170
171

172


173



174

175
176
177
178
179

180
181
182
183
184
185
186
187








-
-
+
+






-
-
+
+

-
+







-
+



-
-
+
+



-
+

-
-
-
-
-
+
+
+
+
+


















-
+



















-
+








-
+

-
+
-















-
+
-





-
-
-
-
+
+
+
-
-
-
-
+
+
+







-
+


-
+



-
+


-
+


-
+



-
+
-
-
+
-
-
-
+
-





-
+









@interface QtWidget: QtObject
@property (readonly, nonatomic) QWidget *qWidget;
@property (nonatomic) bool acceptDrops;
@property (copy, nonatomic) OFString *accessibleDescription;
@property (copy, nonatomic) OFString *accessibleName;
@property (nonatomic) bool autoFillBackground;
@property (nonatomic) of_dimension_t baseSize;
@property (readonly, nonatomic) of_rectangle_t childrenRect;
@property (nonatomic) OFSize baseSize;
@property (readonly, nonatomic) OFRect childrenRect;
@property (readonly, nonatomic) QRegion childrenRegion;
@property (nonatomic) Qt::ContextMenuPolicy contextMenuPolicy;
@property (nonatomic) QCursor cursor;
@property (nonatomic, getter=isEnabled) bool enabled;
@property (nonatomic) Qt::FocusPolicy focusPolicy;
@property (nonatomic) const QFont &font;
@property (readonly, nonatomic) of_rectangle_t frameGeometry;
@property (readonly, nonatomic) of_dimension_t frameSize;
@property (readonly, nonatomic) OFRect frameGeometry;
@property (readonly, nonatomic) OFSize frameSize;
@property (readonly, nonatomic, getter=isFullScreen) bool fullScreen;
@property (nonatomic) of_rectangle_t geometry;
@property (nonatomic) OFRect geometry;
@property (readonly, nonatomic) int height;
@property (nonatomic) Qt::InputMethodHints inputMethodHints;
@property (readonly, nonatomic) bool isActiveWindow;
@property (nonatomic) Qt::LayoutDirection layoutDirection;
@property (nonatomic) QLocale locale;
@property (readonly, nonatomic, getter=isMaximized) bool maximized;
@property (nonatomic) int maximumHeight;
@property (nonatomic) of_dimension_t maximumSize;
@property (nonatomic) OFSize maximumSize;
@property (nonatomic) int maximumWidth;
@property (readonly, nonatomic, getter=isMinimized) bool minimized;
@property (nonatomic) int minimumHeight;
@property (nonatomic) of_dimension_t minimumSize;
@property (readonly, nonatomic) of_dimension_t minimumSizeHint;
@property (nonatomic) OFSize minimumSize;
@property (readonly, nonatomic) OFSize minimumSizeHint;
@property (nonatomic) int minimumWidth;
@property (readonly, nonatomic, getter=isModal) bool modal;
@property (nonatomic, getter=hasMouseTracking) bool mouseTracking;
@property (readonly, nonatomic) of_rectangle_t normalGeometry;
@property (readonly, nonatomic) OFRect normalGeometry;
@property (nonatomic) const QPalette &palette;
@property (nonatomic, setter=moveToPosition:) of_point_t pos;
@property (readonly, nonatomic) of_rectangle_t rect;
@property (nonatomic, setter=resizeTo:) of_dimension_t size;
@property (readonly, nonatomic) of_dimension_t sizeHint;
@property (nonatomic) of_dimension_t sizeIncrement;
@property (nonatomic, setter=moveToPosition:) OFPoint pos;
@property (readonly, nonatomic) OFRect rect;
@property (nonatomic, setter=resizeTo:) OFSize size;
@property (readonly, nonatomic) OFSize sizeHint;
@property (nonatomic) OFSize sizeIncrement;
@property (nonatomic) QSizePolicy sizePolicy;
@property (copy, nonatomic) OFString *statusTip;
@property (copy, nonatomic) OFString *styleSheet;
@property (copy, nonatomic) OFString *toolTip;
@property (nonatomic) int toolTipDuration;
@property (nonatomic) bool updatesEnabled;
@property (nonatomic, getter=isVisible) bool visible;
@property (copy, nonatomic) OFString *whatsThis;
@property (readonly, nonatomic) int width;
@property (nonatomic) Qt::WindowFlags windowFlags;
@property (nonatomic) QIcon windowIcon;
@property (nonatomic) Qt::WindowModality windowModality;
@property (nonatomic, getter=isWindowModified) bool windowModified;
@property (nonatomic) double windowOpacity;
@property (copy, nonatomic) OFString *windowTitle;
@property (readonly, nonatomic) int x;
@property (readonly, nonatomic) int y;
@property (readonly, nonatomic) OFArray OF_GENERIC(QtAction *) *actions;
@property (readonly, nonatomic) of_rectangle_t contentsRect;
@property (readonly, nonatomic) OFRect contentsRect;
@property (readonly, nonatomic) QtWidget *focusProxy;
@property (readonly, nonatomic) QtWidget *focusWidget;
@property (readonly, nonatomic, getter=isHidden) bool hidden;
@property (readonly, nonatomic) bool isWindow;
@property (readonly, nonatomic) QtWidget *nativeParentWidget;
@property (readonly, nonatomic) QtWidget *nextInFocusChain;
@property (readonly, nonatomic) QtWidget *parentWidget;
@property (readonly, nonatomic) QtWidget *previousInFocusChain;
@property (readonly, nonatomic) QtWidget *window;
@property (readonly, nonatomic) OFString *windowRole;

- (instancetype)initWithQObject: (QObject *)qObject OF_UNAVAILABLE;
- (instancetype)initWithQWidget: (QWidget *)qWidget OF_DESIGNATED_INITIALIZER;
- (void)activateWindow;
- (void)addAction: (QtAction *)action;
- (void)addActions: (OFArray OF_GENERIC(QtAction *) *)actions;
- (void)adjustSize;
- (QPalette::ColorRole)backgroundRole;
- (QBackingStore *)backingStore;
- (QtWidget *)childAt: (of_point_t)point;
- (QtWidget *)childAt: (OFPoint)point;
- (void)clearFocus;
- (void)clearMask;
- (QMargins)contentsMargins;
- (WId)effectiveWinID;
- (void)ensurePolished;
- (QFontInfo)fontInfo;
- (QFontMetrics)fontMetrics;
- (QPalette::ColorRole)foregroundRole;
- (QPixmap)grabRectangle: (of_rectangle_t)rectangle;
- (QPixmap)grabRectangle: (OFRect)rectangle;
- (void)grabGesture: (Qt::GestureType)gesture;
- (void)grabGesture: (Qt::GestureType)gesture
- (void)grabGesture: (Qt::GestureType)gesture flags: (Qt::GestureFlags)flags;
	      flags: (Qt::GestureFlags)flags;
- (void)grabKeyboard;
- (void)grabMouse;
- (void)grabMouseWithCursor: (const QCursor &)cursor;
- (int)grabShortcutWithKey: (const QKeySequence &)key;
- (int)grabShortcutWithKey: (const QKeySequence &)key
		   context: (Qt::ShortcutContext)context;
- (QGraphicsEffect *)graphicsEffect;
- (QGraphicsProxyWidget *)graphicsProxyWidget;
#ifdef QT_KEYPAD_NAVIGATION
- (bool)hasEditFocus;
#endif
- (bool)hasFocus;
- (bool)hasHeightForWidth;
- (int)heightForWidth: (int)w;
- (QVariant)queryInputMethod: (Qt::InputMethodQuery)query;
- (void)insertAction: (QtAction *)action
- (void)insertAction: (QtAction *)action before: (QtAction *)before;
	      before: (QtAction *)before;
- (void)insertActions: (OFArray OF_GENERIC(QtAction *) *)actions
	       before: (QtAction *)before;
- (bool)isAncestorOf: (QtWidget *)child;
- (bool)isEnabledTo: (QtWidget *)ancestor;
- (bool)isVisibleTo: (QtWidget *)ancestor;
- (of_point_t)mapPosition: (of_point_t)pos
		     from: (QtWidget *)parent;
- (of_point_t)mapPositionFromGlobal: (of_point_t)pos;
- (of_point_t)mapPositionFromParent: (of_point_t)pos;
- (OFPoint)mapPosition: (OFPoint)pos from: (QtWidget *)parent;
- (OFPoint)mapPositionFromGlobal: (OFPoint)pos;
- (OFPoint)mapPositionFromParent: (OFPoint)pos;
- (of_point_t)mapPosition: (of_point_t)pos
		       to: (QtWidget *)parent;
- (of_point_t)mapPositionToGlobal: (of_point_t)pos;
- (of_point_t)mapPositionToParent: (of_point_t)pos;
- (OFPoint)mapPosition: (OFPoint)pos to: (QtWidget *)parent;
- (OFPoint)mapPositionToGlobal: (OFPoint)pos;
- (OFPoint)mapPositionToParent: (OFPoint)pos;
- (QRegion)mask;
- (void)overrideWindowFlags: (Qt::WindowFlags)flags;
- (void)releaseKeyboard;
- (void)releaseMouse;
- (void)releaseShortcut: (int)ID;
- (void)removeAction: (QtAction *)action;
- (void)renderIntoPaintDevice: (QtObject <QtPaintDevice> *)target
		 targetOffset: (of_point_t)targetOffset
		 targetOffset: (OFPoint)targetOffset
		 sourceRegion: (QRegion)sourceRegion;
- (void)renderIntoPaintDevice: (QtObject <QtPaintDevice> *)target
		 targetOffset: (of_point_t)targetOffset
		 targetOffset: (OFPoint)targetOffset
		 sourceRegion: (QRegion)sourceRegion
			flags: (QWidget::RenderFlags)renderFlags;
- (void)renderIntoPainter: (QPainter *)target
	     targetOffset: (of_point_t)targetOffset
	     targetOffset: (OFPoint)targetOffset
	     sourceRegion: (QRegion)sourceRegion;
- (void)renderIntoPainter: (QPainter *)target
	     targetOffset: (of_point_t)targetOffset
	     targetOffset: (OFPoint)targetOffset
	     sourceRegion: (QRegion)sourceRegion
		    flags: (QWidget::RenderFlags)renderFlags;
- (void)repaintInRectangle: (of_rectangle_t)rect;
- (void)repaintInRectangle: (OFRect)rect;
- (void)repaintInRegion: (const QRegion &)region;
- (bool)restoreGeometry: (OFData *)geometry;
- (OFData *)saveGeometry;
- (void)scrollRight: (int)dx
- (void)scrollRight: (int)dx down: (int)dy;
	       down: (int)dy;
- (void)scrollRight: (int)dx
- (void)scrollRight: (int)dx down: (int)dy inRectangle: (OFRect)rect;
	       down: (int)dy
	inRectangle: (of_rectangle_t)rect;
- (void)setAttribute: (Qt::WidgetAttribute)attribute
- (void)setAttribute: (Qt::WidgetAttribute)attribute to: (bool)on;
		  to: (bool)on;
- (void)setFocus: (Qt::FocusReason)reason;
#ifdef QT_KEYPAD_NAVIGATION
- (void)setEditFocus: (bool)enable;
#endif
- (void)setFixedHeight: (int)height;
- (void)setFixedSize: (of_dimension_t)size;
- (void)setFixedSize: (OFSize)size;
- (void)setFixedWidth: (int)width;
- (void)setFocusProxy: (QtWidget *)widget;
- (void)setForegroundRole: (QPalette::ColorRole)role;
- (void)setGraphicsEffect: (QGraphicsEffect *)effect;
- (void)setLayout: (QLayout *)layout;
- (void)setMaskFromBitmap: (const QBitmap &)bitmap;
- (void)setMask: (const QRegion &)region;
︙
207
208
209
210
211
212
213
214

215
216
217
218
219
220
221

199
200
201
202
203
204
205

206
207
208
209
210
211
212
213








-
+








- (QStyle *)style;
- (bool)testAttribute: (Qt::WidgetAttribute)attribute;
- (bool)isUnderMouse;
- (void)ungrabGesture: (Qt::GestureType)gesture;
- (void)unsetCursor;
- (void)unsetLayoutDirection;
- (void)unsetLocale;
- (void)updateInRectangle: (of_rectangle_t)rect;
- (void)updateInRectangle: (OFRect)rect;
- (void)updateInRegion: (const QRegion &)region;
- (void)updateGeometry;
- (QRegion)visibleRegion;
- (WId)winID;
- (QWindow *)windowHandle;
- (Qt::WindowStates)windowState;
- (Qt::WindowType)windowType;
︙

Modified src/QtWidgets/QtWidget.mm from [dd7b1dee96] to [9522cd6974].

︙
91
92
93
94
95
96
97
98

99
100
101
102
103

104
105
106
107
108

109
110
111
112
113
114
115

91
92
93
94
95
96
97

98
99
100
101
102

103
104
105
106
107

108
109
110
111
112
113
114
115








-
+




-
+




-
+








}

- (void)setAutoFillBackground: (bool)autoFillBackground
{
	toQt(self)->setAutoFillBackground(autoFillBackground);
}

- (of_dimension_t)baseSize
- (OFSize)baseSize
{
	return toOF(toQt(self)->baseSize());
}

- (void)setBaseSize: (of_dimension_t)baseSize
- (void)setBaseSize: (OFSize)baseSize
{
	toQt(self)->setBaseSize(toQt(baseSize).toSize());
}

- (of_rectangle_t)childrenRect
- (OFRect)childrenRect
{
	return toOF(toQt(self)->childrenRect());
}

- (QRegion)childrenRegion
{
	return toQt(self)->childrenRegion();
︙
171
172
173
174
175
176
177
178

179
180
181
182
183

184
185
186
187
188
189
190
191
192
193

194
195
196
197
198

199
200
201
202
203
204
205

171
172
173
174
175
176
177

178
179
180
181
182

183
184
185
186
187
188
189
190
191
192

193
194
195
196
197

198
199
200
201
202
203
204
205








-
+




-
+









-
+




-
+








}

- (void)setFont: (const QFont &)font
{
	toQt(self)->setFont(font);
}

- (of_rectangle_t)frameGeometry
- (OFRect)frameGeometry
{
	return toOF(toQt(self)->frameGeometry());
}

- (of_dimension_t)frameSize
- (OFSize)frameSize
{
	return toOF(toQt(self)->frameSize());
}

- (bool)isFullScreen
{
	return toQt(self)->isFullScreen();
}

- (of_rectangle_t)geometry
- (OFRect)geometry
{
	return toOF(toQt(self)->geometry());
}

- (void)setGeometry: (of_rectangle_t)geometry
- (void)setGeometry: (OFRect)geometry
{
	toQt(self)->setGeometry(toQt(geometry).toRect());
}

- (int)height
{
	return toQt(self)->height();
︙
261
262
263
264
265
266
267
268

269
270
271
272
273

274
275
276
277
278
279
280

261
262
263
264
265
266
267

268
269
270
271
272

273
274
275
276
277
278
279
280








-
+




-
+








}

- (void)setMaximumHeight: (int)maximumHeight
{
	toQt(self)->setMaximumHeight(maximumHeight);
}

- (of_dimension_t)maximumSize
- (OFSize)maximumSize
{
	return toOF(toQt(self)->maximumSize());
}

- (void)setMaximumSize: (of_dimension_t)maximumSize
- (void)setMaximumSize: (OFSize)maximumSize
{
	toQt(self)->setMaximumSize(toQt(maximumSize).toSize());
}

- (int)maximumWidth
{
	return toQt(self)->maximumWidth();
︙
296
297
298
299
300
301
302
303

304
305
306
307
308

309
310
311
312
313

314
315
316
317
318
319
320

296
297
298
299
300
301
302

303
304
305
306
307

308
309
310
311
312

313
314
315
316
317
318
319
320








-
+




-
+




-
+








}

- (void)setMinimumHeight: (int)minimumHeight
{
	toQt(self)->setMinimumHeight(minimumHeight);
}

- (of_dimension_t)minimumSize
- (OFSize)minimumSize
{
	return toOF(toQt(self)->minimumSize());
}

- (void)setMinimumSize: (of_dimension_t)minimumSize
- (void)setMinimumSize: (OFSize)minimumSize
{
	toQt(self)->setMinimumSize(toQt(minimumSize).toSize());
}

- (of_dimension_t)minimumSizeHint
- (OFSize)minimumSizeHint
{
	return toOF(toQt(self)->minimumSizeHint());
}

- (int)minimumWidth
{
	return toQt(self)->minimumWidth();
︙
336
337
338
339
340
341
342
343

344
345
346
347
348
349
350
351
352
353
354
355
356
357
358

359
360
361
362
363

364
365
366
367
368

369
370
371
372
373

374
375
376
377
378

379
380
381
382
383

384
385
386
387
388

389
390
391
392
393

394
395
396
397
398
399
400

336
337
338
339
340
341
342

343
344
345
346
347
348
349
350
351
352
353
354
355
356
357

358
359
360
361
362

363
364
365
366
367

368
369
370
371
372

373
374
375
376
377

378
379
380
381
382

383
384
385
386
387

388
389
390
391
392

393
394
395
396
397
398
399
400








-
+














-
+




-
+




-
+




-
+




-
+




-
+




-
+




-
+








}

- (void)setMouseTracking: (bool)mouseTracking
{
	toQt(self)->setMouseTracking(mouseTracking);
}

- (of_rectangle_t)normalGeometry
- (OFRect)normalGeometry
{
	return toOF(toQt(self)->normalGeometry());
}

- (const QPalette &)palette
{
	return toQt(self)->palette();
}

- (void)setPalette: (const QPalette &)palette
{
	toQt(self)->setPalette(palette);
}

- (of_point_t)pos
- (OFPoint)pos
{
	return toOF(toQt(self)->pos());
}

- (void)moveToPosition: (of_point_t)pos
- (void)moveToPosition: (OFPoint)pos
{
	toQt(self)->move(toQt(pos));
}

- (of_rectangle_t)rect
- (OFRect)rect
{
	return toOF(toQt(self)->rect());
}

- (of_dimension_t)size
- (OFSize)size
{
	return toOF(toQt(self)->size());
}

- (void)resizeTo: (of_dimension_t)size
- (void)resizeTo: (OFSize)size
{
	toQt(self)->resize(toQt(size).toSize());
}

- (of_dimension_t)sizeHint
- (OFSize)sizeHint
{
	return toOF(toQt(self)->sizeHint());
}

- (of_dimension_t)sizeIncrement
- (OFSize)sizeIncrement
{
	return toOF(toQt(self)->sizeIncrement());
}

- (void)setSizeIncrement: (of_dimension_t)sizeIncrement
- (void)setSizeIncrement: (OFSize)sizeIncrement
{
	toQt(self)->setSizeIncrement(toQt(sizeIncrement).toSize());
}

- (QSizePolicy)sizePolicy
{
	return toQt(self)->sizePolicy();
︙
608
609
610
611
612
613
614
615

616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635

636
637
638
639
640
641
642

608
609
610
611
612
613
614

615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634

635
636
637
638
639
640
641
642








-
+



















-
+








}

- (QBackingStore *)backingStore
{
	return toQt(self)->backingStore();
}

- (QtWidget *)childAt: (of_point_t)point
- (QtWidget *)childAt: (OFPoint)point
{
	return toOF(toQt(self)->childAt(toQt(point)));
}

- (void)clearFocus
{
	return toQt(self)->clearFocus();
}

- (void)clearMask
{
	toQt(self)->clearMask();
}

- (QMargins)contentsMargins
{
	return toQt(self)->contentsMargins();
}

- (of_rectangle_t)contentsRect
- (OFRect)contentsRect
{
	return toOF(toQt(self)->contentsRect());
}

- (WId)effectiveWinID
{
	return toQt(self)->effectiveWinId();
︙
668
669
670
671
672
673
674
675

676
677
678
679
680
681
682

668
669
670
671
672
673
674

675
676
677
678
679
680
681
682








-
+








}

- (QPalette::ColorRole)foregroundRole
{
	return toQt(self)->foregroundRole();
}

- (QPixmap)grabRectangle: (of_rectangle_t)rectangle
- (QPixmap)grabRectangle: (OFRect)rectangle
{
	return toQt(self)->grab(toQt(rectangle).toRect());
}

- (void)grabGesture: (Qt::GestureType)gesture
{
	toQt(self)->grabGesture(gesture);
︙
784
785
786
787
788
789
790
791
792

793
794
795
796
797

798
799
800
801
802

803
804
805
806
807
808

809
810
811
812
813

814
815
816
817
818

819
820
821
822
823
824
825

784
785
786
787
788
789
790


791
792
793
794
795

796
797
798
799
800

801
802
803
804
805


806
807
808
809
810

811
812
813
814
815

816
817
818
819
820
821
822
823








-
-
+




-
+




-
+




-
-
+




-
+




-
+








}

- (bool)isWindow
{
	return toQt(self)->isWindow();
}

- (of_point_t)mapPosition: (of_point_t)pos
		     from: (QtWidget *)parent
- (OFPoint)mapPosition: (OFPoint)pos from: (QtWidget *)parent
{
	return toOF(toQt(self)->mapFrom(toQt(parent), toQt(pos)));
}

- (of_point_t)mapPositionFromGlobal: (of_point_t)pos
- (OFPoint)mapPositionFromGlobal: (OFPoint)pos
{
	return toOF(toQt(self)->mapFromGlobal(toQt(pos)));
}

- (of_point_t)mapPositionFromParent: (of_point_t)pos
- (OFPoint)mapPositionFromParent: (OFPoint)pos
{
	return toOF(toQt(self)->mapFromParent(toQt(pos)));
}

- (of_point_t)mapPosition: (of_point_t)pos
		       to: (QtWidget *)parent
- (OFPoint)mapPosition: (OFPoint)pos to: (QtWidget *)parent
{
	return toOF(toQt(self)->mapTo(toQt(parent), toQt(pos)));
}

- (of_point_t)mapPositionToGlobal: (of_point_t)pos
- (OFPoint)mapPositionToGlobal: (OFPoint)pos
{
	return toOF(toQt(self)->mapToGlobal(toQt(pos)));
}

- (of_point_t)mapPositionToParent: (of_point_t)pos
- (OFPoint)mapPositionToParent: (OFPoint)pos
{
	return toOF(toQt(self)->mapToParent(toQt(pos)));
}

- (QRegion)mask
{
	return toQt(self)->mask();
︙
867
868
869
870
871
872
873
874

875
876
877
878
879
880
881
882

883
884
885
886
887
888
889
890
891

892
893
894
895
896
897
898

899
900
901
902
903
904
905
906

907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926

927
928
929
930
931
932

933
934
935
936
937
938
939

940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957

958
959
960
961
962
963
964

865
866
867
868
869
870
871

872
873
874
875
876
877
878
879

880
881
882
883
884
885
886
887
888

889
890
891
892
893
894
895

896
897
898
899
900
901
902
903

904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923

924

925
926
927
928

929


930
931
932
933

934

935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950

951
952
953
954
955
956
957
958








-
+







-
+








-
+






-
+







-
+



















-
+
-




-
+
-
-




-
+
-
















-
+









- (void)removeAction: (QtAction *)action
{
	toQt(self)->removeAction(toQt(action));
}

- (void)renderIntoPaintDevice: (QtObject <QtPaintDevice> *)target
		 targetOffset: (of_point_t)targetOffset
		 targetOffset: (OFPoint)targetOffset
		 sourceRegion: (QRegion)sourceRegion
{
	toQt(self)->render([target qPaintDevice], toQt(targetOffset),
	    sourceRegion);
}

- (void)renderIntoPaintDevice: (QtObject <QtPaintDevice> *)target
		 targetOffset: (of_point_t)targetOffset
		 targetOffset: (OFPoint)targetOffset
		 sourceRegion: (QRegion)sourceRegion
			flags: (QWidget::RenderFlags)renderFlags
{
	toQt(self)->render([target qPaintDevice], toQt(targetOffset),
	    sourceRegion, renderFlags);
}

- (void)renderIntoPainter: (QPainter *)target
	     targetOffset: (of_point_t)targetOffset
	     targetOffset: (OFPoint)targetOffset
	     sourceRegion: (QRegion)sourceRegion
{
	toQt(self)->render(target, toQt(targetOffset), sourceRegion);
}

- (void)renderIntoPainter: (QPainter *)target
	     targetOffset: (of_point_t)targetOffset
	     targetOffset: (OFPoint)targetOffset
	     sourceRegion: (QRegion)sourceRegion
		    flags: (QWidget::RenderFlags)renderFlags
{
	toQt(self)->render(target, toQt(targetOffset), sourceRegion,
	    renderFlags);
}

- (void)repaintInRectangle: (of_rectangle_t)rect
- (void)repaintInRectangle: (OFRect)rect
{
	toQt(self)->repaint(toQt(rect).toRect());
}

- (void)repaintInRegion: (const QRegion &)region
{
	toQt(self)->repaint(region);
}

- (bool)restoreGeometry: (OFData *)geometry
{
	return toQt(self)->restoreGeometry(toQt(geometry));
}

- (OFData *)saveGeometry
{
	return toOF(toQt(self)->saveGeometry());
}

- (void)scrollRight: (int)dx
- (void)scrollRight: (int)dx down: (int)dy
	       down: (int)dy
{
	toQt(self)->scroll(dx, dy);
}

- (void)scrollRight: (int)dx
- (void)scrollRight: (int)dx down: (int)dy inRectangle: (OFRect)rect
	       down: (int)dy
	inRectangle: (of_rectangle_t)rect
{
	toQt(self)->scroll(dx, dy, toQt(rect).toRect());
}

- (void)setAttribute: (Qt::WidgetAttribute)attribute
- (void)setAttribute: (Qt::WidgetAttribute)attribute to: (bool)on
		  to: (bool)on
{
	toQt(self)->setAttribute(attribute, on);
}

#ifdef QT_KEYPAD_NAVIGATION
- (void)setEditFocus: (bool)enable
{
	toQt(self)->setEditFocus(enable);
}
#endif

- (void)setFixedHeight: (int)height
{
	toQt(self)->setFixedHeight(height);
}

- (void)setFixedSize: (of_dimension_t)size
- (void)setFixedSize: (OFSize)size
{
	toQt(self)->setFixedSize(toQt(size).toSize());
}

- (void)setFixedWidth: (int)width
{
	toQt(self)->setFixedWidth(width);
︙
1058
1059
1060
1061
1062
1063
1064
1065

1066
1067
1068
1069
1070
1071
1072

1052
1053
1054
1055
1056
1057
1058

1059
1060
1061
1062
1063
1064
1065
1066








-
+








}

- (void)ungrabGesture: (Qt::GestureType)gesture
{
	toQt(self)->ungrabGesture(gesture);
}

- (void)updateInRectangle: (of_rectangle_t)rect
- (void)updateInRectangle: (OFRect)rect
{
	toQt(self)->update(toQt(rect).toRect());
}

- (void)updateInRegion: (const QRegion &)region
{
	toQt(self)->update(region);
︙

Modified src/common/helpers.h from [b31e057a48] to [678ba15fab].

︙
30
31
32
33
34
35
36
37

38
39
40

41
42
43
44

45
46
47
48
49

50
51
52

53
54
55

56
57
58

59
60
61
62

63
64
65
66
67

68
69
70
71

72
73
74

75
76
77

78
79
80
81
82

83
84
85


86
87
88

30
31
32
33
34
35
36

37
38
39

40
41
42
43

44
45
46
47
48

49
50
51

52
53
54

55
56
57

58
59
60
61

62
63
64
65
66

67
68
69


70
71
72

73
74
75

76
77
78
79
80

81
82


83
84
85
86
87








-
+


-
+



-
+




-
+


-
+


-
+


-
+



-
+




-
+


-
-
+


-
+


-
+




-
+

-
-
+
+




#import "QtEvent.h"
#import "QtChildEvent.h"
#import "QtThread.h"
#import "QtWidget.h"

namespace ObjQt {

static OF_INLINE of_point_t
static OF_INLINE OFPoint
toOF(const QPoint &qPoint)
{
	return of_point(qPoint.x(), qPoint.y());
	return OFPointMake(qPoint.x(), qPoint.y());
}

static OF_INLINE QPoint
toQt(const of_point_t &point)
toQt(const OFPoint &point)
{
	return QPoint(point.x, point.y);
}

static OF_INLINE of_dimension_t
static OF_INLINE OFSize
toOF(const QSize &qSize)
{
	return of_dimension(qSize.width(), qSize.height());
	return OFSizeMake(qSize.width(), qSize.height());
}

static OF_INLINE of_dimension_t
static OF_INLINE OFSize
toOF(const QSizeF &qSizeF)
{
	return of_dimension(qSizeF.width(), qSizeF.height());
	return OFSizeMake(qSizeF.width(), qSizeF.height());
}

static OF_INLINE QSizeF
toQt(const of_dimension_t &dimension)
toQt(const OFSize &dimension)
{
	return QSizeF(dimension.width, dimension.height);
}

static OF_INLINE of_rectangle_t
static OF_INLINE OFRect
toOF(const QRect &qRect)
{
	return of_rectangle(qRect.x(), qRect.y(),
	    qRect.width(), qRect.height());
	return OFRectMake(qRect.x(), qRect.y(), qRect.width(), qRect.height());
}

static OF_INLINE of_rectangle_t
static OF_INLINE OFRect
toOF(const QRectF &qRectF)
{
	return of_rectangle(qRectF.x(), qRectF.y(),
	return OFRectMake(qRectF.x(), qRectF.y(),
	    qRectF.width(), qRectF.height());
}

static OF_INLINE QRectF
toQt(const of_rectangle_t &rectangle)
toQt(const OFRect &rect)
{
	return QRectF(rectangle.origin.x, rectangle.origin.y,
	    rectangle.size.width, rectangle.size.height);
	return QRectF(rect.origin.x, rect.origin.y,
	    rect.size.width, rect.size.height);
}

}