Index: src/QtCore/QtChildEvent.h ================================================================== --- src/QtCore/QtChildEvent.h +++ src/QtCore/QtChildEvent.h @@ -23,15 +23,15 @@ #import "QtEvent.h" @class QtObject; @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; +@property (readonly, nonatomic) QChildEvent *qChildEvent; +@property (readonly, nonatomic, getter=isAdded) bool added; +@property (readonly, nonatomic) QtObject *child; +@property (readonly, nonatomic, getter=isPolished) bool polished; +@property (readonly, nonatomic, getter=isRemoved) bool removed; - initWithQEvent: (QEvent *)event OF_UNAVAILABLE; - initWithQChildEvent: (QChildEvent *)qChildEvent; - initWithType: (QChildEvent::Type)type child: (QtObject *)child; Index: src/QtCore/QtCoreApplication.h ================================================================== --- src/QtCore/QtCoreApplication.h +++ src/QtCore/QtCoreApplication.h @@ -23,14 +23,14 @@ #import "QtObject.h" #include @interface QtCoreApplication: QtObject -@property (readonly) QCoreApplication *qCoreApplication; -@property (copy) OFString *applicationName, *applicationVersion; -@property (copy) OFString *organizationDomain, *organizationName; -@property (getter=isQuitLockEnabled) bool quitLockEnabled; +@property (readonly, nonatomic) QCoreApplication *qCoreApplication; +@property (nonatomic, copy) OFString *applicationName, *applicationVersion; +@property (nonatomic, copy) OFString *organizationDomain, *organizationName; +@property (nonatomic, getter=isQuitLockEnabled) bool quitLockEnabled; - initWithQObject: (QObject *)qObject OF_UNAVAILABLE; - initWithQCoreApplication: (QCoreApplication *)qCoreApplication; - (void)installNativeEventFilter: (QAbstractNativeEventFilter *)filterObject; - (void)quit; Index: src/QtCore/QtEvent.h ================================================================== --- src/QtCore/QtEvent.h +++ src/QtCore/QtEvent.h @@ -30,14 +30,14 @@ { QEvent *_qEvent; bool _ownsEvent; } -@property (readonly) QEvent *qEvent; -@property (getter=isAccepted) bool accepted; -@property (readonly, getter=isSpontaneous) bool spontaneous; -@property (readonly) QEvent::Type type; +@property (readonly, nonatomic) QEvent *qEvent; +@property (nonatomic, getter=isAccepted) bool accepted; +@property (readonly, nonatomic, getter=isSpontaneous) bool spontaneous; +@property (readonly, nonatomic) QEvent::Type type; + (int)registerEventType: (int)hint; - init OF_UNAVAILABLE; - initWithQEvent: (QEvent *)qEvent; - (void)accept; Index: src/QtCore/QtObject.h ================================================================== --- src/QtCore/QtObject.h +++ src/QtCore/QtObject.h @@ -33,14 +33,14 @@ { QObject *_qObject; bool _ownsObject; } -@property (readonly) QObject *qObject; -@property (readonly) const QMetaObject *metaObject; -@property (retain) QtObject *parent; -@property (copy) OFString *objectName; +@property (readonly, nonatomic) QObject *qObject; +@property (readonly, nonatomic) const QMetaObject *metaObject; +@property (nonatomic, retain) QtObject *parent; +@property (nonatomic, copy) OFString *objectName; - init OF_UNAVAILABLE; - initWithQObject: (QObject *)qObject; - (bool)setBlockSignals: (bool)block; - (OFArray OF_GENERIC(QtObject *) *)children; Index: src/QtCore/QtThread.h ================================================================== --- src/QtCore/QtThread.h +++ src/QtCore/QtThread.h @@ -23,18 +23,19 @@ #import "QtObject.h" #include @interface QtThread: QtObject -@property (readonly) QThread *qThread; -@property QAbstractEventDispatcher *eventDispatcher; -@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; +@property (readonly, nonatomic) QThread *qThread; +@property (nonatomic) QAbstractEventDispatcher *eventDispatcher; +@property (readonly, nonatomic, getter=isFinished) bool finished; +@property (readonly, nonatomic, getter=isInterruptionRequested) + bool interruptionRequested; +@property (readonly, nonatomic, getter=isRunning) bool running; +@property (readonly, nonatomic) int loopLevel; +@property (nonatomic) QThread::Priority priority; +@property (nonatomic) unsigned int stackSize; - initWithQObject: (QObject *)qObject OF_UNAVAILABLE; - initWithQThread: (QThread *)qThread; - (void)exitWithReturnCode: (int)returnCode; - (void)requestInterruption; Index: src/QtGui/QtGUIApplication.h ================================================================== --- src/QtGui/QtGUIApplication.h +++ src/QtGui/QtGUIApplication.h @@ -23,20 +23,20 @@ #import "QtCoreApplication.h" #include @interface QtGUIApplication: QtCoreApplication -@property (readonly) QGuiApplication *qGuiApplication; -@property (copy) OFString *applicationDisplayName; +@property (readonly, nonatomic) QGuiApplication *qGuiApplication; +@property (nonatomic, copy) OFString *applicationDisplayName; #if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) -@property (copy) OFString *desktopFileName; +@property (nonatomic, copy) OFString *desktopFileName; #endif -@property Qt::LayoutDirection layoutDirection; -@property (readonly, copy) OFString *platformName; -@property (readonly) QScreen *primaryScreen; -@property bool quitsOnLastWindowClosed; -@property QIcon windowIcon; +@property (nonatomic) Qt::LayoutDirection layoutDirection; +@property (readonly, nonatomic) OFString *platformName; +@property (readonly, nonatomic) QScreen *primaryScreen; +@property (nonatomic) bool quitsOnLastWindowClosed; +@property (nonatomic) QIcon windowIcon; - initWithQCoreApplication: (QCoreApplication *)qCoreApplication OF_UNAVAILABLE; - initWithQGuiApplication: (QGuiApplication *)qGuiApplication; - (double)devicePixelRatio; - (bool)isSavingSession; Index: src/QtGui/QtPaintDevice.h ================================================================== --- src/QtGui/QtPaintDevice.h +++ src/QtGui/QtPaintDevice.h @@ -43,11 +43,11 @@ - (int)width; - (int)widthMM; @end @interface QtPaintDevice: OFObject -@property (readonly) QObject *qObject; +@property (readonly, nonatomic) QObject *qObject; @end namespace ObjQt { static OF_INLINE QPaintDevice * Index: src/QtWidgets/QtAbstractButton.h ================================================================== --- src/QtWidgets/QtAbstractButton.h +++ src/QtWidgets/QtAbstractButton.h @@ -23,22 +23,22 @@ #import "QtWidget.h" #include @interface QtAbstractButton: QtWidget -@property (readonly) QAbstractButton *qAbstractButton; -@property bool autoExclusive; -@property bool autoRepeat; -@property int autoRepeatDelay; -@property int autoRepeatInterval; -@property (getter=isCheckable) bool checkable; -@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; +@property (readonly, nonatomic) QAbstractButton *qAbstractButton; +@property (nonatomic) bool autoExclusive; +@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) QKeySequence shortcut; +@property (nonatomic, copy) OFString *text; - initWithQWidget: (QWidget *)qWidget OF_UNAVAILABLE; - initWithQAbstractButton: (QAbstractButton *)qAbstractButton; - (QButtonGroup *)group; @end Index: src/QtWidgets/QtAction.h ================================================================== --- src/QtWidgets/QtAction.h +++ src/QtWidgets/QtAction.h @@ -25,28 +25,28 @@ #include @class QtWidget; @interface QtAction: QtObject -@property (readonly) QAction *qAction; -@property bool autoRepeat; -@property (getter=isCheckable) bool checkable; -@property (getter=isChecked) bool checked; -@property (getter=isEnabled) bool enabled; -@property QFont font; -@property QIcon icon; -@property (copy) OFString *iconText; -@property (getter=isIconVisibleInMenu) bool iconVisibleInMenu; -@property QAction::MenuRole menuRole; -@property QAction::Priority priority; -@property QKeySequence shortcut; -@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; +@property (readonly, nonatomic) QAction *qAction; +@property (nonatomic) bool autoRepeat; +@property (nonatomic, getter=isCheckable) bool checkable; +@property (nonatomic, getter=isChecked) bool checked; +@property (nonatomic, getter=isEnabled) bool enabled; +@property (nonatomic) QFont font; +@property (nonatomic) QIcon icon; +@property (nonatomic, copy) OFString *iconText; +@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 (nonatomic, getter=isVisible) bool visible; +@property (nonatomic, copy) OFString *whatsThis; - initWithQObject: (QObject *)qObject OF_UNAVAILABLE; - initWithQAction: (QAction *)qAction; - (QActionGroup *)actionGroup; - (void)activate: (QAction::ActionEvent)event; Index: src/QtWidgets/QtApplication.h ================================================================== --- src/QtWidgets/QtApplication.h +++ src/QtWidgets/QtApplication.h @@ -23,20 +23,20 @@ #import "QtGUIApplication.h" #include @interface QtApplication: QtGUIApplication -@property (readonly) QApplication *qApplication; -@property bool autoSIPEnabled; -@property int cursorFlashTime; -@property int doubleClickInterval; -@property of_dimension_t globalStrut; -@property int keyboardInputInterval; -@property int startDragDistance; -@property int startDragTime; -@property (copy) OFString *styleSheet; -@property int wheelScrollLines; +@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) int keyboardInputInterval; +@property (nonatomic) int startDragDistance; +@property (nonatomic) int startDragTime; +@property (nonatomic, copy) OFString *styleSheet; +@property (nonatomic) int wheelScrollLines; - initWithQGuiApplication: (QGuiApplication *)qGuiApplication OF_UNAVAILABLE; - initWithQApplication: (QApplication *)qApplication; - (void)aboutQt; - (void)closeAllWindows; Index: src/QtWidgets/QtPushButton.h ================================================================== --- src/QtWidgets/QtPushButton.h +++ src/QtWidgets/QtPushButton.h @@ -25,15 +25,15 @@ #include #include @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; +@property (readonly, nonatomic) QPushButton *qPushButton; +@property (nonatomic) QMenu *menu; +@property (nonatomic) bool autoDefault; +@property (nonatomic, getter=isDefault, setter=setDefault:) bool default_; +@property (nonatomic, getter=isFlat) bool flat; - initWithQAbstractButton: (QAbstractButton *)qAbstractButton OF_UNAVAILABLE; - initWithQPushButton: (QPushButton *)qPushButton; - initWithText: (OFString *)text; - initWithIcon: (QIcon)icon Index: src/QtWidgets/QtWidget.h ================================================================== --- src/QtWidgets/QtWidget.h +++ src/QtWidgets/QtWidget.h @@ -26,67 +26,67 @@ #include @class QtAction; @interface QtWidget: QtObject -@property (readonly) QWidget *qWidget; -@property bool acceptDrops; -@property (copy) OFString *accessibleDescription; -@property (copy) OFString *accessibleName; -@property bool autoFillBackground; -@property of_dimension_t baseSize; -@property (readonly) of_rectangle_t childrenRect; -@property (readonly) QRegion childrenRegion; -@property Qt::ContextMenuPolicy contextMenuPolicy; -@property QCursor cursor; -@property (getter=isEnabled) bool enabled; -@property Qt::FocusPolicy focusPolicy; -@property const QFont &font; -@property (readonly) of_rectangle_t frameGeometry; -@property (readonly) of_dimension_t frameSize; -@property (readonly, getter=isFullScreen) bool fullScreen; -@property of_rectangle_t geometry; -@property (readonly) int height; -@property Qt::InputMethodHints inputMethodHints; -@property (readonly) bool isActiveWindow; -@property Qt::LayoutDirection layoutDirection; -@property QLocale locale; -@property (readonly, getter=isMaximized) bool maximized; -@property int maximumHeight; -@property of_dimension_t maximumSize; -@property int maximumWidth; -@property (readonly, getter=isMinimized) bool minimized; -@property int minimumHeight; -@property of_dimension_t minimumSize; -@property (readonly) of_dimension_t minimumSizeHint; -@property int minimumWidth; -@property (readonly, getter=isModal) bool modal; -@property (getter=hasMouseTracking) bool mouseTracking; -@property (readonly) of_rectangle_t normalGeometry; -@property const QPalette &palette; -@property (setter=moveToPosition:) of_point_t pos; -@property (readonly) of_rectangle_t rect; -@property (setter=resizeTo:) of_dimension_t size; -@property (readonly) of_dimension_t sizeHint; -@property of_dimension_t sizeIncrement; -@property QSizePolicy sizePolicy; -@property (copy) OFString *statusTip; -@property (copy) OFString *styleSheet; -@property (copy) OFString *toolTip; -@property int toolTipDuration; -@property bool updatesEnabled; -@property (getter=isVisible) bool visible; -@property (copy) OFString *whatsThis; -@property (readonly) int width; -@property Qt::WindowFlags windowFlags; -@property QIcon windowIcon; -@property Qt::WindowModality windowModality; -@property (getter=isWindowModified) bool windowModified; -@property double windowOpacity; -@property (copy) OFString *windowTitle; -@property (readonly) int x; -@property (readonly) int y; +@property (readonly, nonatomic) QWidget *qWidget; +@property (nonatomic) bool acceptDrops; +@property (nonatomic, copy) OFString *accessibleDescription; +@property (nonatomic, copy) 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; +@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, getter=isFullScreen) bool fullScreen; +@property (nonatomic) of_rectangle_t 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 (nonatomic, readonly, 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; +@property (nonatomic) of_dimension_t minimumSize; +@property (readonly, nonatomic) of_dimension_t 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 (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) QSizePolicy sizePolicy; +@property (nonatomic, copy) OFString *statusTip; +@property (nonatomic, copy) OFString *styleSheet; +@property (nonatomic, copy) OFString *toolTip; +@property (nonatomic) int toolTipDuration; +@property (nonatomic) bool updatesEnabled; +@property (nonatomic, getter=isVisible) bool visible; +@property (nonatomic, copy) 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 (readonly, nonatomic) int x; +@property (readonly, nonatomic) int y; - initWithQObject: (QObject *)qObject OF_UNAVAILABLE; - initWithQWidget: (QWidget *)qWidget; - (OFArray OF_GENERIC(QtAction *) *)actions; - (void)activateWindow;