[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/models
From:       Marc Mutz <mutz () kde ! org>
Date:       2008-02-06 12:04:44
Message-ID: 1202299484.408128.15159.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 771558 by mutz:

std::merge + std::unique \approx std::set_union

 M  +3 -4      keylistmodel.cpp  


--- trunk/KDE/kdepim/kleopatra/models/keylistmodel.cpp #771557:771558
@@ -613,10 +613,9 @@
 
     std::vector<Key> merged;
     merged.reserve( keys.size() + mKeysByFingerprint.size() );
-    std::merge( keys.begin(), keys.end(),
-                mKeysByFingerprint.begin(), mKeysByFingerprint.end(),
-                std::back_inserter( merged ), ByFingerprint<std::less>() );
-    merged.erase( std::unique( merged.begin(), merged.end(), \
ByFingerprint<std::equal_to>() ), merged.end() ); +    std::set_union( keys.begin(), \
keys.end(), +                    mKeysByFingerprint.begin(), \
mKeysByFingerprint.end(), +                    std::back_inserter( merged ), \
ByFingerprint<std::less>() );  
     mKeysByFingerprint = merged;
 


[prev in list] [next in list] [prev in thread] [next in thread]