libtransport.git Changeset - 6dc7437b53d7

Changeset - 6dc7437b53d7

Parent rev.

Child rev.

[Not reviewed]

Merge

6 47 6

Vitaly Takmazov - 12 years ago 2013-04-10 21:10:54
vitalyster@gmail.com

Merge branch 'swiften_update'

2 files changed with 9 insertions and 1 deletions:

include/Swiften/Network/DummyNetworkFactories.cpp

include/Swiften/Network/DummyNetworkFactories.h

0 comments (0 inline, 0 general)

include/Swiften/Network/DummyNetworkFactories.cpp

➞

Show inline comments

@@ @@ -15,7 +15,8 @@ namespace Swift { @@
 DummyNetworkFactories::DummyNetworkFactories(EventLoop* eventLoop) {
 	timerFactory = new DummyTimerFactory();
 	connectionFactory = new DummyConnectionFactory(eventLoop);
 	domainNameResolver = new PlatformDomainNameResolver(eventLoop);
 	idnConverter = boost::shared_ptr<IDNConverter>(PlatformIDNConverter::create());
 	domainNameResolver = new PlatformDomainNameResolver(idnConverter.get(), eventLoop);
 	connectionServerFactory = new DummyConnectionServerFactory(eventLoop);
 	m_platformXMLParserFactory =  new PlatformXMLParserFactory();
 	this->eventLoop = eventLoop;

include/Swiften/Network/DummyNetworkFactories.h

➞

Show inline comments

@@ @@ -8,6 +8,8 @@ @@
 #include <Swiften/Network/NetworkFactories.h>
 #include <Swiften/Parser/PlatformXMLParserFactory.h>
 #include <Swiften/IDN/IDNConverter.h>
 #include <Swiften/IDN/PlatformIDNConverter.h>
 namespace Swift {
 	class EventLoop;
@@ @@ -25,6 +27,10 @@ namespace Swift { @@
 				return connectionFactory;
+			}
 			IDNConverter* getIDNConverter() const {
 				return idnConverter.get();
+			}
 			DomainNameResolver* getDomainNameResolver() const {
 				return domainNameResolver;
+			}
@@ @@ -57,6 +63,7 @@ namespace Swift { @@
 			PlatformXMLParserFactory *m_platformXMLParserFactory;
 			TimerFactory* timerFactory;
 			ConnectionFactory* connectionFactory;
 			boost::shared_ptr<IDNConverter> idnConverter;
 			DomainNameResolver* domainNameResolver;
 			ConnectionServerFactory* connectionServerFactory;
 			EventLoop *eventLoop;

0 comments (0 inline, 0 general)