Commit 27bfea40 authored by Daniel Vrátil's avatar Daniel Vrátil 🤖
Browse files

Adapt to libkleo's new kleoexception.h include file

In order to avoid clash with the standard <exception> header
on case-insensitive systems, libkleo's Exception header has been
renamed to KleoException.
parent d32c5ce4
Pipeline #39734 canceled with stage
......@@ -15,7 +15,7 @@ option(DISABLE_KWATCHGNUPG "Don't build the kwatchgnupg tool [default=OFF]" OFF)
# Standalone build. Find / include everything necessary.
set(KF5_MIN_VERSION "5.75.0")
set(KMIME_VERSION "5.15.40")
set(LIBKLEO_VERSION "5.15.81")
set(LIBKLEO_VERSION "5.15.82")
set(QT_REQUIRED_VERSION "5.13.0")
set(GPGME_REQUIRED_VERSION "1.11.1")
......
......@@ -18,7 +18,7 @@
#include <QGpgME/DecryptVerifyJob>
#include <Libkleo/Dn>
#include <Libkleo/Exception>
#include <Libkleo/KleoException>
#include <Libkleo/Stl_Util>
#include <Libkleo/KeyCache>
#include <Libkleo/Predicates>
......
......@@ -21,7 +21,7 @@
#include <utils/kleo_assert.h>
#include <Libkleo/Stl_Util>
#include <Libkleo/Exception>
#include <Libkleo/KleoException>
#include "emailoperationspreferences.h"
......
......@@ -27,7 +27,7 @@
#include "utils/kleo_assert.h"
#include <Libkleo/Stl_Util>
#include <Libkleo/Exception>
#include <Libkleo/KleoException>
#include <gpgme++/key.h>
......
......@@ -28,7 +28,7 @@
#include "utils/archivedefinition.h"
#include "utils/path-helper.h"
#include <Libkleo/Exception>
#include <Libkleo/KleoException>
#include <Libkleo/Classify>
......
......@@ -19,7 +19,7 @@
#include <Libkleo/Formatting>
#include <Libkleo/Stl_Util>
#include <Libkleo/Exception>
#include <Libkleo/KleoException>
#include <QGpgME/Protocol>
#include <QGpgME/SignJob>
......
......@@ -12,7 +12,7 @@
#include "task_p.h"
#include "kleopatra_debug.h"
#include <Libkleo/Exception>
#include <Libkleo/KleoException>
#include <Libkleo/GnuPG>
#include <utils/auditlog.h>
......
......@@ -29,7 +29,7 @@
#include <utils/kleo_assert.h>
#include <Libkleo/Stl_Util>
#include <Libkleo/Exception>
#include <Libkleo/KleoException>
#include <Libkleo/KeyCache>
#include <gpgme++/data.h>
......
......@@ -13,7 +13,7 @@
#include <crypto/createchecksumscontroller.h>
#include <Libkleo/Exception>
#include <Libkleo/KleoException>
#include <KLocalizedString>
......
......@@ -19,7 +19,7 @@
#include <utils/output.h>
#include <utils/kleo_assert.h>
#include <Libkleo/Exception>
#include <Libkleo/KleoException>
#include <Libkleo/KeyCache>
#include <Libkleo/Formatting>
......
......@@ -23,7 +23,7 @@
#include <utils/kleo_assert.h>
#include <Libkleo/Stl_Util>
#include <Libkleo/Exception>
#include <Libkleo/KleoException>
#include <Libkleo/KeyCache>
#include <Libkleo/Formatting>
......
......@@ -14,7 +14,7 @@
#include <utils/input.h>
#include <utils/output.h>
#include <Libkleo/Exception>
#include <Libkleo/KleoException>
#include <gpg-error.h>
......
......@@ -17,7 +17,7 @@
#include <utils/input.h>
#include <utils/output.h>
#include <Libkleo/Exception>
#include <Libkleo/KleoException>
#include <KLocalizedString>
......
......@@ -13,7 +13,7 @@
#include <commands/importcertificatefromfilecommand.h>
#include <Libkleo/Exception>
#include <Libkleo/KleoException>
#include <gpgme++/key.h>
......
......@@ -13,7 +13,7 @@
#include <crypto/newsignencryptemailcontroller.h>
#include <Libkleo/Exception>
#include <Libkleo/KleoException>
#include <KLocalizedString>
......
......@@ -15,7 +15,7 @@
#include <utils/kleo_assert.h>
#include <Libkleo/Exception>
#include <Libkleo/KleoException>
#include <KLocalizedString>
......
......@@ -14,7 +14,7 @@
#include <dialogs/certificateselectiondialog.h>
#include <Libkleo/Stl_Util>
#include <Libkleo/Exception>
#include <Libkleo/KleoException>
#include <Libkleo/KeyCache>
#include <gpgme++/key.h>
......
......@@ -17,7 +17,7 @@
#include <utils/input.h>
#include <utils/output.h>
#include <Libkleo/Exception>
#include <Libkleo/KleoException>
#include <KLocalizedString>
......
......@@ -13,7 +13,7 @@
#include <crypto/signencryptfilescontroller.h>
#include <Libkleo/Exception>
#include <Libkleo/KleoException>
#include <KLocalizedString>
......
......@@ -18,7 +18,7 @@
#include <Libkleo/GnuPG>
#include <Libkleo/Stl_Util>
#include <Libkleo/Exception>
#include <Libkleo/KleoException>
#include "kleopatra_debug.h"
#include <KLocalizedString>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment