summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/Disco/CapsManager.h')
-rw-r--r--Swiften/Disco/CapsManager.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/Disco/CapsManager.h b/Swiften/Disco/CapsManager.h
index 842f2be..961dae8 100644
--- a/Swiften/Disco/CapsManager.h
+++ b/Swiften/Disco/CapsManager.h
@@ -26,7 +26,7 @@ namespace Swift {
public:
CapsManager(CapsStorage*, StanzaChannel*, IQRouter*);
- DiscoInfo::ref getCaps(const String&) const;
+ DiscoInfo::ref getCaps(const std::string&) const;
// Mainly for testing purposes
void setWarnOnInvalidHash(bool b) {
@@ -36,15 +36,15 @@ namespace Swift {
private:
void handlePresenceReceived(boost::shared_ptr<Presence>);
void handleStanzaChannelAvailableChanged(bool);
- void handleDiscoInfoReceived(const JID&, const String& hash, DiscoInfo::ref, ErrorPayload::ref);
- void requestDiscoInfo(const JID& jid, const String& node, const String& hash);
+ void handleDiscoInfoReceived(const JID&, const std::string& hash, DiscoInfo::ref, ErrorPayload::ref);
+ void requestDiscoInfo(const JID& jid, const std::string& node, const std::string& hash);
private:
IQRouter* iqRouter;
CapsStorage* capsStorage;
bool warnOnInvalidHash;
- std::set<String> requestedDiscoInfos;
- std::set< std::pair<JID, String> > failingCaps;
- std::map<String, std::set< std::pair<JID, String> > > fallbacks;
+ std::set<std::string> requestedDiscoInfos;
+ std::set< std::pair<JID, std::string> > failingCaps;
+ std::map<std::string, std::set< std::pair<JID, std::string> > > fallbacks;
};
}