#ifndef INGUITHREAD_H
#define INGUITHREAD_H
+#include <QMutex>
#include <QObject>
+#include <QWaitCondition>
#include "support/bind.h"
#include "support/functional.h"
void callInGuiThread();
Q_SIGNALS:
- void triggerCall();
- void called();
+ void triggerFunctionCall();
private Q_SLOTS:
void doFunctionCall();
private:
virtual void synchronousFunctionCall() = 0;
+
+ QWaitCondition condition_;
+ QMutex sync_mutex_;
};
}
template<class F, class P1>
- R call(F f, P1 p1)
+ R call(F f, P1& p1)
{
- return call(bind(f, p1));
+ return call(lyx::bind(f, lyx::ref(p1)));
}
template<class F, class P1, class P2>
- R call(F f, P1 p1, P2 p2)
+ R call(F f, P1& p1, P2& p2)
{
- return call(bind(f, p1, p2));
+ return call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2)));
}
template<class F, class P1, class P2, class P3>
- R call(F f, P1 p1, P2 p2, P3 p3)
+ R call(F f, P1& p1, P2& p2, P3& p3)
{
- return call(bind(f, p1, p2, p3));
+ return call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3)));
}
template<class F, class P1, class P2, class P3, class P4>
- R call(F f, P1 p1, P2 p2, P3 p3, P4 p4)
+ R call(F f, P1& p1, P2& p2, P3& p3, P4& p4)
{
- return call(bind(f, p1, p2, p3, p4));
+ return call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3), lyx::ref(p4)));
}
/*
*/
template<class F, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8>
- R call(F f, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8)
+ R call(F f, P1& p1, P2& p2, P3& p3, P4& p4, P5& p5, P6& p6, P7& p7, P8& p8)
{
- return call(bind(f, p1, p2, p3, p4, p5, p6, p7, p8));
+ return call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3), lyx::ref(p4),
+ lyx::ref(p5), lyx::ref(p6), lyx::ref(p7), lyx::ref(p8)));
}
private:
}
template<class F, class P1>
- void call(F f, P1 p1)
+ void call(F f, P1& p1)
{
- call(bind(f, p1));
+ call(lyx::bind(f, lyx::ref(p1)));
}
template<class F, class P1, class P2>
- void call(F f, P1 p1, P2 p2)
+ void call(F f, P1& p1, P2& p2)
{
- call(bind(f, p1, p2));
+ call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2)));
}
template<class F, class P1, class P2, class P3>
- void call(F f, P1 p1, P2 p2, P3 p3)
+ void call(F f, P1& p1, P2& p2, P3& p3)
{
- call(bind(f, p1, p2, p3));
+ call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3)));
}
template<class F, class P1, class P2, class P3, class P4>
- void call(F f, P1 p1, P2 p2, P3 p3, P4 p4)
+ void call(F f, P1& p1, P2& p2, P3& p3, P4& p4)
{
- call(bind(f, p1, p2, p3, p4));
+ call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3), lyx::ref(p4)));
}
/*
*/
template<class F, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8>
- void call(F f, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8)
+ void call(F f, P1& p1, P2& p2, P3& p3, P4& p4, P5& p5, P6& p6, P7& p7, P8& p8)
{
- call(bind(f, p1, p2, p3, p4, p5, p6, p7, p8));
+ call(bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3), lyx::ref(p4), lyx::ref(p5),
+ lyx::ref(p6), lyx::ref(p7), lyx::ref(p8)));
}
private:
} // namespace frontend
} // namespace lyx
-#endif // GUIABOUT_H
+#endif // INGUITHREAD_H