summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-03-12 16:22:03 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-03-12 16:22:03 (GMT)
commit410d721ec495e29e15d45cbd921a9bb59133973d (patch)
tree9d1dfd3f5d85ecdf41ba1296b518b65c269edc2a /Swiften/Session
parentb5d0be6e0d5b57effc5b7883d6e6e72aa2a1f062 (diff)
downloadswift-contrib-410d721ec495e29e15d45cbd921a9bb59133973d.zip
swift-contrib-410d721ec495e29e15d45cbd921a9bb59133973d.tar.bz2
Make ByteArray an std::vector<unsigned char>.
Diffstat (limited to 'Swiften/Session')
-rw-r--r--Swiften/Session/BasicSessionStream.cpp4
-rw-r--r--Swiften/Session/SessionTracer.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/Session/BasicSessionStream.cpp b/Swiften/Session/BasicSessionStream.cpp
index ddb833e..c783e01 100644
--- a/Swiften/Session/BasicSessionStream.cpp
+++ b/Swiften/Session/BasicSessionStream.cpp
@@ -193,11 +193,11 @@ void BasicSessionStream::handleConnectionFinished(const boost::optional<Connecti
}
void BasicSessionStream::handleDataRead(const ByteArray& data) {
- onDataRead(std::string(data.getData(), data.getSize()));
+ onDataRead(data.toString());
}
void BasicSessionStream::handleDataWritten(const ByteArray& data) {
- onDataWritten(std::string(data.getData(), data.getSize()));
+ onDataWritten(data.toString());
}
};
diff --git a/Swiften/Session/SessionTracer.h b/Swiften/Session/SessionTracer.h
index 7c6f3fa..cce45eb 100644
--- a/Swiften/Session/SessionTracer.h
+++ b/Swiften/Session/SessionTracer.h
@@ -27,7 +27,7 @@ namespace Swift {
std::cerr << direction;
}
std::cerr << " " << session->getRemoteJID()<< " " << direction << direction << std::endl;
- std::cerr << std::string(data.getData(), data.getSize()) << std::endl;
+ std::cerr << data.toString() << std::endl;
}
boost::shared_ptr<Session> session;