summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-02-14 18:57:18 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-02-14 21:36:32 (GMT)
commitcb05f5a908e20006c954ce38755c2e422ecc2388 (patch)
treea793551a5fe279a57d4330119560e8542f745484 /Swiften/TLS/PKCS12Certificate.h
parentcad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff)
downloadswift-cb05f5a908e20006c954ce38755c2e422ecc2388.zip
swift-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2
Removed Swift::String.
Diffstat (limited to 'Swiften/TLS/PKCS12Certificate.h')
-rw-r--r--Swiften/TLS/PKCS12Certificate.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/TLS/PKCS12Certificate.h b/Swiften/TLS/PKCS12Certificate.h
index 1d8c7c2..1c8c38f 100644
--- a/Swiften/TLS/PKCS12Certificate.h
+++ b/Swiften/TLS/PKCS12Certificate.h
@@ -14,7 +14,7 @@ namespace Swift {
public:
PKCS12Certificate() {}
- PKCS12Certificate(const String& filename, const String& password) : password_(password) {
+ PKCS12Certificate(const std::string& filename, const std::string& password) : password_(password) {
data_.readFromFile(filename);
}
@@ -30,13 +30,13 @@ namespace Swift {
data_ = data;
}
- const String& getPassword() const {
+ const std::string& getPassword() const {
return password_;
}
private:
ByteArray data_;
- String password_;
+ std::string password_;
};
}