{format} Update to clang-format 18 & reformat

.github/workflows/format-check.yml

@@ -15,5 +15,5 @@ jobs:
       - name: Run clang-format style check
         uses: jidicula/[email protected]
         with:
-          clang-format-version: '15'
+          clang-format-version: '18'
           exclude-regex: 'extern'

include/E57Exception.h

@@ -378,8 +378,7 @@ namespace e57
       E57Exception() = delete;
       E57Exception( ErrorCode ecode, std::string context, const char *srcFileName = nullptr,
                     int srcLineNumber = 0, const char *srcFunctionName = nullptr ) :
-         errorCode_( ecode ),
-         context_( std::move( context ) ), sourceFileName_( srcFileName ),
+         errorCode_( ecode ), context_( std::move( context ) ), sourceFileName_( srcFileName ),
          sourceFunctionName_( srcFunctionName ), sourceLineNumber_( srcLineNumber )
       {
       }

src/BlobNodeImpl.cpp

@@ -68,8 +68,7 @@ namespace e57
    }
 
    BlobNodeImpl::BlobNodeImpl( ImageFileImplWeakPtr destImageFile, int64_t fileOffset,
-                               int64_t length ) :
-      NodeImpl( destImageFile )
+                               int64_t length ) : NodeImpl( destImageFile )
    {
       // Init blob object that already exists in E57 file currently reading.
 
@@ -210,8 +209,7 @@ namespace e57
    void BlobNodeImpl::dump( int indent, std::ostream &os ) const
    {
       // don't checkImageFileOpen
-      os << space( indent ) << "type:        Blob"
-         << " (" << type() << ")" << std::endl;
+      os << space( indent ) << "type:        Blob" << " (" << type() << ")" << std::endl;
       NodeImpl::dump( indent, os );
       os << space( indent ) << "blobLogicalLength_:           " << blobLogicalLength_ << std::endl;
       os << space( indent ) << "binarySectionLogicalStart:    " << binarySectionLogicalStart_

src/CompressedVectorNodeImpl.cpp

@@ -238,8 +238,8 @@ namespace e57
 #ifdef E57_ENABLE_DIAGNOSTIC_OUTPUT
    void CompressedVectorNodeImpl::dump( int indent, std::ostream &os ) const
    {
-      os << space( indent ) << "type:        CompressedVector"
-         << " (" << type() << ")" << std::endl;
+      os << space( indent ) << "type:        CompressedVector" << " (" << type() << ")"
+         << std::endl;
       NodeImpl::dump( indent, os );
       if ( prototype_ )
       {

src/CompressedVectorWriterImpl.cpp

@@ -49,8 +49,7 @@ namespace e57
 
    CompressedVectorWriterImpl::CompressedVectorWriterImpl(
       std::shared_ptr<CompressedVectorNodeImpl> ni, std::vector<SourceDestBuffer> &sbufs ) :
-      cVector_( ni ),
-      isOpen_( false ) // set to true when succeed below
+      cVector_( ni ), isOpen_( false ) // set to true when succeed below
    {
       //???  check if cvector already been written (can't write twice)
 

src/DecodeChannel.cpp

@@ -33,8 +33,7 @@ namespace e57
 {
    DecodeChannel::DecodeChannel( SourceDestBuffer dbuf_arg, std::shared_ptr<Decoder> decoder_arg,
                                  unsigned bytestreamNumber_arg, uint64_t maxRecordCount_arg ) :
-      dbuf( dbuf_arg ),
-      decoder( decoder_arg ), bytestreamNumber( bytestreamNumber_arg )
+      dbuf( dbuf_arg ), decoder( decoder_arg ), bytestreamNumber( bytestreamNumber_arg )
    {
       maxRecordCount = maxRecordCount_arg;
       currentPacketLogicalOffset = 0;

src/Decoder.cpp

@@ -199,8 +199,7 @@ Decoder::Decoder( unsigned bytestreamNumber ) : bytestreamNumber_( bytestreamNum
 
 BitpackDecoder::BitpackDecoder( unsigned bytestreamNumber, SourceDestBuffer &dbuf,
                                 unsigned alignmentSize, uint64_t maxRecordCount ) :
-   Decoder( bytestreamNumber ),
-   maxRecordCount_( maxRecordCount ), destBuffer_( dbuf.impl() ),
+   Decoder( bytestreamNumber ), maxRecordCount_( maxRecordCount ), destBuffer_( dbuf.impl() ),
    inBuffer_( 1024 ), // !!! need to pick smarter channel buffer sizes
    inBufferAlignmentSize_( alignmentSize ), bitsPerWord_( 8 * alignmentSize ),
    bytesPerWord_( alignmentSize )
@@ -856,8 +855,7 @@ ConstantIntegerDecoder::ConstantIntegerDecoder( bool isScaledInteger, unsigned b
                                                 SourceDestBuffer &dbuf, int64_t minimum,
                                                 double scale, double offset,
                                                 uint64_t maxRecordCount ) :
-   Decoder( bytestreamNumber ),
-   maxRecordCount_( maxRecordCount ), destBuffer_( dbuf.impl() ),
+   Decoder( bytestreamNumber ), maxRecordCount_( maxRecordCount ), destBuffer_( dbuf.impl() ),
    isScaledInteger_( isScaledInteger ), minimum_( minimum ), scale_( scale ), offset_( offset )
 {
 }

src/E57XmlParser.cpp

@@ -155,8 +155,8 @@ class E57FileInputStream : public BinInputStream
 
 E57FileInputStream::E57FileInputStream( CheckedFile *cf, uint64_t logicalStart,
                                         uint64_t logicalLength ) :
-   cf_( cf ),
-   logicalStart_( logicalStart ), logicalLength_( logicalLength ), logicalPosition_( logicalStart )
+   cf_( cf ), logicalStart_( logicalStart ), logicalLength_( logicalLength ),
+   logicalPosition_( logicalStart )
 {
 }
 

src/Encoder.cpp

@@ -214,9 +214,9 @@ void Encoder::dump( int indent, std::ostream &os ) const
 
 BitpackEncoder::BitpackEncoder( unsigned bytestreamNumber, SourceDestBuffer &sbuf,
                                 unsigned outputMaxSize, unsigned alignmentSize ) :
-   Encoder( bytestreamNumber ),
-   sourceBuffer_( sbuf.impl() ), outBuffer_( outputMaxSize ), outBufferFirst_( 0 ),
-   outBufferEnd_( 0 ), outBufferAlignmentSize_( alignmentSize ), currentRecordIndex_( 0 )
+   Encoder( bytestreamNumber ), sourceBuffer_( sbuf.impl() ), outBuffer_( outputMaxSize ),
+   outBufferFirst_( 0 ), outBufferEnd_( 0 ), outBufferAlignmentSize_( alignmentSize ),
+   currentRecordIndex_( 0 )
 {
 }
 
@@ -496,9 +496,8 @@ void BitpackFloatEncoder::dump( int indent, std::ostream &os ) const
 
 BitpackStringEncoder::BitpackStringEncoder( unsigned bytestreamNumber, SourceDestBuffer &sbuf,
                                             unsigned outputMaxSize ) :
-   BitpackEncoder( bytestreamNumber, sbuf, outputMaxSize, 1 ),
-   totalBytesProcessed_( 0 ), isStringActive_( false ), prefixComplete_( false ),
-   currentCharPosition_( 0 )
+   BitpackEncoder( bytestreamNumber, sbuf, outputMaxSize, 1 ), totalBytesProcessed_( 0 ),
+   isStringActive_( false ), prefixComplete_( false ), currentCharPosition_( 0 )
 {
 }
 
@@ -896,8 +895,8 @@ void BitpackIntegerEncoder<RegisterT>::dump( int indent, std::ostream &os ) cons
 
 ConstantIntegerEncoder::ConstantIntegerEncoder( unsigned bytestreamNumber, SourceDestBuffer &sbuf,
                                                 int64_t minimum ) :
-   Encoder( bytestreamNumber ),
-   sourceBuffer_( sbuf.impl() ), currentRecordIndex_( 0 ), minimum_( minimum )
+   Encoder( bytestreamNumber ), sourceBuffer_( sbuf.impl() ), currentRecordIndex_( 0 ),
+   minimum_( minimum )
 {
 }
 

src/FloatNodeImpl.cpp

@@ -33,8 +33,8 @@ namespace e57
 {
    FloatNodeImpl::FloatNodeImpl( ImageFileImplWeakPtr destImageFile, double value,
                                  FloatPrecision precision, double minimum, double maximum ) :
-      NodeImpl( destImageFile ),
-      value_( value ), precision_( precision ), minimum_( minimum ), maximum_( maximum )
+      NodeImpl( destImageFile ), value_( value ), precision_( precision ), minimum_( minimum ),
+      maximum_( maximum )
    {
       // Since this ctor also used to construct single precision, and defaults for minimum/maximum
       // are for double precision, adjust bounds smaller if single.
@@ -214,8 +214,7 @@ namespace e57
    void FloatNodeImpl::dump( int indent, std::ostream &os ) const
    {
       // don't checkImageFileOpen
-      os << space( indent ) << "type:        Float"
-         << " (" << type() << ")" << std::endl;
+      os << space( indent ) << "type:        Float" << " (" << type() << ")" << std::endl;
       NodeImpl::dump( indent, os );
       os << space( indent ) << "precision:   ";
       if ( precision() == PrecisionSingle )

src/IntegerNodeImpl.cpp

@@ -33,8 +33,7 @@ namespace e57
 {
    IntegerNodeImpl::IntegerNodeImpl( ImageFileImplWeakPtr destImageFile, int64_t value,
                                      int64_t minimum, int64_t maximum ) :
-      NodeImpl( destImageFile ),
-      value_( value ), minimum_( minimum ), maximum_( maximum )
+      NodeImpl( destImageFile ), value_( value ), minimum_( minimum ), maximum_( maximum )
    {
    }
 
@@ -160,8 +159,7 @@ namespace e57
    void IntegerNodeImpl::dump( int indent, std::ostream &os ) const
    {
       // don't checkImageFileOpen
-      os << space( indent ) << "type:        Integer"
-         << " (" << type() << ")" << std::endl;
+      os << space( indent ) << "type:        Integer" << " (" << type() << ")" << std::endl;
       NodeImpl::dump( indent, os );
       os << space( indent ) << "value:       " << value_ << std::endl;
       os << space( indent ) << "minimum:     " << minimum_ << std::endl;

src/ScaledIntegerNodeImpl.cpp

@@ -36,9 +36,8 @@ namespace e57
    ScaledIntegerNodeImpl::ScaledIntegerNodeImpl( ImageFileImplWeakPtr destImageFile,
                                                  int64_t rawValue, int64_t minimum, int64_t maximum,
                                                  double scale, double offset ) :
-      NodeImpl( destImageFile ),
-      value_( rawValue ), minimum_( minimum ), maximum_( maximum ), scale_( scale ),
-      offset_( offset )
+      NodeImpl( destImageFile ), value_( rawValue ), minimum_( minimum ), maximum_( maximum ),
+      scale_( scale ), offset_( offset )
    {
    }
 
@@ -228,8 +227,7 @@ namespace e57
    void ScaledIntegerNodeImpl::dump( int indent, std::ostream &os ) const
    {
       // don't checkImageFileOpen
-      os << space( indent ) << "type:        ScaledInteger"
-         << " (" << type() << ")" << std::endl;
+      os << space( indent ) << "type:        ScaledInteger" << " (" << type() << ")" << std::endl;
       NodeImpl::dump( indent, os );
       os << space( indent ) << "rawValue:    " << value_ << std::endl;
       os << space( indent ) << "minimum:     " << minimum_ << std::endl;

src/SourceDestBufferImpl.cpp

@@ -36,9 +36,8 @@ using namespace e57;
 SourceDestBufferImpl::SourceDestBufferImpl( ImageFileImplWeakPtr destImageFile,
                                             const ustring &pathName, const size_t capacity,
                                             bool doConversion, bool doScaling ) :
-   destImageFile_( destImageFile ),
-   pathName_( pathName ), memoryRepresentation_( Int32 ), capacity_( capacity ),
-   doConversion_( doConversion ), doScaling_( doScaling )
+   destImageFile_( destImageFile ), pathName_( pathName ), memoryRepresentation_( Int32 ),
+   capacity_( capacity ), doConversion_( doConversion ), doScaling_( doScaling )
 {
 }
 
@@ -109,8 +108,8 @@ template void SourceDestBufferImpl::setTypeInfo<double>( double *base, size_t st
 
 SourceDestBufferImpl::SourceDestBufferImpl( ImageFileImplWeakPtr destImageFile,
                                             const ustring &pathName, std::vector<ustring> *b ) :
-   destImageFile_( destImageFile ),
-   pathName_( pathName ), memoryRepresentation_( UString ), ustrings_( b )
+   destImageFile_( destImageFile ), pathName_( pathName ), memoryRepresentation_( UString ),
+   ustrings_( b )
 {
    /// don't checkImageFileOpen, checkState_ will do it
 

src/StringNodeImpl.cpp

@@ -137,8 +137,7 @@ namespace e57
 #ifdef E57_ENABLE_DIAGNOSTIC_OUTPUT
    void StringNodeImpl::dump( int indent, std::ostream &os ) const
    {
-      os << space( indent ) << "type:        String"
-         << " (" << type() << ")" << std::endl;
+      os << space( indent ) << "type:        String" << " (" << type() << ")" << std::endl;
       NodeImpl::dump( indent, os );
       os << space( indent ) << "value:       '" << value_ << "'" << std::endl;
    }

src/StructureNodeImpl.cpp

@@ -454,8 +454,7 @@ void StructureNodeImpl::writeXml( ImageFileImplSharedPtr imf, CheckedFile &cf, i
 void StructureNodeImpl::dump( int indent, std::ostream &os ) const
 {
    // don't checkImageFileOpen
-   os << space( indent ) << "type:        Structure"
-      << " (" << type() << ")" << std::endl;
+   os << space( indent ) << "type:        Structure" << " (" << type() << ")" << std::endl;
    NodeImpl::dump( indent, os );
    for ( unsigned i = 0; i < children_.size(); i++ )
    {

src/VectorNodeImpl.cpp

@@ -128,8 +128,7 @@ namespace e57
    void VectorNodeImpl::dump( int indent, std::ostream &os ) const
    {
       // don't checkImageFileOpen
-      os << space( indent ) << "type:        Vector"
-         << " (" << type() << ")" << std::endl;
+      os << space( indent ) << "type:        Vector" << " (" << type() << ")" << std::endl;
       NodeImpl::dump( indent, os ); // NOLINT(bugprone-parent-virtual-call)
       os << space( indent ) << "allowHeteroChildren: " << allowHeteroChildren() << std::endl;
       for ( unsigned i = 0; i < children_.size(); i++ )