SVN commit 1202089 by mutz:

stl_util.h: move from kleopatra to libkleo

 M  +2 -1      kleopatra/commands/checksumcreatefilescommand.cpp  
 M  +2 -1      kleopatra/commands/checksumverifyfilescommand.cpp  
 M  +2 -1      kleopatra/commands/decryptverifyclipboardcommand.cpp  
 M  +2 -1      kleopatra/commands/decryptverifyfilescommand.cpp  
 M  +1 -2      kleopatra/commands/deletecertificatescommand.cpp  
 M  +2 -1      kleopatra/commands/encryptclipboardcommand.cpp  
 M  +1 -1      kleopatra/commands/importcertificatescommand.cpp  
 M  +1 -1      kleopatra/commands/lookupcertificatescommand.cpp  
 M  +1 -1      kleopatra/commands/selftestcommand.cpp  
 M  +2 -1      kleopatra/commands/signclipboardcommand.cpp  
 M  +2 -1      kleopatra/commands/signencryptfilescommand.cpp  
 M  +1 -1      kleopatra/crypto/createchecksumscontroller.cpp  
 M  +1 -1      kleopatra/crypto/decryptverifytask.cpp  
 M  +1 -1      kleopatra/crypto/encryptemailcontroller.cpp  
 M  +1 -1      kleopatra/crypto/encryptemailtask.cpp  
 M  +1 -1      kleopatra/crypto/gui/decryptverifyfileswizard.cpp  
 M  +2 -1      kleopatra/crypto/gui/newresultpage.cpp  
 M  +1 -1      kleopatra/crypto/gui/newsignencryptfileswizard.cpp  
 M  +2 -1      kleopatra/crypto/gui/resultlistwidget.cpp  
 M  +2 -1      kleopatra/crypto/gui/signencryptemailconflictdialog.cpp  
 M  +2 -1      kleopatra/crypto/gui/signencryptwizard.cpp  
 M  +2 -1      kleopatra/crypto/gui/signingcertificateselectionwidget.cpp  
 M  +1 -1      kleopatra/crypto/newsignencryptemailcontroller.cpp  
 M  +2 -1      kleopatra/crypto/signemailcontroller.cpp  
 M  +1 -1      kleopatra/crypto/signemailtask.cpp  
 M  +1 -1      kleopatra/crypto/signencryptfilescontroller.cpp  
 M  +1 -1      kleopatra/crypto/signencryptfilestask.cpp  
 M  +1 -1      kleopatra/crypto/verifychecksumscontroller.cpp  
 M  +2 -1      kleopatra/dialogs/adduseriddialog.cpp  
 M  +2 -1      kleopatra/dialogs/certifycertificatedialog.cpp  
 M  +1 -1      kleopatra/dialogs/deletecertificatesdialog.cpp  
 M  +2 -1      kleopatra/dialogs/lookupcertificatesdialog.cpp  
 M  +1 -1      kleopatra/mainwindow_desktop.cpp  
 M  +1 -1      kleopatra/mainwindow_mobile.cpp  
 M  +1 -1      kleopatra/models/keycache.cpp  
 M  +2 -1      kleopatra/models/keylistsortfilterproxymodel.cpp  
 M  +1 -1      kleopatra/models/predicates.h  
 M  +1 -1      kleopatra/newcertificatewizard/newcertificatewizard.cpp  
 M  +2 -1      kleopatra/smartcard/readerstatus.cpp  
 M  +1 -1      kleopatra/uiserver/assuanserverconnection.cpp  
 M  +1 -1      kleopatra/uiserver/decryptverifycommandfilesbase.cpp  
 M  +1 -1      kleopatra/uiserver/selectcertificatecommand.cpp  
 M  +1 -1      kleopatra/uiserver/uiserver.cpp  
 M  +1 -1      kleopatra/utils/filesystemwatcher.cpp  
 M  +1 -1      kleopatra/utils/multivalidator.cpp  
 M  +1 -1      kleopatra/utils/path-helper.cpp  
 D             kleopatra/utils/stl_util.h  
 M  +2 -1      kleopatra/view/keylistcontroller.cpp  
 M  +1 -1      kleopatra/view/keytreeview.cpp  
 M  +1 -1      kleopatra/view/tabwidget.cpp  
 M  +1 -2      libkleo/kleo/keyfiltermanager.cpp  
 A             libkleo/kleo/stl_util.h   kleopatra/utils/stl_util.h#1202052 [License: GPL (v2)]


