← Back to branch summary

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

« back to all changes in this revision

Viewing changes to kde/src/canvasobjectmanager.h

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2015-01-07 14:51:16 UTC
  • mfrom: (4.3.5 sid)
  • Revision ID: package-import@ubuntu.com-20150107145116-yxnafinf4lrdvrmx
Tags: 1.4.1-0.1ubuntu1
* Merge with Debian, remaining changes:
 - Drop soprano, nepomuk build-dep
* Drop ubuntu patches, now upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
kde/src/canvasobjectmanager.h
137
137
      CALL_ENDED           = 0x01<<16, /* When a call end                                   */
138
138
      BUDDY_IN             = 0x01<<17, /* When a buggy log in                               */
139
139
      BUDDY_OUT            = 0x01<<18, /* When a buddy log out                              */
 
140
      USER_CANCEL          = 0x01<<19, /* When the user press escape                        */
140
141
//       LEFT_CONFERENCE   = 0x01<<18, /* Someone left a conference                         */
141
142
//       JOIN_CONFERENCE   = 0x01<<19, /* Someone joined a conference                       */
142
143
   };
171
172
   };
172
173
 
173
174
   //Constants
174
 
   static const char EVENT_COUNT   = 20;
 
175
   static const char EVENT_COUNT   = 21;
175
176
   static const char ELEMENT_COUNT = 9 ;
176
177
 
177
178
   //Attributes
181
182
   CanvasObjectManager::ObjectLifeCycle m_CurrentLifeCycle   ;
182
183
   bool                                 m_DisableTransition  ;
183
184
   QTimer*                              m_pTimer             ;
184
 
   static CanvasObjectManager::Object   m_slEvents[ EVENT_COUNT   ];
 
185
   static CanvasObjectManager::Object   m_slEvents[ EVENT_COUNT+1 ];
185
186
   static const CanvasElement           elements  [ ELEMENT_COUNT ];
186
187
 
187
188
   //Helpers