From 3f1e871fd01b9a9631eaee4c13cf05e6c9b6628f Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>
Date: Mon, 15 Sep 2014 17:23:18 +0200
Subject: [PATCH] Fix last commit

---
 src/contactmodel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/contactmodel.cpp b/src/contactmodel.cpp
index c6dd9e56..56485c75 100644
--- a/src/contactmodel.cpp
+++ b/src/contactmodel.cpp
@@ -236,7 +236,7 @@ bool ContactModel::addContact(Contact* c)
 
    //Deprecate the placeholder
    if (m_hPlaceholders.contains(c->uid())) {
-      Contact* c2 = m_hPlaceholders[c->uid()];
+      ContactPlaceHolder* c2 = m_hPlaceholders[c->uid()];
       if (c2) {
          c2->merge(c);
          m_hPlaceholders[c->uid()] = nullptr;
-- 
GitLab