Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
| commit | cfbdb43d2cadd40aa87338d41548e4bf89e146e6 (patch) | |
| tree | 18d94153a302445196fc0c18586abf44a1ce4a38 /Swiften/Client/MemoryStorages.cpp | |
| parent | 1d545a4a7fb877f021508094b88c1f17b30d8b4e (diff) | |
| download | swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.zip swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.tar.bz2 | |
Convert tabs to 4 spaces for all source files
Removed trailing spaces and whitespace on empty lines
in the process.
Changed CheckTabs.py tool to disallow hard tabs in source
files.
Test-Information:
Manually checked 30 random files that the conversion worked
as expected.
Change-Id: I874f99d617bd3d2bb55f02d58f22f58f9b094480
Diffstat (limited to 'Swiften/Client/MemoryStorages.cpp')
| -rw-r--r-- | Swiften/Client/MemoryStorages.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/Swiften/Client/MemoryStorages.cpp b/Swiften/Client/MemoryStorages.cpp index 8825fa2..14aa63a 100644 --- a/Swiften/Client/MemoryStorages.cpp +++ b/Swiften/Client/MemoryStorages.cpp @@ -16,48 +16,48 @@ namespace Swift { MemoryStorages::MemoryStorages(CryptoProvider* crypto) { - vcardStorage = new VCardMemoryStorage(crypto); - capsStorage = new CapsMemoryStorage(); - avatarStorage = new AvatarMemoryStorage(); - rosterStorage = new RosterMemoryStorage(); + vcardStorage = new VCardMemoryStorage(crypto); + capsStorage = new CapsMemoryStorage(); + avatarStorage = new AvatarMemoryStorage(); + rosterStorage = new RosterMemoryStorage(); #ifdef SWIFT_EXPERIMENTAL_HISTORY - historyStorage = new SQLiteHistoryStorage(":memory:"); + historyStorage = new SQLiteHistoryStorage(":memory:"); #else - historyStorage = NULL; + historyStorage = NULL; #endif } MemoryStorages::~MemoryStorages() { - delete rosterStorage; - delete avatarStorage; - delete capsStorage; - delete vcardStorage; + delete rosterStorage; + delete avatarStorage; + delete capsStorage; + delete vcardStorage; #ifdef SWIFT_EXPERIMENTAL_HISTORY - delete historyStorage; + delete historyStorage; #endif } VCardStorage* MemoryStorages::getVCardStorage() const { - return vcardStorage; + return vcardStorage; } CapsStorage* MemoryStorages::getCapsStorage() const { - return capsStorage; + return capsStorage; } AvatarStorage* MemoryStorages::getAvatarStorage() const { - return avatarStorage; + return avatarStorage; } RosterStorage* MemoryStorages::getRosterStorage() const { - return rosterStorage; + return rosterStorage; } HistoryStorage* MemoryStorages::getHistoryStorage() const { #ifdef SWIFT_EXPERIMENTAL_HISTORY - return historyStorage; + return historyStorage; #else - return NULL; + return NULL; #endif } |