[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=3315e81

The following commit has been merged in the master branch:
commit 3315e817fb1ce8fd802b9ff7e9aa665d352573ef
Merge: e11daf41c21aae5329323cf1f0ecb7ab2b1f6b82 ca988288eb9711c518ad6c082b41e9ef0de952ba
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Jan 15 17:00:42 2013 +0000

    Merge big model refactor.
    
    Replace all the models used to power KTp
    
    Subclass of Tp::Contact (KTp::Contact) to power the model
    Create a list of contacts ContactListModel
    Which can be grouped into AccountsTreeProxyModel or GroupsTreeProxyModel
    
    BUG: 304085
    BUG: 307899
    BUG: 282218
    CCBUG: 279023
    
    REVIEW: 107377
    REVIEW: 107629
    
    DIGEST:

 KTp/CMakeLists.txt                                 |   5 +
 KTp/Models/CMakeLists.txt                          |  46 ++-
 KTp/Models/abstract-grouping-proxy-model.cpp       | 338 +++++++++++++++++
 KTp/Models/abstract-grouping-proxy-model.h         |  77 ++++
 KTp/Models/accounts-filter-model.h                 | 281 +--------------
 KTp/Models/accounts-tree-proxy-model.cpp           | 108 ++++++
 .../accounts-tree-proxy-model.h}                   |  28 +-
 ...-filter-model.cpp => contacts-filter-model.cpp} | 399 +++++++++++----------
 ...unts-filter-model.h => contacts-filter-model.h} |  22 +-
 KTp/Models/contacts-list-model.cpp                 | 205 +++++++++++
 KTp/Models/contacts-list-model.h                   |  56 +++
 KTp/Models/groups-tree-proxy-model.cpp             |  76 ++++
 .../groups-tree-proxy-model.h}                     |  27 +-
 KTp/{Models => }/capabilities-hack-private.cpp     |   0
 KTp/{Models => }/capabilities-hack-private.h       |   0
 KTp/{debug.h => contact-factory.cpp}               |  32 +-
 KTp/{debug.h => contact-factory.h}                 |  34 +-
 KTp/contact.cpp                                    |  95 +++++
 KTp/contact.h                                      |  59 +++
 19 files changed, 1334 insertions(+), 554 deletions(-)

diff --cc KTp/CMakeLists.txt
index 7cae74b,cbdeb8d..10c17bf
--- a/KTp/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@@ -2,9 -2,11 +2,12 @@@ include_directories (${CMAKE_CURRENT_BI
                       ${CMAKE_CURRENT_SOURCE_DIR})
  
  set (ktp_common_internals_private_SRCS
 +     abstract-message-filter.cpp
       actions.cpp
+      capabilities-hack-private.cpp
       circular-countdown.cpp
+      contact.cpp
+      contact-factory.cpp
       debug.cpp
       error-dictionary.cpp
       global-contact-manager.cpp
@@@ -27,9 -23,10 +30,11 @@@
  )
  
  set (ktp_common_internals_private_HDRS
 +     abstract-message-filter.h
       actions.h
       circular-countdown.h
+      contact.h
+      contact-factory.h
       debug.h
       error-dictionary.h
       global-contact-manager.h

-- 
ktp-common-internals packaging