4 files changed, 6 insertions, 6 deletions
diff --git a/Swift/Controllers/UnitTest/MockChatWindow.h b/Swift/Controllers/UnitTest/MockChatWindow.h
index b4588e7..e535eca 100644
--- a/Swift/Controllers/UnitTest/MockChatWindow.h
+++ b/Swift/Controllers/UnitTest/MockChatWindow.h
@@ -43,7 +43,7 @@ namespace Swift {
             virtual void replaceSystemMessage(const ChatMessage& /*message*/, const std::string& /*id*/, const TimestampBehaviour /*timestampBehaviour*/) {}
 
             // File transfer related stuff
-            virtual std::string addFileTransfer(const std::string& /*senderName*/, bool /*senderIsSelf*/,const std::string& /*filename*/, const boost::uintmax_t /*sizeInBytes*/, const std::string& /*description*/) { return 0; }
+            virtual std::string addFileTransfer(const std::string& /*senderName*/, bool /*senderIsSelf*/,const std::string& /*filename*/, const boost::uintmax_t /*sizeInBytes*/, const std::string& /*description*/) { return nullptr; }
             virtual void setFileTransferProgress(std::string /*id*/, const int /*alreadyTransferedBytes*/) { }
             virtual void setFileTransferStatus(std::string /*id*/, const FileTransferState /*state*/, const std::string& /*msg*/) { }
 
diff --git a/Swift/Controllers/UnitTest/MockMainWindow.h b/Swift/Controllers/UnitTest/MockMainWindow.h
index 9177bdc..43522ce 100644
--- a/Swift/Controllers/UnitTest/MockMainWindow.h
+++ b/Swift/Controllers/UnitTest/MockMainWindow.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.
  */
@@ -12,7 +12,7 @@ namespace Swift {
     class Roster;
     class MockMainWindow : public MainWindow {
         public:
-            MockMainWindow() : roster(NULL) {}
+            MockMainWindow() : roster(nullptr) {}
             virtual ~MockMainWindow() {}
             virtual void setRosterModel(Roster* roster) {this->roster = roster;}
             virtual void setMyNick(const std::string& /*name*/) {}
diff --git a/Swift/Controllers/UnitTest/MockMainWindowFactory.h b/Swift/Controllers/UnitTest/MockMainWindowFactory.h
index 4af0c79..adf4fdf 100644
--- a/Swift/Controllers/UnitTest/MockMainWindowFactory.h
+++ b/Swift/Controllers/UnitTest/MockMainWindowFactory.h
@@ -13,7 +13,7 @@ namespace Swift {
 
     class MockMainWindowFactory : public MainWindowFactory {
         public:
-            MockMainWindowFactory() : last(NULL) {}
+            MockMainWindowFactory() : last(nullptr) {}
 
             virtual ~MockMainWindowFactory() {}
 
diff --git a/Swift/Controllers/UnitTest/PresenceNotifierTest.cpp b/Swift/Controllers/UnitTest/PresenceNotifierTest.cpp
index e1284fd..b3b364f 100644
--- a/Swift/Controllers/UnitTest/PresenceNotifierTest.cpp
+++ b/Swift/Controllers/UnitTest/PresenceNotifierTest.cpp
@@ -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.
  */
@@ -57,7 +57,7 @@ class PresenceNotifierTest : public CppUnit::TestFixture {
             user2 = JID("user2@foo.com/baz");
             avatarManager = new DummyAvatarManager();
             roster = new XMPPRosterImpl();
-            nickResolver = new NickResolver(JID("foo@bar.com"), roster, NULL, mucRegistry);
+            nickResolver = new NickResolver(JID("foo@bar.com"), roster, nullptr, mucRegistry);
             presenceOracle = new PresenceOracle(stanzaChannel, roster);
             timerFactory = new DummyTimerFactory();
         }