[Libreoffice-commits] core.git: solenv/gbuildtojson sot/source starmath/source stoc/source svl/source svtools/source

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Tue Aug 20 13:36:35 UTC 2019


 solenv/gbuildtojson/gbuildtojson.cxx        |    4 ++--
 sot/source/sdstor/ucbstorage.cxx            |    2 +-
 starmath/source/ElementsDockingWindow.cxx   |    2 +-
 starmath/source/cursor.cxx                  |    4 ++--
 starmath/source/document.cxx                |    2 +-
 stoc/source/uriproc/UriReferenceFactory.cxx |    2 +-
 svl/source/items/IndexedStyleSheets.cxx     |    2 +-
 svl/source/items/poolcach.cxx               |    4 ++--
 svtools/source/brwbox/datwin.cxx            |    2 +-
 svtools/source/contnr/foldertree.cxx        |    2 +-
 svtools/source/control/ruler.cxx            |    4 ++--
 svtools/source/control/tabbar.cxx           |    6 +++---
 svtools/source/control/valueset.cxx         |    4 ++--
 13 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit 95dd183c41c52aa0ed9b5223ae7584f486103a78
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Aug 20 14:02:06 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Aug 20 15:35:37 2019 +0200

    loplugin:constvars in solenv..svtools
    
    Change-Id: Ieb0116321bbddd804db6d1789ea3521c5b220840
    Reviewed-on: https://gerrit.libreoffice.org/77807
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/solenv/gbuildtojson/gbuildtojson.cxx b/solenv/gbuildtojson/gbuildtojson.cxx
index 00bc6ee8abb8..8061b801cd76 100644
--- a/solenv/gbuildtojson/gbuildtojson.cxx
+++ b/solenv/gbuildtojson/gbuildtojson.cxx
@@ -41,7 +41,7 @@ int main(int argc, char** argv)
     }
     cout << "{";
     bool first(true);