--- trunk/KDE/kdepim/kleopatra/commands/checksumcreatefilescommand.cpp #1202088:1202089
@@ -38,9 +38,10 @@
 
 #include <crypto/createchecksumscontroller.h>
 
-#include <utils/stl_util.h>
 #include <utils/filedialog.h>
 
+#include <kleo/stl_util.h>
+
 #include <KLocale>
 #include <KMessageBox>
 #include <kdebug.h>
--- trunk/KDE/kdepim/kleopatra/commands/checksumverifyfilescommand.cpp #1202088:1202089
@@ -38,9 +38,10 @@
 
 #include <crypto/verifychecksumscontroller.h>
 
-#include <utils/stl_util.h>
 #include <utils/filedialog.h>
 
+#include <kleo/stl_util.h>
+
 #include <KLocale>
 #include <KMessageBox>
 #include <kdebug.h>
--- trunk/KDE/kdepim/kleopatra/commands/decryptverifyclipboardcommand.cpp #1202088:1202089
@@ -45,8 +45,9 @@
 
 #include <utils/classify.h>
 #include <utils/types.h>
-#include <utils/stl_util.h>
 
+#include <kleo/stl_util.h>
+
 #include <KLocale>
 #include <KMessageBox>
 #include <kdebug.h>
--- trunk/KDE/kdepim/kleopatra/commands/decryptverifyfilescommand.cpp #1202088:1202089
@@ -38,9 +38,10 @@
 
 #include <crypto/decryptverifyfilescontroller.h>
 
-#include <utils/stl_util.h>
 #include <utils/filedialog.h>
 
+#include <kleo/stl_util.h>
+
 #include <KLocale>
 #include <KMessageBox>
 #include <kdebug.h>
--- trunk/KDE/kdepim/kleopatra/commands/deletecertificatescommand.cpp #1202088:1202089
@@ -41,8 +41,7 @@
 #include <models/keycache.h>
 #include <models/predicates.h>
 
-#include <utils/stl_util.h>
-
+#include <kleo/stl_util.h>
 #include <kleo/cryptobackend.h>
 #include <kleo/cryptobackendfactory.h>
 #include <kleo/multideletejob.h>
--- trunk/KDE/kdepim/kleopatra/commands/encryptclipboardcommand.cpp #1202088:1202089
@@ -42,8 +42,9 @@
 
 #include <utils/input.h>
 #include <utils/output.h>
-#include <utils/stl_util.h>
 
+#include <kleo/stl_util.h>
+
 #include <KLocale>
 #include <KMessageBox>
 #include <kdebug.h>
--- trunk/KDE/kdepim/kleopatra/commands/importcertificatescommand.cpp #1202088:1202089
@@ -39,8 +39,8 @@
 #include <models/predicates.h>
 
 #include <utils/formatting.h>
-#include <utils/stl_util.h>
 
+#include <kleo/stl_util.h>
 #include <kleo/cryptobackendfactory.h>
 #include <kleo/importjob.h>
 #include <kleo/importfromkeyserverjob.h>
--- trunk/KDE/kdepim/kleopatra/commands/lookupcertificatescommand.cpp #1202088:1202089
@@ -40,9 +40,9 @@
 
 #include <dialogs/lookupcertificatesdialog.h>
 
-#include <utils/stl_util.h>
 #include <utils/formatting.h>
 
