Commit 0ebae27c authored by Adrien Béraud's avatar Adrien Béraud Committed by Guillaume Roguez

manager: merge managerimpl code in manager files

Note: Manager namespace is not longer existing.

Refs #71531

Change-Id: I55e2281afefbd42e39512b3c7ace15e693bf32ff
Signed-off-by: Guillaume Roguez's avatarGuillaume Roguez <guillaume.roguez@savoirfairelinux.com>
parent 649a22e0
......@@ -24,7 +24,7 @@ IM_LIBA=./im/libim.la
IM_LIB=@EXPAT_LIBS@
endif
# Redefine the USE_IAX variable here, so that it could be used in managerimpl
# Redefine the USE_IAX variable here, so that it could be used in manager
if USE_IAX
IAX_SUBDIR=iax
IAX_CXXFLAG=-DUSE_IAX
......@@ -104,7 +104,6 @@ libring_la_SOURCES = conference.cpp \
account_factory.cpp \
call_factory.cpp \
preferences.cpp \
managerimpl.cpp \
manager.cpp \
call.cpp \
account.cpp \
......@@ -127,7 +126,6 @@ libring_la_SOURCES = conference.cpp \
account_factory.h \
call_factory.h \
preferences.h \
managerimpl.h \
manager.h \
account.h \
call.h \
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -172,7 +172,7 @@ start:
static void
notify()
{
if (!ManagerImpl::initialized) {
if (!Manager::initialized) {
RING_WARN("Manager not initialized yet");
return;
}
......
......@@ -38,7 +38,6 @@
#endif
#include "manager.h"
#include "managerimpl.h"
#include "logger.h"
#include "dring.h"
#include "callmanager_interface.h"
......
This diff is collapsed.
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