From d9a4368be5b46944bc00e9357a171d6c77f6da32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Tue, 7 Apr 2020 18:46:03 +0200
Subject: Add a paired constant for WITHOUT_ARTS so that WITH_ARTS can be used
 in the code without double negation.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Signed-off-by: gregory guy <gregory-tde@laposte.net>
(cherry picked from commit c6b4624a36c2efe115d42a6c799471cb0761ed66)
---
 config.h.in         |  3 +++
 configure.in.in     |  3 +++
 src/notecontent.cpp | 21 ++++++++++-----------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/config.h.in b/config.h.in
index 0abbc1f..a0faba4 100644
--- a/config.h.in
+++ b/config.h.in
@@ -141,6 +141,9 @@
 /* Defined if compiling without arts */
 #undef WITHOUT_ARTS
 
+/* Define a paired constant for WITHOUT_ARTS without a negative notation. */
+#undef WITH_ARTS
+
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #undef WORDS_BIGENDIAN
diff --git a/configure.in.in b/configure.in.in
index d881620..4b3b49e 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -53,3 +53,6 @@ if test "$KONTACT_SUBDIR" = "no"; then
 	DO_NOT_COMPILE="$DO_NOT_COMPILE kontact_plugin"
 fi
 
+if test "$build_arts" != "no"; then
+    AC_DEFINE(WITH_ARTS, 1, [Define a paired constant for WITHOUT_ARTS without a negative notation.])
+fi
diff --git a/src/notecontent.cpp b/src/notecontent.cpp
index c22743e..d7da39d 100644
--- a/src/notecontent.cpp
+++ b/src/notecontent.cpp
@@ -67,12 +67,11 @@
 #include "kcolorcombo2.h"
 #include "htmlexporter.h"
 
-#include "config.h"
-#ifndef WITHOUT_ARTS
-	#include <arts/kplayobject.h>
-	#include <arts/kplayobjectfactory.h>
-	#include <arts/kartsserver.h>
-	#include <arts/kartsdispatcher.h>
+#ifdef WITH_ARTS
+#include <arts/kplayobject.h>
+#include <arts/kplayobjectfactory.h>
+#include <arts/kartsserver.h>
+#include <arts/kartsdispatcher.h>
 #endif
 
 /** class NoteContent:
@@ -1164,11 +1163,7 @@ TQString SoundContent::zoneTip(int zone)
 
 void SoundContent::setHoveredZone(int oldZone, int newZone)
 {
-#ifdef WITHOUT_ARTS
-	Q_UNUSED(oldZone);
-	if (newZone == Note::Custom0 || newZone == Note::Content)
-		std::cout << "Compiled without aRts: sound is not played." << std::endl;
-#else
+#ifdef WITH_ARTS
 	static KArtsDispatcher        *s_dispatcher  = new KArtsDispatcher(); // Needed for s_playObj (we don't use it directly)
 	static KArtsServer            *s_playServer  = new KArtsServer();
 	static KDE::PlayObjectFactory *s_playFactory = new KDE::PlayObjectFactory(s_playServer);
@@ -1189,6 +1184,10 @@ void SoundContent::setHoveredZone(int oldZone, int newZone)
 			s_playObj = 0;
 		}
 	}
+#else
+	Q_UNUSED(oldZone);
+	if (newZone == Note::Custom0 || newZone == Note::Content)
+		std::cout << "Compiled without aRts: sound is not played." << std::endl;
 #endif
 }
 
-- 
cgit v1.2.1