+#include <kleo/stl_util.h>
 #include <kleo/importfromkeyserverjob.h>
 #include <kleo/keylistjob.h>
 #include <kleo/cryptobackendfactory.h>
--- trunk/KDE/kdepim/kleopatra/commands/selftestcommand.cpp #1202088:1202089
@@ -49,7 +49,7 @@
 #include <selftest/gpgagentcheck.h>
 #include <selftest/libkleopatrarccheck.h>
 
-#include <utils/stl_util.h>
+#include <kleo/stl_util.h>
 
 #include <KLocale>
 #include <KGlobal>
--- trunk/KDE/kdepim/kleopatra/commands/signclipboardcommand.cpp #1202088:1202089
@@ -42,8 +42,9 @@
 
 #include <utils/input.h>
 #include <utils/output.h>
-#include <utils/stl_util.h>
 
+#include <kleo/stl_util.h>
+
 #include <KLocale>
 #include <KMessageBox>
 #include <kdebug.h>
--- trunk/KDE/kdepim/kleopatra/commands/signencryptfilescommand.cpp #1202088:1202089
@@ -38,9 +38,10 @@
 
 #include <crypto/signencryptfilescontroller.h>
 
-#include <utils/stl_util.h>
 #include <utils/filedialog.h>
 
+#include <kleo/stl_util.h>
+
 #include <KLocale>
 #include <KMessageBox>
 #include <kdebug.h>
--- trunk/KDE/kdepim/kleopatra/crypto/createchecksumscontroller.cpp #1202088:1202089
@@ -37,9 +37,9 @@
 #include <utils/input.h>
 #include <utils/output.h>
 #include <utils/classify.h>
-#include <utils/stl_util.h>
 #include <utils/kleo_assert.h>
 
+#include <kleo/stl_util.h>
 #include <kleo/checksumdefinition.h>
 
 #include <KLocale>
--- trunk/KDE/kdepim/kleopatra/crypto/decryptverifytask.cpp #1202088:1202089
@@ -42,6 +42,7 @@
 #include <kleo/decryptverifyjob.h>
 #include <kleo/dn.h>
 #include <kleo/exception.h>
+#include <kleo/stl_util.h>
 
 #include <models/keycache.h>
 #include <models/predicates.h>
@@ -51,7 +52,6 @@
 #include <utils/output.h>
 #include <utils/classify.h>
 #include <utils/formatting.h>
-#include <utils/stl_util.h>
 #include <utils/kleo_assert.h>
 #include <utils/auditlog.h>
 
--- trunk/KDE/kdepim/kleopatra/crypto/encryptemailcontroller.cpp #1202088:1202089
@@ -42,9 +42,9 @@
 
 #include <utils/input.h>
 #include <utils/output.h>
-#include <utils/stl_util.h>
 #include <utils/kleo_assert.h>
 
+#include <kleo/stl_util.h>
 #include <kleo/exception.h>
 
 #include "emailoperationspreferences.h"
--- trunk/KDE/kdepim/kleopatra/crypto/encryptemailtask.cpp #1202088:1202089
@@ -36,10 +36,10 @@
 
 #include <utils/input.h>
 #include <utils/output.h>
-#include <utils/stl_util.h>
 #include <utils/kleo_assert.h>
 #include <utils/auditlog.h>
 
+#include <kleo/stl_util.h>
 #include <kleo/cryptobackendfactory.h>
 #include <kleo/cryptobackend.h>
 #include <kleo/encryptjob.h>
--- trunk/KDE/kdepim/kleopatra/crypto/gui/decryptverifyfileswizard.cpp #1202088:1202089
@@ -44,8 +44,8 @@
 
 #include <utils/scrollarea.h>
 #include <utils/kleo_assert.h>
-#include <utils/stl_util.h>
 
+#include <kleo/stl_util.h>
 #include "libkleo/ui/filenamerequester.h"
 
 #include <KLocale>
