diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-09-29 09:18:51 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-09-29 21:14:10 +0200 |
| commit | 442771d105fbce531ec3df5673dcc4a5f7a8bc7b (patch) | |
| tree | 477b103a5aeb22fa87d9d1af45640c73236033f0 /vcl/inc/osx | |
| parent | 41af2a9e26f3ee6b505b343120d5df3617ba5c49 (diff) | |
OSX rename mpFirstInstance to mpInstance
In the same spirit as the Windows commit
7c52d86f7b05fe7e0178f6d98a12a531b88a32ff.
Change-Id: Ic45803c0715723b6f57c9f6a0c731edd559aa92c
Reviewed-on: https://gerrit.libreoffice.org/42932
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/inc/osx')
| -rw-r--r-- | vcl/inc/osx/runinmain.hxx | 6 | ||||
| -rw-r--r-- | vcl/inc/osx/saldata.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/osx/salframe.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/vcl/inc/osx/runinmain.hxx b/vcl/inc/osx/runinmain.hxx index c971d3a25639..0c2a5268d70a 100644 --- a/vcl/inc/osx/runinmain.hxx +++ b/vcl/inc/osx/runinmain.hxx @@ -140,13 +140,13 @@ union RuninmainResult */ #define OSX_SALDATA_RUNINMAIN( command ) \ - OSX_RUNINMAIN( GetSalData()->mpFirstInstance, command ) + OSX_RUNINMAIN( GetSalData()->mpInstance, command ) #define OSX_SALDATA_RUNINMAIN_POINTER( command, type ) \ - OSX_RUNINMAIN_POINTER( GetSalData()->mpFirstInstance, command, type ) + OSX_RUNINMAIN_POINTER( GetSalData()->mpInstance, command, type ) #define OSX_SALDATA_RUNINMAIN_UNION( command, member ) \ - OSX_RUNINMAIN_UNION( GetSalData()->mpFirstInstance, command, member ) + OSX_RUNINMAIN_UNION( GetSalData()->mpInstance, command, member ) #endif // INCLUDED_VCL_INC_OSX_RUNINMAIN_HXX diff --git a/vcl/inc/osx/saldata.hxx b/vcl/inc/osx/saldata.hxx index 5ec684b83973..357a2df6a74b 100644 --- a/vcl/inc/osx/saldata.hxx +++ b/vcl/inc/osx/saldata.hxx @@ -63,7 +63,7 @@ class SalData { public: SALTIMERPROC mpTimerProc; // timer callback proc - AquaSalInstance *mpFirstInstance; // pointer of first instance + AquaSalInstance *mpInstance; std::list<AquaSalFrame*> maPresentationFrames; // list of frames in presentation mode SalObject *mpFirstObject; // pointer of first object window SalVirtualDevice *mpFirstVD; // first VirDev diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index f8cef1834106..55779e6868be 100644 --- a/vcl/inc/osx/salframe.h +++ b/vcl/inc/osx/salframe.h @@ -206,7 +206,7 @@ private: // data inline bool AquaSalFrame::isAlive( const AquaSalFrame* pFrame ) { - AquaSalInstance *pInst = GetSalData()->mpFirstInstance; + AquaSalInstance *pInst = GetSalData()->mpInstance; return pInst && pInst->isFrameAlive( pFrame ); } |