diff --git a/src/gui/server/Makefile.am b/src/gui/server/Makefile.am index 7e0365d62db479135e5bdae9ca81df94573b5ea4..d423713f553c4e42fc12d665b91b2bb9ff1d0ac7 100644 --- a/src/gui/server/Makefile.am +++ b/src/gui/server/Makefile.am @@ -8,6 +8,6 @@ libsflphoneguiserver_la_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${dat libsflphoneguiserver_la_CPPFLAGS = -I$(top_srcdir)/libs -I$(top_srcdir)/src $(libccext2_CFLAGS) libsflphoneguiserver_la_LIBADD = -noinst_HEADERS = responsemessage.h request.h requestfactory.h subcall.h \ +noinst_HEADERS = responsemessage.h request.h requestfactory.h \ argtokenizer.h tcpsessionio.h requestmanager.h guiserver.h guiserverimpl.h sessionio.h \ tcpsessionio.h tcpstreampool.h requestconfig.h ObjectPool.hpp ObjectPool.inl diff --git a/src/gui/server/request.cpp b/src/gui/server/request.cpp index 124ec473a79a0f8e669e914b606dfa767ec58192..dfe0b9295282bb32dad4a962d76917cd59d6c2d8 100644 --- a/src/gui/server/request.cpp +++ b/src/gui/server/request.cpp @@ -20,7 +20,6 @@ #include "global.h" #include "request.h" #include "guiserver.h" -#include "subcall.h" ResponseMessage RequestCall::execute() diff --git a/src/gui/server/requestconfig.cpp b/src/gui/server/requestconfig.cpp index 134a26ab7b89b1688eaf4344493e71072eb96655..c87376bcb5d93c4dff93ac8f463bb3c116a5de25 100644 --- a/src/gui/server/requestconfig.cpp +++ b/src/gui/server/requestconfig.cpp @@ -20,7 +20,6 @@ #include "global.h" #include "requestconfig.h" #include "guiserver.h" -#include "subcall.h" ResponseMessage RequestGetEvents::execute() diff --git a/src/gui/server/subcall.h b/src/gui/server/subcall.h deleted file mode 100644 index a02bd593f43d783cd3da36660a89128a2bb3d0a5..0000000000000000000000000000000000000000 --- a/src/gui/server/subcall.h +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Copyright (C) 2005 Savoir-Faire Linux inc. - * Author: Yan Morin <yan.morin@savoirfairelinux.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -#ifndef SUBCALL_H -#define SUBCALL_H - -#include <string> - -/** -Contains an sequenceId and a callid. It's allow us to maintain a map of id->SubCall - -@author Yan Morin -*/ -class SubCall{ -public: - SubCall() {} - SubCall(const std::string& seq, const std::string& callid) : _seq(seq), _callid(callid) {} - ~SubCall() {} - - // accessors - std::string sequenceId() const { return _seq; } - std::string callId() const { return _callid; } -private: - std::string _seq; // sequence id - std::string _callid; -}; - -#endif