--- trunk/KDE/kdepim/kleopatra/crypto/gui/newresultpage.cpp #1202088:1202089
@@ -39,7 +39,8 @@
 
 #include <crypto/taskcollection.h>
 
-#include <utils/stl_util.h>
+#include <kleo/stl_util.h>
+
 #include <boost/mem_fn.hpp>
 
 #include <KLocalizedString>
--- trunk/KDE/kdepim/kleopatra/crypto/gui/newsignencryptfileswizard.cpp #1202088:1202089
@@ -49,8 +49,8 @@
 #include <utils/archivedefinition.h>
 #include <utils/path-helper.h>
 #include <utils/gui-helper.h>
-#include <utils/stl_util.h>
 
+#include <kleo/stl_util.h>
 #include <ui/filenamerequester.h>
 
 #include <KLocale>
--- trunk/KDE/kdepim/kleopatra/crypto/gui/resultlistwidget.cpp #1202088:1202089
@@ -40,8 +40,9 @@
 #include <crypto/taskcollection.h>
 
 #include <utils/scrollarea.h>
-#include <utils/stl_util.h>
 
+#include <kleo/stl_util.h>
+
 #include <KLocalizedString>
 #include <KPushButton>
 #include <KStandardGuiItem>
--- trunk/KDE/kdepim/kleopatra/crypto/gui/signencryptemailconflictdialog.cpp #1202088:1202089
@@ -42,11 +42,12 @@
 #include <models/predicates.h>
 
 #include <utils/gui-helper.h>
-#include <utils/stl_util.h>
 #include <utils/formatting.h>
 #include <utils/kleo_assert.h>
 #include <utils/kdsignalblocker.h>
 
+#include <kleo/stl_util.h>
+
 #include <gpgme++/key.h>
 
 #include <kmime/kmime_header_parsing.h>
--- trunk/KDE/kdepim/kleopatra/crypto/gui/signencryptwizard.cpp #1202088:1202089
@@ -43,9 +43,10 @@
 #include <crypto/taskcollection.h>
 #include <crypto/certificateresolver.h>
 
-#include <utils/stl_util.h>
 #include <utils/kleo_assert.h>
 
+#include <kleo/stl_util.h>
+
 #include <gpgme++/key.h>
 
 #include <KConfig>
--- trunk/KDE/kdepim/kleopatra/crypto/gui/signingcertificateselectionwidget.cpp #1202088:1202089
@@ -39,8 +39,9 @@
 #include <models/keycache.h>
 
 #include <utils/formatting.h>
-#include <utils/stl_util.h>
 
+#include <kleo/stl_util.h>
+
 #include <KLocalizedString>
 #include <QByteArray>
 #include <QMap>
--- trunk/KDE/kdepim/kleopatra/crypto/newsignencryptemailcontroller.cpp #1202088:1202089
@@ -47,9 +47,9 @@
 
 #include <utils/input.h>
 #include <utils/output.h>
-#include <utils/stl_util.h>
 #include <utils/kleo_assert.h>
 
+#include <kleo/stl_util.h>
 #include <kleo/exception.h>
 
 #include <gpgme++/key.h>
--- trunk/KDE/kdepim/kleopatra/crypto/signemailcontroller.cpp #1202088:1202089
@@ -42,11 +42,12 @@
 
 #include <utils/input.h>
 #include <utils/output.h>
-#include <utils/stl_util.h>
 #include <utils/kleo_assert.h>
 
 #include "emailoperationspreferences.h"
 
+#include <kleo/stl_util.h>
+
 #include <kmime/kmime_header_parsing.h>
 
 #include <KLocale>
--- trunk/KDE/kdepim/kleopatra/crypto/signemailtask.cpp #1202088:1202089
@@ -36,10 +36,10 @@
 
 #include <utils/input.h>
 #include <utils/output.h>
-#include <utils/stl_util.h>
 #include <utils/kleo_assert.h>
 #include <utils/auditlog.h>
 
