Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-02-14 18:57:18 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-02-14 21:36:32 (GMT) |
| commit | cb05f5a908e20006c954ce38755c2e422ecc2388 (patch) | |
| tree | a793551a5fe279a57d4330119560e8542f745484 /Swiften/Disco/CapsFileStorage.cpp | |
| parent | cad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff) | |
| download | swift-cb05f5a908e20006c954ce38755c2e422ecc2388.zip swift-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2 | |
Removed Swift::String.
Diffstat (limited to 'Swiften/Disco/CapsFileStorage.cpp')
| -rw-r--r-- | Swiften/Disco/CapsFileStorage.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/Disco/CapsFileStorage.cpp b/Swiften/Disco/CapsFileStorage.cpp index 107cf28..2334acf 100644 --- a/Swiften/Disco/CapsFileStorage.cpp +++ b/Swiften/Disco/CapsFileStorage.cpp @@ -21,7 +21,7 @@ namespace Swift { CapsFileStorage::CapsFileStorage(const boost::filesystem::path& path) : path(path) { } -DiscoInfo::ref CapsFileStorage::getDiscoInfo(const String& hash) const { +DiscoInfo::ref CapsFileStorage::getDiscoInfo(const std::string& hash) const { boost::filesystem::path capsPath(getCapsPath(hash)); if (boost::filesystem::exists(capsPath)) { ByteArray data; @@ -29,7 +29,7 @@ DiscoInfo::ref CapsFileStorage::getDiscoInfo(const String& hash) const { DiscoInfoParser parser; PayloadParserTester tester(&parser); - tester.parse(String(data.getData(), data.getSize())); + tester.parse(std::string(data.getData(), data.getSize())); return boost::dynamic_pointer_cast<DiscoInfo>(parser.getPayload()); } else { @@ -37,7 +37,7 @@ DiscoInfo::ref CapsFileStorage::getDiscoInfo(const String& hash) const { } } -void CapsFileStorage::setDiscoInfo(const String& hash, DiscoInfo::ref discoInfo) { +void CapsFileStorage::setDiscoInfo(const std::string& hash, DiscoInfo::ref discoInfo) { boost::filesystem::path capsPath(getCapsPath(hash)); if (!boost::filesystem::exists(capsPath.parent_path())) { try { @@ -54,8 +54,8 @@ void CapsFileStorage::setDiscoInfo(const String& hash, DiscoInfo::ref discoInfo) file.close(); } -boost::filesystem::path CapsFileStorage::getCapsPath(const String& hash) const { - return path / (Hexify::hexify(Base64::decode(hash)) + ".xml").getUTF8String(); +boost::filesystem::path CapsFileStorage::getCapsPath(const std::string& hash) const { + return path / (Hexify::hexify(Base64::decode(hash)) + ".xml"); } } |