From 1af25740d4e4ddf91160024953b87e76f7fea8da Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Sun, 19 Nov 2017 16:05:11 +0100 Subject: [PATCH] Make more things properties --- src/QtCore/QtObject.h | 11 +++++---- src/QtGui/QtGUIApplication.h | 4 +-- src/QtGui/QtPaintDevice.h | 30 +++++++++++------------ src/QtWidgets/QtAbstractButton.h | 2 +- src/QtWidgets/QtAction.h | 21 ++++++++-------- src/QtWidgets/QtWidget.h | 42 ++++++++++++++++---------------- 6 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/QtCore/QtObject.h b/src/QtCore/QtObject.h index 573dfd7..06092a9 100644 --- a/src/QtCore/QtObject.h +++ b/src/QtCore/QtObject.h @@ -37,13 +37,16 @@ @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 @@ -55,7 +58,6 @@ method: (OFString *)method; - (void)dumpObjectInfo; - (void)dumpObjectTree; -- (OFArray OF_GENERIC(OFData *) *)dynamicPropertyNames; - (bool)handleEvent: (QtEvent *)event; - (bool)filterEvent: (QtEvent *)event forObject: (QtObject *)watched; @@ -78,7 +80,6 @@ - (bool)signalsBlocked; - (int)startTimerWithInterval: (int)interval type: (Qt::TimerType)type; -- (QtThread *)thread; - (void)deleteLater; @end diff --git a/src/QtGui/QtGUIApplication.h b/src/QtGui/QtGUIApplication.h index ca60268..848e6f1 100644 --- a/src/QtGui/QtGUIApplication.h +++ b/src/QtGui/QtGUIApplication.h @@ -35,6 +35,8 @@ @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 @@ -42,8 +44,6 @@ - (double)devicePixelRatio; - (bool)isSavingSession; - (bool)isSessionRestored; -- (OFString *)sessionID; -- (OFString *)sessionKey; @end namespace ObjQt { diff --git a/src/QtGui/QtPaintDevice.h b/src/QtGui/QtPaintDevice.h index 7df3d6c..024c5d8 100644 --- a/src/QtGui/QtPaintDevice.h +++ b/src/QtGui/QtPaintDevice.h @@ -25,23 +25,23 @@ #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 diff --git a/src/QtWidgets/QtAbstractButton.h b/src/QtWidgets/QtAbstractButton.h index d9ed12c..226ce28 100644 --- a/src/QtWidgets/QtAbstractButton.h +++ b/src/QtWidgets/QtAbstractButton.h @@ -37,11 +37,11 @@ @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 { diff --git a/src/QtWidgets/QtAction.h b/src/QtWidgets/QtAction.h index 7c54a07..5655b91 100644 --- a/src/QtWidgets/QtAction.h +++ b/src/QtWidgets/QtAction.h @@ -40,27 +40,26 @@ @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; diff --git a/src/QtWidgets/QtWidget.h b/src/QtWidgets/QtWidget.h index 46a95d5..4ed61cf 100644 --- a/src/QtWidgets/QtWidget.h +++ b/src/QtWidgets/QtWidget.h @@ -30,8 +30,8 @@ @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; @@ -50,7 +50,7 @@ @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; @@ -69,26 +69,37 @@ @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; @@ -99,11 +110,8 @@ - (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; @@ -132,9 +140,7 @@ 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; @@ -144,11 +150,7 @@ - (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; @@ -178,13 +180,13 @@ 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; @@ -214,9 +216,7 @@ - (void)updateGeometry; - (QRegion)visibleRegion; - (WId)winID; -- (QtWidget *)window; - (QWindow *)windowHandle; -- (OFString *)windowRole; - (Qt::WindowStates)windowState; - (Qt::WindowType)windowType; @end