> +++ src/platforms/mirserver/miral/edid.cpp > + std::ostringstream stringStream; > + stringStream << "Incorrect EDID structure size {" << data.size() << > "}"; > + throw std::runtime_error(stringStream.str()); > > This would do: > throw std::runtime_error(std::string("Incorrect EDID structure size:") + > std::to_string(data.size())); > > > ++ src/platforms/mirserver/miral/persist_display_config.cpp > since you remove the #if MIR_SERVER_VERSION block, please merge the list of > mir headers so it is neater. > > +++ src/platforms/mirserver/miral/persist_display_config.cpp > Nitpick: space after the "for": > + for(auto iter = output.modes.cbegin(); iter != output.modes.cend(); ++iter, > i++) { > > > +++ src/platforms/mirserver/qmirserver_p.cpp > Nitpick: please add "// namespace" after the anonymous namespace closing brace > > > Rest looks good
Fixed.
« Back to merge proposal
> +++ src/platforms/ mirserver/ miral/edid. cpp error(stringStr eam.str( )); error(std: :string( "Incorrect EDID structure size:") + string( data.size( ))); mirserver/ miral/persist_ display_ config. cpp mirserver/ miral/persist_ display_ config. cpp modes.cbegin( ); iter != output. modes.cend( ); ++iter, mirserver/ qmirserver_ p.cpp
> + std::ostringstream stringStream;
> + stringStream << "Incorrect EDID structure size {" << data.size() <<
> "}";
> + throw std::runtime_
>
> This would do:
> throw std::runtime_
> std::to_
>
>
> ++ src/platforms/
> since you remove the #if MIR_SERVER_VERSION block, please merge the list of
> mir headers so it is neater.
>
> +++ src/platforms/
> Nitpick: space after the "for":
> + for(auto iter = output.
> i++) {
>
>
> +++ src/platforms/
> Nitpick: please add "// namespace" after the anonymous namespace closing brace
>
>
> Rest looks good
Fixed.