[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:04:31 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=fff449b
The following commit has been merged in the master branch:
commit fff449b615da62b721ea7e0904622214cfe9e1b3
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date: Thu Jun 2 21:27:09 2011 +0200
Fix typo
---
models/groups-model.cpp | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/models/groups-model.cpp b/models/groups-model.cpp
index 2b7fec9..46631e4 100644
--- a/models/groups-model.cpp
+++ b/models/groups-model.cpp
@@ -255,7 +255,7 @@ void GroupsModel::removeContactFromGroup(ProxyTreeNode* proxyNode, const QString
disconnect(proxyNode, SIGNAL(contactAddedToGroup(QString)), 0, 0);
disconnect(proxyNode, SIGNAL(contactRemovedFromGroup(QString)), 0, 0);
- //if the the contact has no groups left, then put it in Ungroupped group
+ //if the the contact has no groups left, then put it in Ungrouped group
if (contactGroups.isEmpty()) {
addContactToGroups(proxyNode->data(AccountsModel::ItemRole).value<ContactModelItem*>(), contactGroups);
}
@@ -280,13 +280,13 @@ void GroupsModel::addContactToGroups(ContactModelItem* contactItem, QStringList
{
kDebug() << "Contact groups:" << groups;
- //check if the contact is in Ungroupped group, if it is, it needs to be removed from there
- bool checkUngroupped = false;
- //if the contact has no groups, create an 'Ungroupped' group for it
+ //check if the contact is in Ungrouped group, if it is, it needs to be removed from there
+ bool checkUngrouped = false;
+ //if the contact has no groups, create an 'Ungrouped' group for it
if (groups.isEmpty()) {
- groups.append("Ungroupped"); //FIXME i18n
+ groups.append("Ungrouped"); //FIXME i18n
} else {
- checkUngroupped = true;
+ checkUngrouped = true;
}
groups.removeDuplicates();
@@ -306,16 +306,16 @@ void GroupsModel::addContactToGroups(ContactModelItem* contactItem, QStringList
kDebug() << "Existing group found for" << group;
groupItem = savedGroupItem;
- if (!checkUngroupped) {
+ if (!checkUngrouped) {
break;
}
}
- if (checkUngroupped) {
- if (savedGroupItem->groupName() == "Ungroupped") {
+ if (checkUngrouped) {
+ if (savedGroupItem->groupName() == "Ungrouped") {
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, QString("Ungroupped"));
+ removeContactFromGroup(tmpNode, QString("Ungrouped"));
if (groupExists) {
break;
}
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list