diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-11-11 13:07:33 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-11-13 11:03:01 +0100 |
| commit | 27756a94605fb1cfd0bd40fae0b2d4bac4546742 (patch) | |
| tree | b98cdb10241bcedf81aa995eb356a3ef3a142c3e /vcl | |
| parent | 977220881cfffefb49843f27d3ab68f2de555469 (diff) | |
vcl: rename static variable I18NStatus::pInstance
Change-Id: Ic162dd2d9a97e7d311921fad7d4d2bdf4b81293b
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/unx/i18n_status.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/app/i18n_status.cxx | 18 |
2 files changed, 9 insertions, 11 deletions
diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx index cd6d87559fc7..e0929db1b2e0 100644 --- a/vcl/inc/unx/i18n_status.hxx +++ b/vcl/inc/unx/i18n_status.hxx @@ -65,8 +65,6 @@ private: I18NStatus(); ~I18NStatus(); - static I18NStatus* pInstance; - static bool getStatusWindowMode(); public: diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index 207a4b4a6406..4142825e669c 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -493,24 +493,24 @@ IMPL_LINK_TYPED( IIIMPStatusWindow, SelectHdl, MenuButton*, pBtn, void ) * I18NStatus */ -I18NStatus* I18NStatus::pInstance = nullptr; +static I18NStatus* g_pI18NStatusInstance = nullptr; I18NStatus& I18NStatus::get() { - if( ! pInstance ) - pInstance = new I18NStatus(); - return *pInstance; + if (!g_pI18NStatusInstance) + g_pI18NStatusInstance = new I18NStatus(); + return *g_pI18NStatusInstance; } bool I18NStatus::exists() { - return pInstance != nullptr; + return g_pI18NStatusInstance != nullptr; } void I18NStatus::free() { - if( pInstance ) - delete pInstance, pInstance = nullptr; + if (g_pI18NStatusInstance) + delete g_pI18NStatusInstance, g_pI18NStatusInstance = nullptr; } I18NStatus::I18NStatus() : @@ -522,8 +522,8 @@ I18NStatus::I18NStatus() : I18NStatus::~I18NStatus() { m_pStatusWindow.disposeAndClear(); - if( pInstance == this ) - pInstance = nullptr; + if( g_pI18NStatusInstance == this ) + g_pI18NStatusInstance = nullptr; } void I18NStatus::setParent( SalFrame* pParent ) |