diff --git a/computermodel.h b/computermodel.h
index 241b140ba..aeb918e9a 100644
--- a/computermodel.h
+++ b/computermodel.h
@@ -57,6 +57,8 @@ class FilteredPlacesModel : public QSortFilterProxyModel
 
 class RunCommandModel : public AbstractModel
 {
+    Q_OBJECT
+
     public:
         RunCommandModel(QObject *parent = 0);
         ~RunCommandModel();
diff --git a/containmentinterface.h b/containmentinterface.h
index c75e4dac6..2700ad86f 100644
--- a/containmentinterface.h
+++ b/containmentinterface.h
@@ -39,7 +39,7 @@ class ContainmentInterface : public QObject
             TaskManager
         };
 
-        Q_ENUMS(Target)
+        Q_ENUM(Target)
 
         ContainmentInterface(QObject *parent = 0);
         ~ContainmentInterface();
diff --git a/forwardingmodel.cpp b/forwardingmodel.cpp
index 91099e6e6..6313ed72c 100644
--- a/forwardingmodel.cpp
+++ b/forwardingmodel.cpp
@@ -199,8 +199,9 @@ int ForwardingModel::separatorCount() const
 
 void ForwardingModel::reset()
 {
-    emit beginResetModel();
-    emit endResetModel();
+    beginResetModel();
+    endResetModel();
+
     emit countChanged();
     emit separatorCountChanged();
 }
diff --git a/funnelmodel.cpp b/funnelmodel.cpp
index 467d36dda..476fec985 100644
--- a/funnelmodel.cpp
+++ b/funnelmodel.cpp
@@ -42,13 +42,13 @@ void FunnelModel::setSourceModel(QAbstractItemModel *model)
     connect(model, SIGNAL(destroyed(QObject*)), this, SLOT(reset()));
 
     if (!m_sourceModel) {
-        emit beginResetModel();
+        beginResetModel();
 
         m_sourceModel = model;
 
         connectSignals();
 
-        emit endResetModel();
+        endResetModel();
 
         emit countChanged();
 
diff --git a/recentcontactsmodel.cpp b/recentcontactsmodel.cpp
index 9d5a48618..dc030a52a 100644
--- a/recentcontactsmodel.cpp
+++ b/recentcontactsmodel.cpp
@@ -207,7 +207,7 @@ void RecentContactsModel::refresh()
 
 void RecentContactsModel::buildCache()
 {
-    qDeleteAll(m_idToData.values());
+    qDeleteAll(m_idToData);
     m_idToData.clear();
     m_dataToRow.clear();
 
diff --git a/recentusagemodel.h b/recentusagemodel.h
index fdbd1b293..89b721518 100644
--- a/recentusagemodel.h
+++ b/recentusagemodel.h
@@ -27,6 +27,8 @@
 
 class GroupSortProxy : public QSortFilterProxyModel
 {
+    Q_OBJECT
+
     public:
         explicit GroupSortProxy(QAbstractItemModel *sourceModel);
         ~GroupSortProxy();