[pim/libksieve] /: Remove conditional compiles for KDEPIM_ENTERPRISE_BUILD
Allen Winter <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit d6a1466f1c438614b96e77c87ae00b8413580baa by Allen Winter.
Committed on 28/07/2026 at 13:02.
Pushed by winterz into branch 'master'.
Remove conditional compiles for KDEPIM_ENTERPRISE_BUILD
Eliminates enterprise feature:
- use the graphical sieve editor by default
M +0 -5 CMakeLists.txt
M +0 -9 src/ksieveui/CMakeLists.txt
M +0 -1 src/ksieveui/editor/sieveeditor.cpp
M +1 -6 src/ksieveui/editor/sieveeditorwidget.cpp
D +0 -17 src/ksieveui/settings/sieve-editor.kcfg.in
D +0 -11 src/ksieveui/settings/sieve-editor.kcfgc
https://invent.kde.org/pim/libksieve/-/commit/d6a1466f1c438614b96e77c87ae00b8413580baa
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 863cf55f..ca3dc8f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,11 +118,6 @@ if(USE_UNITY_CMAKE_SUPPORT)
set(COMPILE_WITH_UNITY_CMAKE_SUPPORT ON)
endif()
add_definitions(-DQT_NO_CONTEXTLESS_CONNECT)
-option(
- KDEPIM_ENTERPRISE_BUILD
- "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client."
- FALSE
-)
# Look for Sasl2 before anything else
find_package(Sasl2)
set_package_properties(
diff --git a/src/ksieveui/CMakeLists.txt b/src/ksieveui/CMakeLists.txt
index d7715365..d88c5658 100644
--- a/src/ksieveui/CMakeLists.txt
+++ b/src/ksieveui/CMakeLists.txt
@@ -9,13 +9,6 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX LIBKSIEVEUI
add_library(KPim6KSieveUi)
add_library(KPim6::KSieveUi ALIAS KPim6KSieveUi)
-if(KDEPIM_ENTERPRISE_BUILD)
- set(USE_GRAPHICAL_SIEVE_EDITOR true)
-else()
- set(USE_GRAPHICAL_SIEVE_EDITOR false)
-endif()
-
-configure_file(settings/sieve-editor.kcfg.in ${CMAKE_CURRENT_BINARY_DIR}/sieve-editor.kcfg)
configure_file(config-libksieveui.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-libksieveui.h)
@@ -351,8 +344,6 @@ ecm_qt_declare_logging_category(KPim6KSieveUi HEADER libksieveui_debug.h IDENTIF
EXPORT LIBKSIEVE
)
-kconfig_add_kcfg_files(KPim6KSieveUi settings/sieve-editor.kcfgc)
-
generate_export_header(KPim6KSieveUi BASE_NAME ksieveui)
if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(
diff --git a/src/ksieveui/editor/sieveeditor.cpp b/src/ksieveui/editor/sieveeditor.cpp
index 3109f33a..1b960e3f 100644
--- a/src/ksieveui/editor/sieveeditor.cpp
+++ b/src/ksieveui/editor/sieveeditor.cpp
@@ -6,7 +6,6 @@
#include "sieveeditor.h"
using namespace Qt::Literals::StringLiterals;
-#include "sieve-editor.h"
#include "sieveeditorwidget.h"
#include <KLocalizedString>
diff --git a/src/ksieveui/editor/sieveeditorwidget.cpp b/src/ksieveui/editor/sieveeditorwidget.cpp
index 88cfb92f..2273d190 100644
--- a/src/ksieveui/editor/sieveeditorwidget.cpp
+++ b/src/ksieveui/editor/sieveeditorwidget.cpp
@@ -13,7 +13,6 @@ using namespace Qt::Literals::StringLiterals;
#include "autocreatescripts/sieveeditorgraphicalmodewidget.h"
#include "editor/sieveinfodialog.h"
#include "scriptsparsing/parsingutil.h"
-#include "sieve-editor.h"
#include "sieveeditormenubar.h"
#include "sieveeditortextmodewidget.h"
@@ -146,11 +145,7 @@ SieveEditorWidget::SieveEditorWidget(bool useMenuBar, QWidget *parent)
connect(mTextModeWidget, &SieveEditorTextModeWidget::redoAvailable, this, &SieveEditorWidget::redoAvailable);
connect(mTextModeWidget, &SieveEditorTextModeWidget::copyAvailable, this, &SieveEditorWidget::copyAvailable);
connect(mTextModeWidget, &SieveEditorTextModeWidget::sieveEditorTabCurrentChanged, this, &SieveEditorWidget::sieveEditorTabCurrentChanged);
- if (KSieveUi::EditorSettings::useGraphicEditorByDefault()) {
- changeMode(GraphicMode);
- } else {
- changeSwitchButtonText();
- }
+ changeSwitchButtonText();
}
SieveEditorWidget::~SieveEditorWidget() = default;
diff --git a/src/ksieveui/settings/sieve-editor.kcfg.in b/src/ksieveui/settings/sieve-editor.kcfg.in
deleted file mode 100644
index 5834e014..00000000
--- a/src/ksieveui/settings/sieve-editor.kcfg.in
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- SPDX-FileCopyrightText: none
- SPDX-License-Identifier: BSD-3-Clause
--->
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
- http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-
- <group name="General">
- <entry name="UseGraphicEditorByDefault" type="Bool">
- <default>${USE_GRAPHICAL_SIEVE_EDITOR}</default>
- <label>Use graphical editor by default to edit sieve script.</label>
- </entry>
- </group>
-</kcfg>
diff --git a/src/ksieveui/settings/sieve-editor.kcfgc b/src/ksieveui/settings/sieve-editor.kcfgc
deleted file mode 100644
index 2dfacf5e..00000000
--- a/src/ksieveui/settings/sieve-editor.kcfgc
+++ /dev/null
@@ -1,11 +0,0 @@
-# SPDX-FileCopyrightText: none
-# SPDX-License-Identifier: BSD-3-Clause
-
-File=sieve-editor.kcfg
-NameSpace=KSieveUi
-ClassName=EditorSettings
-Mutators=true
-Singleton=true
-ItemAccessors=true
-SetUserTexts=true
-TranslationSystem=kde