summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2014-05-18 09:29:04 (GMT)
committerRemko Tronçon <git@el-tramo.be>2014-05-18 15:49:08 (GMT)
commit9bba31c6ce54290011a96723f720d872ecdbabca (patch)
treeeec68d77764e85957d4c25878010e34f29ee8410 /Swift/Controllers/Storages
parenta507d029d8995e27adf96a46f60a8ba696667f7e (diff)
downloadswift-9bba31c6ce54290011a96723f720d872ecdbabca.zip
swift-9bba31c6ce54290011a96723f720d872ecdbabca.tar.bz2
Fix uninitialized variables
Change-Id: I95b6b67dcafe338561d3dfb28664bc3bba6d1159
Diffstat (limited to 'Swift/Controllers/Storages')
-rw-r--r--Swift/Controllers/Storages/FileStorages.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/Storages/FileStorages.cpp b/Swift/Controllers/Storages/FileStorages.cpp
index 52a5e00..e1b681f 100644
--- a/Swift/Controllers/Storages/FileStorages.cpp
+++ b/Swift/Controllers/Storages/FileStorages.cpp
@@ -22,6 +22,8 @@ FileStorages::FileStorages(const boost::filesystem::path& baseDir, const JID& ji
rosterStorage = new RosterFileStorage(baseDir / profile / "roster.xml");
#ifdef SWIFT_EXPERIMENTAL_HISTORY
historyStorage = new SQLiteHistoryStorage(baseDir / "history.db");
+#else
+ historyStorage = NULL;
#endif
}
@@ -30,9 +32,7 @@ FileStorages::~FileStorages() {
delete avatarStorage;
delete capsStorage;
delete vcardStorage;
-#ifdef SWIFT_EXPERIMENTAL_HISTORY
delete historyStorage;
-#endif
}
VCardStorage* FileStorages::getVCardStorage() const {