diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2017-09-06 22:05:25 +0200 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2017-09-06 23:48:09 +0200 |
commit | 115bed941d7b7ed1b95d6424bfb98456c1d87546 (patch) | |
tree | 248d137cab0fa448e8a4e3d89f98be522fae38b9 | |
parent | df34535d0a835ac8f7cd19e011965a8790e0c7ae (diff) |
Rename wrong name of vars in auto loop
My commit https://cgit.freedesktop.org/libreoffice/core/commit/?id=8c7b42c942d6693915dc825ede80279f720a5775
was wrong for some variable names, var in for loops aren't iterators on objects but objects
Change-Id: I13484e5faa50aa8585231661846afa007b7a6eab
Reviewed-on: https://gerrit.libreoffice.org/42026
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
-rw-r--r-- | vcl/source/app/session.cxx | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx index 5e56ce9115b1..d8f20efdfebb 100644 --- a/vcl/source/app/session.cxx +++ b/vcl/source/app/session.cxx @@ -115,8 +115,8 @@ void VCLSession::callSaveRequested( bool bShutdown ) { osl::MutexGuard aGuard( m_aMutex ); // reset listener states - for (auto & it: m_aListeners) { - it.m_bSaveDone = it.m_bInteractionRequested = it.m_bInteractionDone = false; + for (auto & listener : m_aListeners) { + listener.m_bSaveDone = listener.m_bInteractionRequested = listener.m_bInteractionDone = false; } // copy listener vector since calling a listener may remove it. @@ -142,8 +142,8 @@ void VCLSession::callSaveRequested( bool bShutdown ) } SolarMutexReleaser aReleaser; - for (auto const & it: aListeners) - it.m_xListener->doSave( bShutdown, false/*bCancelable*/ ); + for (auto const & listener: aListeners) + listener.m_xListener->doSave( bShutdown, false/*bCancelable*/ ); } void VCLSession::callInteractionGranted( bool bInteractionGranted ) @@ -154,9 +154,9 @@ void VCLSession::callInteractionGranted( bool bInteractionGranted ) { osl::MutexGuard aGuard( m_aMutex ); // copy listener vector since calling a listener may remove it. - for (auto const & it: m_aListeners) - if( it.m_bInteractionRequested ) - aListeners.push_back( it ); + for (auto const & listener: m_aListeners) + if( listener.m_bInteractionRequested ) + aListeners.push_back( listener ); m_bInteractionGranted = bInteractionGranted; @@ -174,8 +174,8 @@ void VCLSession::callInteractionGranted( bool bInteractionGranted ) } SolarMutexReleaser aReleaser; - for (auto const & it: aListeners) - it.m_xListener->approveInteraction( bInteractionGranted ); + for (auto const & listener: aListeners) + listener.m_xListener->approveInteraction( bInteractionGranted ); } void VCLSession::callShutdownCancelled() @@ -192,8 +192,8 @@ void VCLSession::callShutdownCancelled() } SolarMutexReleaser aReleaser; - for (auto const & it: aListeners) - it.m_xListener->shutdownCanceled(); + for (auto const & listener: aListeners) + listener.m_xListener->shutdownCanceled(); } void VCLSession::callQuit() @@ -210,9 +210,9 @@ void VCLSession::callQuit() } SolarMutexReleaser aReleaser; - for (auto const & it: aListeners) + for (auto const & listener: aListeners) { - css::uno::Reference< XSessionManagerListener2 > xListener2( it.m_xListener, UNO_QUERY ); + css::uno::Reference< XSessionManagerListener2 > xListener2( listener.m_xListener, UNO_QUERY ); if( xListener2.is() ) xListener2->doQuit(); } @@ -292,13 +292,13 @@ void SAL_CALL VCLSession::queryInteraction( const css::uno::Reference<XSessionMa m_xSession->queryInteraction(); m_bInteractionRequested = true; } - for (auto & it: m_aListeners) + for (auto & listener: m_aListeners) { - if( it.m_xListener == xListener ) + if( listener.m_xListener == xListener ) { - SAL_INFO("vcl.se.debug", " it->m_xListener == xListener"); - it.m_bInteractionRequested = true; - it.m_bInteractionDone = false; + SAL_INFO("vcl.se.debug", " listener.m_xListener == xListener"); + listener.m_bInteractionRequested = true; + listener.m_bInteractionDone = false; } } } @@ -309,15 +309,15 @@ void SAL_CALL VCLSession::interactionDone( const css::uno::Reference< XSessionMa osl::MutexGuard aGuard( m_aMutex ); int nRequested = 0, nDone = 0; - for (auto & it: m_aListeners) + for (auto & listener: m_aListeners) { - if( it.m_bInteractionRequested ) + if( listener.m_bInteractionRequested ) { nRequested++; - if( xListener == it.m_xListener ) - it.m_bInteractionDone = true; + if( xListener == listener.m_xListener ) + listener.m_bInteractionDone = true; } - if( it.m_bInteractionDone ) + if( listener.m_bInteractionDone ) nDone++; } @@ -338,11 +338,11 @@ void SAL_CALL VCLSession::saveDone( const css::uno::Reference< XSessionManagerLi osl::MutexGuard aGuard( m_aMutex ); bool bSaveDone = true; - for (auto & it: m_aListeners) + for (auto & listener: m_aListeners) { - if( it.m_xListener == xListener ) - it.m_bSaveDone = true; - if( ! it.m_bSaveDone ) + if( listener.m_xListener == xListener ) + listener.m_bSaveDone = true; + if( ! listener.m_bSaveDone ) bSaveDone = false; } @@ -372,9 +372,9 @@ void VCLSession::disposing() { vector.swap(m_aListeners); } css::lang::EventObject src(static_cast<OWeakObject *>(this)); - for (auto const & i: vector) { + for (auto const & listener: vector) { try { - i.m_xListener->disposing(src); + listener.m_xListener->disposing(src); SAL_INFO("vcl.se.debug", " call Listener disposing"); } catch (css::uno::RuntimeException & e) { SAL_WARN("vcl.se", "ignoring RuntimeException " << e.Message); |