Skip to content
Snippets Groups Projects
Commit 79ded032 authored by Stepan Salenikovich's avatar Stepan Salenikovich Committed by Guillaume Roguez
Browse files

im: clean up header

- remove unused #defines
- forward declare pjsip_inv_session

Issue: #79618
Change-Id: I17c5c140919096511b481914eb5ae5146e4305c0
parent 0d100ecf
No related branches found
No related tags found
No related merge requests found
/* /*
* Copyright (C) 2004-2015 Savoir-Faire Linux Inc. * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> * Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Emmanuel Lepage <elv1313@gmail.com> * Author: Emmanuel Lepage <elv1313@gmail.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com> * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
...@@ -29,12 +29,13 @@ ...@@ -29,12 +29,13 @@
* shall include the source code for the parts of OpenSSL used as well * shall include the source code for the parts of OpenSSL used as well
* as that of the covered work. * as that of the covered work.
*/ */
#include "instant_messaging.h" #include "instant_messaging.h"
#include "logger.h" #include "logger.h"
#include "sip/sip_utils.h" #include "sip/sip_utils.h"
#include <expat.h> #include <expat.h>
#include <pjsip_ua.h>
namespace ring { namespace ring {
......
/* /*
* Copyright (C) 2004-2015 Savoir-Faire Linux Inc. * Copyright (C) 2004-2015 Savoir-faire Linux Inc.
* Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> * Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
* Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com> * Author: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
* *
...@@ -29,16 +29,10 @@ ...@@ -29,16 +29,10 @@
* as that of the covered work. * as that of the covered work.
*/ */
#ifndef __INSTANT_MESSAGING_H__ #pragma once
#define __INSTANT_MESSAGING_H__
#include <string> #include <string>
#include <vector> #include <vector>
#include <pjsip.h>
#include <pjlib.h>
#include <pjsip_ua.h>
#include <pjlib-util.h>
#include <map> #include <map>
#include <list> #include <list>
#include <stdexcept> #include <stdexcept>
...@@ -49,8 +43,7 @@ ...@@ -49,8 +43,7 @@
#include <iax/iax-client.h> #include <iax/iax-client.h>
#endif #endif
#define MODE_APPEND std::ios::out || std::ios::app struct pjsip_inv_session;
#define MODE_TEST std::ios::out
namespace ring { namespace InstantMessaging { namespace ring { namespace InstantMessaging {
...@@ -66,7 +59,6 @@ namespace ring { namespace InstantMessaging { ...@@ -66,7 +59,6 @@ namespace ring { namespace InstantMessaging {
constexpr static unsigned MAXIMUM_MESSAGE_LENGTH = 1800; constexpr static unsigned MAXIMUM_MESSAGE_LENGTH = 1800;
constexpr static const char* IM_XML_URI = "uri"; constexpr static const char* IM_XML_URI = "uri";
constexpr static const char* BOUNDARY = "--boundary";
struct InstantMessageException : std::runtime_error struct InstantMessageException : std::runtime_error
{ {
...@@ -143,5 +135,3 @@ std::string findMimePayload(const std::string& encodedPayloads, ...@@ -143,5 +135,3 @@ std::string findMimePayload(const std::string& encodedPayloads,
std::map< std::string, std::string > parsePayloads(const std::string& encodedPayloads); std::map< std::string, std::string > parsePayloads(const std::string& encodedPayloads);
}} // namespace ring::InstantMessaging }} // namespace ring::InstantMessaging
#endif // __INSTANT_MESSAGING_H_
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment