vcl/android/androidinst.cxx | 4 ++-- vcl/headless/headlessinst.cxx | 4 ++-- vcl/headless/svpdata.cxx | 4 ++-- vcl/inc/unx/gendata.hxx | 22 +++++++++++----------- vcl/inc/unx/gtk/gtkdata.hxx | 2 +- vcl/inc/unx/saldata.hxx | 4 ++-- vcl/inc/unx/saldisp.hxx | 2 +- vcl/ios/iosinst.cxx | 4 ++-- vcl/unx/generic/app/saldata.cxx | 4 ++-- vcl/unx/generic/app/saldisp.cxx | 4 ++-- vcl/unx/generic/app/salinst.cxx | 2 +- vcl/unx/generic/window/salframe.cxx | 2 +- vcl/unx/gtk/gtkdata.cxx | 4 ++-- vcl/unx/gtk3/gtk3gtkdata.cxx | 4 ++-- 14 files changed, 33 insertions(+), 33 deletions(-)
New commits: commit 76eae641c926faea1b9f9e2694b28de1f2f4d17f Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Tue Sep 19 10:40:34 2017 +0200 rename SalGenericData to GenericUnixSalData since it's generic over the various unixen, not anything else Change-Id: I994d5c9be99134b804e96bc045bf054fd9b434ef Reviewed-on: https://gerrit.libreoffice.org/42455 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx index afb919a2e4e9..f74f3e0d35ef 100644 --- a/vcl/android/androidinst.cxx +++ b/vcl/android/androidinst.cxx @@ -28,10 +28,10 @@ // Horrible hack static int viewWidth = 1, viewHeight = 1; -class AndroidSalData : public SalGenericData +class AndroidSalData : public GenericUnixSalData { public: - explicit AndroidSalData( SalInstance *pInstance ) : SalGenericData( SAL_DATA_ANDROID, pInstance ) {} + explicit AndroidSalData( SalInstance *pInstance ) : GenericUnixSalData( SAL_DATA_ANDROID, pInstance ) {} virtual void ErrorTrapPush() {} virtual bool ErrorTrapPop( bool ) { return false; } }; diff --git a/vcl/headless/headlessinst.cxx b/vcl/headless/headlessinst.cxx index 69027f3ccb3c..79f2f268ed2e 100644 --- a/vcl/headless/headlessinst.cxx +++ b/vcl/headless/headlessinst.cxx @@ -43,10 +43,10 @@ SalSystem *HeadlessSalInstance::CreateSalSystem() return new HeadlessSalSystem(); } -class HeadlessSalData : public SalGenericData +class HeadlessSalData : public GenericUnixSalData { public: - explicit HeadlessSalData( SalInstance *pInstance ) : SalGenericData( SAL_DATA_HEADLESS, pInstance ) {} + explicit HeadlessSalData( SalInstance *pInstance ) : GenericUnixSalData( SAL_DATA_HEADLESS, pInstance ) {} virtual void ErrorTrapPush() override {} virtual bool ErrorTrapPop( bool ) override { return false; } }; diff --git a/vcl/headless/svpdata.cxx b/vcl/headless/svpdata.cxx index e51b6d175aa4..3bc2807c8cc5 100644 --- a/vcl/headless/svpdata.cxx +++ b/vcl/headless/svpdata.cxx @@ -10,10 +10,10 @@ #include <unx/gendata.hxx> #include <headless/svpinst.hxx> -class SvpSalData : public SalGenericData +class SvpSalData : public GenericUnixSalData { public: - explicit SvpSalData( SalInstance *pInstance ) : SalGenericData( SAL_DATA_SVP, pInstance ) {} + explicit SvpSalData( SalInstance *pInstance ) : GenericUnixSalData( SAL_DATA_SVP, pInstance ) {} virtual void ErrorTrapPush() override {} virtual bool ErrorTrapPop( bool /*bIgnoreError*/ = true ) override { return false; } }; diff --git a/vcl/inc/unx/gendata.hxx b/vcl/inc/unx/gendata.hxx index 8a34120d2541..94d3b7ac0cfb 100644 --- a/vcl/inc/unx/gendata.hxx +++ b/vcl/inc/unx/gendata.hxx @@ -16,23 +16,23 @@ class SalGenericDisplay; -enum SalGenericDataType { SAL_DATA_GTK, SAL_DATA_GTK3, - SAL_DATA_TDE3, SAL_DATA_KDE3, SAL_DATA_KDE4, - SAL_DATA_UNX, SAL_DATA_SVP, - SAL_DATA_ANDROID, SAL_DATA_IOS, - SAL_DATA_HEADLESS }; +enum GenericUnixSalDataType { SAL_DATA_GTK, SAL_DATA_GTK3, + SAL_DATA_TDE3, SAL_DATA_KDE3, SAL_DATA_KDE4, + SAL_DATA_UNX, SAL_DATA_SVP, + SAL_DATA_ANDROID, SAL_DATA_IOS, + SAL_DATA_HEADLESS }; -class VCL_DLLPUBLIC SalGenericData : public SalData +class VCL_DLLPUBLIC GenericUnixSalData : public SalData { protected: - SalGenericDataType m_eType; + GenericUnixSalDataType m_eType; SalGenericDisplay *m_pDisplay; // cached hostname to avoid slow lookup OUString m_aHostname; // for transient storage of unicode strings eg. 'u123' by input methods OUString m_aUnicodeEntry; public: - SalGenericData( SalGenericDataType t, SalInstance *pInstance ) : SalData(), m_eType( t ), m_pDisplay( nullptr ) { m_pInstance = pInstance; SetSalData( this ); } + GenericUnixSalData( GenericUnixSalDataType t, SalInstance *pInstance ) : SalData(), m_eType( t ), m_pDisplay( nullptr ) { m_pInstance = pInstance; SetSalData( this ); } virtual void Dispose() {} SalGenericDisplay *GetDisplay() const { return m_pDisplay; } @@ -48,7 +48,7 @@ class VCL_DLLPUBLIC SalGenericData : public SalData { return m_aUnicodeEntry; } - SalGenericDataType GetType() const + GenericUnixSalDataType GetType() const { return m_eType; } @@ -58,9 +58,9 @@ class VCL_DLLPUBLIC SalGenericData : public SalData virtual bool ErrorTrapPop( bool bIgnoreError = true ) = 0; // true on error }; -inline SalGenericData * GetGenericData() +inline GenericUnixSalData * GetGenericData() { - return static_cast<SalGenericData *>(ImplGetSVData()->mpSalData); + return static_cast<GenericUnixSalData *>(ImplGetSVData()->mpSalData); } #endif diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index 36c42d0c3f09..146c1656f302 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -92,7 +92,7 @@ public: sal_uLong m_nTimeoutMS; }; -class GtkSalData : public SalGenericData +class GtkSalData : public GenericUnixSalData { GSource* m_pUserEvent; osl::Mutex m_aDispatchMutex; diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx index e7899c4138f4..6a7902dbf444 100644 --- a/vcl/inc/unx/saldata.hxx +++ b/vcl/inc/unx/saldata.hxx @@ -44,7 +44,7 @@ class SalPrinter; typedef unsigned int pthread_t; #endif -class VCLPLUG_GEN_PUBLIC X11SalData : public SalGenericData +class VCLPLUG_GEN_PUBLIC X11SalData : public GenericUnixSalData { struct XErrorStackEntry { @@ -59,7 +59,7 @@ protected: SalXLib *pXLib_; public: - X11SalData( SalGenericDataType t, SalInstance *pInstance ); + X11SalData( GenericUnixSalDataType t, SalInstance *pInstance ); virtual ~X11SalData() override; virtual void Init(); diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 2c23d6010c35..0ec4e10e7d65 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -402,7 +402,7 @@ namespace vcl_sal { const OUString& pLang, KeySym nSymbol ); - inline SalDisplay *getSalDisplay(SalGenericData const * data) + inline SalDisplay *getSalDisplay(GenericUnixSalData const * data) { assert(data != nullptr); assert(data->GetType() != SAL_DATA_GTK3); diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx index fb2d79b2fd59..afc1dc87be50 100644 --- a/vcl/ios/iosinst.cxx +++ b/vcl/ios/iosinst.cxx @@ -31,11 +31,11 @@ // Horrible hack static int viewWidth = 1, viewHeight = 1; -class IosSalData : public SalGenericData +class IosSalData : public GenericUnixSalData { public: explicit IosSalData(SalInstance *pInstance) - : SalGenericData(SAL_DATA_IOS, pInstance) + : GenericUnixSalData(SAL_DATA_IOS, pInstance) { } virtual void ErrorTrapPush() {} diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index b8d6de519ff0..eeadf9d083ac 100644 --- a/vcl/unx/generic/app/saldata.cxx +++ b/vcl/unx/generic/app/saldata.cxx @@ -243,8 +243,8 @@ static const char* XRequest[] = { "X_NoOperation" }; -X11SalData::X11SalData( SalGenericDataType t, SalInstance *pInstance ) - : SalGenericData( t, pInstance ) +X11SalData::X11SalData( GenericUnixSalDataType t, SalInstance *pInstance ) + : GenericUnixSalData( t, pInstance ) { pXLib_ = nullptr; diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index e5980e5f9e43..c4250049a607 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -294,7 +294,7 @@ SalDisplay::SalDisplay( Display *display ) : #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "SalDisplay::SalDisplay()\n" ); #endif - SalGenericData *pData = GetGenericData(); + GenericUnixSalData *pData = GetGenericData(); SAL_WARN_IF( pData->GetDisplay(), "vcl", "Second SalDisplay created !!!" ); pData->SetDisplay( this ); @@ -322,7 +322,7 @@ SalDisplay::~SalDisplay() void SalDisplay::doDestruct() { - SalGenericData *pData = GetGenericData(); + GenericUnixSalData *pData = GetGenericData(); delete m_pWMAdaptor; m_pWMAdaptor = nullptr; diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx index 456c238a1d08..3a98d3243e2b 100644 --- a/vcl/unx/generic/app/salinst.cxx +++ b/vcl/unx/generic/app/salinst.cxx @@ -141,7 +141,7 @@ Bool ImplPredicateEvent( Display *, XEvent *pEvent, char *pData ) bool X11SalInstance::AnyInput(VclInputFlags nType) { - SalGenericData *pData = GetGenericData(); + GenericUnixSalData *pData = GetGenericData(); Display *pDisplay = vcl_sal::getSalDisplay(pData)->GetDisplay(); bool bRet = false; diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index f8baf9b0742e..ec179e8808f7 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -812,7 +812,7 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, SalFrameStyleFlags nSalFrameStyle, SystemParentData* pSystemParent ) : m_nXScreen( 0 ) { - SalGenericData *pData = GetGenericData(); + GenericUnixSalData *pData = GetGenericData(); // initialize frame geometry memset( &maGeometry, 0, sizeof(maGeometry) ); diff --git a/vcl/unx/gtk/gtkdata.cxx b/vcl/unx/gtk/gtkdata.cxx index f29663636633..7a304a859825 100644 --- a/vcl/unx/gtk/gtkdata.cxx +++ b/vcl/unx/gtk/gtkdata.cxx @@ -414,7 +414,7 @@ int GtkSalDisplay::CaptureMouse( SalFrame* pSFrame ) **********************************************************************/ GtkSalData::GtkSalData( SalInstance *pInstance ) - : SalGenericData( SAL_DATA_GTK, pInstance ) + : GenericUnixSalData( SAL_DATA_GTK, pInstance ) , m_aDispatchMutex() , m_aDispatchCondition() { @@ -819,7 +819,7 @@ gboolean GtkSalData::userEventFn( gpointer data ) { gboolean bContinue = FALSE; GtkSalData *pThis = static_cast<GtkSalData *>(data); - SalGenericData *pData = GetGenericData(); + GenericUnixSalData *pData = GetGenericData(); SolarMutexGuard aGuard; const SalGenericDisplay *pDisplay = pData->GetDisplay(); if (pDisplay) diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx index c0d1b8021f00..88175a865003 100644 --- a/vcl/unx/gtk3/gtk3gtkdata.cxx +++ b/vcl/unx/gtk3/gtk3gtkdata.cxx @@ -385,7 +385,7 @@ int GtkSalDisplay::CaptureMouse( SalFrame* pSFrame ) **********************************************************************/ GtkSalData::GtkSalData( SalInstance *pInstance ) - : SalGenericData( SAL_DATA_GTK3, pInstance ) + : GenericUnixSalData( SAL_DATA_GTK3, pInstance ) , m_aDispatchMutex() , m_aDispatchCondition() { @@ -781,7 +781,7 @@ gboolean GtkSalData::userEventFn( gpointer data ) { gboolean bContinue = FALSE; GtkSalData *pThis = static_cast<GtkSalData *>(data); - SalGenericData *pData = GetGenericData(); + GenericUnixSalData *pData = GetGenericData(); SolarMutexGuard aGuard; const SalGenericDisplay *pDisplay = pData->GetDisplay(); if (pDisplay) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits