diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-09-05 21:38:42 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-09-06 08:48:02 +0100 |
| commit | d2038058c0568041e1722e877aae2825931a8745 (patch) | |
| tree | 2b6d3e994dce8a38c9e6f32d75f67dfa735c100a /vcl | |
| parent | 495ad69a2eb2b0b12bf799a8f973a7121c4722d2 (diff) | |
move all X11SalData stuff together
Change-Id: I2dc27e8aa0231ad66955721029f61720d757967f
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/generic/app/saldata.cxx | 8 | ||||
| -rw-r--r-- | vcl/unx/generic/app/saltimer.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index a75fe0a299e7..b584f66a1eab 100644 --- a/vcl/unx/generic/app/saldata.cxx +++ b/vcl/unx/generic/app/saldata.cxx @@ -53,6 +53,7 @@ #include <X11/Xproto.h> #include "salinst.hxx" +#include "saltimer.hxx" #include <osl/signal.h> #include <osl/thread.h> @@ -564,6 +565,13 @@ void X11SalData::XError( Display *pDisplay, XErrorEvent *pEvent ) m_aXErrorHandlerStack.back().m_bWas = true; } +void X11SalData::Timeout( bool idle ) +{ + ImplSVData* pSVData = ImplGetSVData(); + if( pSVData->mpSalTimer ) + pSVData->mpSalTimer->CallCallback( idle ); +} + struct YieldEntry { int fd; // file descriptor for reading diff --git a/vcl/unx/generic/app/saltimer.cxx b/vcl/unx/generic/app/saltimer.cxx index 604f4acf6ee0..bf690db494a4 100644 --- a/vcl/unx/generic/app/saltimer.cxx +++ b/vcl/unx/generic/app/saltimer.cxx @@ -23,18 +23,10 @@ #include <unistd.h> #include <unx/salunx.h> -#include <unx/saldata.hxx> #include <unx/saldisp.hxx> #include <unx/saltimer.h> #include <unx/salinst.h> -void X11SalData::Timeout( bool idle ) -{ - ImplSVData* pSVData = ImplGetSVData(); - if( pSVData->mpSalTimer ) - pSVData->mpSalTimer->CallCallback( idle ); -} - void SalXLib::StopTimer() { m_aTimeout.tv_sec = 0; |