@@ -58,13 +58,20 @@ bool _done; #endif OFRunLoop *_inRunLoop; } -#ifdef OF_HAVE_PROPERTIES -@property (retain) OFDate *fireDate; -#endif +/*! + * Whether the timer is valid. + */ +@property (readonly) bool isValid; + +/*! + * The time interval in which the timer will repeat, if it is a repeating + * timer. + */ +@property (readonly) of_time_interval_t timeInterval; /*! * @brief Creates and schedules a new timer with the specified time interval. * * @param timeInterval The time interval after which the timer should be fired @@ -300,30 +307,14 @@ /*! * @brief Invalidates the timer, preventing it from firing. */ - (void)invalidate; -/*! - * @brief Returns whether the timer is valid. - * - * @return Whether the timer is valid - */ -- (bool)isValid; - -/*! - * @brief Returns the time interval in which the timer will repeat, if it is a - * repeating timer. - * - * @return The time interval in which the timer will repeat, if it is a - * repeating timer - */ -- (of_time_interval_t)timeInterval; - #ifdef OF_HAVE_THREADS /*! * @brief Waits until the timer fired. */ - (void)waitUntilDone; #endif @end OF_ASSUME_NONNULL_END