7 files changed, 29 insertions, 41 deletions
diff --git a/Swift/Controllers/Chat/ChatController.h b/Swift/Controllers/Chat/ChatController.h
index 99f8e23..7bd6107 100644
--- a/Swift/Controllers/Chat/ChatController.h
+++ b/Swift/Controllers/Chat/ChatController.h
@@ -98,7 +98,7 @@ namespace Swift {
             UIEventStream* eventStream_;
 
             Tristate contactSupportsReceipts_;
-            bool receivingPresenceFromUs_;
+            bool receivingPresenceFromUs_ = false;
             bool userWantsReceipts_;
             std::map<std::string, FileTransferController*> ftControllers;
             SettingsProvider* settings_;
diff --git a/Swift/Controllers/HistoryViewController.h b/Swift/Controllers/HistoryViewController.h
index 4c4d9f9..75fc460 100644
--- a/Swift/Controllers/HistoryViewController.h
+++ b/Swift/Controllers/HistoryViewController.h
@@ -69,7 +69,7 @@ namespace Swift {
 
             std::map<HistoryMessage::Type, ContactsMap> contacts_;
             ContactRosterItem* selectedItem_;
-            HistoryMessage::Type selectedItemType_;
+            HistoryMessage::Type selectedItemType_ = HistoryMessage::Chat;
             boost::gregorian::date currentResultDate_;
     };
 }
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h
index 4f691ee..cc3d45f 100644
--- a/Swift/Controllers/MainController.h
+++ b/Swift/Controllers/MainController.h
@@ -187,7 +187,7 @@ namespace Swift {
             int timeBeforeNextReconnect_;
             Timer::ref reconnectTimer_;
             StatusTracker* statusTracker_;
-            bool myStatusLooksOnline_;
+            bool myStatusLooksOnline_ = false;
             bool quitRequested_;
             bool offlineRequested_;
             static const int SecondsToWaitBeforeForceQuitting;
diff --git a/Swift/Controllers/Roster/UnitTest/RosterTest.cpp b/Swift/Controllers/Roster/UnitTest/RosterTest.cpp
index 4687176..5f500d4 100644
--- a/Swift/Controllers/Roster/UnitTest/RosterTest.cpp
+++ b/Swift/Controllers/Roster/UnitTest/RosterTest.cpp
@@ -30,11 +30,7 @@ class RosterTest : public CppUnit::TestFixture {
             jid1_ = JID("a@b.c");
             jid2_ = JID("b@c.d");
             jid3_ = JID("c@d.e");
-            roster_ = new Roster();
-        }
-
-        void tearDown() {
-            delete roster_;
+            roster_ = std::unique_ptr<Roster>(new Roster());
         }
 
         void testGetGroup() {
@@ -136,7 +132,7 @@ class RosterTest : public CppUnit::TestFixture {
         }
 
     private:
-        Roster *roster_;
+        std::unique_ptr<Roster> roster_;
         JID jid1_;
         JID jid2_;
         JID jid3_;
diff --git a/Swift/Controllers/Roster/UnitTest/TableRosterTest.cpp b/Swift/Controllers/Roster/UnitTest/TableRosterTest.cpp
index e4e8bdb..ddc8785 100644
--- a/Swift/Controllers/Roster/UnitTest/TableRosterTest.cpp
+++ b/Swift/Controllers/Roster/UnitTest/TableRosterTest.cpp
@@ -13,10 +13,11 @@ std::ostream& operator<<(std::ostream& os, const Swift::TableRoster::Index& i) {
     return os;
 }
 
+#include <memory>
+
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
-#include <memory>
 #include <boost/variant.hpp>
 
 #include <Swiften/Network/DummyTimerFactory.h>
@@ -33,17 +34,12 @@ class TableRosterTest : public CppUnit::TestFixture {
 
     public:
         void setUp() {
-            timerFactory = new DummyTimerFactory();
-            roster = new Roster();
+            timerFactory = std::unique_ptr<DummyTimerFactory>(new DummyTimerFactory());
+            roster = std::unique_ptr<Roster>(new Roster());
             jid1 = JID("jid1@example.com");
             jid2 = JID("jid2@example.com");
         }
 
-        void tearDown() {
-            delete roster;
-            delete timerFactory;
-        }
-
         void testAddContact_EmptyRoster() {
             /*
             std::shared_ptr<TableRoster> tableRoster(createTestling());
@@ -73,7 +69,7 @@ class TableRosterTest : public CppUnit::TestFixture {
         }
 
         TableRoster* createTestling() {
-            TableRoster* result = new TableRoster(roster, timerFactory, 10);
+            TableRoster* result = new TableRoster(roster.get(), timerFactory.get(), 10);
             result->onUpdate.connect(boost::bind(&TableRosterTest::handleUpdate, this, _1));
             return result;
         }
@@ -83,8 +79,8 @@ class TableRosterTest : public CppUnit::TestFixture {
         }
 
     private:
-        DummyTimerFactory* timerFactory;
-        Roster* roster;
+        std::unique_ptr<DummyTimerFactory> timerFactory;
+        std::unique_ptr<Roster> roster;
         JID jid1;
         JID jid2;
         std::vector<TableRoster::Update> updates;
diff --git a/Swift/Controllers/Settings/UnitTest/SettingsProviderHierachyTest.cpp b/Swift/Controllers/Settings/UnitTest/SettingsProviderHierachyTest.cpp
index 5822add..3cfebc7 100644
--- a/Swift/Controllers/Settings/UnitTest/SettingsProviderHierachyTest.cpp
+++ b/Swift/Controllers/Settings/UnitTest/SettingsProviderHierachyTest.cpp
@@ -4,6 +4,8 @@
  * See the COPYING file for more information.
  */
 
+#include <memory>
+
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
@@ -29,17 +31,11 @@ public:
     SettingsProviderHierachyTest() : setting1("somekey", 42) {}
 
     void setUp() {
-        bottom = new DummySettingsProvider();
-        top = new DummySettingsProvider();
-        testling = new SettingsProviderHierachy();
-        testling->addProviderToTopOfStack(bottom);
-        testling->addProviderToTopOfStack(top);
-    }
-
-    void tearDown() {
-        delete testling;
-        delete top;
-        delete bottom;
+        bottom = std::unique_ptr<DummySettingsProvider>(new DummySettingsProvider());
+        top = std::unique_ptr<DummySettingsProvider>(new DummySettingsProvider());
+        testling = std::unique_ptr<SettingsProviderHierachy>(new SettingsProviderHierachy());
+        testling->addProviderToTopOfStack(bottom.get());
+        testling->addProviderToTopOfStack(top.get());
     }
 
     void testEmpty() {
@@ -82,9 +78,9 @@ public:
         CPPUNIT_ASSERT_EQUAL(17, testling->getSetting(setting1));
     }
 private:
-    SettingsProviderHierachy* testling;
-    DummySettingsProvider* bottom;
-    DummySettingsProvider* top;
+    std::unique_ptr<SettingsProviderHierachy> testling;
+    std::unique_ptr<DummySettingsProvider> bottom;
+    std::unique_ptr<DummySettingsProvider> top;
     SettingsProvider::Setting<int> setting1;
 };
 
diff --git a/Swift/Controllers/UnitTest/MockChatWindow.h b/Swift/Controllers/UnitTest/MockChatWindow.h
index 054cd31..9b943f0 100644
--- a/Swift/Controllers/UnitTest/MockChatWindow.h
+++ b/Swift/Controllers/UnitTest/MockChatWindow.h
@@ -14,7 +14,7 @@
 namespace Swift {
     class MockChatWindow : public ChatWindow {
         public:
-            MockChatWindow() : labelsEnabled_(false), impromptuMUCSupported_(false) {}
+            MockChatWindow() {}
             virtual ~MockChatWindow();
 
             virtual std::string addMessage(const ChatMessage& message, const std::string& senderName, bool senderIsSelf, std::shared_ptr<SecurityLabel> /*label*/, const std::string& /*avatarPath*/, const boost::posix_time::ptime& /*time*/) {
@@ -128,21 +128,21 @@ namespace Swift {
             std::string name_;
             ChatMessage lastAddedMessage_;
             std::string lastAddedMessageSenderName_;
-            bool lastAddedMessageSenderIsSelf_;
+            bool lastAddedMessageSenderIsSelf_ = false;
             ChatMessage lastAddedAction_;
             std::string lastAddedActionSenderName_;
-            bool lastAddedActionSenderIsSelf_;
+            bool lastAddedActionSenderIsSelf_ = false;
             ChatMessage lastAddedPresence_;
             ChatMessage lastReplacedMessage_;
             ChatMessage lastAddedSystemMessage_;
             ChatMessage lastReplacedSystemMessage_;
-			ChatMessage lastAddedErrorMessage_;
+            ChatMessage lastAddedErrorMessage_;
             JID lastMUCInvitationJID_;
             std::vector<SecurityLabelsCatalog::Item> labels_;
-            bool labelsEnabled_;
-            bool impromptuMUCSupported_;
+            bool labelsEnabled_ = false;
+            bool impromptuMUCSupported_ = false;
             SecurityLabelsCatalog::Item label_;
-            Roster* roster_;
+            Roster* roster_ = nullptr;
             std::vector<std::pair<std::string, ReceiptState>> receiptChanges_;
     };
 }