1 files changed, 27 insertions, 25 deletions
diff --git a/Swift/Controllers/Storages/FileStorages.cpp b/Swift/Controllers/Storages/FileStorages.cpp
index 4fb2034..49f9ecf 100644
--- a/Swift/Controllers/Storages/FileStorages.cpp
+++ b/Swift/Controllers/Storages/FileStorages.cpp
@@ -1,61 +1,63 @@
 /*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
-#include "Swift/Controllers/Storages/FileStorages.h"
-#include "Swift/Controllers/Storages/VCardFileStorage.h"
-#include "Swift/Controllers/Storages/AvatarFileStorage.h"
-#include "Swift/Controllers/Storages/CapsFileStorage.h"
-#include "Swift/Controllers/Storages/RosterFileStorage.h"
-#include <Swiften/History/SQLiteHistoryStorage.h>
+#include <Swift/Controllers/Storages/FileStorages.h>
+
 #include <Swiften/Base/Path.h>
+#include <Swiften/History/SQLiteHistoryStorage.h>
+
+#include <Swift/Controllers/Storages/AvatarFileStorage.h>
+#include <Swift/Controllers/Storages/CapsFileStorage.h>
+#include <Swift/Controllers/Storages/RosterFileStorage.h>
+#include <Swift/Controllers/Storages/VCardFileStorage.h>
 
 namespace Swift {
 
 FileStorages::FileStorages(const boost::filesystem::path& baseDir, const JID& jid, CryptoProvider* crypto) {
-	boost::filesystem::path profile = stringToPath(jid.toBare());
-	vcardStorage = new VCardFileStorage(baseDir / profile / "vcards", crypto);
-	capsStorage = new CapsFileStorage(baseDir / "caps");
-	avatarStorage = new AvatarFileStorage(baseDir / "avatars", baseDir / profile / "avatars", crypto);
-	rosterStorage = new RosterFileStorage(baseDir / profile / "roster.xml");
+    boost::filesystem::path profile = stringToPath(jid.toBare());
+    vcardStorage = new VCardFileStorage(baseDir / profile / "vcards", crypto);
+    capsStorage = new CapsFileStorage(baseDir / "caps");
+    avatarStorage = new AvatarFileStorage(baseDir / "avatars", baseDir / profile / "avatars", crypto);
+    rosterStorage = new RosterFileStorage(baseDir / profile / "roster.xml");
 #ifdef SWIFT_EXPERIMENTAL_HISTORY
-	historyStorage = new SQLiteHistoryStorage(baseDir / "history.db");
+    historyStorage = new SQLiteHistoryStorage(baseDir / "history.db");
 #else
-	historyStorage = NULL;
+    historyStorage = nullptr;
 #endif
 }
 
 FileStorages::~FileStorages() {
-	delete rosterStorage;
-	delete avatarStorage;
-	delete capsStorage;
-	delete vcardStorage;
-	delete historyStorage;
+    delete rosterStorage;
+    delete avatarStorage;
+    delete capsStorage;
+    delete vcardStorage;
+    delete historyStorage;
 }
 
 VCardStorage* FileStorages::getVCardStorage() const {
-	return vcardStorage;
+    return vcardStorage;
 }
 
 CapsStorage* FileStorages::getCapsStorage() const {
-	return capsStorage;
+    return capsStorage;
 }
 
 AvatarStorage* FileStorages::getAvatarStorage() const {
-	return avatarStorage;
+    return avatarStorage;
 }
 
 RosterStorage* FileStorages::getRosterStorage() const {
-	return rosterStorage;
+    return rosterStorage;
 }
 
 HistoryStorage* FileStorages::getHistoryStorage() const {
 #ifdef SWIFT_EXPERIMENTAL_HISTORY
-	return historyStorage;
+    return historyStorage;
 #else
-	return NULL;
+    return nullptr;
 #endif
 }