[Libreoffice-commits] core.git: 3 commits - compilerplugins/clang connectivity/source vcl/unx

[Stephan Bergmann]

 compilerplugins/clang/loopvartoosmall.cxx         |    8 ++++----
 connectivity/source/drivers/evoab2/EApi.cxx       |    2 +-
 connectivity/source/drivers/evoab2/NStatement.cxx |    2 +-
 connectivity/source/drivers/kab/korder.cxx        |    4 ++--
 vcl/unx/kde4/KDESalGraphics.cxx                   |    2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit b4f9145fb4cfa8cee6fb52c647adb45712453eca
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 2 18:21:58 2015 +0200

    Enable loplugin:loopvartoosmall
    
    Change-Id: I114320ebaab9223b82b4fd9710c3cc221a836645

diff --git a/compilerplugins/clang/loopvartoosmall.cxx b/compilerplugins/clang/loopvartoosmall.cxx
index 78fc47e..c7fa0d3 100644
--- a/compilerplugins/clang/loopvartoosmall.cxx
+++ b/compilerplugins/clang/loopvartoosmall.cxx
@@ -103,17 +103,17 @@ bool LoopVarTooSmall::VisitForStmt( const ForStmt* stmt )
     if (qt1BitWidth < qt2BitWidth) {
         report(
             DiagnosticsEngine::Warning,
-            "loop index type is narrower than length type. " + qt.getAsString() + " < " + qt2.getAsString(),
+            "loop index type %0 is narrower than length type %1",
             stmt->getInit()->getLocStart())
-          << stmt->getInit()->getSourceRange();
+            << qt << qt2 << stmt->getInit()->getSourceRange();
         //stmt->getCond()->dump();
     }
     return true;
 }
 
 
-loplugin::Plugin::Registration< LoopVarTooSmall > X("loopvartoosmall", false);
+loplugin::Plugin::Registration< LoopVarTooSmall > X("loopvartoosmall");
 
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 7b6b8131f6ace6334e20e85cd96dddc6213bec0b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 2 18:21:44 2015 +0200

    loplugin:loopvartoosmall
    
    Change-Id: Iaa82f5e3180024db747a52d699aa77c16781afa0

diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index b77aa0c..ed6b130 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -206,7 +206,7 @@ namespace
 static QRegion XRegionToQRegion( Region xr )
 {
     QRegion qr;
-    for( int i = 0;
+    for( long i = 0;
          i < xr->numRects;
          ++i )
     {
commit d58d9402e8b33fdfb83899aba80ea5b4ab145ff9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jun 2 18:21:39 2015 +0200

    loplugin:loopvartoosmall
    
    Change-Id: Id5501599969fab5c6944a31b1fb629a3fc5f85b2

diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx
index ff1fd4f..ac77d56 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -111,7 +111,7 @@ static const ApiMap aClientApiMap38[] =
 template<size_t N> static bool
 tryLink( oslModule &aModule, const char *pName, const ApiMap (&pMap)[N])
 {
-    for (guint i = 0; i < N; ++i)
+    for (size_t i = 0; i < N; ++i)
     {
         SymbolFunc aMethod = reinterpret_cast<SymbolFunc>(osl_getFunctionSymbol
             (aModule, OUString::createFromAscii ( pMap[ i ].sym_name ).pData));
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 9b8a101..637d166 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -215,7 +215,7 @@ void OCommonStatement::orderByAnalysis( const OSQLParseNode* _pOrderByClause, So
     const OSQLParseNode* pOrderList = _pOrderByClause->getByRule( OSQLParseNode::ordering_spec_commalist );
     ENSURE_OR_THROW( pOrderList, "unexpected parse tree structure" );
 
-    for ( sal_uInt32 i=0; i<pOrderList->count(); ++i )
+    for ( size_t i=0; i<pOrderList->count(); ++i )
     {
         const OSQLParseNode* pOrderBy = pOrderList->getChild(i);
         if ( !pOrderBy || !SQL_ISRULE( pOrderBy, ordering_spec ) )
diff --git a/connectivity/source/drivers/kab/korder.cxx b/connectivity/source/drivers/kab/korder.cxx
index 3948d5ee..9418a56 100644
--- a/connectivity/source/drivers/kab/korder.cxx
+++ b/connectivity/source/drivers/kab/korder.cxx
@@ -56,7 +56,7 @@ KabComplexOrder::KabComplexOrder()
 
 KabComplexOrder::~KabComplexOrder()
 {
-    for (sal_uInt32 i = 0; i < m_aOrders.size(); i++)
+    for (std::vector<KabOrder *>::size_type i = 0; i < m_aOrders.size(); i++)
         delete m_aOrders[i];
 }
 
@@ -67,7 +67,7 @@ void KabComplexOrder::addOrder(KabOrder *pOrder)
 
 sal_Int32 KabComplexOrder::compare(const ::KABC::Addressee &aAddressee1, const ::KABC::Addressee &aAddressee2) const
 {
-    for (sal_uInt32 i = 0; i < m_aOrders.size(); i++)
+    for (std::vector<KabOrder *>::size_type i = 0; i < m_aOrders.size(); i++)
     {
         const KabOrder *pOrder = m_aOrders[i];
         sal_Int32 result = pOrder->compare(aAddressee1, aAddressee2);