diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-03-18 18:49:10 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-03-18 10:57:27 +0000 |
| commit | 5198b4b8c7a7086753e499900b227e16f3d65340 (patch) | |
| tree | fc69508e6e979679281b630bcebba6a611f8b07b /vcl/inc | |
| parent | 396138719206d5033faaeaf09b88437cbb3480e7 (diff) | |
vcl: make GtkData use osl::Condition instead of oslCondition
Condition is deprecated already, but there is no need for the
GtkData class to use the low-level C-API, when in fact there is a C++
fascade that calls on this via the C++ abstraction, osl::Condition.
This will make it much easier to switch to using std::condition_variable
in the future.
Change-Id: Iddd2cad0e1137c0b458ebe25b506d463847a6dc0
Reviewed-on: https://gerrit.libreoffice.org/35389
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/unx/gtk/gtkdata.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index ffb0fb700718..69ff7f479478 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -29,7 +29,7 @@ #include <unx/saldisp.hxx> #include <unx/gtk/gtksys.hxx> #include <vcl/ptrstyle.hxx> -#include <osl/conditn.h> +#include <osl/conditn.hxx> #include "saltimer.hxx" #include <o3tl/enumarray.hxx> @@ -94,11 +94,11 @@ public: class GtkData : public SalGenericData { - GSource* m_pUserEvent; - osl::Mutex m_aDispatchMutex; - oslCondition m_aDispatchCondition; - css::uno::Any m_aException; - bool blockIdleTimeout; + GSource* m_pUserEvent; + osl::Mutex m_aDispatchMutex; + osl::Condition m_aDispatchCondition; + css::uno::Any m_aException; + bool blockIdleTimeout; public: GtkData( SalInstance *pInstance ); |