Commit 3a84dc89 authored by Daniel Vrátil's avatar Daniel Vrátil 🤖
Browse files

Rename exception.h to kleoexception.h

On case-insensitive systems (Windows), the generated fancy
include Exception gets confused for the standard <exception>
include file, which then breaks builds in most curious
ways.

To avoid that, we rename exception.h to kleoexception.h, so the
fancy header is KleoException and thus the ambiguity is resolved.

As far as I checked the header is only included from Kleopatra,
which I will fix too.
parent d3ea942a
Pipeline #39729 canceled with stage
cmake_minimum_required(VERSION 3.5)
set(PIM_VERSION "5.15.81")
set(PIM_VERSION "5.15.82")
project(libkleo VERSION ${PIM_VERSION})
......
......@@ -23,10 +23,10 @@ set(libkleo_core_SRCS
kleo/defaultkeygenerationjob.cpp
kleo/dn.cpp
kleo/enum.cpp
kleo/exception.cpp
kleo/kconfigbasedkeyfilter.cpp
kleo/keyfiltermanager.cpp
kleo/keyresolver.cpp
kleo/kleoexception.cpp
models/keycache.cpp
models/keylistmodel.cpp
models/keylistsortfilterproxymodel.cpp
......@@ -128,11 +128,11 @@ ecm_generate_headers(libkleo_CamelCase_HEADERS
DefaultKeyGenerationJob
Dn
Enum
Exception
KConfigBasedKeyFilter
KeyFilter
KeyFilterManager
KeyResolver
KleoException
OidMap
Predicates
Stl_Util
......
......@@ -9,7 +9,7 @@
#include "checksumdefinition.h"
#include "exception.h"
#include "kleoexception.h"
#include "libkleo_debug.h"
......
......@@ -7,6 +7,6 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "exception.h"
#include "kleoexception.h"
Kleo::Exception::~Exception() throw() {}
......@@ -9,7 +9,7 @@
#include "hex.h"
#include <Libkleo/Exception>
#include "kleo/kleoexception.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