diff --git a/src/frontends/qt/InGuiThread.h b/src/frontends/qt/InGuiThread.h index ffc62c8704..60d0187419 100644 --- a/src/frontends/qt/InGuiThread.h +++ b/src/frontends/qt/InGuiThread.h @@ -16,11 +16,9 @@ #include #include -namespace lyx { +#include -using std::function; -using std::ref; -using std::bind; +namespace lyx { namespace frontend { @@ -68,25 +66,25 @@ public: template R call(F f, P1& p1) { - return call(lyx::bind(f, lyx::ref(p1))); + return call(std::bind(f, std::ref(p1))); } template R call(F f, P1& p1, P2& p2) { - return call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2))); + return call(std::bind(f, std::ref(p1), std::ref(p2))); } template R call(F f, P1& p1, P2& p2, P3& p3) { - return call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3))); + return call(std::bind(f, std::ref(p1), std::ref(p2), std::ref(p3))); } template R call(F f, P1& p1, P2& p2, P3& p3, P4& p4) { - return call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3), lyx::ref(p4))); + return call(std::bind(f, std::ref(p1), std::ref(p2), std::ref(p3), std::ref(p4))); } /* @@ -96,8 +94,8 @@ public: template R call(F f, P1& p1, P2& p2, P3& p3, P4& p4, P5& p5, P6& p6, P7& p7, P8& 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))); + return call(std::bind(f, std::ref(p1), std::ref(p2), std::ref(p3), std::ref(p4), + std::ref(p5), std::ref(p6), std::ref(p7), std::ref(p8))); } private: @@ -109,7 +107,7 @@ private: private: R return_value_; - function func_; + std::function func_; }; @@ -131,25 +129,25 @@ public: template void call(F f, P1& p1) { - call(lyx::bind(f, lyx::ref(p1))); + call(std::bind(f, std::ref(p1))); } template void call(F f, P1& p1, P2& p2) { - call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2))); + call(std::bind(f, std::ref(p1), std::ref(p2))); } template void call(F f, P1& p1, P2& p2, P3& p3) { - call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3))); + call(std::bind(f, std::ref(p1), std::ref(p2), std::ref(p3))); } template void call(F f, P1& p1, P2& p2, P3& p3, P4& p4) { - call(lyx::bind(f, lyx::ref(p1), lyx::ref(p2), lyx::ref(p3), lyx::ref(p4))); + call(std::bind(f, std::ref(p1), std::ref(p2), std::ref(p3), std::ref(p4))); } /* @@ -159,8 +157,8 @@ public: template void call(F f, P1& p1, P2& p2, P3& p3, P4& p4, P5& p5, P6& p6, P7& p7, P8& 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))); + call(bind(f, std::ref(p1), std::ref(p2), std::ref(p3), std::ref(p4), std::ref(p5), + std::ref(p6), std::ref(p7), std::ref(p8))); } private: @@ -171,7 +169,7 @@ private: } private: - function func_; + std::function func_; };