From 0a5d375c2e02f782b35991b900170644ac5ac1da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=BDeljan=20Rikalo?= Date: Sat, 2 Sep 2023 18:40:18 +0200 Subject: [PATCH] Qt5: removed QTimer_singleShot4() overload because it cannot be used with Qt5 < 5.10. --- lcl/interfaces/qt5/cbindings/src/qtimer_c.cpp | 9 --------- lcl/interfaces/qt5/cbindings/src/qtimer_c.h | 1 - lcl/interfaces/qt5/qt56.pas | 1 - 3 files changed, 11 deletions(-) diff --git a/lcl/interfaces/qt5/cbindings/src/qtimer_c.cpp b/lcl/interfaces/qt5/cbindings/src/qtimer_c.cpp index 51979d426c..d89b2b085c 100644 --- a/lcl/interfaces/qt5/cbindings/src/qtimer_c.cpp +++ b/lcl/interfaces/qt5/cbindings/src/qtimer_c.cpp @@ -81,15 +81,6 @@ void QTimer_singleShot3(int msec, void (*TimeoutEvent)()) QTimer::singleShot(msec, TimeoutEvent); } -void QTimer_singleShot4(int msec, const QObjectH context, void (*TimeoutEvent)()) -{ - #if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) - QTimer::singleShot(msec, (const QObject*)context, TimeoutEvent); - #else - QTimer::singleShot(msec, TimeoutEvent); - #endif -} - void QTimer_start(QTimerH handle, int msec) { ((QTimer *)handle)->start(msec); diff --git a/lcl/interfaces/qt5/cbindings/src/qtimer_c.h b/lcl/interfaces/qt5/cbindings/src/qtimer_c.h index 3f67bfee28..66be94d522 100644 --- a/lcl/interfaces/qt5/cbindings/src/qtimer_c.h +++ b/lcl/interfaces/qt5/cbindings/src/qtimer_c.h @@ -29,7 +29,6 @@ C_EXPORT bool QTimer_isSingleShot(QTimerH handle); C_EXPORT void QTimer_singleShot(int msec, const QObjectH receiver, const char* member); C_EXPORT void QTimer_singleShot2(int msec, Qt::TimerType timerType, const QObjectH receiver, const char* member); C_EXPORT void QTimer_singleShot3(int msec, void (*TimeoutEvent)()); -C_EXPORT void QTimer_singleShot4(int msec, const QObjectH context, void (*TimeoutEvent)()); C_EXPORT void QTimer_start(QTimerH handle, int msec); C_EXPORT void QTimer_start2(QTimerH handle); C_EXPORT void QTimer_stop(QTimerH handle); diff --git a/lcl/interfaces/qt5/qt56.pas b/lcl/interfaces/qt5/qt56.pas index b59990b47c..52f709e5c0 100644 --- a/lcl/interfaces/qt5/qt56.pas +++ b/lcl/interfaces/qt5/qt56.pas @@ -2539,7 +2539,6 @@ function QTimer_isSingleShot(handle: QTimerH): Boolean; cdecl; external Qt5PasLi procedure QTimer_singleShot(msec: Integer; receiver: QObjectH; member: PAnsiChar); cdecl; external Qt5PasLib name 'QTimer_singleShot'; procedure QTimer_singleShot(msec: Integer; timerType: QtTimerType; receiver: QObjectH; member: PAnsiChar); cdecl; external Qt5PasLib name 'QTimer_singleShot2'; procedure QTimer_singleShot(msec: Integer; timeoutEvent: QTimer_timeout_Event); cdecl; external Qt5PasLib name 'QTimer_singleShot3'; -procedure QTimer_singleShot(msec: Integer; context: QObjectH; timeoutEvent: QTimer_timeout_Event); cdecl; external Qt5PasLib name 'QTimer_singleShot4'; procedure QTimer_start(handle: QTimerH; msec: Integer); cdecl; external Qt5PasLib name 'QTimer_start'; procedure QTimer_start(handle: QTimerH); cdecl; external Qt5PasLib name 'QTimer_start2'; procedure QTimer_stop(handle: QTimerH); cdecl; external Qt5PasLib name 'QTimer_stop';