1 files changed, 14 insertions, 6 deletions
diff --git a/Swift/QtUI/EventViewer/EventDelegate.cpp b/Swift/QtUI/EventViewer/EventDelegate.cpp
index 9ecdd34..c0904b3 100644
--- a/Swift/QtUI/EventViewer/EventDelegate.cpp
+++ b/Swift/QtUI/EventViewer/EventDelegate.cpp
@@ -30,6 +30,7 @@ QSize EventDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIn
 		case ErrorEventType: return errorDelegate_.sizeHint(option, item);
 		case MUCInviteEventType: return mucInviteDelegate_.sizeHint(option, item);
-	default: return QStyledItemDelegate::sizeHint(option, index);
 	}
+	assert(false);
+	return QSize();
 }
 
@@ -45,5 +46,4 @@ void EventDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option,
 		case ErrorEventType: errorDelegate_.paint(painter, option, item);break;
 		case MUCInviteEventType: mucInviteDelegate_.paint(painter, option, item);break;
-	default: QStyledItemDelegate::paint(painter, option, index);
 	}
 }
@@ -51,11 +51,19 @@ void EventDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option,
 EventType EventDelegate::getEventType(boost::shared_ptr<StanzaEvent> event) const {
 	boost::shared_ptr<MessageEvent> messageEvent = boost::dynamic_pointer_cast<MessageEvent>(event);
-	if (messageEvent) return MessageEventType;
+	if (messageEvent) {
+		return MessageEventType;
+	}
 	boost::shared_ptr<SubscriptionRequestEvent> subscriptionEvent = boost::dynamic_pointer_cast<SubscriptionRequestEvent>(event);
-	if (subscriptionEvent) return SubscriptionEventType;
+	if (subscriptionEvent) {
+		return SubscriptionEventType;
+	}
 	boost::shared_ptr<ErrorEvent> errorEvent = boost::dynamic_pointer_cast<ErrorEvent>(event);
-	if (errorEvent) return ErrorEventType;
+	if (errorEvent) {
+		return ErrorEventType;
+	}
 	boost::shared_ptr<MUCInviteEvent> mucInviteEvent = boost::dynamic_pointer_cast<MUCInviteEvent>(event);
-	if (mucInviteEvent) return MUCInviteEventType;
+	if (mucInviteEvent) {
+		return MUCInviteEventType;
+	}
 	//I don't know what this is.
 	assert(false);