summaryrefslogtreecommitdiff
path: root/vcl/unx/generic
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-11-11 13:07:33 +0100
committerMichael Stahl <mstahl@redhat.com>2015-11-13 11:03:01 +0100
commit27756a94605fb1cfd0bd40fae0b2d4bac4546742 (patch)
treeb98cdb10241bcedf81aa995eb356a3ef3a142c3e /vcl/unx/generic
parent977220881cfffefb49843f27d3ab68f2de555469 (diff)
vcl: rename static variable I18NStatus::pInstance
Change-Id: Ic162dd2d9a97e7d311921fad7d4d2bdf4b81293b
Diffstat (limited to 'vcl/unx/generic')
-rw-r--r--vcl/unx/generic/app/i18n_status.cxx18
1 files changed, 9 insertions, 9 deletions
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 )