Commit 5527b00b authored by Mark Olesen's avatar Mark Olesen
Browse files

STYLE: use range-for when looping dictionary entries.

- as part of the cleanup of dictionary access methods (c6520033c9c4)
  made the dictionary class single inheritance from IDLList<entry>.

  This eliminates any ambiguities for iterators and allows
  for simple use of range-for looping.

  Eg,
      for (const entry& e : topDict))
      {
          Info<< "entry:" << e.keyword() << " is dict:" << e.isDict() << nl;
      }

   vs

      forAllConstIter(dictionary, topDict, iter))
      {
          Info<< "entry:" << iter().keyword()
              << " is dict:" << iter().isDict() << nl;
      }
parent 73116c4f
...@@ -106,11 +106,11 @@ bool Foam::functionObjects::runTimePostProcessing::read(const dictionary& dict) ...@@ -106,11 +106,11 @@ bool Foam::functionObjects::runTimePostProcessing::read(const dictionary& dict)
readObjects(dict.subOrEmptyDict("lines"), lines_); readObjects(dict.subOrEmptyDict("lines"), lines_);
readObjects(dict.subOrEmptyDict("surfaces"), surfaces_); readObjects(dict.subOrEmptyDict("surfaces"), surfaces_);
const dictionary& textDict = dict.subDict("text"); const dictionary& textDict = dict.subDict("text");
forAllConstIter(dictionary, textDict, iter)
for (const entry& dEntry : textDict)
{ {
if (!iter().isDict()) if (!dEntry.isDict())
{ {
FatalIOErrorInFunction(textDict) FatalIOErrorInFunction(textDict)
<< "text must be specified in dictionary format" << "text must be specified in dictionary format"
...@@ -122,7 +122,7 @@ bool Foam::functionObjects::runTimePostProcessing::read(const dictionary& dict) ...@@ -122,7 +122,7 @@ bool Foam::functionObjects::runTimePostProcessing::read(const dictionary& dict)
new runTimePostPro::text new runTimePostPro::text
( (
*this, *this,
iter().dict(), dEntry.dict(),
scene_.colours() scene_.colours()
) )
); );
......
...@@ -33,9 +33,10 @@ void Foam::functionObjects::runTimePostProcessing::readObjects ...@@ -33,9 +33,10 @@ void Foam::functionObjects::runTimePostProcessing::readObjects
) const ) const
{ {
objects.clear(); objects.clear();
forAllConstIter(dictionary, dict, iter)
for (const entry& dEntry : dict)
{ {
if (!iter().isDict()) if (!dEntry.isDict())
{ {
FatalIOErrorInFunction(dict) FatalIOErrorInFunction(dict)
<< dict.dictName() << dict.dictName()
...@@ -43,12 +44,12 @@ void Foam::functionObjects::runTimePostProcessing::readObjects ...@@ -43,12 +44,12 @@ void Foam::functionObjects::runTimePostProcessing::readObjects
<< exit(FatalIOError); << exit(FatalIOError);
} }
const dictionary& objectDict(iter().dict()); const dictionary& objectDict = dEntry.dict();
const word objectType = objectDict.get<word>("type"); const word objectType = objectDict.get<word>("type");
objects.append objects.append
( (
Type::New(*this, iter().dict(), scene_.colours(), objectType) Type::New(*this, objectDict, scene_.colours(), objectType)
); );
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment