12 files changed, 26 insertions, 354 deletions
diff --git a/Swift/QtUI/ChatList/ChatListMUCItem.cpp b/Swift/QtUI/ChatList/ChatListMUCItem.cpp
index e374ed5..68f9581 100644
--- a/Swift/QtUI/ChatList/ChatListMUCItem.cpp
+++ b/Swift/QtUI/ChatList/ChatListMUCItem.cpp
@@ -13,7 +13,7 @@ ChatListMUCItem::ChatListMUCItem(const MUCBookmark& bookmark, ChatListGroupItem*
 
 }
 
-const MUCBookmark& ChatListMUCItem::getBookmark() {
+const MUCBookmark& ChatListMUCItem::getBookmark() const {
 	return bookmark_;
 }
 
diff --git a/Swift/QtUI/ChatList/ChatListMUCItem.h b/Swift/QtUI/ChatList/ChatListMUCItem.h
index f26aa67..046d1d4 100644
--- a/Swift/QtUI/ChatList/ChatListMUCItem.h
+++ b/Swift/QtUI/ChatList/ChatListMUCItem.h
@@ -24,7 +24,7 @@ namespace Swift {
 				StatusShowTypeRole = Qt::UserRole + 3*/
 			};
 			ChatListMUCItem(const MUCBookmark& bookmark, ChatListGroupItem* parent);
-			const MUCBookmark& getBookmark();
+			const MUCBookmark& getBookmark() const;
 			QVariant data(int role) const;
 		private:
 			MUCBookmark bookmark_;
diff --git a/Swift/QtUI/ChatList/ChatListRecentItem.cpp b/Swift/QtUI/ChatList/ChatListRecentItem.cpp
index 8b6707c..38f9a5e 100644
--- a/Swift/QtUI/ChatList/ChatListRecentItem.cpp
+++ b/Swift/QtUI/ChatList/ChatListRecentItem.cpp
@@ -13,7 +13,7 @@ ChatListRecentItem::ChatListRecentItem(const ChatListWindow::Chat& chat, ChatLis
 
 }
 
-const ChatListWindow::Chat& ChatListRecentItem::getChat() {
+const ChatListWindow::Chat& ChatListRecentItem::getChat() const {
 	return chat_;
 }
 
diff --git a/Swift/QtUI/ChatList/ChatListRecentItem.h b/Swift/QtUI/ChatList/ChatListRecentItem.h
index c2646cc..f88de77 100644
--- a/Swift/QtUI/ChatList/ChatListRecentItem.h
+++ b/Swift/QtUI/ChatList/ChatListRecentItem.h
@@ -25,7 +25,7 @@ namespace Swift {
 				StatusShowTypeRole = Qt::UserRole + 3*/
 			};
 			ChatListRecentItem(const ChatListWindow::Chat& chat, ChatListGroupItem* parent);
-			const ChatListWindow::Chat& getChat();
+			const ChatListWindow::Chat& getChat() const;
 			QVariant data(int role) const;
 		private:
 			ChatListWindow::Chat chat_;
diff --git a/Swift/QtUI/ChatSnippet.h b/Swift/QtUI/ChatSnippet.h
index 7cbb3b3..0d864c1 100644
--- a/Swift/QtUI/ChatSnippet.h
+++ b/Swift/QtUI/ChatSnippet.h
@@ -21,7 +21,7 @@ namespace Swift {
 			virtual const QString& getContent() const = 0;
 			virtual QString getContinuationElementID() const { return ""; }
 
-			boost::shared_ptr<ChatSnippet> getContinuationFallbackSnippet() {return continuationFallback_;}
+			boost::shared_ptr<ChatSnippet> getContinuationFallbackSnippet() const {return continuationFallback_;}
 
 			bool getAppendToPrevious() const {
 				return appendToPrevious_;
diff --git a/Swift/QtUI/EventViewer/QtEventWindow.h b/Swift/QtUI/EventViewer/QtEventWindow.h
index 03f009b..a20e5ab 100644
--- a/Swift/QtUI/EventViewer/QtEventWindow.h
+++ b/Swift/QtUI/EventViewer/QtEventWindow.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "boost/shared_ptr.hpp"
+#include <boost/shared_ptr.hpp>
 
 #include <QTreeView>
 
diff --git a/Swift/QtUI/MUCSearch/MUCSearchRoomItem.h b/Swift/QtUI/MUCSearch/MUCSearchRoomItem.h
index 920aaae..a9eb74d 100644
--- a/Swift/QtUI/MUCSearch/MUCSearchRoomItem.h
+++ b/Swift/QtUI/MUCSearch/MUCSearchRoomItem.h
@@ -15,7 +15,7 @@ namespace Swift {
 			MUCSearchRoomItem(const QString& node, MUCSearchServiceItem* parent);
 			MUCSearchServiceItem* getParent();
 			QVariant data(int role);
-			QString getNode() {return node_;}
+			QString getNode() const {return node_;}
 		private:
 			MUCSearchServiceItem* parent_;
 			QString node_;
diff --git a/Swift/QtUI/MUCSearch/MUCSearchServiceItem.h b/Swift/QtUI/MUCSearch/MUCSearchServiceItem.h
index 411727d..2a28922 100644
--- a/Swift/QtUI/MUCSearch/MUCSearchServiceItem.h
+++ b/Swift/QtUI/MUCSearch/MUCSearchServiceItem.h
@@ -24,7 +24,7 @@ namespace Swift {
 					default: return QVariant();
 				}
 			}
-			QString getHost() {return jidString_;}
+			QString getHost() const {return jidString_;}
 		private:
 			QList<MUCSearchItem*> rooms_;
 			QString jidString_;
diff --git a/Swift/QtUI/QtChatTheme.cpp b/Swift/QtUI/QtChatTheme.cpp
index afcf665..1d7a970 100644
--- a/Swift/QtUI/QtChatTheme.cpp
+++ b/Swift/QtUI/QtChatTheme.cpp
@@ -60,7 +60,7 @@ QtChatTheme::QtChatTheme(const QString& themePath) : qrc_(themePath.isEmpty()),
 
 }
 
-QString QtChatTheme::getBase() {
+QString QtChatTheme::getBase() const {
 	return qrc_ ? "qrc" + themePath_ : "file://" + themePath_;
 }
 
diff --git a/Swift/QtUI/QtChatTheme.h b/Swift/QtUI/QtChatTheme.h
index 199c66d..c6b02a0 100644
--- a/Swift/QtUI/QtChatTheme.h
+++ b/Swift/QtUI/QtChatTheme.h
@@ -13,23 +13,23 @@ namespace Swift {
 	class QtChatTheme {
 		public:
 			QtChatTheme(const QString& themePath);
-			QString getHeader() {return fileContents_[Header];};
-			QString getFooter() {return fileContents_[Footer];};
-			QString getContent() {return fileContents_[Content];};
-			QString getStatus() {return fileContents_[Status];};
-			QString getTopic() {return fileContents_[Topic];};
-			QString getFileTransferRequest() {return fileContents_[FileTransferRequest];};
-			QString getIncomingContent() {return fileContents_[IncomingContent];};
-			QString getIncomingNextContent() {return fileContents_[IncomingNextContent];};
-			QString getIncomingContext() {return fileContents_[IncomingContext];};
-			QString getIncomingNextContext() {return fileContents_[IncomingNextContext];};
-			QString getOutgoingContent() {return fileContents_[OutgoingContent];};
-			QString getOutgoingNextContent() {return fileContents_[OutgoingNextContent];};
-			QString getOutgoingContext() {return fileContents_[OutgoingContext];};
-			QString getOutgoingNextContext() {return fileContents_[OutgoingNextContext];};
-			QString getTemplate() {return fileContents_[Template];}
-			QString getMainCSS() {return fileContents_[MainCSS];}
-			QString getBase();
+			QString getHeader() const {return fileContents_[Header];};
+			QString getFooter() const {return fileContents_[Footer];};
+			QString getContent() const {return fileContents_[Content];};
+			QString getStatus() const {return fileContents_[Status];};
+			QString getTopic() const {return fileContents_[Topic];};
+			QString getFileTransferRequest() const {return fileContents_[FileTransferRequest];};
+			QString getIncomingContent() const {return fileContents_[IncomingContent];};
+			QString getIncomingNextContent() const {return fileContents_[IncomingNextContent];};
+			QString getIncomingContext() const {return fileContents_[IncomingContext];};
+			QString getIncomingNextContext() const {return fileContents_[IncomingNextContext];};
+			QString getOutgoingContent() const {return fileContents_[OutgoingContent];};
+			QString getOutgoingNextContent() const {return fileContents_[OutgoingNextContent];};
+			QString getOutgoingContext() const {return fileContents_[OutgoingContext];};
+			QString getOutgoingNextContext() const {return fileContents_[OutgoingNextContext];};
+			QString getTemplate() const {return fileContents_[Template];}
+			QString getMainCSS() const {return fileContents_[MainCSS];}
+			QString getBase() const;
 
 		private:
 			enum files {Header = 0, Footer, Content, Status, Topic, FileTransferRequest, IncomingContent, IncomingNextContent, IncomingContext, IncomingNextContext, OutgoingContent, OutgoingNextContent, OutgoingContext, OutgoingNextContext, Template, MainCSS, TemplateDefault, EndMarker};
diff --git a/Swift/QtUI/Roster/QtTreeWidgetItem.cpp b/Swift/QtUI/Roster/QtTreeWidgetItem.cpp
deleted file mode 100644
index fcd8691..0000000
--- a/Swift/QtUI/Roster/QtTreeWidgetItem.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright (c) 2010 Kevin Smith
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-
-#include "Swift/QtUI/Roster/QtTreeWidgetItem.h"
-#include "Swift/QtUI/Roster/QtTreeWidget.h"
-
-#include <qdebug.h>
-#include <QtAlgorithms>
-#include <algorithm>
-
-namespace Swift {
-
-QtTreeWidgetItem::QtTreeWidgetItem(QtTreeWidgetItem* parentItem) : QObject(), textColor_(0,0,0), backgroundColor_(255,255,255) {
-	parent_ = parentItem;
-	shown_ = true;
-	expanded_ = true;
-}
-
-
-void QtTreeWidgetItem::setText(const std::string& text) {
-	displayName_ = P2QSTRING(text);
-	displayNameLower_ = displayName_.toLower();
-	emit changed(this);
-}
-
-void QtTreeWidgetItem::setStatusText(const std::string& text) {
-	statusText_ = P2QSTRING(text);
-	emit changed(this);
-}
-
-void QtTreeWidgetItem::setAvatarPath(const std::string& path) {
-	avatar_ = QIcon(P2QSTRING(path));
-	emit changed(this);
-}
-
-void QtTreeWidgetItem::setStatusShow(StatusShow::Type show) {
-	statusShowType_ = show;
-	int color = 0;
-	switch (show) {
-		case StatusShow::Online: color = 0x000000; mergedShowType_ = StatusShow::Online; break;
-		case StatusShow::Away: color = 0x336699; mergedShowType_ = StatusShow::Away; break;
-	 	case StatusShow::XA: color = 0x336699; mergedShowType_ = StatusShow::Away; break;
-		case StatusShow::FFC: color = 0x000000; mergedShowType_ = StatusShow::Online; break;
-		case StatusShow::DND: color = 0x990000; mergedShowType_ = show; break;
-		case StatusShow::None: color = 0x7F7F7F; mergedShowType_ = show; break;
-	}
-	setTextColor(color);
-	emit changed(this);
-}
-
-void QtTreeWidgetItem::setTextColor(unsigned long color) {
-	textColor_ = QColor(
-	 					((color & 0xFF0000)>>16),
-	 					((color & 0xFF00)>>8), 
-	 					(color & 0xFF));
-}
-
-void QtTreeWidgetItem::setBackgroundColor(unsigned long color) {
-	backgroundColor_ = QColor(
-	 					((color & 0xFF0000)>>16),
-	 					((color & 0xFF00)>>8), 
-	 					(color & 0xFF));
-}
-
-void QtTreeWidgetItem::setExpanded(bool expanded) {
-	expanded_ = expanded;
-	emit changed(this);
-}
-
-void QtTreeWidgetItem::hide() {
-	shown_ = false;
-	emit changed(this);
-}
-
-void QtTreeWidgetItem::show() {
-	shown_ = true;
-	emit changed(this);
-}
-
-bool QtTreeWidgetItem::isShown() {
-	return isContact() ? shown_ : shownChildren_.size() > 0;
-}
-
-QWidget* QtTreeWidgetItem::getCollapsedRosterWidget() {
-	QWidget* widget = new QWidget();
-	return widget;
-}
-
-QWidget* QtTreeWidgetItem::getExpandedRosterWidget() {
-	QWidget* widget = new QWidget();
-	return widget;
-}
-
-QtTreeWidgetItem::~QtTreeWidgetItem() {
-	//It's possible (due to the way the roster deletes items in unknown order when it is deleted)
-	// That the children will be deleted before the groups, or that the groups are deleted 
-	// before the children. If the children are deleted first, they will let the parent know that
-	// They've been deleted. If the parent is deleted first, it must tell the children not to
-	// tell it when they're deleted. Everything will be deleted in the end, because all the
-	// widgets are owned by the Roster in Swiften.
-	if (parent_) {
-		parent_->removeChild(this);
-	}
-
-	for (int i = 0; i < children_.size(); i++) {
-		children_[i]->parentItemHasBeenDeleted();
-	}
-}
-
-void QtTreeWidgetItem::parentItemHasBeenDeleted() {
-	parent_ = NULL;
-}
-
-QtTreeWidgetItem* QtTreeWidgetItem::getParentItem() {
-	return parent_;
-}
-
-void QtTreeWidgetItem::addChild(QtTreeWidgetItem* child) {
-	children_.append(child);
-	connect(child, SIGNAL(changed(QtTreeWidgetItem*)), this, SLOT(handleChanged(QtTreeWidgetItem*)));
-	handleChanged(child);
-}
-
-void QtTreeWidgetItem::removeChild(QtTreeWidgetItem* child) {
-	children_.removeAll(child);
-	handleChanged(this);
-}
-
-void bubbleSort(QList<QtTreeWidgetItem*>& list) {
-	bool done = false;
-	for (int i = 0; i < list.size() - 1 && !done; i++) {
-		done = true;
-		for (int j = i + 1; j < list.size(); j++) {
-			if (*(list[j]) < *(list[j - 1])) {
-				done = false;
-				QtTreeWidgetItem* lower = list[j];
-				list[j] = list[j - 1];
-				list[j - 1] = lower;
-			}
-		}
-	}
-}
-
-void QtTreeWidgetItem::handleChanged(QtTreeWidgetItem* child) {
-	/*We don't use the much faster qStableSort because it causes changed(child) and all sorts of nasty recursion*/
-	//qStableSort(children_.begin(), children_.end(), itemLessThan);
-	//bubbleSort(children_);
-	std::stable_sort(children_.begin(), children_.end(), itemLessThan);
-	shownChildren_.clear();
-	for (int i = 0; i < children_.size(); i++) {
-		if (children_[i]->isShown()) {
-			shownChildren_.append(children_[i]);
-		}
-	}
-	emit changed(child);
-}
-
-int QtTreeWidgetItem::rowCount() {
-	//qDebug() << "Returning size of " << children_.size() << " for item " << displayName_;
-	return shownChildren_.size();
-}
-
-int QtTreeWidgetItem::rowOf(QtTreeWidgetItem* item) {
-	return shownChildren_.indexOf(item);
-}
-
-int QtTreeWidgetItem::row() {
-	return parent_ ? parent_->rowOf(this) : 0;
-}
-
-QtTreeWidgetItem* QtTreeWidgetItem::getItem(int row) {
-	//qDebug() << "Returning row " << row << " from item " << displayName_;
-	Q_ASSERT(row >= 0);
-	Q_ASSERT(row < rowCount());
-	return shownChildren_[row];
-}
-
-
-QVariant QtTreeWidgetItem::data(int role) {
-	if (!isContact()) {
-		setTextColor(0xFFFFFF);
-		setBackgroundColor(0x969696);
-	}
- 	switch (role) {
-	 	case Qt::DisplayRole: return displayName_;
-		case Qt::TextColorRole: return textColor_;
-		case Qt::BackgroundColorRole: return backgroundColor_;
-		case Qt::ToolTipRole: return isContact() ? toolTipString() : QVariant();
-	 	case StatusTextRole: return statusText_;
-		case AvatarRole: return avatar_;
-		case PresenceIconRole: return getPresenceIcon();
-	 	default: return QVariant();
-	}
-}
-
-QString QtTreeWidgetItem::toolTipString() {
-	return displayName_ + "\n " + statusText_;
-}
-
-QIcon QtTreeWidgetItem::getPresenceIcon() {
-	QString iconString;
-	switch (statusShowType_) {
-	 	case StatusShow::Online: iconString = "online";break;
-	 	case StatusShow::Away: iconString = "away";break;
-	 	case StatusShow::XA: iconString = "away";break;
-	 	case StatusShow::FFC: iconString = "online";break;
-	 	case StatusShow::DND: iconString = "dnd";break;
-	 	case StatusShow::None: iconString = "offline";break;
-	}
-	return QIcon(":/icons/" + iconString + ".png");
-}
-
-bool QtTreeWidgetItem::isContact() const {
-	return children_.size() == 0;
-}
-
-bool QtTreeWidgetItem::isExpanded() {
-	return expanded_;
-}
-
-bool QtTreeWidgetItem::operator<(const QtTreeWidgetItem& item) const {
-	if (isContact()) {
-		if (!item.isContact()) {
-			return false;
-		}
-		return getStatusShowMerged() == item.getStatusShowMerged() ? getLowerName() < item.getLowerName() : getStatusShowMerged() < item.getStatusShowMerged();
-	} else {
-		if (item.isContact()) {
-			return true;
-		}
-		return getLowerName() < item.getLowerName();
-	}
-}
-
-bool itemLessThan(QtTreeWidgetItem* left, QtTreeWidgetItem* right) {
-	return *left < *right;
-}
-
-}
diff --git a/Swift/QtUI/Roster/QtTreeWidgetItem.h b/Swift/QtUI/Roster/QtTreeWidgetItem.h
deleted file mode 100644
index 6855989..0000000
--- a/Swift/QtUI/Roster/QtTreeWidgetItem.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2010 Kevin Smith
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-
-#pragma once
-
-#include <QColor>
-#include <QVariant>
-#include <string>
-
-#include "Swiften/Roster/TreeWidgetFactory.h"
-#include "Swiften/Roster/TreeWidget.h"
-#include "Swiften/Roster/TreeWidgetItem.h"
-#include "Swift/QtUI/QtSwiftUtil.h"
-
-namespace Swift {
-	enum RosterRoles {
-		StatusTextRole = Qt::UserRole,
-		AvatarRole = Qt::UserRole + 1,
-		PresenceIconRole = Qt::UserRole + 2,
-		StatusShowTypeRole = Qt::UserRole + 3
-	};
-	
-class QtTreeWidget;
-class QtTreeWidgetItem : public QObject, public TreeWidgetItem {
-	Q_OBJECT
-	public:
-			~QtTreeWidgetItem();
-			void addChild(QtTreeWidgetItem* child);
-			void removeChild(QtTreeWidgetItem* child);
-			QtTreeWidgetItem* getParentItem();
-			int rowCount();
-			int rowOf(QtTreeWidgetItem* item);
-			int row();
-			QtTreeWidgetItem* getItem(int row);
-			QVariant data(int role);
-			QIcon getPresenceIcon(); 
-			QtTreeWidgetItem(QtTreeWidgetItem* parentItem);
-			void setText(const std::string& text);
-			void setAvatarPath(const std::string& path);
-			void setStatusText(const std::string& text);
-			void setStatusShow(StatusShow::Type show);
-			void setTextColor(unsigned long color);
-			void setBackgroundColor(unsigned long color);
-			void setExpanded(bool b);
-			void parentItemHasBeenDeleted();
-			void hide();
-			void show();
-			bool isShown();
-			bool isContact() const;
-			bool isExpanded();
-			const QString& getName() const {return displayName_;};
-			const QString& getLowerName() const {return displayNameLower_;};
-			StatusShow::Type getStatusShow() const {return statusShowType_;};
-			StatusShow::Type getStatusShowMerged() const {return mergedShowType_;};
-
-			QWidget* getCollapsedRosterWidget();
-			QWidget* getExpandedRosterWidget();
-			bool operator<(const QtTreeWidgetItem& item) const;
-			
-		signals:
-			void changed(QtTreeWidgetItem*);
-		private slots:
-			void handleChanged(QtTreeWidgetItem* item);
-		private:
-			QString toolTipString();
-			QList<QtTreeWidgetItem*> children_;
-			QList<QtTreeWidgetItem*> shownChildren_;
-			QtTreeWidgetItem* parent_;
-			QString displayName_;
-			QString displayNameLower_;
-			QString statusText_;
-			QColor textColor_;
-			QColor backgroundColor_;
-			QVariant avatar_;
-			bool shown_;
-			bool expanded_;
-			StatusShow::Type statusShowType_;
-			StatusShow::Type mergedShowType_;
-};
-
-bool itemLessThan(QtTreeWidgetItem* left, QtTreeWidgetItem* right);
-
-}