[Libreoffice-commits] core.git: fpicker/source idlc/source svx/source unodevtools/source xmloff/source
Julien Nabet
serval2412 at yahoo.fr
Sun Oct 1 12:53:33 UTC 2017
fpicker/source/aqua/ControlHelper.mm | 2 -
fpicker/source/aqua/FilterHelper.mm | 10 +++----
idlc/source/parser.y | 26 +++++++++----------
svx/source/form/datanavi.cxx | 2 -
svx/source/table/celltypes.hxx | 4 +-
unodevtools/source/skeletonmaker/cppcompskeleton.cxx | 4 +-
xmloff/source/style/xmlprmap.cxx | 4 +-
7 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 22e748e68a87e1b470146eacad374c7dfef74f5a
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sun Oct 1 14:06:22 2017 +0200
Prefer prefix operator
Change-Id: I82f3f66bfc675dbc4a5d5b57d8715c3de01d9620
Reviewed-on: https://gerrit.libreoffice.org/42994
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/fpicker/source/aqua/ControlHelper.mm b/fpicker/source/aqua/ControlHelper.mm
index d0568b9a5ea1..a9ab107bec2a 100644
--- a/fpicker/source/aqua/ControlHelper.mm
+++ b/fpicker/source/aqua/ControlHelper.mm
@@ -874,7 +874,7 @@ void ControlHelper::createFilterControl()
NSMenu *menu = [m_pFilterControl menu];
- for (NSStringList::iterator iter = m_pFilterHelper->getFilterNames()->begin(); iter != m_pFilterHelper->getFilterNames()->end(); iter++) {
+ for (NSStringList::iterator iter = m_pFilterHelper->getFilterNames()->begin(); iter != m_pFilterHelper->getFilterNames()->end(); ++iter) {
NSString *filterName = *iter;
SAL_INFO("fpicker.aqua","adding filter name: " << [filterName UTF8String]);
if ([filterName isEqualToString:@"-"]) {
diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm
index 0454c6ef977b..668d0f643cd5 100644
--- a/fpicker/source/aqua/FilterHelper.mm
+++ b/fpicker/source/aqua/FilterHelper.mm
@@ -183,7 +183,7 @@ FilterHelper::~FilterHelper()
if (nullptr != m_pFilterNames) {
//we called retain when we added the strings to the list, so we should release them now
- for (NSStringList::iterator iter = m_pFilterNames->begin(); iter != m_pFilterNames->end(); iter++) {
+ for (NSStringList::iterator iter = m_pFilterNames->begin(); iter != m_pFilterNames->end(); ++iter) {
[*iter release];
}
delete m_pFilterNames;
@@ -345,7 +345,7 @@ bool FilterHelper::filenameMatchesFilter(NSString* sFilename)
{
rtl::OUString aName = [sFilename OUString];
- for(OUStringList::iterator iter = suffixList.begin(); iter != suffixList.end(); iter++) {
+ for(OUStringList::iterator iter = suffixList.begin(); iter != suffixList.end(); ++iter) {
if (*iter == ".*" || aName.endsWithIgnoreAsciiCase(*iter)) {
return true;
}
@@ -377,7 +377,7 @@ NSStringList* FilterHelper::getFilterNames()
if (nullptr == m_pFilterNames) {
//build filter names list
m_pFilterNames = new NSStringList;
- for (FilterList::iterator iter = m_pFilterList->begin(); iter != m_pFilterList->end(); iter++) {
+ for (FilterList::iterator iter = m_pFilterList->begin(); iter != m_pFilterList->end(); ++iter) {
m_pFilterNames->push_back([[NSString stringWithOUString:iter->getTitle()] retain]);
}
}
@@ -399,7 +399,7 @@ int FilterHelper::getCurrentFilterIndex()
int result = 0;//default to first filter
if (m_aCurrentFilter.getLength() > 0) {
int i = 0;
- for (FilterList::iterator iter = m_pFilterList->begin(); iter != m_pFilterList->end(); iter++, i++) {
+ for (FilterList::iterator iter = m_pFilterList->begin(); iter != m_pFilterList->end(); ++iter, ++i) {
rtl::OUString aTitle = iter->getTitle();
if (m_aCurrentFilter.equals(aTitle)) {
result = i;
@@ -421,7 +421,7 @@ OUStringList FilterHelper::getCurrentFilterSuffixList()
{
OUStringList retVal;
if (m_aCurrentFilter.getLength() > 0) {
- for (FilterList::iterator iter = m_pFilterList->begin(); iter != m_pFilterList->end(); iter++) {
+ for (FilterList::iterator iter = m_pFilterList->begin(); iter != m_pFilterList->end(); ++iter) {
rtl::OUString aTitle = iter->getTitle();
if (m_aCurrentFilter.equals(aTitle)) {
retVal = iter->getFilterSuffixList();
diff --git a/idlc/source/parser.y b/idlc/source/parser.y
index af945f67a4c2..1c1a27a67806 100644
--- a/idlc/source/parser.y
+++ b/idlc/source/parser.y
@@ -1561,7 +1561,7 @@ property :
pDecl = (*iter);
if ( !pDecl )
{
- iter++;
+ ++iter;
continue;
}
@@ -1569,14 +1569,14 @@ property :
if ( !pType )
{
- iter++;
+ ++iter;
continue;
}
pAttr = new AstAttribute(NT_property, $1, pType, pDecl->getName(), pScope);
pScope->addDeclaration(pAttr);
- iter++;
+ ++iter;
delete pDecl;
}
}
@@ -1641,7 +1641,7 @@ service_export :
{
ErrorHandler::lookupError(ErrorCode::InterfaceMemberLookup, *iter, scopeAsDecl(pScope));
}
- iter++;
+ ++iter;
}
}
}
@@ -1683,7 +1683,7 @@ service_export :
{
ErrorHandler::lookupError(ErrorCode::ServiceMemberLookup, *iter, scopeAsDecl(pScope));
}
- iter++;
+ ++iter;
}
}
delete $2;
@@ -1723,7 +1723,7 @@ service_export :
{
ErrorHandler::lookupError(ErrorCode::InterfaceMemberLookup, *iter, scopeAsDecl(pScope));
}
- iter++;
+ ++iter;
}
}
}
@@ -1764,7 +1764,7 @@ service_export :
{
ErrorHandler::lookupError(ErrorCode::ServiceMemberLookup, *iter, scopeAsDecl(pScope));
}
- iter++;
+ ++iter;
}
}
}
@@ -2042,7 +2042,7 @@ type_declarator :
pDecl = (*iter);
if ( !pDecl )
{
- iter++;
+ ++iter;
continue;
}
@@ -2050,14 +2050,14 @@ type_declarator :
if ( !pType )
{
- iter++;
+ ++iter;
continue;
}
pTypeDef = new AstTypeDef(pType, pDecl->getName(), pScope);
pScope->addDeclaration(pTypeDef);
- iter++;
+ ++iter;
delete pDecl;
}
delete pList;
@@ -2551,7 +2551,7 @@ member :
pDecl = (*iter);
if ( !pDecl )
{
- iter++;
+ ++iter;
continue;
}
@@ -2559,7 +2559,7 @@ member :
if ( !pType )
{
- iter++;
+ ++iter;
continue;
}
@@ -2571,7 +2571,7 @@ member :
}
pScope->addDeclaration(pMember);
- iter++;
+ ++iter;
delete pDecl;
}
delete pList;
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 7eb5ff874f26..2bd2fcab389d 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -1098,7 +1098,7 @@ namespace svxform
else
{
xNum->nextElement();
- nIter++;
+ ++nIter;
}
}
}
diff --git a/svx/source/table/celltypes.hxx b/svx/source/table/celltypes.hxx
index 66409ccd4fb7..2200e1661a59 100644
--- a/svx/source/table/celltypes.hxx
+++ b/svx/source/table/celltypes.hxx
@@ -79,9 +79,9 @@ public:
rValue = maIter;
if( maIter < maEnd )
- maIter++;
+ ++maIter;
else
- maIter--;
+ --maIter;
return true;
}
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
index 8b63e8a2326a..529b9f48f26a 100644
--- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
@@ -758,7 +758,7 @@ OString generateClassDefinition(std::ostream& o,
// printType(o, options, manager, iter->second.first.replace('.','/'),
// 1, false);
// o << " m_" << iter->first << ";\n";
-// iter++;
+// ++iter;
// }
// }
// if (!attributes.empty())
@@ -770,7 +770,7 @@ OString generateClassDefinition(std::ostream& o,
// printType(o, options, manager, iter->second.first.replace('.','/'),
// 1, false);
// o << " m_" << iter->first << ";\n";
-// iter++;
+// ++iter;
// }
// }
diff --git a/xmloff/source/style/xmlprmap.cxx b/xmloff/source/style/xmlprmap.cxx
index 634e50afcf7f..a1e4d566576b 100644
--- a/xmloff/source/style/xmlprmap.cxx
+++ b/xmloff/source/style/xmlprmap.cxx
@@ -131,7 +131,7 @@ XMLPropertySetMapper::XMLPropertySetMapper(
XMLPropertySetMapperEntry_Impl aEntry( *pIter, rFactory );
mpImpl->maMapEntries.push_back( aEntry );
}
- pIter++;
+ ++pIter;
}
}
else
@@ -140,7 +140,7 @@ XMLPropertySetMapper::XMLPropertySetMapper(
{
XMLPropertySetMapperEntry_Impl aEntry( *pIter, rFactory );
mpImpl->maMapEntries.push_back( aEntry );
- pIter++;
+ ++pIter;
}
}
}
More information about the Libreoffice-commits
mailing list