Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-28 16:27:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compilation with Qt older then 5.7

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2018-11-01 15:27:46 +01:00
parent 367c5182cf
commit 7aaf29c3de
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
retroshare-gui/src/util/qtthreadsutils.h
View File

@ -31,6 +31,9 @@ namespace RsQThreadUtils {
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
/**
* @brief execute given function in the QThread where given QObject belongs
*/
template <typename F> template <typename F>
void postToObject(F &&fun, QObject *obj = qApp) void postToObject(F &&fun, QObject *obj = qApp)
{ {
@ -46,6 +49,9 @@ void postToObject(F &&fun, QObject *obj = qApp)
}, Qt::QueuedConnection ); }, Qt::QueuedConnection );
} }
/**
* @brief execute given function in the given QThread
*/
template <typename F> template <typename F>
void postToThread(F &&fun, QThread *thread = qApp->thread()) void postToThread(F &&fun, QThread *thread = qApp->thread())
{ {
@ -75,11 +81,18 @@ struct FEvent : QEvent
QEvent(QEvent::None), obj(obj), fun(std::forward<Fun>(fun)) {} QEvent(QEvent::None), obj(obj), fun(std::forward<Fun>(fun)) {}
~FEvent() ~FEvent()
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
// ensure that the object is not being destructed // ensure that the object is not being destructed
if (obj->metaObject()->inherits(type)) fun(); if (obj->metaObject()->inherits(type)) fun();
#else // QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
fun();
#endif // QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
} }
}; };
/**
* @brief execute given function in the QThread where given QObject belongs
*/
template <typename F> template <typename F>
static void postToObject(F &&fun, QObject *obj = qApp) static void postToObject(F &&fun, QObject *obj = qApp)
{ {
@ -88,6 +101,9 @@ static void postToObject(F &&fun, QObject *obj = qApp)
QCoreApplication::postEvent(obj, new FEvent<F>(obj, std::forward<F>(fun))); QCoreApplication::postEvent(obj, new FEvent<F>(obj, std::forward<F>(fun)));
} }
/**
* @brief execute given function in the given QThread
*/
template <typename F> template <typename F>
static void postToThread(F &&fun, QThread *thread = qApp->thread()) static void postToThread(F &&fun, QThread *thread = qApp->thread())
{ {