10 files changed, 26 insertions, 9 deletions
diff --git a/SwifTools/UnitTest/SpellParserTest.cpp b/SwifTools/UnitTest/SpellParserTest.cpp
index 3148ae6..ccfd7e5 100644
--- a/SwifTools/UnitTest/SpellParserTest.cpp
+++ b/SwifTools/UnitTest/SpellParserTest.cpp
@@ -10,6 +10,8 @@
  * See the COPYING file for more information.
  */
 
+#include <memory>
+
 #include <boost/algorithm/string.hpp>
 
 #include <cppunit/extensions/HelperMacros.h>
@@ -26,7 +28,6 @@ class SpellParserTest : public CppUnit::TestFixture {
     CPPUNIT_TEST_SUITE_END();
     public:
         SpellParserTest() {
-            parser_ = new SpellParser();
         }
         void tearDown() {
             position_.clear();
@@ -50,7 +51,7 @@ class SpellParserTest : public CppUnit::TestFixture {
             CPPUNIT_ASSERT_EQUAL(26, boost::get<1>(position_.back()));
         }
     private:
-        SpellParser *parser_;
+        const std::unique_ptr<SpellParser> parser_ = std::unique_ptr<SpellParser>(new SpellParser());
         PositionPairList position_;
 };
 
diff --git a/Swiften/Base/IDGenerator.cpp b/Swiften/Base/IDGenerator.cpp
index 5aa471c..b59a39c 100644
--- a/Swiften/Base/IDGenerator.cpp
+++ b/Swiften/Base/IDGenerator.cpp
@@ -16,6 +16,9 @@ namespace Swift {
 IDGenerator::IDGenerator() {
 }
 
+IDGenerator::~IDGenerator() {
+}
+
 std::string IDGenerator::generateID() {
     static boost::uuids::random_generator generator;
     return boost::lexical_cast<std::string>(generator());
diff --git a/Swiften/Base/IDGenerator.h b/Swiften/Base/IDGenerator.h
index d1b5964..6b53994 100644
--- a/Swiften/Base/IDGenerator.h
+++ b/Swiften/Base/IDGenerator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -14,7 +14,8 @@ namespace Swift {
     class SWIFTEN_API IDGenerator {
         public:
             IDGenerator();
+            virtual ~IDGenerator();
 
-            std::string generateID();
+            virtual std::string generateID();
     };
 }
diff --git a/Swiften/Base/SimpleIDGenerator.cpp b/Swiften/Base/SimpleIDGenerator.cpp
index 072dd39..e6d72b3 100644
--- a/Swiften/Base/SimpleIDGenerator.cpp
+++ b/Swiften/Base/SimpleIDGenerator.cpp
@@ -11,6 +11,9 @@ namespace Swift {
 SimpleIDGenerator::SimpleIDGenerator() {
 }
 
+SimpleIDGenerator::~SimpleIDGenerator() {
+}
+
 std::string SimpleIDGenerator::generateID() {
     bool carry = true;
     size_t i = 0;
diff --git a/Swiften/Base/SimpleIDGenerator.h b/Swiften/Base/SimpleIDGenerator.h
index 49ba59e..ff645b1 100644
--- a/Swiften/Base/SimpleIDGenerator.h
+++ b/Swiften/Base/SimpleIDGenerator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -10,6 +10,7 @@
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/IDGenerator.h>
+#include <Swiften/Base/Override.h>
 
 namespace Swift {
 
@@ -21,8 +22,9 @@ namespace Swift {
     class SWIFTEN_API SimpleIDGenerator : public IDGenerator {
         public:
             SimpleIDGenerator();
+            ~SimpleIDGenerator();
 
-            std::string generateID();
+            std::string generateID() SWIFTEN_OVERRIDE;
 
         private:
             std::string currentID;
diff --git a/Swiften/MUC/MUCRegistry.h b/Swiften/MUC/MUCRegistry.h
index 3f61c71..aa341e4 100644
--- a/Swiften/MUC/MUCRegistry.h
+++ b/Swiften/MUC/MUCRegistry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -16,7 +16,7 @@ namespace Swift {
 
     class SWIFTEN_API MUCRegistry {
         public:
-            ~MUCRegistry();
+            virtual ~MUCRegistry();
 
             bool isMUC(const JID& j) const;
             void addMUC(const JID& j);
diff --git a/Swiften/Parser/PayloadParserFactoryCollection.cpp b/Swiften/Parser/PayloadParserFactoryCollection.cpp
index 4426428..bca1e83 100644
--- a/Swiften/Parser/PayloadParserFactoryCollection.cpp
+++ b/Swiften/Parser/PayloadParserFactoryCollection.cpp
@@ -17,6 +17,9 @@ namespace Swift {
 PayloadParserFactoryCollection::PayloadParserFactoryCollection() : defaultFactory_(nullptr) {
 }
 
+PayloadParserFactoryCollection::~PayloadParserFactoryCollection() {
+}
+
 void PayloadParserFactoryCollection::addFactory(PayloadParserFactory* factory) {
     factories_.push_back(factory);
 }
diff --git a/Swiften/Parser/PayloadParserFactoryCollection.h b/Swiften/Parser/PayloadParserFactoryCollection.h
index 06e334e..cc0db5a 100644
--- a/Swiften/Parser/PayloadParserFactoryCollection.h
+++ b/Swiften/Parser/PayloadParserFactoryCollection.h
@@ -17,6 +17,7 @@ namespace Swift {
     class SWIFTEN_API PayloadParserFactoryCollection {
         public:
             PayloadParserFactoryCollection();
+            virtual ~PayloadParserFactoryCollection();
 
             void addFactory(PayloadParserFactory* factory);
             void removeFactory(PayloadParserFactory* factory);
diff --git a/Swiften/Serializer/PayloadSerializerCollection.cpp b/Swiften/Serializer/PayloadSerializerCollection.cpp
index dd20364..114512e 100644
--- a/Swiften/Serializer/PayloadSerializerCollection.cpp
+++ b/Swiften/Serializer/PayloadSerializerCollection.cpp
@@ -17,6 +17,9 @@ namespace Swift {
 PayloadSerializerCollection::PayloadSerializerCollection() {
 }
 
+PayloadSerializerCollection::~PayloadSerializerCollection() {
+}
+
 void PayloadSerializerCollection::addSerializer(PayloadSerializer* serializer) {
     serializers_.push_back(serializer);
 }
diff --git a/Swiften/Serializer/PayloadSerializerCollection.h b/Swiften/Serializer/PayloadSerializerCollection.h
index a0fe2ea..53b3135 100644
--- a/Swiften/Serializer/PayloadSerializerCollection.h
+++ b/Swiften/Serializer/PayloadSerializerCollection.h
@@ -15,10 +15,10 @@
 namespace Swift {
     class PayloadSerializer;
 
-
     class SWIFTEN_API PayloadSerializerCollection {
         public:
             PayloadSerializerCollection();
+            virtual ~PayloadSerializerCollection();
 
             void addSerializer(PayloadSerializer* factory);
             void removeSerializer(PayloadSerializer* factory);