Commit 9bfe1313 authored by Adrien Béraud's avatar Adrien Béraud Committed by Guillaume Roguez

client: rename signal.h to avoid inclusion conflicts

Refs #70084

Change-Id: If635035aea8cd47c52396cdb62511b3507f428f8
parent e0e15794
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#include "logger.h" #include "logger.h"
#include "manager.h" #include "manager.h"
#include "client/signal.h" #include "client/ring_signal.h"
#include "account_schema.h" #include "account_schema.h"
#include "string_utils.h" #include "string_utils.h"
#include "config/yamlparser.h" #include "config/yamlparser.h"
......
...@@ -3,7 +3,7 @@ include $(top_srcdir)/globals.mak ...@@ -3,7 +3,7 @@ include $(top_srcdir)/globals.mak
noinst_LTLIBRARIES = libclient.la noinst_LTLIBRARIES = libclient.la
noinst_HEADERS = \ noinst_HEADERS = \
signal.h ring_signal.h
PRESENCE_SRC = presencemanager.cpp PRESENCE_SRC = presencemanager.cpp
...@@ -13,7 +13,7 @@ noinst_HEADERS += videomanager.h ...@@ -13,7 +13,7 @@ noinst_HEADERS += videomanager.h
endif endif
libclient_la_SOURCES = \ libclient_la_SOURCES = \
signal.cpp \ ring_signal.cpp \
callmanager.cpp \ callmanager.cpp \
configurationmanager.cpp \ configurationmanager.cpp \
$(PRESENCE_SRC) \ $(PRESENCE_SRC) \
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "callmanager_interface.h" #include "callmanager_interface.h"
#include "call_factory.h" #include "call_factory.h"
#include "client/signal.h" #include "client/ring_signal.h"
#include "sip/sipcall.h" #include "sip/sipcall.h"
#include "sip/sipvoiplink.h" #include "sip/sipvoiplink.h"
......
...@@ -52,8 +52,8 @@ ...@@ -52,8 +52,8 @@
#include "security_const.h" #include "security_const.h"
#include "audio/audiolayer.h" #include "audio/audiolayer.h"
#include "system_codec_container.h" #include "system_codec_container.h"
#include "client/signal.h"
#include "account_const.h" #include "account_const.h"
#include "client/ring_signal.h"
#include <dirent.h> #include <dirent.h>
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include "sip/sipaccount.h" #include "sip/sipaccount.h"
#include "sip/sippresence.h" #include "sip/sippresence.h"
#include "sip/pres_sub_client.h" #include "sip/pres_sub_client.h"
#include "client/signal.h" #include "client/ring_signal.h"
namespace DRing { namespace DRing {
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
* as that of the covered work. * as that of the covered work.
*/ */
#include "signal.h" #include "ring_signal.h"
namespace ring { namespace ring {
......
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
#include "logger.h" #include "logger.h"
#include "manager.h" #include "manager.h"
#include "system_codec_container.h" #include "system_codec_container.h"
#include "client/signal.h"
#include "video/sinkclient.h" #include "video/sinkclient.h"
#include "client/ring_signal.h"
#include <functional> #include <functional>
#include <memory> #include <memory>
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
#include "conference.h" #include "conference.h"
#include "ice_transport.h" #include "ice_transport.h"
#include "client/signal.h" #include "client/ring_signal.h"
#if HAVE_TLS #if HAVE_TLS
#include "gnutls_support.h" #include "gnutls_support.h"
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "logger.h" #include "logger.h"
#include "manager.h" #include "manager.h"
#include "noncopyable.h" #include "noncopyable.h"
#include "client/signal.h" #include "client/ring_signal.h"
#include "audio/ringbufferpool.h" #include "audio/ringbufferpool.h"
#include "audio/ringbuffer.h" #include "audio/ringbuffer.h"
#include "audio/resampler.h" #include "audio/resampler.h"
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include "audiofile.h" #include "audiofile.h"
#include "audio/resampler.h" #include "audio/resampler.h"
#include "manager.h" #include "manager.h"
#include "client/signal.h" #include "client/ring_signal.h"
#include "logger.h" #include "logger.h"
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include "manager.h" #include "manager.h"
#include "client/videomanager.h" #include "client/videomanager.h"
#include "client/signal.h" #include "client/ring_signal.h"
#include "config/yamlparser.h" #include "config/yamlparser.h"
#include "logger.h" #include "logger.h"
#include "video_device_monitor.h" #include "video_device_monitor.h"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "media_decoder.h" #include "media_decoder.h"
#include "manager.h" #include "manager.h"
#include "client/videomanager.h" #include "client/videomanager.h"
#include "client/signal.h" #include "client/ring_signal.h"
#include "sinkclient.h" #include "sinkclient.h"
#include "logger.h" #include "logger.h"
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "media_buffer.h" #include "media_buffer.h"
#include "logger.h" #include "logger.h"
#include "client/videomanager.h" #include "client/videomanager.h"
#include "client/signal.h" #include "client/ring_signal.h"
#include "manager.h" #include "manager.h"
#include "sinkclient.h" #include "sinkclient.h"
#include "logger.h" #include "logger.h"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "socket_pair.h" #include "socket_pair.h"
#include "manager.h" #include "manager.h"
#include "client/videomanager.h" #include "client/videomanager.h"
#include "client/signal.h" #include "client/ring_signal.h"
#include "sinkclient.h" #include "sinkclient.h"
#include "logger.h" #include "logger.h"
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include "sips_transport_ice.h" #include "sips_transport_ice.h"
#include "ice_transport.h" #include "ice_transport.h"
#include "client/signal.h" #include "client/ring_signal.h"
#include "upnp/upnp_control.h" #include "upnp/upnp_control.h"
#include "system_codec_container.h" #include "system_codec_container.h"
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
#include "sipvoiplink.h" #include "sipvoiplink.h"
#include "sip_utils.h" #include "sip_utils.h"
#include "manager.h" #include "manager.h"
#include "client/signal.h" #include "client/ring_signal.h"
#include "logger.h" #include "logger.h"
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include "sippresence.h" #include "sippresence.h"
#include "logger.h" #include "logger.h"
#include "pres_sub_server.h" #include "pres_sub_server.h"
#include "client/signal.h" #include "client/ring_signal.h"
namespace ring { namespace ring {
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
#include "config/yamlparser.h" #include "config/yamlparser.h"
#include "logger.h" #include "logger.h"
#include "manager.h" #include "manager.h"
#include "client/signal.h" #include "client/ring_signal.h"
#ifdef RING_VIDEO #ifdef RING_VIDEO
#include "libav_utils.h" #include "libav_utils.h"
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#include "config/yamlparser.h" #include "config/yamlparser.h"
#include <yaml-cpp/yaml.h> #include <yaml-cpp/yaml.h>
#include "client/signal.h" #include "client/ring_signal.h"
#include "string_utils.h" #include "string_utils.h"
#include <type_traits> #include <type_traits>
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
#endif #endif
#include "dring/call_const.h" #include "dring/call_const.h"
#include "client/signal.h" #include "client/ring_signal.h"
#ifdef RING_VIDEO #ifdef RING_VIDEO
#include "client/videomanager.h" #include "client/videomanager.h"
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#include "pres_sub_server.h" #include "pres_sub_server.h"
#include "pres_sub_client.h" #include "pres_sub_client.h"
#include "sipvoiplink.h" #include "sipvoiplink.h"
#include "client/signal.h" #include "client/ring_signal.h"
#include <thread> #include <thread>
#include <sstream> #include <sstream>
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
#include "client/videomanager.h" #include "client/videomanager.h"
#endif #endif
#include "client/signal.h" #include "client/ring_signal.h"
#include "pres_sub_server.h" #include "pres_sub_server.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment