head	1.2;
access;
symbols
	pkgsrc-2014Q3:1.1.0.12
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.10
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.8
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.6
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.4
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.2
	pkgsrc-2013Q2-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2014.11.13.19.19.08;	author markd;	state dead;
branches;
next	1.1;
commitid	BLxxtdelNTXOF3Yx;

1.1
date	2013.06.13.14.29.37;	author joerg;	state Exp;
branches;
next	;
commitid	lTNZbsbjefQOIsTw;


desc
@@


1.2
log
@Update to KDE SC 4.14.3
@
text
@$NetBSD: patch-kleopatra_models_keylistmodel.cpp,v 1.1 2013/06/13 14:29:37 joerg Exp $

--- kleopatra/models/keylistmodel.cpp.orig	2013-06-12 20:30:56.000000000 +0000
+++ kleopatra/models/keylistmodel.cpp
@@@@ -67,10 +67,6 @@@@
 #include <iterator>
 #include <cassert>
 
-#ifdef __GNUC__
-#include <ext/algorithm> // for is_sorted
-#endif
-
 using namespace GpgME;
 using namespace Kleo;
 
@@@@ -444,9 +440,6 @@@@ QModelIndex FlatKeyListModel::doMapFromK
 }
 
 QList<QModelIndex> FlatKeyListModel::doAddKeys( const std::vector<Key> & keys ) {
-#ifdef __GNUC__
-    assert( __gnu_cxx::is_sorted( keys.begin(), keys.end(), _detail::ByFingerprint<std::less>() ) );
-#endif
     if ( keys.empty() )
         return QList<QModelIndex>();
 
@@@@ -701,9 +694,6 @@@@ static std::vector<Key> topological_sort
 }
 
 QList<QModelIndex> HierarchicalKeyListModel::doAddKeys( const std::vector<Key> & keys ) {
-#ifdef __GNUC__
-    assert( __gnu_cxx::is_sorted( keys.begin(), keys.end(), _detail::ByFingerprint<std::less>() ) );
-#endif
     if ( keys.empty() )
         return QList<QModelIndex>();
 
@


1.1
log
@Drop a bunch of ext/algorithm uses for asserts. Add explicit namespace
references to resolve ambiguity with a C++11 STL implementation.
@
text
@d1 1
a1 1
$NetBSD$
@