+#include <kleo/stl_util.h>
 #include <kleo/cryptobackendfactory.h>
 #include <kleo/cryptobackend.h>
 #include <kleo/signjob.h>
--- trunk/KDE/kdepim/kleopatra/crypto/signencryptfilescontroller.cpp #1202088:1202089
@@ -43,10 +43,10 @@
 #include <utils/input.h>
 #include <utils/output.h>
 #include <utils/classify.h>
-#include <utils/stl_util.h>
 #include <utils/kleo_assert.h>
 #include <utils/archivedefinition.h>
 
+#include <kleo/stl_util.h>
 #include <kleo/exception.h>
 
 #include <kmime/kmime_header_parsing.h>
--- trunk/KDE/kdepim/kleopatra/crypto/signencryptfilestask.cpp #1202088:1202089
@@ -37,11 +37,11 @@
 #include <utils/formatting.h>
 #include <utils/input.h>
 #include <utils/output.h>
-#include <utils/stl_util.h>
 #include <utils/path-helper.h>
 #include <utils/kleo_assert.h>
 #include <utils/auditlog.h>
 
+#include <kleo/stl_util.h>
 #include <kleo/exception.h>
 #include <kleo/cryptobackendfactory.h>
 #include <kleo/cryptobackend.h>
--- trunk/KDE/kdepim/kleopatra/crypto/verifychecksumscontroller.cpp #1202088:1202089
@@ -41,9 +41,9 @@
 #include <utils/input.h>
 #include <utils/output.h>
 #include <utils/classify.h>
-#include <utils/stl_util.h>
 #include <utils/kleo_assert.h>
 
+#include <kleo/stl_util.h>
 #include <kleo/checksumdefinition.h>
 
 #include <KLocale>
--- trunk/KDE/kdepim/kleopatra/dialogs/adduseriddialog.cpp #1202088:1202089
@@ -37,8 +37,9 @@
 #include "ui_adduseriddialog.h"
 
 #include <utils/validation.h>
-#include <utils/stl_util.h>
 
+#include <kleo/stl_util.h>
+
 #include <QString>
 #include <QStringList>
 #include <QPushButton>
--- trunk/KDE/kdepim/kleopatra/dialogs/certifycertificatedialog.cpp #1202088:1202089
@@ -37,9 +37,10 @@
 #include "certifycertificatedialog_p.h"
 
 #include <utils/formatting.h>
-#include <utils/stl_util.h>
 #include <utils/kleo_assert.h>
 
+#include <kleo/stl_util.h>
+
 #include <KDebug>
 #include <KLocalizedString>
 
--- trunk/KDE/kdepim/kleopatra/dialogs/deletecertificatesdialog.cpp #1202088:1202089
@@ -37,7 +37,7 @@
 #include <view/keytreeview.h>
 #include <models/keylistmodel.h>
 
-#include <utils/stl_util.h>
+#include <kleo/stl_util.h>
 
 #include <KLocale>
 #include <KMessageBox>
--- trunk/KDE/kdepim/kleopatra/dialogs/lookupcertificatesdialog.cpp #1202088:1202089
@@ -40,8 +40,9 @@
 #include <models/keylistsortfilterproxymodel.h>
 
 #include <utils/headerview.h>
-#include <utils/stl_util.h>
 
+#include <kleo/stl_util.h>
+
 #include <gpgme++/key.h>
 
 #include <KLineEdit>
--- trunk/KDE/kdepim/kleopatra/mainwindow_desktop.cpp #1202088:1202089
@@ -50,7 +50,6 @@
 
 #include "utils/detail_p.h"
 #include "utils/gnupg-helper.h"
-#include "utils/stl_util.h"
 #include "utils/action_data.h"
 #include "utils/classify.h"
 #include "utils/filedialog.h"
@@ -89,6 +88,7 @@
 #include <kleo/cryptobackendfactory.h>
 #include <ui/cryptoconfigdialog.h>
 #include <kleo/cryptoconfig.h>