-    for(auto& varandfile : vartofile)
+    for(const auto& varandfile : vartofile)
     {
         if(first)
             first =false;
@@ -57,7 +57,7 @@ int main(int argc, char** argv)
         filestream.close();
         (void)remove(varandfile.second.c_str());
         string escapedcontents;
-        for(auto& c : contents.str())
+        for(const auto& c : contents.str())
         {
             if(c=='\\')
                 escapedcontents += "\\\\";
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index 1b3bd3381e8a..96c593c1aea8 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -2445,7 +2445,7 @@ bool UCBStorage::CopyStorageElement_Impl( UCBStorageElement_Impl const & rElemen
 UCBStorageElement_Impl* UCBStorage::FindElement_Impl( const OUString& rName ) const
 {
     DBG_ASSERT( !rName.isEmpty(), "Name is empty!" );
-    for (auto& pElement : pImp->GetChildrenList())
+    for (const auto& pElement : pImp->GetChildrenList())
     {
         if ( pElement->m_aName == rName && !pElement->m_bIsRemoved )
             return pElement.get();
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index bee538346307..daef8f190e2b 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -363,7 +363,7 @@ void SmElementsControl::LayoutOrPaintContents(vcl::RenderContext *pContext)
         boxX = nControlWidth / perLine;
 
     const SmElement* pCurrentElement = current();
-    for (std::unique_ptr<SmElement> & i : maElementList)
+    for (const std::unique_ptr<SmElement> & i : maElementList)
     {
         SmElement* element = i.get();
         if (element->isSeparator())
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index f7d127bd25e9..b6575b8655b3 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -129,7 +129,7 @@ void SmCursor::BuildGraph(){
 
     //Restore anchor and position pointers
     if(_anchor.IsValid() || _position.IsValid()){
-        for(auto &pEntry : *mpGraph)
+        for(const auto &pEntry : *mpGraph)
         {
             if(_anchor == pEntry->CaretPos)
                 mpAnchor = pEntry.get();
@@ -152,7 +152,7 @@ void SmCursor::BuildGraph(){
 }
 
 bool SmCursor::SetCaretPosition(SmCaretPos pos){
-    for(auto &pEntry : *mpGraph)
+    for(const auto &pEntry : *mpGraph)
     {
         if(pEntry->CaretPos == pos)
         {
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index c3373f5968c9..bd0c67081f51 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -304,7 +304,7 @@ void SmDocShell::UpdateEditEngineDefaultFonts(const Color& aTextColor)
     aTable[1].nLang = maLinguOptions.nDefaultLanguage_CJK;
     aTable[2].nLang = maLinguOptions.nDefaultLanguage_CTL;
 
-    for (FontDta & rFntDta : aTable)
+    for (const FontDta & rFntDta : aTable)
     {
         LanguageType nLang = (LANGUAGE_NONE == rFntDta.nLang) ?
                 rFntDta.nFallbackLang : rFntDta.nLang;
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index d27d617074a3..779bb36b627b 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -417,7 +417,7 @@ css::uno::Reference< css::uri::XUriReference > Factory::makeAbsolute(
             if (slash) {
                 abs.append('/');
             }
-            for (auto& i : segments)
+            for (const auto& i : segments)
             {
                 if (i < -1) {
                     OUString segment(
diff --git a/svl/source/items/IndexedStyleSheets.cxx b/svl/source/items/IndexedStyleSheets.cxx
index 233c10e56093..4d71e7e6ff95 100644
--- a/svl/source/items/IndexedStyleSheets.cxx
+++ b/svl/source/items/IndexedStyleSheets.cxx
@@ -186,7 +186,7 @@ IndexedStyleSheets::FindStyleSheetPosition(const SfxStyleSheetBase& style) const
 void
 IndexedStyleSheets::Clear(StyleSheetDisposer& disposer)
 {
-    for (auto& rxStyleSheet : mStyleSheets) {
+    for (const auto& rxStyleSheet : mStyleSheets) {
         disposer.Dispose(rxStyleSheet);
     }
     mStyleSheets.clear();
diff --git a/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx
index 1ff06ab402a0..23a4c1629f0e 100644
--- a/svl/source/items/poolcach.cxx
+++ b/svl/source/items/poolcach.cxx
@@ -45,7 +45,7 @@ SfxItemPoolCache::SfxItemPoolCache( SfxItemPool *pItemPool,
 
 SfxItemPoolCache::~SfxItemPoolCache()
 {
-    for (SfxItemModifyImpl & rImpl : m_aCache) {
+    for (const SfxItemModifyImpl & rImpl : m_aCache) {
         pPool->Remove( *rImpl.pPoolItem );
         pPool->Remove( *rImpl.pOrigItem );
     }
@@ -62,7 +62,7 @@ const SfxSetItem& SfxItemPoolCache::ApplyTo( const SfxSetItem &rOrigItem )
                 "original not in pool" );
 
     // Find whether this Transformations ever occurred
-    for (SfxItemModifyImpl & rMapEntry : m_aCache)
+    for (const SfxItemModifyImpl & rMapEntry : m_aCache)
     {
         if ( rMapEntry.pOrigItem == &rOrigItem )
         {
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 49c29b64cc53..93557bd4fc7b 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -628,7 +628,7 @@ void BrowserDataWin::SetUpdateMode( bool bMode )
 
 void BrowserDataWin::DoOutstandingInvalidations()
 {
-    for (auto& rRect : aInvalidRegion)
+    for (const auto& rRect : aInvalidRegion)
         Control::Invalidate( rRect );
     aInvalidRegion.clear();
 }
diff --git a/svtools/source/contnr/foldertree.cxx b/svtools/source/contnr/foldertree.cxx
index bd4dc5812c27..b135b644fda6 100644
--- a/svtools/source/contnr/foldertree.cxx
+++ b/svtools/source/contnr/foldertree.cxx
@@ -74,7 +74,7 @@ void FolderTree::FillTreeEntry( SvTreeListEntry* pEntry )
 
         if ( EnumerationResult::SUCCESS == eResult )
         {
-            for(auto & i : aContent)
+            for(const auto & i : aContent)
             {
                 if( i->mbIsFolder )
                 {
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 0263deacac31..3e83d5da1d0d 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -381,7 +381,7 @@ void Ruler::ImplInvertLines(vcl::RenderContext& rRenderContext)
         aRect.SetRight( nY );
 
     // Draw lines
-    for (RulerLine & rLine : mpData->pLines)
+    for (const RulerLine & rLine : mpData->pLines)
     {
         const long n = rLine.nPos + nNullWinOff;
         if ((n >= nRulX1) && (n < nRulX2))
@@ -959,7 +959,7 @@ void Ruler::ImplDrawTab(vcl::RenderContext& rRenderContext, const Point& rPos, s
 
 void Ruler::ImplDrawTabs(vcl::RenderContext& rRenderContext, long nMin, long nMax, long nVirTop, long nVirBottom)
 {
-    for (RulerTab & rTab : mpData->pTabs)
+    for (const RulerTab & rTab : mpData->pTabs)
     {
         if (rTab.nStyle & RULER_STYLE_INVISIBLE)
             continue;
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 469c626d31a2..43e1c6d7f30e 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -1796,7 +1796,7 @@ sal_uInt16 TabBar::GetPagePos(sal_uInt16 nPageId) const
 
 sal_uInt16 TabBar::GetPageId(const Point& rPos) const
 {
-    for (auto& pItem : mpImpl->mpItemList)
+    for (const auto& pItem : mpImpl->mpItemList)
     {
         if (pItem->maRect.IsInside(rPos))
             return pItem->mnId;
@@ -1997,7 +1997,7 @@ void TabBar::SelectPage(sal_uInt16 nPageId, bool bSelect)
 sal_uInt16 TabBar::GetSelectPageCount() const
 {
     sal_uInt16 nSelected = 0;
-    for (auto& pItem : mpImpl->mpItemList)
+    for (const auto& pItem : mpImpl->mpItemList)
     {
         if (pItem->mbSelect)
             nSelected++;
@@ -2500,7 +2500,7 @@ Size TabBar::CalcWindowSizePixel() const
     if (!mpImpl->mpItemList.empty())
     {
         const_cast<TabBar*>(this)->ImplCalcWidth();
-        for (auto& pItem : mpImpl->mpItemList)
+        for (const auto& pItem : mpImpl->mpItemList)
         {
             nWidth += pItem->mnWidth;
         }
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 3cd358f3759e..79e861fca94c 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -2133,7 +2133,7 @@ Size ValueSet::GetLargestItemSize()
 {
     Size aLargestItem;
 
-    for (std::unique_ptr<ValueSetItem>& pItem : mItemList)
+    for (const std::unique_ptr<ValueSetItem>& pItem : mItemList)
     {
         if (!pItem->mbVisible)
             continue;
@@ -3872,7 +3872,7 @@ Size SvtValueSet::GetLargestItemSize()
 {
     Size aLargestItem;
 
-    for (std::unique_ptr<SvtValueSetItem>& pItem : mItemList)
+    for (const std::unique_ptr<SvtValueSetItem>& pItem : mItemList)
     {
         if (!pItem->mbVisible)
             continue;


More information about the Libreoffice-commits mailing list