[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [libkvkontakte] libkvkontakte: code polish
From: Andi Clemens <andi.clemens () googlemail ! com>
Date: 2012-01-01 1:12:52
Message-ID: 20120101011252.B623BA60A6 () git ! kde ! org
[Download RAW message or body]
Git commit 4024f69cf54625dbe5dc2e2d811a996774a669ff by Andi Clemens.
Committed on 01/01/2012 at 01:58.
Pushed by aclemens into branch 'master'.
code polish
M +1 -1 libkvkontakte/albumlistjob.cpp
M +1 -1 libkvkontakte/cidsnamesjob.cpp
M +1 -1 libkvkontakte/discussionslistjob.cpp
M +1 -1 libkvkontakte/friendlistjob.cpp
M +2 -2 libkvkontakte/grouplistjob.cpp
M +1 -1 libkvkontakte/messageslistjob.cpp
M +1 -1 libkvkontakte/noteslistjob.cpp
M +1 -1 libkvkontakte/photolistjob.cpp
M +1 -1 libkvkontakte/savephotojob.cpp
M +4 -4 libkvkontakte/userinfofulljob.cpp
M +1 -1 libkvkontakte/userinfojob.cpp
M +2 -2 libkvkontakte/vkontaktejobs.cpp
http://commits.kde.org/libkvkontakte/4024f69cf54625dbe5dc2e2d811a996774a669ff
diff --git a/libkvkontakte/albumlistjob.cpp b/libkvkontakte/albumlistjob.cpp
index bbd81da..3f22bc2 100644
--- a/libkvkontakte/albumlistjob.cpp
+++ b/libkvkontakte/albumlistjob.cpp
@@ -53,7 +53,7 @@ void AlbumListJob::handleItem(const QVariant &data)
void AlbumListJob::handleData(const QVariant &data)
{
- foreach (const QVariant &item, data.toList())
+ foreach(const QVariant &item, data.toList())
handleItem(item);
}
diff --git a/libkvkontakte/cidsnamesjob.cpp b/libkvkontakte/cidsnamesjob.cpp
index 8c1b34a..233e46f 100644
--- a/libkvkontakte/cidsnamesjob.cpp
+++ b/libkvkontakte/cidsnamesjob.cpp
@@ -51,7 +51,7 @@ void CidsNamesJob::handleData(const QVariant &data)
{
// We need QMap, because vkontakte.ru might reorder results
// (I did not check it, but they do not guarantee the same order as in "cids")
- foreach (const QVariant &item, data.toList())
+ foreach(const QVariant &item, data.toList())
{
QVariantMap item_map = item.toMap();
d->names[item_map["cid"].toInt()] = item_map["name"].toString();
diff --git a/libkvkontakte/discussionslistjob.cpp b/libkvkontakte/discussionslistjob.cpp
index 8f5283b..53530c9 100644
--- a/libkvkontakte/discussionslistjob.cpp
+++ b/libkvkontakte/discussionslistjob.cpp
@@ -56,7 +56,7 @@ void DiscussionsListJob::handleData(const QVariant &data)
QVariantList list = data.toList();
d->totalCount = list[0].toInt();
list.pop_front();
- foreach (const QVariant &item, list)
+ foreach(const QVariant &item, list)
handleItem(item);
qSort(d->list); // sort by message ID (which should be equivalent to sorting by date)
diff --git a/libkvkontakte/friendlistjob.cpp b/libkvkontakte/friendlistjob.cpp
index 5983915..3c5a1bf 100644
--- a/libkvkontakte/friendlistjob.cpp
+++ b/libkvkontakte/friendlistjob.cpp
@@ -52,7 +52,7 @@ QList<UserInfoPtr> FriendListJob::list() const
void FriendListJob::handleData(const QVariant &data)
{
- foreach (const QVariant &user, data.toList())
+ foreach(const QVariant &user, data.toList())
{
UserInfoPtr userInfo(new UserInfo());
QJson::QObjectHelper::qvariant2qobject(user.toMap(), userInfo.data());
diff --git a/libkvkontakte/grouplistjob.cpp b/libkvkontakte/grouplistjob.cpp
index 1d0614f..a34bfa7 100644
--- a/libkvkontakte/grouplistjob.cpp
+++ b/libkvkontakte/grouplistjob.cpp
@@ -69,14 +69,14 @@ void GroupListJob::handleData(const QVariant &data)
{
QVariantList dataList = data.toList();
dataList.pop_front(); // total count (unused)
- foreach (const QVariant &item, dataList)
+ foreach(const QVariant &item, dataList)
d->list.append(handleSingleData(item));
}
else
{
// TODO: test with both extended={true, false}
- foreach (const QVariant &item, data.toList())
+ foreach(const QVariant &item, data.toList())
{
GroupInfoPtr group = GroupInfoPtr(new GroupInfo());
group->setGid(item.toInt());
diff --git a/libkvkontakte/messageslistjob.cpp b/libkvkontakte/messageslistjob.cpp
index 5e434e4..48e82f4 100644
--- a/libkvkontakte/messageslistjob.cpp
+++ b/libkvkontakte/messageslistjob.cpp
@@ -67,7 +67,7 @@ void MessagesListJob::handleData(const QVariant &data)
QVariantList list = data.toList();
d->totalCount = list[0].toInt();
list.pop_front();
- foreach (const QVariant &item, list)
+ foreach(const QVariant &item, list)
handleItem(item);
}
diff --git a/libkvkontakte/noteslistjob.cpp b/libkvkontakte/noteslistjob.cpp
index 97b0ed1..88c1249 100644
--- a/libkvkontakte/noteslistjob.cpp
+++ b/libkvkontakte/noteslistjob.cpp
@@ -61,7 +61,7 @@ void NotesListJob::handleData(const QVariant &data)
QVariantList list = data.toList();
d->totalCount = list[0].toInt();
list.pop_front();
- foreach (const QVariant &item, list)
+ foreach(const QVariant &item, list)
handleItem(item);
}
diff --git a/libkvkontakte/photolistjob.cpp b/libkvkontakte/photolistjob.cpp
index 854994a..6134cc7 100644
--- a/libkvkontakte/photolistjob.cpp
+++ b/libkvkontakte/photolistjob.cpp
@@ -58,7 +58,7 @@ void PhotoListJob::handleItem(const QVariant &data)
void PhotoListJob::handleData(const QVariant &data)
{
- foreach (const QVariant &item, data.toList())
+ foreach(const QVariant &item, data.toList())
handleItem(item);
}
diff --git a/libkvkontakte/savephotojob.cpp b/libkvkontakte/savephotojob.cpp
index 14b8c11..26d1cda 100644
--- a/libkvkontakte/savephotojob.cpp
+++ b/libkvkontakte/savephotojob.cpp
@@ -46,7 +46,7 @@ void SavePhotoJob::handleItem(const QVariant &data)
void SavePhotoJob::handleData(const QVariant &data)
{
- foreach (const QVariant &item, data.toList())
+ foreach(const QVariant &item, data.toList())
handleItem(item);
}
diff --git a/libkvkontakte/userinfofulljob.cpp b/libkvkontakte/userinfofulljob.cpp
index c47dbc1..ec309ed 100644
--- a/libkvkontakte/userinfofulljob.cpp
+++ b/libkvkontakte/userinfofulljob.cpp
@@ -118,7 +118,7 @@ void UserInfoFullJob::startCountriesJob()
{
// TODO: use usersPropertyToStringList
QSet<int> cids; // this will remove duplicates
- foreach (const UserInfoPtr &user, d->userInfo)
+ foreach(const UserInfoPtr &user, d->userInfo)
if (user->country())
cids.insert(user->country());
d->countryIds = cids.toList();
@@ -138,7 +138,7 @@ void UserInfoFullJob::countriesJobFinished(KJob *)
else
{
QMap<int, QString> names = d->countriesJob->names();
- foreach (const UserInfoPtr &user, d->userInfo)
+ foreach(const UserInfoPtr &user, d->userInfo)
user->setCountryString(names[user->country()]);
if (d->needCityNames)
@@ -152,7 +152,7 @@ void UserInfoFullJob::startCitiesJob()
{
// TODO: use usersPropertyToStringList
QSet<int> cids; // this will remove duplicates
- foreach (const UserInfoPtr &user, d->userInfo)
+ foreach(const UserInfoPtr &user, d->userInfo)
if (user->city())
cids.insert(user->city());
d->cityIds = cids.toList();
@@ -172,7 +172,7 @@ void UserInfoFullJob::citiesJobFinished(KJob *)
else
{
QMap<int, QString> names = d->citiesJob->names();
- foreach (const UserInfoPtr &user, d->userInfo)
+ foreach(const UserInfoPtr &user, d->userInfo)
user->setCityString(names[user->city()]);
handleFinish();
diff --git a/libkvkontakte/userinfojob.cpp b/libkvkontakte/userinfojob.cpp
index 165110a..4cc68f5 100644
--- a/libkvkontakte/userinfojob.cpp
+++ b/libkvkontakte/userinfojob.cpp
@@ -94,7 +94,7 @@ UserInfoPtr UserInfoJob::handleSingleData(const QVariant &data)
void UserInfoJob::handleData(const QVariant &data)
{
- foreach (const QVariant &item, data.toList())
+ foreach(const QVariant &item, data.toList())
d->userInfo.append(handleSingleData(item));
}
diff --git a/libkvkontakte/vkontaktejobs.cpp b/libkvkontakte/vkontaktejobs.cpp
index 02992bc..796c355 100644
--- a/libkvkontakte/vkontaktejobs.cpp
+++ b/libkvkontakte/vkontaktejobs.cpp
@@ -39,7 +39,7 @@ bool KJobWithSubjob::doKill()
bool KJobWithSubjobs::doKill()
{
- foreach (KJob *job, m_jobs)
+ foreach(KJob *job, m_jobs)
job->kill(KJob::Quietly);
m_jobs.clear();
@@ -89,7 +89,7 @@ void VkontakteJob::start()
url.setPath("/method/" + m_method);
prepareQueryItems();
- foreach (const QueryItem &item, m_queryItems)
+ foreach(const QueryItem &item, m_queryItems)
url.addQueryItem(item.first, item.second);
url.addQueryItem("access_token", m_accessToken);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic