[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=a1a67a9

The following commit has been merged in the master branch:
commit a1a67a91b7fd9b6850de5ae9d3fc2f9173d10cb6
Merge: 6c3d59666c8040bb556bc3af60c79d6545263faf 6f15963252a65cc0d853a3dca81612457b5d56b9
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Feb 6 22:35:31 2013 +0000

    Merge branch 'model_refactor_3'
    
    Reviewed by: Martin Klapetek and David Edmundson whilst pair programming

 KTp/CMakeLists.txt                        |   2 +-
 KTp/Declarative/contact-pin.cpp           |   4 +-
 KTp/Declarative/contact-pin.h             |  10 +-
 KTp/Declarative/conversation-target.cpp   |   8 +-
 KTp/Declarative/conversation-target.h     |  10 +-
 KTp/Declarative/conversation.cpp          |   2 +-
 KTp/Declarative/pinned-contacts-model.cpp |  16 +-
 KTp/Declarative/pinned-contacts-model.h   |   6 +-
 KTp/Declarative/qml-plugins.cpp           |   6 +-
 KTp/Declarative/telepathy-text-observer.h |   3 +-
 KTp/Models/CMakeLists.txt                 |  21 +-
 KTp/Models/accounts-filter-model.h        |  34 ---
 KTp/Models/accounts-model-item.cpp        | 433 ------------------------------
 KTp/Models/accounts-model-item.h          |  83 ------
 KTp/Models/accounts-tree-proxy-model.cpp  |  26 +-
 KTp/Models/contact-model-item.cpp         | 272 -------------------
 KTp/Models/contact-model-item.h           |  66 -----
 KTp/Models/contacts-filter-model.cpp      | 229 ++++++----------
 KTp/Models/contacts-filter-model.h        |  39 ++-
 KTp/Models/contacts-list-model.cpp        | 146 +++++-----
 KTp/Models/contacts-model.cpp             | 320 ++++------------------
 KTp/Models/contacts-model.h               | 156 +++--------
 KTp/Models/flat-model-proxy.cpp           | 188 -------------
 KTp/Models/flat-model-proxy.h             |  65 -----
 KTp/Models/groups-model-item.cpp          | 125 ---------
 KTp/Models/groups-model-item.h            |  68 -----
 KTp/Models/groups-model.cpp               | 360 -------------------------
 KTp/Models/groups-model.h                 |  96 -------
 KTp/Models/groups-tree-proxy-model.cpp    |  17 +-
 KTp/Models/proxy-tree-node.cpp            |  91 -------
 KTp/Models/proxy-tree-node.h              |  59 ----
 KTp/Models/tree-node.cpp                  | 130 ---------
 KTp/Models/tree-node.h                    |  68 -----
 KTp/Widgets/add-contact-dialog.cpp        |   4 +-
 KTp/Widgets/contact-grid-widget.cpp       |   6 +-
 KTp/ktp-metatypes.h                       |  33 ---
 KTp/types.h                               |  87 ++++++
 37 files changed, 391 insertions(+), 2898 deletions(-)

-- 
ktp-common-internals packaging