1 files changed, 56 insertions, 55 deletions
diff --git a/Swift/QtUI/MUCSearch/MUCSearchDelegate.cpp b/Swift/QtUI/MUCSearch/MUCSearchDelegate.cpp
index 828b89a..0163e03 100644
--- a/Swift/QtUI/MUCSearch/MUCSearchDelegate.cpp
+++ b/Swift/QtUI/MUCSearch/MUCSearchDelegate.cpp
@@ -1,17 +1,18 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
-#include <QPen>
+#include <Swift/QtUI/MUCSearch/MUCSearchDelegate.h>
+
 #include <QPainter>
+#include <QPen>
 
-#include "Swift/QtUI/MUCSearch/MUCSearchDelegate.h"
-#include "Swift/QtUI/Roster/GroupItemDelegate.h"
-#include "Swift/QtUI/MUCSearch/MUCSearchItem.h"
-#include "Swift/QtUI/MUCSearch/MUCSearchRoomItem.h"
-#include "Swift/QtUI/MUCSearch/MUCSearchServiceItem.h"
+#include <Swift/QtUI/MUCSearch/MUCSearchItem.h>
+#include <Swift/QtUI/MUCSearch/MUCSearchRoomItem.h>
+#include <Swift/QtUI/MUCSearch/MUCSearchServiceItem.h>
+#include <Swift/QtUI/Roster/GroupItemDelegate.h>
 
 namespace Swift {
 
@@ -24,63 +25,63 @@ MUCSearchDelegate::~MUCSearchDelegate() {
 }
 
 // QSize MUCSearchDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index ) const {
-// 	// MUCSearchItem* item = static_cast<MUCSearchItem*>(index.internalPointer());
-// 	// if (item && dynamic_cast<MUCSearchMUCItem*>(item)) {
-// 	// 	return mucSizeHint(option, index);
-// 	// } else if (item && dynamic_cast<MUCSearchGroupItem*>(item)) {
-// 	// 	return groupDelegate_->sizeHint(option, index);
-// 	// } 
-// 	return QStyledItemDelegate::sizeHint(option, index);
+//     // MUCSearchItem* item = static_cast<MUCSearchItem*>(index.internalPointer());
+//     // if (item && dynamic_cast<MUCSearchMUCItem*>(item)) {
+//     //     return mucSizeHint(option, index);
+//     // } else if (item && dynamic_cast<MUCSearchGroupItem*>(item)) {
+//     //     return groupDelegate_->sizeHint(option, index);
+//     // }
+//     return QStyledItemDelegate::sizeHint(option, index);
 // }
 
 // QSize MUCSearchDelegate::mucSizeHint(const QStyleOptionViewItem& /*option*/, const QModelIndex& /*index*/ ) const {
-// 	QFontMetrics nameMetrics(common_.nameFont);
-// 	QFontMetrics statusMetrics(common_.detailFont);
-// 	int sizeByText = 2 * common_.verticalMargin + nameMetrics.height() + statusMetrics.height();
-// 	return QSize(150, sizeByText);
+//     QFontMetrics nameMetrics(common_.nameFont);
+//     QFontMetrics statusMetrics(common_.detailFont);
+//     int sizeByText = 2 * common_.verticalMargin + nameMetrics.height() + statusMetrics.height();
+//     return QSize(150, sizeByText);
 // }
 
 // void MUCSearchDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const {
-// 	MUCSearchItem* item = static_cast<MUCSearchItem*>(index.internalPointer());
-// 	if (item && dynamic_cast<MUCSearchMUCItem*>(item)) {
-// 		paintMUC(painter, option, dynamic_cast<MUCSearchMUCItem*>(item));
-// 	} else if (item && dynamic_cast<MUCSearchGroupItem*>(item)) {
-// 		MUCSearchGroupItem* group = dynamic_cast<MUCSearchGroupItem*>(item);
-// 		groupDelegate_->paint(painter, option, group->data(Qt::DisplayRole).toString(), group->rowCount(), option.state & QStyle::State_Open); 
-// 	} else {
-// 		QStyledItemDelegate::paint(painter, option, index);
-// 	}
+//     MUCSearchItem* item = static_cast<MUCSearchItem*>(index.internalPointer());
+//     if (item && dynamic_cast<MUCSearchMUCItem*>(item)) {
+//         paintMUC(painter, option, dynamic_cast<MUCSearchMUCItem*>(item));
+//     } else if (item && dynamic_cast<MUCSearchGroupItem*>(item)) {
+//         MUCSearchGroupItem* group = dynamic_cast<MUCSearchGroupItem*>(item);
+//         groupDelegate_->paint(painter, option, group->data(Qt::DisplayRole).toString(), group->rowCount(), option.state & QStyle::State_Open);
+//     } else {
+//         QStyledItemDelegate::paint(painter, option, index);
+//     }
 // }
 
 // void MUCSearchDelegate::paintMUC(QPainter* painter, const QStyleOptionViewItem& option, MUCSearchMUCItem* item) const {
-// 	painter->save();
-// 	QRect fullRegion(option.rect);
-// 	if ( option.state & QStyle::State_Selected ) {
-// 		painter->fillRect(fullRegion, option.palette.highlight());
-// 		painter->setPen(option.palette.highlightedText().color());
-// 	} else {
-// 		QColor nameColor = item->data(Qt::TextColorRole).value<QColor>();
-// 		painter->setPen(QPen(nameColor));
-// 	}
-
-// 	QFontMetrics nameMetrics(common_.nameFont);
-// 	painter->setFont(common_.nameFont);
-// 	int extraFontWidth = nameMetrics.width("H");
-// 	int leftOffset = common_.horizontalMargin * 2 + extraFontWidth / 2;
-// 	QRect textRegion(fullRegion.adjusted(leftOffset, 0, 0, 0));
-	
-// 	int nameHeight = nameMetrics.height() + common_.verticalMargin;
-// 	QRect nameRegion(textRegion.adjusted(0, common_.verticalMargin, 0, 0));
-	
-// 	painter->drawText(nameRegion, Qt::AlignTop, item->data(Qt::DisplayRole).toString());
-	
-// 	painter->setFont(common_.detailFont);
-// 	painter->setPen(QPen(QColor(160,160,160)));
-	
-// 	QRect detailRegion(textRegion.adjusted(0, nameHeight, 0, 0));
-// 	painter->drawText(detailRegion, Qt::AlignTop, item->data(DetailTextRole).toString());
-	
-// 	painter->restore();
+//     painter->save();
+//     QRect fullRegion(option.rect);
+//     if ( option.state & QStyle::State_Selected ) {
+//         painter->fillRect(fullRegion, option.palette.highlight());
+//         painter->setPen(option.palette.highlightedText().color());
+//     } else {
+//         QColor nameColor = item->data(Qt::TextColorRole).value<QColor>();
+//         painter->setPen(QPen(nameColor));
+//     }
+
+//     QFontMetrics nameMetrics(common_.nameFont);
+//     painter->setFont(common_.nameFont);
+//     int extraFontWidth = nameMetrics.width("H");
+//     int leftOffset = common_.horizontalMargin * 2 + extraFontWidth / 2;
+//     QRect textRegion(fullRegion.adjusted(leftOffset, 0, 0, 0));
+
+//     int nameHeight = nameMetrics.height() + common_.verticalMargin;
+//     QRect nameRegion(textRegion.adjusted(0, common_.verticalMargin, 0, 0));
+
+//     painter->drawText(nameRegion, Qt::AlignTop, item->data(Qt::DisplayRole).toString());
+
+//     painter->setFont(common_.detailFont);
+//     painter->setPen(QPen(QColor(160,160,160)));
+
+//     QRect detailRegion(textRegion.adjusted(0, nameHeight, 0, 0));
+//     painter->drawText(detailRegion, Qt::AlignTop, item->data(DetailTextRole).toString());
+
+//     painter->restore();
 // }
 
 }