diff options
| author | Linus Jahn <lnj@kaidan.im> | 2022-04-04 12:00:16 +0200 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2022-04-05 11:24:50 +0200 |
| commit | a060a70cf6a815b18dc42ed76a3a577cc3ec14e2 (patch) | |
| tree | b16ace641360c57c2ce56baecffe9e7406587150 /src | |
| parent | 93f9c8cf35d112b8e00da42ab73aa68c448e1011 (diff) | |
| download | qxmpp-a060a70cf6a815b18dc42ed76a3a577cc3ec14e2.tar.gz | |
Rename QXmppGlobal to QXmppBuildConstants
Plan is to split up Global into build constants and other globals. This
avoids hassle when editing QXmppGlobal. With IDEs it can easily happen
that you edit the wrong file from the build dir instead the `.h.in`.
Co-authored-by: Melvin Keskin <melvo@olomono.de>
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/base/QXmppBuildConstants.h.in (renamed from src/base/QXmppGlobal.h.in) | 6 | ||||
| -rw-r--r-- | src/base/QXmppGlobal.h | 12 |
3 files changed, 18 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cb9a04f1..ec5686ff 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,11 +16,11 @@ if(BUILD_SHARED) else() set(QXMPP_BUILD_SHARED false) endif() -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/base/QXmppGlobal.h.in ${CMAKE_CURRENT_BINARY_DIR}/base/QXmppGlobal.h @ONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/base/QXmppBuildConstants.h.in ${CMAKE_CURRENT_BINARY_DIR}/base/QXmppBuildConstants.h @ONLY) include_directories(${CMAKE_CURRENT_BINARY_DIR}/base) set(INSTALL_HEADER_FILES - ${CMAKE_CURRENT_BINARY_DIR}/base/QXmppGlobal.h + ${CMAKE_CURRENT_BINARY_DIR}/base/QXmppBuildConstants.h # Base base/QXmppArchiveIq.h @@ -38,6 +38,7 @@ set(INSTALL_HEADER_FILES base/QXmppEntityTimeIq.h base/QXmppFutureUtils_p.h base/QXmppGeolocItem.h + base/QXmppGlobal.h base/QXmppHttpUploadIq.h base/QXmppIbbIq.h base/QXmppIq.h diff --git a/src/base/QXmppGlobal.h.in b/src/base/QXmppBuildConstants.h.in index 61b2e965..5e9d7f96 100644 --- a/src/base/QXmppGlobal.h.in +++ b/src/base/QXmppBuildConstants.h.in @@ -4,8 +4,8 @@ // // SPDX-License-Identifier: LGPL-2.1-or-later -#ifndef QXMPPGLOBAL_H -#define QXMPPGLOBAL_H +#ifndef QXMPPBUILDCONSTANTS_H +#define QXMPPBUILDCONSTANTS_H #include <QString> @@ -106,4 +106,4 @@ struct Success } -#endif // QXMPPGLOBAL_H +#endif // QXMPPBUILDCONSTANTS_H diff --git a/src/base/QXmppGlobal.h b/src/base/QXmppGlobal.h new file mode 100644 index 00000000..d71037bd --- /dev/null +++ b/src/base/QXmppGlobal.h @@ -0,0 +1,12 @@ +// SPDX-FileCopyrightText: 2010 Manjeet Dahiya <manjeetdahiya@gmail.com> +// SPDX-FileCopyrightText: 2017 Niels Ole Salscheider <niels_ole@salscheider-online.de> +// SPDX-FileCopyrightText: 2019 Linus Jahn <lnj@kaidan.im> +// +// SPDX-License-Identifier: LGPL-2.1-or-later + +#ifndef QXMPPGLOBAL_H +#define QXMPPGLOBAL_H + +#include "QXmppBuildConstants.h" + +#endif // QXMPPGLOBAL_H |