+#include <kleo/stl_util.h>
 
 #include <boost/bind.hpp>
 #include <boost/shared_ptr.hpp>
--- trunk/KDE/kdepim/kleopatra/mainwindow_mobile.cpp #1202088:1202089
@@ -54,7 +54,6 @@
 
 #include "utils/detail_p.h"
 #include "utils/gnupg-helper.h"
-#include "utils/stl_util.h"
 #include "utils/action_data.h"
 #include "utils/classify.h"
 #include "utils/filedialog.h"
@@ -100,6 +99,7 @@
 #include <QVariant>
 #include <QHeaderView>
 
+#include <kleo/stl_util.h>
 #include <kleo/cryptobackendfactory.h>
 #include <ui/cryptoconfigdialog.h>
 #include <kleo/cryptoconfig.h>
--- trunk/KDE/kdepim/kleopatra/models/keycache.cpp #1202088:1202089
@@ -40,9 +40,9 @@
 #include "smimevalidationpreferences.h"
 
 #include <utils/filesystemwatcher.h>
-#include <utils/stl_util.h>
 #include <utils/progressmanager.h>
 
+#include <kleo/stl_util.h>
 #include <kleo/cryptobackendfactory.h>
 #include <kleo/dn.h>
 #include <kleo/keylistjob.h>
--- trunk/KDE/kdepim/kleopatra/models/keylistsortfilterproxymodel.cpp #1202088:1202089
@@ -40,7 +40,8 @@
 
 #include <gpgme++/key.h>
 
-#include <utils/stl_util.h>
+#include <kleo/stl_util.h>
+
 #include <boost/bind.hpp>
 
 #include <cassert>
--- trunk/KDE/kdepim/kleopatra/models/predicates.h #1202088:1202089
@@ -33,7 +33,7 @@
 #ifndef __KLEOPATRA_MODELS_PREDICATES_H__
 #define __KLEOPATRA_MODELS_PREDICATES_H__
 
-#include <utils/stl_util.h>
+#include <kleo/stl_util.h>
 
 #include <QByteArray>
 #include <string>
--- trunk/KDE/kdepim/kleopatra/newcertificatewizard/newcertificatewizard.cpp #1202088:1202089
@@ -50,9 +50,9 @@
 
 #include <utils/formatting.h>
 #include <utils/validation.h>
-#include <utils/stl_util.h>
 #include <utils/filedialog.h>
 
+#include <kleo/stl_util.h>
 #include <kleo/dn.h>
 #include <kleo/oidmap.h>
 #include <kleo/keygenerationjob.h>
--- trunk/KDE/kdepim/kleopatra/smartcard/readerstatus.cpp #1202088:1202089
@@ -35,10 +35,11 @@
 #include "readerstatus.h"
 
 #include <utils/gnupg-helper.h>
-#include <utils/stl_util.h>
 #include <utils/kdsignalblocker.h>
 #include <utils/filesystemwatcher.h>
 
+#include <kleo/stl_util.h>
+
 #include <gpgme++/context.h>
 #include <gpgme++/assuanresult.h>
 #include <gpgme++/defaultassuantransaction.h>
--- trunk/KDE/kdepim/kleopatra/uiserver/assuanserverconnection.cpp #1202088:1202089
@@ -53,8 +53,8 @@
 #include <utils/log.h>
 #include <utils/kleo_assert.h>
 #include <utils/getpid.h>
-#include <utils/stl_util.h>
 
+#include <kleo/stl_util.h>
 #include <kleo/exception.h>
 
 #include <gpgme++/data.h>
--- trunk/KDE/kdepim/kleopatra/uiserver/decryptverifycommandfilesbase.cpp #1202088:1202089
@@ -45,8 +45,8 @@
 #include <utils/input.h>
 #include <utils/output.h>
 #include <utils/kleo_assert.h>
-#include <utils/stl_util.h>
 
