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

List:       kde-commits
Subject:    aegypten_branch: kdepim/kmail
From:       Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date:       2004-05-29 14:41:17
Message-ID: 20040529144117.CB7B0126E2 () office ! kde ! org
[Download RAW message or body]

CVS commit by mutz: 

Make George happy by removing the need for Qt w/ -stl on. Or probably not, given that \
the only change needed was s/std::copy/qCopy/ in a 1000+ lines file full of STL and \
Qt code... Which just proves that the -stl switch isn't going to change anything \
w.r.t. current and future STL usage, but remains to be a nuisance for people using Qt \
containers and whishing to use std::unique et al on them... This nuisance has driven \
_me_ from using QValueFoo to using std::foo... :/


  M +3 -6      keyresolver.cpp   1.1.2.26
  R            configure.in.in   1.1.2.1


--- kdepim/kmail/keyresolver.cpp  #1.1.2.25:1.1.2.26
@@ -35,8 +35,4 @@
 */
 
-#ifdef QT_NO_STL
-#undef QT_NO_STL
-#endif
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -55,4 +51,5 @@
 #include <gpgmepp/keylistresult.h>
 
+#include <kabc/stdaddressbook.h>
 #include <klocale.h>
 #include <kdebug.h>
@@ -60,5 +57,5 @@
 
 #include <qstringlist.h>
-#include <kabc/stdaddressbook.h>
+#include <qtl.h>
 
 #include <algorithm>
@@ -1094,5 +1091,5 @@ void Kleo::KeyResolver::collapseAllSplit
     for ( std::vector<SplitInfo>::const_iterator it = v.begin() + 1; it != v.end() ; \
++it ) {  si.keys.insert( si.keys.end(), it->keys.begin(), it->keys.end() );
-      std::copy( it->recipients.begin(), it->recipients.end(), std::back_inserter( \
si.recipients ) ); +      qCopy( it->recipients.begin(), it->recipients.end(), \
std::back_inserter( si.recipients ) );  }
     v.resize( 1 );


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