summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/Controllers')
-rw-r--r--Swift/Controllers/DummySoundPlayer.h6
-rw-r--r--Swift/Controllers/Storages/MemoryStoragesFactory.h9
2 files changed, 9 insertions, 6 deletions
diff --git a/Swift/Controllers/DummySoundPlayer.h b/Swift/Controllers/DummySoundPlayer.h
index b91192c..d0601c5 100644
--- a/Swift/Controllers/DummySoundPlayer.h
+++ b/Swift/Controllers/DummySoundPlayer.h
@@ -1,16 +1,16 @@
/*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
#pragma once
-#include "Swift/Controllers/SoundPlayer.h"
+#include <Swift/Controllers/SoundPlayer.h>
namespace Swift {
class DummySoundPlayer : public SoundPlayer {
public:
- void playSound(SoundEffect sound) {}
+ void playSound(SoundEffect sound, const std::string& soundResource) {}
};
}
diff --git a/Swift/Controllers/Storages/MemoryStoragesFactory.h b/Swift/Controllers/Storages/MemoryStoragesFactory.h
index 0dea349..e18f9fc 100644
--- a/Swift/Controllers/Storages/MemoryStoragesFactory.h
+++ b/Swift/Controllers/Storages/MemoryStoragesFactory.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
@@ -11,13 +11,16 @@
namespace Swift {
class JID;
+ class CryptoProvider;
class MemoryStoragesFactory : public StoragesFactory {
public:
- MemoryStoragesFactory() {}
+ MemoryStoragesFactory(CryptoProvider* cryptoProvider) : cryptoProvider_(cryptoProvider) {}
virtual Storages* createStorages(const JID& profile) const {
- return new MemoryStorages();
+ return new MemoryStorages(cryptoProvider_);
}
+ private:
+ CryptoProvider* cryptoProvider_;
};
}