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

The following commit has been merged in the master branch:
commit c233004d7738414a9083e7b1abed019e4ceb9205
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue Oct 25 00:56:19 2011 +0200

    Fix usage of m_ungroupedString var
    
    Reviewed-by: David Edmundson
---
 models/groups-model.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/models/groups-model.cpp b/models/groups-model.cpp
index a61cae0..e56dc2a 100644
--- a/models/groups-model.cpp
+++ b/models/groups-model.cpp
@@ -192,7 +192,7 @@ bool GroupsModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int
 
         kDebug() << contact->contact().data()->alias() << "added to group" << group;
 
-        if (group != m_ungroupedString) {
+        if (group != mPriv->m_ungroupedString) {
             //FIXME: Should we connect this somewhere?
             Tp::PendingOperation *op = contact->contact().data()->manager().data()->addContactsToGroup(group,
                                                                                                        QList<Tp::ContactPtr>() << contact->contact());
@@ -391,7 +391,7 @@ void GroupsModel::addContactToGroups(ContactModelItem* contactItem, QStringList
     bool checkUngrouped = false;
     //if the contact has no groups, create an 'Ungrouped' group for it
     if (groups.isEmpty()) {
-        groups.append(m_ungroupedString);
+        groups.append(mPriv->m_ungroupedString);
     } else {
         checkUngrouped = true;
     }
@@ -414,11 +414,11 @@ void GroupsModel::addContactToGroups(ContactModelItem* contactItem, QStringList
                 }
             }
             if (checkUngrouped) {
-                if (savedGroupItem->groupName() == m_ungroupedString) {
+                if (savedGroupItem->groupName() == mPriv->m_ungroupedString) {
                     for (int i = 0; i < savedGroupItem->size(); i++) {
                         ProxyTreeNode *tmpNode = qobject_cast<ProxyTreeNode*>(savedGroupItem->childAt(i));
                         if (tmpNode->data(AccountsModel::ItemRole).value<ContactModelItem*>()->contact()->id() == contactItem->contact()->id()) {
-                            removeContactFromGroup(tmpNode, m_ungroupedString);
+                            removeContactFromGroup(tmpNode, mPriv->m_ungroupedString);
                             if (groupExists) {
                                 break;
                             }

-- 
ktp-common-internals packaging