← Back to branch summary

~noskcaj/ubuntu/saucy/sflphone/merge-1.2.3-2

« back to all changes in this revision

Viewing changes to kde/src/lib/instantmessagingmodel.cpp

  • Committer: Jackson Doak
  • Date: 2013-07-10 21:04:46 UTC
  • mfrom: (20.1.3 sid)
  • Revision ID: noskcaj@ubuntu.com-20130710210446-y8f587vza807icr9
https://launchpad.net/bugs/1196978
Properly merged from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
kde/src/lib/instantmessagingmodel.cpp
1
1
/****************************************************************************
2
 
 *   Copyright (C) 2012 by Savoir-Faire Linux                               *
 
2
 *   Copyright (C) 2012-2013 by Savoir-Faire Linux                          *
3
3
 *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com> *
4
4
 *                                                                          *
5
5
 *   This library is free software; you can redistribute it and/or          *
24
24
InstantMessagingModelManager* InstantMessagingModelManager::m_spInstance  = nullptr;
25
25
CallModelBase*                InstantMessagingModelManager::m_spCallModel = nullptr;
26
26
 
 
27
///Signleton
 
28
InstantMessagingModelManager* InstantMessagingModelManager::getInstance()
 
29
{
 
30
   if (!m_spInstance) {
 
31
      m_spInstance = new InstantMessagingModelManager();
 
32
   }
 
33
   return m_spInstance;
 
34
}
 
35
 
 
36
void InstantMessagingModelManager::init(CallModelBase* model) {
 
37
   m_spCallModel = model;
 
38
   getInstance();
 
39
}
27
40
 
28
41
///Constructor
29
42
InstantMessagingModelManager::InstantMessagingModelManager() : QObject(0)