← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to kde/src/klib/dataengine/sflphoneengine.h

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2014-01-28 18:23:36 UTC
  • mfrom: (1.1.11)
  • mto: This revision was merged to the branch mainline in revision 24.
  • Revision ID: package-import@ubuntu.com-20140128182336-3xenud1kbnwmf3mz
http://bugs.debian.org/735846
http://bugs.debian.org/727164
http://bugs.debian.org/718178
http://bugs.debian.org/736583
http://bugs.debian.org/722040
http://bugs.debian.org/736746
* New upstream release 
  - Fixes "New Upstream Release" (Closes: #735846)
  - Fixes "Ringtone does not stop" (Closes: #727164)
  - Fixes "[sflphone-kde] crash on startup" (Closes: #718178)
  - Fixes "sflphone GUI crashes when call is hung up" (Closes: #736583)
* Build-Depends: ensure GnuTLS 2.6
  - libucommon-dev (>= 6.0.7-1.1), libccrtp-dev (>= 2.0.6-3)
  - Fixes "FTBFS Build-Depends libgnutls{26,28}-dev" (Closes: #722040)
* Fix "boost 1.49 is going away" unversioned Build-Depends: (Closes: #736746)
* Add Build-Depends: libsndfile-dev, nepomuk-core-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
kde/src/klib/dataengine/sflphoneengine.h
1
1
/****************************************************************************
2
 
 *   Copyright (C) 2010-2013 by Savoir-Faire Linux                          *
 
2
 *   Copyright (C) 2010-2014 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          *
20
20
 
21
21
//Base
22
22
#include <Plasma/DataEngine>
23
 
#include "../sortabledockcommon.h"
24
23
 
25
24
//Qt
26
25
#include <QHash>
36
35
//Typedef
37
36
typedef QHash<QString,QVariant>                 HashStringString;
38
37
typedef QHash<QString,QHash<QString,QVariant> > ContactHash     ;
39
 
class Call;
 
38
#include "../../lib/call.h"
40
39
 
41
40
///SFLPhoneEngine: SFLPhone KDE plasma dataengine
42
 
class SFLPhoneEngine : public Plasma::DataEngine,public SortableDockCommon<>
 
41
class SFLPhoneEngine : public Plasma::DataEngine
43
42
{
44
43
   Q_OBJECT
45
44
 
51
50
      //Getter
52
51
      Plasma::Service*    serviceForSource (const QString &source)       ;
53
52
      virtual QStringList sources          (                     ) const ;
54
 
      static CallModel<>* getModel         (                     )       ;
 
53
      static CallModel* getModel         (                     )       ;
55
54
 
56
55
      //Friends
57
56
      friend class SFLPhoneService;
65
64
 
66
65
   private:
67
66
      //Attributes
68
 
      static CallModel<>*  m_pModel   ;
 
67
      static CallModel*  m_pModel   ;
69
68
      ContactHash          m_hContacts;
70
69
 
71
70
      //Getter
72
 
      QString getCallStateName(call_state state);
 
71
      QString getCallStateName(Call::State state);
73
72
 
74
73
      //Callback
75
74
      void updateHistory        ();