summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Swift/QtUI/EventViewer/EventDelegate.cpp2
-rw-r--r--Swiften/Roster/ContactRosterItem.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/Swift/QtUI/EventViewer/EventDelegate.cpp b/Swift/QtUI/EventViewer/EventDelegate.cpp
index 8bdeb46..334dbd7 100644
--- a/Swift/QtUI/EventViewer/EventDelegate.cpp
+++ b/Swift/QtUI/EventViewer/EventDelegate.cpp
@@ -54,7 +54,7 @@ EventType EventDelegate::getEventType(boost::shared_ptr<StanzaEvent> event) cons
if (errorEvent) return ErrorEventType;
//I don't know what this is.
assert(false);
-
+ return MessageEventType;
}
}
diff --git a/Swiften/Roster/ContactRosterItem.cpp b/Swiften/Roster/ContactRosterItem.cpp
index a9591a5..1c27395 100644
--- a/Swiften/Roster/ContactRosterItem.cpp
+++ b/Swiften/Roster/ContactRosterItem.cpp
@@ -30,6 +30,7 @@ StatusShow::Type ContactRosterItem::getSimplifiedStatusShow() const {
case StatusShow::None: return StatusShow::None; break;
}
assert(false);
+ return StatusShow::None;
}
String ContactRosterItem::getStatusText() const {