Commit 192cfb66 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #7133: renamed SdesNegotiator and Pattern to lowercase names

parent d1294de5
......@@ -38,7 +38,7 @@
#include "sip/sdp.h"
#include "sip/sipcall.h"
#include "sip/sipaccount.h"
#include "sip/SdesNegotiator.h"
#include "sip/sdes_negotiator.h"
namespace sfl {
......
......@@ -36,7 +36,7 @@
#include <ccrtp/CryptoContext.h>
#include "audio_rtp_session.h"
#include "sip/SdesNegotiator.h"
#include "sip/sdes_negotiator.h"
class SdesNegotiator;
class SIPCall;
......
......@@ -32,7 +32,7 @@
#include "audio_rtp_session.h"
#include "audio_symmetric_rtp_session.h"
#include "sip/SdesNegotiator.h"
#include "sip/sdes_negotiator.h"
#include <ccrtp/CryptoContext.h>
#include <vector>
......
......@@ -3,16 +3,14 @@ include $(top_srcdir)/globals.mak
noinst_LTLIBRARIES = libsiplink.la
libsiplink_la_SOURCES = \
Pattern.cpp \
SdesNegotiator.cpp \
pattern.cpp \
sdes_negotiator.cpp \
sdp.cpp \
sipaccount.cpp \
sipcall.cpp \
sipvoiplink.cpp
noinst_HEADERS = \
Pattern.h \
SdesNegotiator.h \
sipvoiplink.cpp \
pattern.h \
sdes_negotiator.h \
sdp.h \
sipaccount.h \
sipcall.h \
......
......@@ -27,7 +27,7 @@
* as that of the covered work.
*/
#include "Pattern.h"
#include "pattern.h"
#include <sstream>
#include <cstdio>
......
......@@ -26,8 +26,8 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
#ifndef __SFL_PATTERN_H__
#define __SFL_PATTERN_H__
#ifndef __PATTERN_H__
#define __PATTERN_H__
#include <stdexcept>
#include <string>
......@@ -345,4 +345,4 @@ class Pattern {
}
#endif
#endif // __PATTERN_H__ // __PATTERN_H__ // __PATTERN_H__ // __PATTERN_H__
......@@ -28,9 +28,8 @@
* as that of the covered work.
*/
#include "SdesNegotiator.h"
#include "Pattern.h"
#include "sdes_negotiator.h"
#include "pattern.h"
#include <cstdio>
#include <iostream>
......
......@@ -27,8 +27,8 @@
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/
#ifndef __SFL_SDES_NEGOTIATOR_H__
#define __SFL_SDES_NEGOTIATOR_H__
#ifndef __SDES_NEGOTIATOR_H__
#define __SDES_NEGOTIATOR_H__
#include <stdexcept>
#include <string>
......@@ -254,4 +254,4 @@ class SdesNegotiator {
std::vector<CryptoAttribute *> parse(void);
};
}
#endif
#endif // __SDES_NEGOTIATOR_H__
......@@ -44,7 +44,7 @@
#include "sipcall.h"
#include "sipaccount.h"
#include "eventthread.h"
#include "SdesNegotiator.h"
#include "sdes_negotiator.h"
#include "dbus/dbusmanager.h"
#include "dbus/callmanager.h"
......
......@@ -41,6 +41,8 @@
#include <sstream>
#include "sdesnegotiatortest.h"
#include "sip/pattern.h"
#include "sip/sdes_negotiator.h"
#include <unistd.h>
#include "global.h"
......
......@@ -34,8 +34,6 @@
#include <cppunit/TestCase.h>
#include <cppunit/TestSuite.h>
#include <assert.h>
#include <cstddef>
#include <stdio.h>
#include <sstream>
......@@ -50,20 +48,19 @@
#include <pjlib-util.h>
#include <pjnath/stun_config.h>
// Application import
#include "sip/SdesNegotiator.h"
#include "sip/Pattern.h"
/*
* @file sdesnegotiationTest.cpp
* @brief Regroups unitary tests related to the plugin manager.
*/
#ifndef _SDESNEGOTIATOR_TEST_
#define _SDESNEGOTIATOR_TEST_
#ifndef __SDESNEGOTIATOR_TEST_H__
#define __SDESNEGOTIATOR_TEST_H__
#include "sip/sdes_negotiator.h" // for CryptoSuiteDefinition
namespace sfl {
class Pattern;
}
class SdesNegotiatorTest : public CppUnit::TestCase {
......@@ -119,4 +116,4 @@ class SdesNegotiatorTest : public CppUnit::TestCase {
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(SdesNegotiatorTest, "SdesNegotiatorTest");
CPPUNIT_TEST_SUITE_REGISTRATION(SdesNegotiatorTest);
#endif
#endif // __SDESNEGOTIATOR_TEST_H__
Supports Markdown
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