3 files changed, 34 insertions, 29 deletions
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
index cff34d8..737196a 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
@@ -1,38 +1,40 @@
 /*
- * 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/UserSearch/QtUserSearchWindow.h"
+#include <Swift/QtUI/UserSearch/QtUserSearchWindow.h>
+#include <boost/bind.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
 #include <QItemDelegate>
 #include <QModelIndex>
-#include <QWizardPage>
 #include <QMovie>
-#include <boost/bind.hpp>
+#include <QWizardPage>
-#include <boost/smart_ptr/make_shared.hpp>
+#include <Swiften/Base/Log.h>
 #include <Swiften/Base/foreach.h>
-#include <Swift/Controllers/UIEvents/UIEventStream.h>
-#include <Swift/Controllers/UIEvents/RequestChatUIEvent.h>
 #include <Swift/Controllers/UIEvents/AddContactUIEvent.h>
 #include <Swift/Controllers/UIEvents/CreateImpromptuMUCUIEvent.h>
 #include <Swift/Controllers/UIEvents/InviteToMUCUIEvent.h>
-#include <Swift/QtUI/UserSearch/UserSearchModel.h>
+#include <Swift/Controllers/UIEvents/RequestChatUIEvent.h>
-#include <Swift/QtUI/UserSearch/UserSearchDelegate.h>
+#include <Swift/Controllers/UIEvents/UIEventStream.h>
-#include <Swift/QtUI/QtSwiftUtil.h>
 #include <Swift/QtUI/QtFormResultItemModel.h>
-#include <Swift/QtUI/UserSearch/QtUserSearchFirstPage.h>
+#include <Swift/QtUI/QtSwiftUtil.h>
-#include <Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.h>
+#include <Swift/QtUI/UserSearch/QtContactListWidget.h>
+#include <Swift/QtUI/UserSearch/QtUserSearchDetailsPage.h>
 #include <Swift/QtUI/UserSearch/QtUserSearchFieldsPage.h>
+#include <Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.h>
+#include <Swift/QtUI/UserSearch/QtUserSearchFirstPage.h>
 #include <Swift/QtUI/UserSearch/QtUserSearchResultsPage.h>
-#include <Swift/QtUI/UserSearch/QtUserSearchDetailsPage.h>
+#include <Swift/QtUI/UserSearch/UserSearchDelegate.h>
-#include <Swift/QtUI/UserSearch/QtContactListWidget.h>
+#include <Swift/QtUI/UserSearch/UserSearchModel.h>
-#include <Swiften/Base/Log.h>
 namespace Swift {
 QtUserSearchWindow::QtUserSearchWindow(UIEventStream* eventStream, UserSearchWindow::Type type, const std::set<std::string>& groups, SettingsProvider* settingsProvider) : eventStream_(eventStream), type_(type), model_(NULL), firstMultiJIDPage_(NULL), settings_(settingsProvider), searchNext_(false), supportsImpromptu_(false) {
        setupUi(this);
@@ -51,11 +53,11 @@ QtUserSearchWindow::QtUserSearchWindow(UIEventStream* eventStream, UserSearchWin
                        title = tr("Add Users to Chat");
                        break;
        }
        setWindowTitle(title);
-        delegate_ = new UserSearchDelegate();
+        delegate_ = new UserSearchDelegate(this);
        setFirstPage(title);
        setSecondPage();
        setThirdPage();
diff --git a/Swift/QtUI/UserSearch/UserSearchDelegate.cpp b/Swift/QtUI/UserSearch/UserSearchDelegate.cpp
index 35793f4..1ac9eb3 100644
--- a/Swift/QtUI/UserSearch/UserSearchDelegate.cpp
+++ b/Swift/QtUI/UserSearch/UserSearchDelegate.cpp
@@ -1,26 +1,26 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
 * All rights reserved.
 * See the COPYING file for more information.
 */
-#include <QPen>
+#include <Swift/QtUI/UserSearch/UserSearchDelegate.h>
+#include <QFontMetrics>
+#include <QModelIndex>
 #include <QPainter>
+#include <QPen>
 #include <QStyleOptionViewItem>
-#include <QModelIndex>
-#include <QFontMetrics>
-#include "Swift/QtUI/UserSearch/UserSearchDelegate.h"
-//#include "Swift/QtUI/Roster/GroupItemDelegate.h"
 #include <Swift/Controllers/Chat/UserSearchController.h>
 #include <Swift/QtUI/UserSearch/UserSearchModel.h>
