[Marble-devel] Review Request 118943: Accept Placemarks as children of GeoDataChange

[Dennis Nienhüser]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/118943/#review61000
-----------------------------------------------------------



src/lib/marble/geodata/data/GeoDataUpdate.cpp
<https://git.reviewboard.kde.org/r/118943/#comment42488>

    Wouldn't they still be equal if one has a null pointer as change and the other an empty change? I'd do
    
    bool const changeEmpty = !d->m_change || d->m_change->size() == 0;
    bool const otherChangeEmpty = !other.d->m_change || other.d->m_change->size() == 0;
    
    if( ( changeEmpty != otherChangeEmpty ) {
      return false;
    } else if( d->m_change && other.d->m_change && *d->m_change != *other.d->m_change ) {
      return false;
    }
    
    return d->m_targetHref == other.d->m_targetHref;
    


- Dennis Nienhüser


On June 26, 2014, 8:45 a.m., Sanjiban Bairagya wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/118943/
> -----------------------------------------------------------
> 
> (Updated June 26, 2014, 8:45 a.m.)
> 
> 
> Review request for Marble, Dennis Nienhüser and Torsten Rahn.
> 
> 
> Repository: marble
> 
> 
> Description
> -------
> 
> This patch allows to accept Placemarks as children of GeoDataChange
> 
> 
> Diffs
> -----
> 
>   src/lib/marble/geodata/CMakeLists.txt bac40ac 
>   src/lib/marble/geodata/data/GeoDataAnimatedUpdate.h 5794656 
>   src/lib/marble/geodata/data/GeoDataAnimatedUpdate.cpp 511073c 
>   src/lib/marble/geodata/data/GeoDataChange.h PRE-CREATION 
>   src/lib/marble/geodata/data/GeoDataChange.cpp PRE-CREATION 
>   src/lib/marble/geodata/data/GeoDataUpdate.h ddadee2 
>   src/lib/marble/geodata/data/GeoDataUpdate.cpp ce42922 
>   src/lib/marble/geodata/handlers/kml/KmlAltitudeModeTagHandler.cpp 9827969 
>   src/lib/marble/geodata/handlers/kml/KmlChangeTagHandler.h PRE-CREATION 
>   src/lib/marble/geodata/handlers/kml/KmlChangeTagHandler.cpp PRE-CREATION 
>   src/lib/marble/geodata/handlers/kml/KmlGxAltitudeModeTagHandler.cpp 3a6bf5a 
>   src/lib/marble/geodata/handlers/kml/KmlModelTagHandler.cpp fe2f126 
>   src/lib/marble/geodata/handlers/kml/KmlPlacemarkTagHandler.cpp 110bc40 
>   src/lib/marble/geodata/handlers/kml/KmlUpdateTagHandler.cpp 534749c 
>   src/lib/marble/geodata/parser/GeoDataTypes.h dafcea3 
>   src/lib/marble/geodata/parser/GeoDataTypes.cpp e87b876 
>   src/lib/marble/geodata/writers/kml/KmlAnimatedUpdateTagWriter.h PRE-CREATION 
>   src/lib/marble/geodata/writers/kml/KmlAnimatedUpdateTagWriter.cpp PRE-CREATION 
>   src/lib/marble/geodata/writers/kml/KmlLookAtTagWriter.cpp 4e45daa 
>   src/lib/marble/geodata/writers/kml/KmlPlaylistTagWriter.cpp 86511bb 
>   src/lib/marble/geodata/writers/kml/KmlPointTagWriter.cpp 70eadbc 
>   src/lib/marble/geodata/writers/kml/KmlUpdateTagWriter.cpp fc1ddf6 
>   tests/TestTour.cpp db2d9c9 
>   tests/data/Tour.kml d9fc9ed 
> 
> Diff: https://git.reviewboard.kde.org/r/118943/diff/
> 
> 
> Testing
> -------
> 
> Tested and passed with tests/Tour.kml
> 
> 
> Thanks,
> 
> Sanjiban Bairagya
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/marble-devel/attachments/20140626/64e4b27e/attachment.html>