+#include <kleo/stl_util.h>
 #include <kleo/exception.h>
 
 #include <gpgme++/error.h>
--- trunk/KDE/kdepim/kleopatra/uiserver/selectcertificatecommand.cpp #1202088:1202089
@@ -38,9 +38,9 @@
 
 #include <models/keycache.h>
 
-#include <utils/stl_util.h>
 #include <boost/mem_fn.hpp>
 
+#include <kleo/stl_util.h>
 #include <kleo/exception.h>
 
 #include <gpgme++/key.h>
--- trunk/KDE/kdepim/kleopatra/uiserver/uiserver.cpp #1202088:1202089
@@ -39,8 +39,8 @@
 
 #include <utils/detail_p.h>
 #include <utils/gnupg-helper.h>
-#include <utils/stl_util.h>
 
+#include <kleo/stl_util.h>
 #include <kleo/exception.h>
 
 #include <KLocalizedString>
--- trunk/KDE/kdepim/kleopatra/utils/filesystemwatcher.cpp #1202088:1202089
@@ -42,7 +42,7 @@
 #include <QTimer>
 #include <QDir>
 
-#include "stl_util.h"
+#include <kleo/stl_util.h>
 
 #include <boost/bind.hpp>
 
--- trunk/KDE/kdepim/kleopatra/utils/multivalidator.cpp #1202088:1202089
@@ -34,7 +34,7 @@
 
 #include "multivalidator.h"
 
-#include "stl_util.h"
+#include <kleo/stl_util.h>
 
 #include <boost/lambda/lambda.hpp>
 #include <boost/lambda/bind.hpp>
--- trunk/KDE/kdepim/kleopatra/utils/path-helper.cpp #1202088:1202089
@@ -34,7 +34,7 @@
 
 #include "path-helper.h"
 
-#include <utils/stl_util.h>
+#include <kleo/stl_util.h>
 
 #include <kleo/exception.h>
 
--- trunk/KDE/kdepim/kleopatra/view/keylistcontroller.cpp #1202088:1202089
@@ -43,7 +43,6 @@
 #include <smartcard/readerstatus.h>
 
 #include <utils/formatting.h>
-#include <utils/stl_util.h>
 #include <utils/action_data.h>
 
 #include "tooltippreferences.h"
@@ -74,6 +73,8 @@
 #include "commands/checksumverifyfilescommand.h"
 #include "commands/checksumcreatefilescommand.h"
 
+#include <kleo/stl_util.h>
+
 #include <gpgme++/key.h>
 
 #include <KActionCollection>
--- trunk/KDE/kdepim/kleopatra/view/keytreeview.cpp #1202088:1202089
@@ -39,8 +39,8 @@
 #include <models/predicates.h>
 
 #include <utils/headerview.h>
-#include <utils/stl_util.h>
 
+#include <kleo/stl_util.h>
 #include <kleo/keyfilter.h>
 
 #include <QTreeView>
--- trunk/KDE/kdepim/kleopatra/view/tabwidget.cpp #1202088:1202089
@@ -39,8 +39,8 @@
 #include <models/keylistsortfilterproxymodel.h>
 
 #include <utils/action_data.h>
-#include <utils/stl_util.h>
 
+#include <kleo/stl_util.h>
 #include <kleo/keyfilter.h>
 #include <kleo/keyfiltermanager.h>
 
--- trunk/KDE/kdepim/libkleo/kleo/keyfiltermanager.cpp #1202088:1202089
@@ -34,6 +34,7 @@
 #include "kconfigbasedkeyfilter.h"
 
 #include "cryptobackendfactory.h"
+#include "stl_util.h"
 
 #include <kconfig.h>
 #include <kconfiggroup.h>
@@ -54,8 +55,6 @@
 #include <vector>
 #include <climits>
 
-#include <kleopatra/utils/stl_util.h>
-
 using namespace Kleo;
 using namespace boost;
 using namespace GpgME;