-//#include "Swift/QtUI/MUCSearch/MUCSearchServiceItem.h"
 namespace Swift {
-UserSearchDelegate::UserSearchDelegate() {
+UserSearchDelegate::UserSearchDelegate(QObject* parent) : QStyledItemDelegate(parent) {
 }
 UserSearchDelegate::~UserSearchDelegate() {
diff --git a/Swift/QtUI/UserSearch/UserSearchDelegate.h b/Swift/QtUI/UserSearch/UserSearchDelegate.h
index 41c20dc..92fa0e8 100644
--- a/Swift/QtUI/UserSearch/UserSearchDelegate.h
+++ b/Swift/QtUI/UserSearch/UserSearchDelegate.h
@@ -1,24 +1,27 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
 * All rights reserved.
 * See the COPYING file for more information.
 */
 #pragma once
-#include <QStyledItemDelegate>
 #include <QPainter>
 #include <QStyleOptionViewItem>
+#include <QStyledItemDelegate>
 #include <Swift/QtUI/Roster/DelegateCommons.h>
 namespace Swift {
        class UserSearchDelegate : public QStyledItemDelegate {
+                Q_OBJECT
                public:
-                        UserSearchDelegate();
+                        UserSearchDelegate(QObject* parent = 0);
-                        ~UserSearchDelegate();
+                        virtual ~UserSearchDelegate();
                        void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
                        QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index ) const;
                private:
                        DelegateCommons common_;
        };

diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp index cff34d8..737196a 100644 --- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp +++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
@@ -1,38 +1,40 @@
1	/*	1	/*
2	* Copyright (c) 2010-2014 Isode Limited.	2	* Copyright (c) 2010-2015 Isode Limited.
3	* All rights reserved.	3	* All rights reserved.
4	* See the COPYING file for more information.	4	* See the COPYING file for more information.
5	*/	5	*/
6		6
7	#include "Swift/QtUI/UserSearch/QtUserSearchWindow.h"	7	#include <Swift/QtUI/UserSearch/QtUserSearchWindow.h>
		8
		9	#include <boost/bind.hpp>
		10	#include <boost/smart_ptr/make_shared.hpp>
8		11
9	#include <QItemDelegate>	12	#include <QItemDelegate>
10	#include <QModelIndex>	13	#include <QModelIndex>
11	#include <QWizardPage>
12	#include <QMovie>	14	#include <QMovie>
13	#include <boost/bind.hpp>	15	#include <QWizardPage>
14	#include <boost/smart_ptr/make_shared.hpp>
15		16
		17	#include <Swiften/Base/Log.h>
16	#include <Swiften/Base/foreach.h>	18	#include <Swiften/Base/foreach.h>
17	#include <Swift/Controllers/UIEvents/UIEventStream.h>	19
18	#include <Swift/Controllers/UIEvents/RequestChatUIEvent.h>
19	#include <Swift/Controllers/UIEvents/AddContactUIEvent.h>	20	#include <Swift/Controllers/UIEvents/AddContactUIEvent.h>
20	#include <Swift/Controllers/UIEvents/CreateImpromptuMUCUIEvent.h>	21	#include <Swift/Controllers/UIEvents/CreateImpromptuMUCUIEvent.h>
21	#include <Swift/Controllers/UIEvents/InviteToMUCUIEvent.h>	22	#include <Swift/Controllers/UIEvents/InviteToMUCUIEvent.h>
22	#include <Swift/QtUI/UserSearch/UserSearchModel.h>	23	#include <Swift/Controllers/UIEvents/RequestChatUIEvent.h>
23	#include <Swift/QtUI/UserSearch/UserSearchDelegate.h>	24	#include <Swift/Controllers/UIEvents/UIEventStream.h>
24	#include <Swift/QtUI/QtSwiftUtil.h>	25
25	#include <Swift/QtUI/QtFormResultItemModel.h>	26	#include <Swift/QtUI/QtFormResultItemModel.h>
26	#include <Swift/QtUI/UserSearch/QtUserSearchFirstPage.h>	27	#include <Swift/QtUI/QtSwiftUtil.h>
27	#include <Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.h>	28	#include <Swift/QtUI/UserSearch/QtContactListWidget.h>
		29	#include <Swift/QtUI/UserSearch/QtUserSearchDetailsPage.h>
28	#include <Swift/QtUI/UserSearch/QtUserSearchFieldsPage.h>	30	#include <Swift/QtUI/UserSearch/QtUserSearchFieldsPage.h>
		31	#include <Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.h>
		32	#include <Swift/QtUI/UserSearch/QtUserSearchFirstPage.h>
29	#include <Swift/QtUI/UserSearch/QtUserSearchResultsPage.h>	33	#include <Swift/QtUI/UserSearch/QtUserSearchResultsPage.h>
30	#include <Swift/QtUI/UserSearch/QtUserSearchDetailsPage.h>	34	#include <Swift/QtUI/UserSearch/UserSearchDelegate.h>
31	#include <Swift/QtUI/UserSearch/QtContactListWidget.h>	35	#include <Swift/QtUI/UserSearch/UserSearchModel.h>
32
33	#include <Swiften/Base/Log.h>
34		36
35	namespace Swift {	37	namespace Swift {
36		38
37	QtUserSearchWindow::QtUserSearchWindow(UIEventStream* eventStream, UserSearchWindow::Type type, const std::set<std::string>& groups, SettingsProvider* settingsProvider) : eventStream_(eventStream), type_(type), model_(NULL), firstMultiJIDPage_(NULL), settings_(settingsProvider), searchNext_(false), supportsImpromptu_(false) {	39	QtUserSearchWindow::QtUserSearchWindow(UIEventStream* eventStream, UserSearchWindow::Type type, const std::set<std::string>& groups, SettingsProvider* settingsProvider) : eventStream_(eventStream), type_(type), model_(NULL), firstMultiJIDPage_(NULL), settings_(settingsProvider), searchNext_(false), supportsImpromptu_(false) {
38	setupUi(this);	40	setupUi(this);
@@ -51,11 +53,11 @@ QtUserSearchWindow::QtUserSearchWindow(UIEventStream* eventStream, UserSearchWin
51	title = tr("Add Users to Chat");	53	title = tr("Add Users to Chat");
52	break;	54	break;
53	}	55	}
54	setWindowTitle(title);	56	setWindowTitle(title);
55		57
56	delegate_ = new UserSearchDelegate();	58	delegate_ = new UserSearchDelegate(this);
57		59
58	setFirstPage(title);	60	setFirstPage(title);
59	setSecondPage();	61	setSecondPage();
60	setThirdPage();	62	setThirdPage();
61		63


diff --git a/Swift/QtUI/UserSearch/UserSearchDelegate.cpp b/Swift/QtUI/UserSearch/UserSearchDelegate.cpp index 35793f4..1ac9eb3 100644 --- a/Swift/QtUI/UserSearch/UserSearchDelegate.cpp +++ b/Swift/QtUI/UserSearch/UserSearchDelegate.cpp
@@ -1,26 +1,26 @@
1	/*	1	/*
2	* Copyright (c) 2010 Isode Limited.	2	* Copyright (c) 2010-2015 Isode Limited.
3	* All rights reserved.	3	* All rights reserved.
4	* See the COPYING file for more information.	4	* See the COPYING file for more information.
5	*/	5	*/
6		6
7	#include <QPen>	7	#include <Swift/QtUI/UserSearch/UserSearchDelegate.h>
		8
		9	#include <QFontMetrics>
		10	#include <QModelIndex>
8	#include <QPainter>	11	#include <QPainter>
		12	#include <QPen>
9	#include <QStyleOptionViewItem>	13	#include <QStyleOptionViewItem>
10	#include <QModelIndex>
11	#include <QFontMetrics>
12		14
13	#include "Swift/QtUI/UserSearch/UserSearchDelegate.h"
14	//#include "Swift/QtUI/Roster/GroupItemDelegate.h"
15	#include <Swift/Controllers/Chat/UserSearchController.h>	15	#include <Swift/Controllers/Chat/UserSearchController.h>
		16
16	#include <Swift/QtUI/UserSearch/UserSearchModel.h>	17	#include <Swift/QtUI/UserSearch/UserSearchModel.h>
17	//#include "Swift/QtUI/MUCSearch/MUCSearchServiceItem.h"
18		18
19	namespace Swift {	19	namespace Swift {
20		20
21	UserSearchDelegate::UserSearchDelegate() {	21	UserSearchDelegate::UserSearchDelegate(QObject* parent) : QStyledItemDelegate(parent) {
22		22
23	}	23	}
24		24
25	UserSearchDelegate::~UserSearchDelegate() {	25	UserSearchDelegate::~UserSearchDelegate() {
26		26


diff --git a/Swift/QtUI/UserSearch/UserSearchDelegate.h b/Swift/QtUI/UserSearch/UserSearchDelegate.h index 41c20dc..92fa0e8 100644 --- a/Swift/QtUI/UserSearch/UserSearchDelegate.h +++ b/Swift/QtUI/UserSearch/UserSearchDelegate.h
@@ -1,24 +1,27 @@
1	/*	1	/*
2	* Copyright (c) 2010 Isode Limited.	2	* Copyright (c) 2010-2015 Isode Limited.
3	* All rights reserved.	3	* All rights reserved.
4	* See the COPYING file for more information.	4	* See the COPYING file for more information.
5	*/	5	*/
6		6
7	#pragma once	7	#pragma once
8		8
9	#include <QStyledItemDelegate>
10	#include <QPainter>	9	#include <QPainter>
11	#include <QStyleOptionViewItem>	10	#include <QStyleOptionViewItem>
		11	#include <QStyledItemDelegate>
12		12
13	#include <Swift/QtUI/Roster/DelegateCommons.h>	13	#include <Swift/QtUI/Roster/DelegateCommons.h>
14		14
15	namespace Swift {	15	namespace Swift {
16	class UserSearchDelegate : public QStyledItemDelegate {	16	class UserSearchDelegate : public QStyledItemDelegate {
		17	Q_OBJECT
		18
17	public:	19	public:
18	UserSearchDelegate();	20	UserSearchDelegate(QObject* parent = 0);
19	~UserSearchDelegate();	21	virtual ~UserSearchDelegate();
		22
20	void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;	23	void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const;
21	QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index ) const;	24	QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index ) const;
22	private:	25	private:
23	DelegateCommons common_;	26	DelegateCommons common_;
24	};	27	};