5 files changed, 19 insertions, 6 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index d8c32be..328d837 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/Controllers/MainController.h>
 
@@ -120,12 +120,13 @@ MainController::MainController(
 			loginWindow_(NULL) ,
 			useDelayForLatency_(useDelayForLatency),
 			ftOverview_(NULL),
 			emoticons_(emoticons) {
 	storages_ = NULL;
 	certificateStorage_ = NULL;
+	certificateTrustChecker_ = NULL;
 	statusTracker_ = NULL;
 	presenceNotifier_ = NULL;
 	eventNotifier_ = NULL;
 	rosterController_ = NULL;
 	chatsManager_ = NULL;
 	historyController_ = NULL;
@@ -267,12 +268,14 @@ void MainController::resetClient() {
 	delete rosterController_;
 	rosterController_ = NULL;
 	delete eventNotifier_;
 	eventNotifier_ = NULL;
 	delete presenceNotifier_;
 	presenceNotifier_ = NULL;
+	delete certificateTrustChecker_;
+	certificateTrustChecker_ = NULL;
 	delete certificateStorage_;
 	certificateStorage_ = NULL;
 	delete storages_;
 	storages_ = NULL;
 	delete statusTracker_;
 	statusTracker_ = NULL;
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index 7b32bff..1d945da 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/QtSwift.h>
 
@@ -262,9 +262,10 @@ QtSwift::~QtSwift() {
 	delete uriHandler_;
 	delete dock_;
 	delete soundPlayer_;
 	delete chatWindowFactory_;
 	delete certificateStorageFactory_;
 	delete storagesFactory_;
+	delete applicationPathProvider_;
 }
 
 }
diff --git a/Swift/QtUI/QtVCardWidget/QtTagComboBox.cpp b/Swift/QtUI/QtVCardWidget/QtTagComboBox.cpp
index bade009..33863b2 100644
--- a/Swift/QtUI/QtVCardWidget/QtTagComboBox.cpp
+++ b/Swift/QtUI/QtVCardWidget/QtTagComboBox.cpp
@@ -1,26 +1,32 @@
 /*
  * Copyright (c) 2012 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #include "QtTagComboBox.h"
 
 #include <QAbstractItemView>
 #include <QtGui>
 
 namespace Swift {
 
 QtTagComboBox::QtTagComboBox(QWidget* parent) : QComboBox(parent) {
 	setEditable(false);
-	displayModel = new QStandardItemModel();
+	displayModel = new QStandardItemModel(this);
 	displayItem = new QStandardItem();
 	displayItem->setText("");
 	displayModel->insertRow(0, displayItem);
-	editMenu = new QMenu();
+	editMenu = new QMenu(this);
 	this->setModel(displayModel);
 	editable = true;
 }
 
 QtTagComboBox::~QtTagComboBox() {
 
diff --git a/Swift/QtUI/UserSearch/QtContactListWidget.cpp b/Swift/QtUI/UserSearch/QtContactListWidget.cpp
index 1069678..9b76aba 100644
--- a/Swift/QtUI/UserSearch/QtContactListWidget.cpp
+++ b/Swift/QtUI/UserSearch/QtContactListWidget.cpp
@@ -2,13 +2,13 @@
  * Copyright (c) 2013 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/UserSearch/QtContactListWidget.h>
 
@@ -56,12 +56,13 @@ QtContactListWidget::QtContactListWidget(QWidget* parent, SettingsProvider* sett
 #endif
 }
 
 QtContactListWidget::~QtContactListWidget() {
 	delete contactListDelegate_;
 	delete removableItemDelegate_;
+	delete contactListModel_;
 }
 
 void QtContactListWidget::setList(const std::vector<Contact::ref>& list) {
 	contactListModel_->setList(list);
 }
 
diff --git a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
index 151313c..2b775f9 100644
--- a/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
+++ b/Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp
@@ -2,13 +2,13 @@
  * Copyright (c) 2013 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/QtUI/UserSearch/QtSuggestingJIDInput.h>
 #include <Swift/QtUI/UserSearch/ContactListDelegate.h>
@@ -58,12 +58,14 @@ QtSuggestingJIDInput::QtSuggestingJIDInput(QWidget* parent, SettingsProvider* se
 	settings_->onSettingChanged.connect(boost::bind(&QtSuggestingJIDInput::handleSettingsChanged, this, _1));
 }
 
 QtSuggestingJIDInput::~QtSuggestingJIDInput() {
 	settings_->onSettingChanged.disconnect(boost::bind(&QtSuggestingJIDInput::handleSettingsChanged, this, _1));
 	delete treeViewPopup_;
+	delete contactListDelegate_;
+	delete contactListModel_;
 }
 
 Contact::ref QtSuggestingJIDInput::getContact() {
 	if (!!currentContact_) {
 		return currentContact_;
 	}