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

The following commit has been merged in the master branch:
commit bd54854584f7381d4dc3f365c80bf6f068bf98f5
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Jan 3 11:43:03 2013 +0000

    Namespace and d-pointer GroupsTreeProxyModel
---
 KTp/Models/groups-tree-proxy-model.cpp | 21 +++++++++++++++++----
 KTp/Models/groups-tree-proxy-model.h   | 12 ++++++++++--
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/KTp/Models/groups-tree-proxy-model.cpp b/KTp/Models/groups-tree-proxy-model.cpp
index e41d990..c034ae0 100644
--- a/KTp/Models/groups-tree-proxy-model.cpp
+++ b/KTp/Models/groups-tree-proxy-model.cpp
@@ -22,12 +22,25 @@
 
 #include <KLocalizedString>
 
-GroupsTreeProxyModel::GroupsTreeProxyModel(QAbstractItemModel *sourceModel) :
-    AbstractGroupingProxyModel(sourceModel)
+class KTp::GroupsTreeProxyModel::Private
 {
+public:
+    //nothing here yet, added anyway in case we need private members without breaking the ABI
+};
+
+
+KTp::GroupsTreeProxyModel::GroupsTreeProxyModel(QAbstractItemModel *sourceModel) :
+    AbstractGroupingProxyModel(sourceModel),
+    d(new KTp::GroupsTreeProxyModel::Private())
+{
+}
+
+KTp::GroupsTreeProxyModel::~GroupsTreeProxyModel()
+{
+    delete d;
 }
 
-QSet<QString> GroupsTreeProxyModel::groupsForIndex(const QModelIndex &sourceIndex) const
+QSet<QString> KTp::GroupsTreeProxyModel::groupsForIndex(const QModelIndex &sourceIndex) const
 {
     QStringList groups = sourceIndex.data(ContactsModel::GroupsRole).value<QStringList>();
     if (groups.isEmpty()) {
@@ -38,7 +51,7 @@ QSet<QString> GroupsTreeProxyModel::groupsForIndex(const QModelIndex &sourceInde
 }
 
 
-QVariant GroupsTreeProxyModel::dataForGroup(const QString &group, int role) const
+QVariant KTp::GroupsTreeProxyModel::dataForGroup(const QString &group, int role) const
 {
     switch (role) {
     case ContactsModel::TypeRole:
diff --git a/KTp/Models/groups-tree-proxy-model.h b/KTp/Models/groups-tree-proxy-model.h
index 4b59c80..4fc2218 100644
--- a/KTp/Models/groups-tree-proxy-model.h
+++ b/KTp/Models/groups-tree-proxy-model.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef GROUPSTREEPROXYMODEL_H
-#define GROUPSTREEPROXYMODEL_H
+#ifndef KTP_GROUPS_TREE_PROXY_MODEL_H
+#define KTP_GROUPS_TREE_PROXY_MODEL_H
 
 #include "abstract-grouping-proxy-model.h"
 
@@ -25,14 +25,22 @@
 
 #include <KTp/ktp-export.h>
 
+namespace KTp
+{
+
 class KTP_EXPORT GroupsTreeProxyModel : public KTp::AbstractGroupingProxyModel
 {
     Q_OBJECT
 public:
     GroupsTreeProxyModel(QAbstractItemModel *sourceModel);
+    virtual ~GroupsTreeProxyModel();
    
     virtual QSet<QString> groupsForIndex(const QModelIndex &sourceIndex) const;
     virtual QVariant dataForGroup(const QString &group, int role) const;
+private:
+    class Private;
+    Private *d;
 };
+}
 
 #endif // ACCOUNTSTREEPROXYMODEL_H

-- 
ktp-common-internals packaging