From 53a299c513c447afc57c7f520ac35aea2dffc277 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 25 Feb 2022 07:29:19 +0100 Subject: [PATCH] Make build without texttospeech support --- src/commandoptions.cpp | 7 +++++++ src/messagedisplayhelper.cpp | 5 +++++ src/prefdlg.cpp | 5 +++++ src/soundpicker.cpp | 5 +++++ 4 files changed, 22 insertions(+) diff --git a/src/commandoptions.cpp b/src/commandoptions.cpp index a564fbb3..a6bbded1 100644 --- a/src/commandoptions.cpp +++ b/src/commandoptions.cpp @@ -14,7 +14,10 @@ #include "kalarm_debug.h" #include +#include +#if KPIMTEXTEDIT_TEXT_TO_SPEECH #include +#endif #include #include @@ -570,7 +573,11 @@ void CommandOptions::process() { if (mParser->isSet(*mOptions.at(BEEP))) setErrorIncompatible(BEEP, SPEAK); +#if KPIMTEXTEDIT_TEXT_TO_SPEECH else if (!KPIMTextEdit::TextToSpeech::self()->isReady()) +#else + else +#endif setError(xi18nc("@info:shell", "%1 requires KAlarm to be compiled with QTextToSpeech support", optionName(SPEAK))); } const bool onceOnly = mParser->isSet(*mOptions.at(REMINDER_ONCE)); diff --git a/src/messagedisplayhelper.cpp b/src/messagedisplayhelper.cpp index 0f6b9680..6e80e8ca 100644 --- a/src/messagedisplayhelper.cpp +++ b/src/messagedisplayhelper.cpp @@ -21,7 +21,10 @@ #include "lib/synchtimer.h" #include "kalarm_debug.h" +#include +#if KPIMTEXTEDIT_TEXT_TO_SPEECH #include +#endif #include #include @@ -831,6 +834,7 @@ void MessageDisplayHelper::playAudio() */ void MessageDisplayHelper::slotSpeak() { +#if KPIMTEXTEDIT_TEXT_TO_SPEECH KPIMTextEdit::TextToSpeech* tts = KPIMTextEdit::TextToSpeech::self(); if (!tts->isReady()) { @@ -840,6 +844,7 @@ void MessageDisplayHelper::slotSpeak() } tts->say(mMessage); +#endif } /****************************************************************************** diff --git a/src/prefdlg.cpp b/src/prefdlg.cpp index ea32116e..d3cf48ae 100644 --- a/src/prefdlg.cpp +++ b/src/prefdlg.cpp @@ -48,7 +48,10 @@ #include using namespace KHolidays; +#include +#if KPIMTEXTEDIT_TEXT_TO_SPEECH #include +#endif #include #include @@ -1355,8 +1358,10 @@ EditPrefTab::EditPrefTab(StackedScrollGroup* scrollGroup) mSound->addItem(SoundPicker::i18n_combo_None()); // index 0 mSound->addItem(SoundPicker::i18n_combo_Beep()); // index 1 mSound->addItem(SoundPicker::i18n_combo_File()); // index 2 +#if KPIMTEXTEDIT_TEXT_TO_SPEECH if (KPIMTextEdit::TextToSpeech::self()->isReady()) mSound->addItem(SoundPicker::i18n_combo_Speak()); // index 3 +#endif mSound->setMinimumSize(mSound->sizeHint()); mSound->setWhatsThis(defsetting.subs(SoundPicker::i18n_label_Sound()).toString()); hlayout->addWidget(mSound); diff --git a/src/soundpicker.cpp b/src/soundpicker.cpp index 426baf96..f85071ea 100644 --- a/src/soundpicker.cpp +++ b/src/soundpicker.cpp @@ -16,7 +16,10 @@ #include "lib/pushbutton.h" #include "kalarm_debug.h" +#include +#if KPIMTEXTEDIT_TEXT_TO_SPEECH #include +#endif #include #include @@ -130,7 +133,9 @@ void SoundPicker::showFile(bool show) */ void SoundPicker::showSpeak(bool show) { +#if KPIMTEXTEDIT_TEXT_TO_SPEECH if (!KPIMTextEdit::TextToSpeech::self()->isReady()) +#endif show = false; // speech capability is not installed or configured if (show != mSpeakShowing) { -- GitLab