From 9bfe1313e7d56c832d41a7f93f20fb7c1f738a35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 2 Apr 2015 17:13:55 -0400
Subject: [PATCH] client: rename signal.h to avoid inclusion conflicts
Refs #70084
Change-Id: If635035aea8cd47c52396cdb62511b3507f428f8
---
src/account.cpp | 2 +-
src/client/Makefile.am | 4 ++--
src/client/callmanager.cpp | 2 +-
src/client/configurationmanager.cpp | 2 +-
src/client/presencemanager.cpp | 2 +-
src/client/{signal.cpp => ring_signal.cpp} | 2 +-
src/client/{signal.h => ring_signal.h} | 0
src/client/videomanager.cpp | 2 +-
src/managerimpl.cpp | 2 +-
src/media/audio/alsa/alsalayer.cpp | 2 +-
src/media/audio/sound/audiofile.cpp | 2 +-
src/media/video/video_device_monitor.cpp | 2 +-
src/media/video/video_input.cpp | 2 +-
src/media/video/video_mixer.cpp | 2 +-
src/media/video/video_receive_thread.cpp | 2 +-
src/ringdht/ringaccount.cpp | 2 +-
src/sip/pres_sub_client.cpp | 2 +-
src/sip/pres_sub_server.cpp | 2 +-
src/sip/sipaccount.cpp | 2 +-
src/sip/sipaccountbase.cpp | 2 +-
src/sip/sipcall.cpp | 2 +-
src/sip/sippresence.cpp | 2 +-
src/sip/sipvoiplink.cpp | 2 +-
23 files changed, 23 insertions(+), 23 deletions(-)
rename src/client/{signal.cpp => ring_signal.cpp} (99%)
rename src/client/{signal.h => ring_signal.h} (100%)
diff --git a/src/account.cpp b/src/account.cpp
index 2d713a86ba..6074424123 100644
--- a/src/account.cpp
+++ b/src/account.cpp
@@ -47,7 +47,7 @@
#include "logger.h"
#include "manager.h"
-#include "client/signal.h"
+#include "client/ring_signal.h"
#include "account_schema.h"
#include "string_utils.h"
#include "config/yamlparser.h"
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index 6a6c0cbec8..cb26ade38f 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/globals.mak
noinst_LTLIBRARIES = libclient.la
noinst_HEADERS = \
- signal.h
+ ring_signal.h
PRESENCE_SRC = presencemanager.cpp
@@ -13,7 +13,7 @@ noinst_HEADERS += videomanager.h
endif
libclient_la_SOURCES = \
- signal.cpp \
+ ring_signal.cpp \
callmanager.cpp \
configurationmanager.cpp \
$(PRESENCE_SRC) \
diff --git a/src/client/callmanager.cpp b/src/client/callmanager.cpp
index 4d521e2878..36d0a753c3 100644
--- a/src/client/callmanager.cpp
+++ b/src/client/callmanager.cpp
@@ -34,7 +34,7 @@
#include "callmanager_interface.h"
#include "call_factory.h"
-#include "client/signal.h"
+#include "client/ring_signal.h"
#include "sip/sipcall.h"
#include "sip/sipvoiplink.h"
diff --git a/src/client/configurationmanager.cpp b/src/client/configurationmanager.cpp
index 9ffef7f813..d74cae5331 100644
--- a/src/client/configurationmanager.cpp
+++ b/src/client/configurationmanager.cpp
@@ -52,8 +52,8 @@
#include "security_const.h"
#include "audio/audiolayer.h"
#include "system_codec_container.h"
-#include "client/signal.h"
#include "account_const.h"
+#include "client/ring_signal.h"
#include <dirent.h>
diff --git a/src/client/presencemanager.cpp b/src/client/presencemanager.cpp
index a4b1a56003..22182f9a0d 100644
--- a/src/client/presencemanager.cpp
+++ b/src/client/presencemanager.cpp
@@ -44,7 +44,7 @@
#include "sip/sipaccount.h"
#include "sip/sippresence.h"
#include "sip/pres_sub_client.h"
-#include "client/signal.h"
+#include "client/ring_signal.h"
namespace DRing {
diff --git a/src/client/signal.cpp b/src/client/ring_signal.cpp
similarity index 99%
rename from src/client/signal.cpp
rename to src/client/ring_signal.cpp
index ae5e99a988..a5ef36daf2 100644
--- a/src/client/signal.cpp
+++ b/src/client/ring_signal.cpp
@@ -28,7 +28,7 @@
* as that of the covered work.
*/
-#include "signal.h"
+#include "ring_signal.h"
namespace ring {
diff --git a/src/client/signal.h b/src/client/ring_signal.h
similarity index 100%
rename from src/client/signal.h
rename to src/client/ring_signal.h
diff --git a/src/client/videomanager.cpp b/src/client/videomanager.cpp
index a6ec5f022a..b80893c7bb 100644
--- a/src/client/videomanager.cpp
+++ b/src/client/videomanager.cpp
@@ -39,8 +39,8 @@
#include "logger.h"
#include "manager.h"
#include "system_codec_container.h"
-#include "client/signal.h"
#include "video/sinkclient.h"
+#include "client/ring_signal.h"
#include <functional>
#include <memory>
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index d595750580..519422aa9d 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -77,7 +77,7 @@
#include "conference.h"
#include "ice_transport.h"
-#include "client/signal.h"
+#include "client/ring_signal.h"
#if HAVE_TLS
#include "gnutls_support.h"
diff --git a/src/media/audio/alsa/alsalayer.cpp b/src/media/audio/alsa/alsalayer.cpp
index 05e3733972..272d1f4913 100644
--- a/src/media/audio/alsa/alsalayer.cpp
+++ b/src/media/audio/alsa/alsalayer.cpp
@@ -34,7 +34,7 @@
#include "logger.h"
#include "manager.h"
#include "noncopyable.h"
-#include "client/signal.h"
+#include "client/ring_signal.h"
#include "audio/ringbufferpool.h"
#include "audio/ringbuffer.h"
#include "audio/resampler.h"
diff --git a/src/media/audio/sound/audiofile.cpp b/src/media/audio/sound/audiofile.cpp
index f4622b4628..113237d529 100644
--- a/src/media/audio/sound/audiofile.cpp
+++ b/src/media/audio/sound/audiofile.cpp
@@ -41,7 +41,7 @@
#include "audiofile.h"
#include "audio/resampler.h"
#include "manager.h"
-#include "client/signal.h"
+#include "client/ring_signal.h"
#include "logger.h"
diff --git a/src/media/video/video_device_monitor.cpp b/src/media/video/video_device_monitor.cpp
index f8fdc07d39..fa5bbef028 100644
--- a/src/media/video/video_device_monitor.cpp
+++ b/src/media/video/video_device_monitor.cpp
@@ -37,7 +37,7 @@
#include "manager.h"
#include "client/videomanager.h"
-#include "client/signal.h"
+#include "client/ring_signal.h"
#include "config/yamlparser.h"
#include "logger.h"
#include "video_device_monitor.h"
diff --git a/src/media/video/video_input.cpp b/src/media/video/video_input.cpp
index 934589d1e2..eb2aad83a9 100644
--- a/src/media/video/video_input.cpp
+++ b/src/media/video/video_input.cpp
@@ -36,7 +36,7 @@
#include "media_decoder.h"
#include "manager.h"
#include "client/videomanager.h"
-#include "client/signal.h"
+#include "client/ring_signal.h"
#include "sinkclient.h"
#include "logger.h"
diff --git a/src/media/video/video_mixer.cpp b/src/media/video/video_mixer.cpp
index f699550a89..9ab0c42ab0 100644
--- a/src/media/video/video_mixer.cpp
+++ b/src/media/video/video_mixer.cpp
@@ -35,7 +35,7 @@
#include "media_buffer.h"
#include "logger.h"
#include "client/videomanager.h"
-#include "client/signal.h"
+#include "client/ring_signal.h"
#include "manager.h"
#include "sinkclient.h"
#include "logger.h"
diff --git a/src/media/video/video_receive_thread.cpp b/src/media/video/video_receive_thread.cpp
index 3500d3c4f8..35717e36ce 100644
--- a/src/media/video/video_receive_thread.cpp
+++ b/src/media/video/video_receive_thread.cpp
@@ -36,7 +36,7 @@
#include "socket_pair.h"
#include "manager.h"
#include "client/videomanager.h"
-#include "client/signal.h"
+#include "client/ring_signal.h"
#include "sinkclient.h"
#include "logger.h"
diff --git a/src/ringdht/ringaccount.cpp b/src/ringdht/ringaccount.cpp
index 9cd3e7777b..b9789e213a 100644
--- a/src/ringdht/ringaccount.cpp
+++ b/src/ringdht/ringaccount.cpp
@@ -44,7 +44,7 @@
#include "sips_transport_ice.h"
#include "ice_transport.h"
-#include "client/signal.h"
+#include "client/ring_signal.h"
#include "upnp/upnp_control.h"
#include "system_codec_container.h"
diff --git a/src/sip/pres_sub_client.cpp b/src/sip/pres_sub_client.cpp
index 6ba3810726..318f55d000 100644
--- a/src/sip/pres_sub_client.cpp
+++ b/src/sip/pres_sub_client.cpp
@@ -51,7 +51,7 @@
#include "sipvoiplink.h"
#include "sip_utils.h"
#include "manager.h"
-#include "client/signal.h"
+#include "client/ring_signal.h"
#include "logger.h"
diff --git a/src/sip/pres_sub_server.cpp b/src/sip/pres_sub_server.cpp
index 6a5edf4c01..eb3cf419d6 100644
--- a/src/sip/pres_sub_server.cpp
+++ b/src/sip/pres_sub_server.cpp
@@ -38,7 +38,7 @@
#include "sippresence.h"
#include "logger.h"
#include "pres_sub_server.h"
-#include "client/signal.h"
+#include "client/ring_signal.h"
namespace ring {
diff --git a/src/sip/sipaccount.cpp b/src/sip/sipaccount.cpp
index 9066aa9053..ad35de4157 100644
--- a/src/sip/sipaccount.cpp
+++ b/src/sip/sipaccount.cpp
@@ -55,7 +55,7 @@
#include "config/yamlparser.h"
#include "logger.h"
#include "manager.h"
-#include "client/signal.h"
+#include "client/ring_signal.h"
#ifdef RING_VIDEO
#include "libav_utils.h"
diff --git a/src/sip/sipaccountbase.cpp b/src/sip/sipaccountbase.cpp
index 6af744aca8..f497069459 100644
--- a/src/sip/sipaccountbase.cpp
+++ b/src/sip/sipaccountbase.cpp
@@ -43,7 +43,7 @@
#include "config/yamlparser.h"
#include <yaml-cpp/yaml.h>
-#include "client/signal.h"
+#include "client/ring_signal.h"
#include "string_utils.h"
#include <type_traits>
diff --git a/src/sip/sipcall.cpp b/src/sip/sipcall.cpp
index 16babd4d1d..71a3d7f8ac 100644
--- a/src/sip/sipcall.cpp
+++ b/src/sip/sipcall.cpp
@@ -54,7 +54,7 @@
#endif
#include "dring/call_const.h"
-#include "client/signal.h"
+#include "client/ring_signal.h"
#ifdef RING_VIDEO
#include "client/videomanager.h"
diff --git a/src/sip/sippresence.cpp b/src/sip/sippresence.cpp
index 871ce2ec2e..6027a2a513 100644
--- a/src/sip/sippresence.cpp
+++ b/src/sip/sippresence.cpp
@@ -39,7 +39,7 @@
#include "pres_sub_server.h"
#include "pres_sub_client.h"
#include "sipvoiplink.h"
-#include "client/signal.h"
+#include "client/ring_signal.h"
#include <thread>
#include <sstream>
diff --git a/src/sip/sipvoiplink.cpp b/src/sip/sipvoiplink.cpp
index 7632fbf95f..e49f4c50c0 100644
--- a/src/sip/sipvoiplink.cpp
+++ b/src/sip/sipvoiplink.cpp
@@ -63,7 +63,7 @@
#include "client/videomanager.h"
#endif
-#include "client/signal.h"
+#include "client/ring_signal.h"
#include "pres_sub_server.h"
--
GitLab