Index: src/QtCore/QtObject.h ================================================================== --- src/QtCore/QtObject.h +++ src/QtCore/QtObject.h @@ -35,17 +35,20 @@ bool _ownsObject; } @property (readonly, nonatomic) QObject *qObject; @property (readonly, nonatomic) const QMetaObject *metaObject; -@property (nonatomic, retain) QtObject *parent; -@property (nonatomic, copy) OFString *objectName; +@property (retain, nonatomic) QtObject *parent; +@property (copy, nonatomic) OFString *objectName; +@property (readonly, nonatomic) OFArray OF_GENERIC(QtObject *) *children; +@property (readonly, nonatomic) + OFArray OF_GENERIC(OFData *) *dynamicPropertyNames; +@property (readonly, nonatomic) QtThread *thread; - init OF_UNAVAILABLE; - initWithQObject: (QObject *)qObject OF_DESIGNATED_INITIALIZER; - (bool)setBlockSignals: (bool)block; -- (OFArray OF_GENERIC(QtObject *) *)children; - (QMetaObject::Connection)connectSignal: (OFString *)signal sender: (QtObject *)sender method: (OFString *)method type: (Qt::ConnectionType)type; - (bool)disconnectSignal: (OFString *)signal @@ -53,11 +56,10 @@ method: (OFString *)method; - (bool)disconnectAllSignalsForReceiver: (QtObject *)receiver method: (OFString *)method; - (void)dumpObjectInfo; - (void)dumpObjectTree; -- (OFArray OF_GENERIC(OFData *) *)dynamicPropertyNames; - (bool)handleEvent: (QtEvent *)event; - (bool)filterEvent: (QtEvent *)event forObject: (QtObject *)watched; // MISSING: T findChild(const QString &name = QString(), // Qt::FindChildOptions options = Qt::FindChildrenRecursively) const; @@ -76,11 +78,10 @@ - (bool)setProperty: (QVariant&)value forName: (OFString *)name; - (bool)signalsBlocked; - (int)startTimerWithInterval: (int)interval type: (Qt::TimerType)type; -- (QtThread *)thread; - (void)deleteLater; @end namespace ObjQt { Index: src/QtGui/QtGUIApplication.h ================================================================== --- src/QtGui/QtGUIApplication.h +++ src/QtGui/QtGUIApplication.h @@ -33,19 +33,19 @@ @property (nonatomic) Qt::LayoutDirection layoutDirection; @property (readonly, nonatomic) OFString *platformName; @property (readonly, nonatomic) QScreen *primaryScreen; @property (nonatomic) bool quitsOnLastWindowClosed; @property (nonatomic) QIcon windowIcon; +@property (readonly, nonatomic) OFString *sessionID; +@property (readonly, nonatomic) OFString *sessionKey; - initWithQCoreApplication: (QCoreApplication *)qCoreApplication OF_UNAVAILABLE; - initWithQGuiApplication: (QGuiApplication *)qGuiApplication OF_DESIGNATED_INITIALIZER; - (double)devicePixelRatio; - (bool)isSavingSession; - (bool)isSessionRestored; -- (OFString *)sessionID; -- (OFString *)sessionKey; @end namespace ObjQt { static OF_INLINE QtGUIApplication * Index: src/QtGui/QtPaintDevice.h ================================================================== --- src/QtGui/QtPaintDevice.h +++ src/QtGui/QtPaintDevice.h @@ -23,27 +23,27 @@ #import #include @protocol QtPaintDevice -- (QPaintDevice *)qPaintDevice; -- (int)colorCount; -- (int)depth; -- (int)devicePixelRatio; +@property (readonly, nonatomic) QPaintDevice *qPaintDevice; +@property (readonly, nonatomic) int colorCount; +@property (readonly, nonatomic) int depth; +@property (readonly, nonatomic) int devicePixelRatio; #if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) -- (double)devicePixelRatioF; +@property (readonly, nonatomic) double devicePixelRatioF; #endif -- (int)height; -- (int)heightMM; -- (int)logicalDPIX; -- (int)logicalDPIY; -- (QPaintEngine *)paintEngine; -- (bool)paintingActive; -- (int)physicalDPIX; -- (int)physicalDPIY; -- (int)width; -- (int)widthMM; +@property (readonly, nonatomic) int height; +@property (readonly, nonatomic) int heightMM; +@property (readonly, nonatomic) int logicalDPIX; +@property (readonly, nonatomic) int logicalDPIY; +@property (readonly, nonatomic) QPaintEngine *paintEngine; +@property (readonly, nonatomic) bool paintingActive; +@property (readonly, nonatomic) int physicalDPIX; +@property (readonly, nonatomic) int physicalDPIY; +@property (readonly, nonatomic) int width; +@property (readonly, nonatomic) int widthMM; @end @interface QtPaintDevice: OFObject @property (readonly, nonatomic) QObject *qObject; @end Index: src/QtWidgets/QtAbstractButton.h ================================================================== --- src/QtWidgets/QtAbstractButton.h +++ src/QtWidgets/QtAbstractButton.h @@ -35,15 +35,15 @@ @property (nonatomic, getter=isDown) bool down; @property (nonatomic) QIcon icon; @property (nonatomic) of_dimension_t iconSize; @property (nonatomic) QKeySequence shortcut; @property (nonatomic, copy) OFString *text; +@property (readonly, nonatomic) QButtonGroup *group; - initWithQWidget: (QWidget *)qWidget OF_UNAVAILABLE; - initWithQAbstractButton: (QAbstractButton *)qAbstractButton OF_DESIGNATED_INITIALIZER; -- (QButtonGroup *)group; @end namespace ObjQt { static OF_INLINE QtAbstractButton * Index: src/QtWidgets/QtAction.h ================================================================== --- src/QtWidgets/QtAction.h +++ src/QtWidgets/QtAction.h @@ -38,31 +38,30 @@ @property (nonatomic, getter=isIconVisibleInMenu) bool iconVisibleInMenu; @property (nonatomic) QAction::MenuRole menuRole; @property (nonatomic) QAction::Priority priority; @property (nonatomic) QKeySequence shortcut; @property (nonatomic) Qt::ShortcutContext shortcutContext; -@property (nonatomic, copy) OFString *statusTip; -@property (nonatomic, copy) OFString *text; -@property (nonatomic, copy) OFString *toolTip; +@property (copy, nonatomic) OFString *statusTip; +@property (copy, nonatomic) OFString *text; +@property (copy, nonatomic) OFString *toolTip; @property (nonatomic, getter=isVisible) bool visible; -@property (nonatomic, copy) OFString *whatsThis; +@property (copy, nonatomic) OFString *whatsThis; +@property (readonly, nonatomic) + OFArray OF_GENERIC(QtWidget *) *associatedWidgets; + @property (nonatomic, setter=setSeparator:) bool isSeparator; +@property (readonly, nonatomic) QtWidget *parentWidget; - initWithQObject: (QObject *)qObject OF_UNAVAILABLE; - initWithQAction: (QAction *)qAction OF_DESIGNATED_INITIALIZER; - (QActionGroup *)actionGroup; - (void)activate: (QAction::ActionEvent)event; - (QList)associatedGraphicsWidgets; -- (OFArray OF_GENERIC(QtWidget *) *)associatedWidgets; - (QVariant)data; -- (bool)isSeparator; - (QMenu *)menu; -- (QtWidget *)parentWidget; - (void)setActionGroup: (QActionGroup *)group; -- (void)setData: (const QVariant&)data; -- (void)setMenu: (QMenu *)menu; -- (void)setSeparator: (bool)isSeparator; -- (void)setShortcuts: (const QList&)shortcuts; +- (void)setData: (const QVariant &)data; +- (void)setShortcuts: (const QList &)shortcuts; - (void)setShortcutsWithStandardKey: (QKeySequence::StandardKey)key; - (QList)shortcuts; - (bool)showStatusText: (QtWidget *)widget; @end Index: src/QtWidgets/QtWidget.h ================================================================== --- src/QtWidgets/QtWidget.h +++ src/QtWidgets/QtWidget.h @@ -28,12 +28,12 @@ @class QtAction; @interface QtWidget: QtObject @property (readonly, nonatomic) QWidget *qWidget; @property (nonatomic) bool acceptDrops; -@property (nonatomic, copy) OFString *accessibleDescription; -@property (nonatomic, copy) OFString *accessibleName; +@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 (readonly, nonatomic) QRegion childrenRegion; @property (nonatomic) Qt::ContextMenuPolicy contextMenuPolicy; @@ -48,11 +48,11 @@ @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 (nonatomic, readonly, getter=isMaximized) bool maximized; +@property (readonly, nonatomic, getter=isMaximized) bool maximized; @property (nonatomic) int maximumHeight; @property (nonatomic) of_dimension_t maximumSize; @property (nonatomic) int maximumWidth; @property (readonly, nonatomic, getter=isMinimized) bool minimized; @property (nonatomic) int minimumHeight; @@ -67,30 +67,41 @@ @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) QSizePolicy sizePolicy; -@property (nonatomic, copy) OFString *statusTip; -@property (nonatomic, copy) OFString *styleSheet; -@property (nonatomic, copy) OFString *toolTip; +@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 (nonatomic, copy) OFString *whatsThis; +@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 (nonatomic, copy) OFString *windowTitle; +@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) 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; - initWithQObject: (QObject *)qObject OF_UNAVAILABLE; - initWithQWidget: (QWidget *)qWidget OF_DESIGNATED_INITIALIZER; -- (OFArray OF_GENERIC(QtAction *) *)actions; - (void)activateWindow; - (void)addAction: (QtAction *)action; - (void)addActions: (OFArray OF_GENERIC(QtAction *) *)actions; - (void)adjustSize; - (QPalette::ColorRole)backgroundRole; @@ -97,15 +108,12 @@ - (QBackingStore *)backingStore; - (QtWidget *)childAt: (of_point_t)point; - (void)clearFocus; - (void)clearMask; - (QMargins)contentsMargins; -- (of_rectangle_t)contentsRect; - (WId)effectiveWinID; - (void)ensurePolished; -- (QtWidget *)focusProxy; -- (QtWidget *)focusWidget; - (QFontInfo)fontInfo; - (QFontMetrics)fontMetrics; - (QPalette::ColorRole)foregroundRole; - (QPixmap)grabRectangle: (of_rectangle_t)rectangle; - (void)grabGesture: (Qt::GestureType)gesture; @@ -130,27 +138,21 @@ before: (QtAction *)before; - (void)insertActions: (OFArray OF_GENERIC(QtAction *) *)actions before: (QtAction *)before; - (bool)isAncestorOf: (QtWidget *)child; - (bool)isEnabledTo: (QtWidget *)ancestor; -- (bool)isHidden; - (bool)isVisibleTo: (QtWidget *)ancestor; -- (bool)isWindow; - (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; - (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; - (QRegion)mask; -- (QtWidget *)nativeParentWidget; -- (QtWidget *)nextInFocusChain; - (void)overrideWindowFlags: (Qt::WindowFlags)flags; -- (QtWidget *)parentWidget; -- (QtWidget *)previousInFocusChain; - (void)releaseKeyboard; - (void)releaseMouse; - (void)releaseShortcut: (int)ID; - (void)removeAction: (QtAction *)action; - (void)renderIntoPaintDevice: (QtObject *)target @@ -176,17 +178,17 @@ - (void)scrollRight: (int)dx down: (int)dy inRectangle: (of_rectangle_t)rect; - (void)setAttribute: (Qt::WidgetAttribute)attribute 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)setFixedWidth: (int)width; -- (void)setFocus: (Qt::FocusReason)reason; - (void)setFocusProxy: (QtWidget *)widget; - (void)setForegroundRole: (QPalette::ColorRole)role; - (void)setGraphicsEffect: (QGraphicsEffect *)effect; - (void)setLayout: (QLayout *)layout; - (void)setMaskFromBitmap: (const QBitmap &)bitmap; @@ -212,13 +214,11 @@ - (void)updateInRectangle: (of_rectangle_t)rect; - (void)updateInRegion: (const QRegion &)region; - (void)updateGeometry; - (QRegion)visibleRegion; - (WId)winID; -- (QtWidget *)window; - (QWindow *)windowHandle; -- (OFString *)windowRole; - (Qt::WindowStates)windowState; - (Qt::WindowType)windowType; @end @interface QtWidget (QtPaintDevice)