[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kcontacts] /: Astyle kdelibs
From: Montel Laurent <montel () kde ! org>
Date: 2016-07-08 21:20:45
Message-ID: E1bLdCX-0001yU-IG () code ! kde ! org
[Download RAW message or body]
Git commit 4fde747a2baa31f46aa12e80b176a169ae03ed02 by Montel Laurent.
Committed on 08/07/2016 at 16:31.
Pushed by mlaurent into branch 'master'.
Astyle kdelibs
M +1 -1 autotests/addresstest.cpp
M +0 -1 autotests/customidentifiertest.cpp
M +3 -5 autotests/vcardlinetest.cpp
M +0 -1 autotests/vcardlinetest.h
M +0 -1 src/addressee.cpp
M +0 -1 src/addressee.h
M +0 -1 src/fieldgroup.cpp
M +0 -1 src/fieldgroup.h
M +0 -1 src/vcardparser/vcardline.h
M +1 -1 src/vcardtool.cpp
M +5 -5 tests/testread2.cpp
M +2 -2 tests/testwrite.cpp
http://commits.kde.org/kcontacts/4fde747a2baa31f46aa12e80b176a169ae03ed02
diff --git a/autotests/addresstest.cpp b/autotests/addresstest.cpp
index 3632934..d94bf8d 100644
--- a/autotests/addresstest.cpp
+++ b/autotests/addresstest.cpp
@@ -30,7 +30,7 @@ QTEST_MAIN(AddressTest)
void AddressTest::initTestCase()
{
- setenv("LANG", "C", 1);
+ setenv("LANG", "C", 1);
}
void AddressTest::emptyTest()
diff --git a/autotests/customidentifiertest.cpp b/autotests/customidentifiertest.cpp
index 90958ab..f96defd 100644
--- a/autotests/customidentifiertest.cpp
+++ b/autotests/customidentifiertest.cpp
@@ -122,5 +122,4 @@ void CustomIdentifierTest::shouldExportVcard4()
}
-
QTEST_MAIN(CustomIdentifierTest)
diff --git a/autotests/vcardlinetest.cpp b/autotests/vcardlinetest.cpp
index 9fa89f5..c613bfb 100644
--- a/autotests/vcardlinetest.cpp
+++ b/autotests/vcardlinetest.cpp
@@ -50,7 +50,7 @@ void VCardLineTest::shouldAssignValues()
line.setIdentifier(identifier);
line.setGroup(group);
QMap<QString, QString> map;
- for(int i = 0; i < 5; ++i) {
+ for (int i = 0; i < 5; ++i) {
map.insert(QStringLiteral("foo%1").arg(i), QStringLiteral("bla%1").arg(i));
line.addParameter(QStringLiteral("foo%1").arg(i), \
QStringLiteral("bla%1").arg(i)); }
@@ -74,7 +74,7 @@ void VCardLineTest::shouldCopyValue()
line.setIdentifier(identifier);
line.setGroup(group);
QMap<QString, QString> map;
- for(int i = 0; i < 5; ++i) {
+ for (int i = 0; i < 5; ++i) {
map.insert(QStringLiteral("foo%1").arg(i), QStringLiteral("bla%1").arg(i));
line.addParameter(QStringLiteral("foo%1").arg(i), \
QStringLiteral("bla%1").arg(i)); }
@@ -89,7 +89,6 @@ void VCardLineTest::shouldCopyValue()
QCOMPARE(line.group(), group);
QCOMPARE(line.value(), valueVariant);
-
KContacts::VCardLine copyLine(line);
QVERIFY(!copyLine.parameterList().isEmpty());
QCOMPARE(copyLine.parameterList(), QStringList() << map.keys());
@@ -108,7 +107,7 @@ void VCardLineTest::shouldEqualValue()
line.setIdentifier(identifier);
line.setGroup(group);
QMap<QString, QString> map;
- for(int i = 0; i < 5; ++i) {
+ for (int i = 0; i < 5; ++i) {
map.insert(QStringLiteral("foo%1").arg(i), QStringLiteral("bla%1").arg(i));
line.addParameter(QStringLiteral("foo%1").arg(i), \
QStringLiteral("bla%1").arg(i)); }
@@ -123,7 +122,6 @@ void VCardLineTest::shouldEqualValue()
QCOMPARE(line.group(), group);
QCOMPARE(line.value(), valueVariant);
-
KContacts::VCardLine copyLine(line);
QVERIFY(line == copyLine);
}
diff --git a/autotests/vcardlinetest.h b/autotests/vcardlinetest.h
index 319589a..d671a4a 100644
--- a/autotests/vcardlinetest.h
+++ b/autotests/vcardlinetest.h
@@ -18,7 +18,6 @@
Boston, MA 02110-1301, USA.
*/
-
#ifndef VCARDLINETEST_H
#define VCARDLINETEST_H
diff --git a/src/addressee.cpp b/src/addressee.cpp
index 4b1cdff..0b9e11f 100644
--- a/src/addressee.cpp
+++ b/src/addressee.cpp
@@ -558,7 +558,6 @@ QVector<QUrl> Addressee::sourcesUrlList() const
return d->mSources;
}
-
FieldGroup::List Addressee::fieldGroupList() const
{
return d->mFieldGroupList;
diff --git a/src/addressee.h b/src/addressee.h
index dfc7819..61ae556 100644
--- a/src/addressee.h
+++ b/src/addressee.h
@@ -1044,7 +1044,6 @@ public:
void setFieldGroupList(const FieldGroup::List &fieldGroupList);
void insertFieldGroup(const FieldGroup &fieldGroup);
-
private:
class Private;
QSharedDataPointer<Private> d;
diff --git a/src/fieldgroup.cpp b/src/fieldgroup.cpp
index df824e9..537c2eb 100644
--- a/src/fieldgroup.cpp
+++ b/src/fieldgroup.cpp
@@ -18,7 +18,6 @@
Boston, MA 02110-1301, USA.
*/
-
#include "fieldgroup.h"
#include <QMap>
diff --git a/src/fieldgroup.h b/src/fieldgroup.h
index 3f20cbd..926ffcb 100644
--- a/src/fieldgroup.h
+++ b/src/fieldgroup.h
@@ -18,7 +18,6 @@
Boston, MA 02110-1301, USA.
*/
-
#ifndef FIELDGROUP_H
#define FIELDGROUP_H
diff --git a/src/vcardparser/vcardline.h b/src/vcardparser/vcardline.h
index 220a195..4ec8c8d 100644
--- a/src/vcardparser/vcardline.h
+++ b/src/vcardparser/vcardline.h
@@ -52,7 +52,6 @@ public:
*/
bool operator==(const VCardLine &other) const;
-
/**
* Sets the identifier of this line e.g. UID, FN, CLASS
*
diff --git a/src/vcardtool.cpp b/src/vcardtool.cpp
index 4b8b37a..702da1f 100644
--- a/src/vcardtool.cpp
+++ b/src/vcardtool.cpp
@@ -618,7 +618,7 @@ QByteArray VCardTool::createVCards(const Addressee::List &list,
}
} else if (identifier.toLower() == \
QLatin1String("x-kaddressbook-x-spousesname") && version == VCard::v4_0) { if \
(!value.isEmpty()) {
- VCardLine line( QStringLiteral("RELATED"), QStringLiteral(";"));
+ VCardLine line(QStringLiteral("RELATED"), QStringLiteral(";"));
line.addParameter(QStringLiteral("TYPE"), \
QStringLiteral("spouse")); line.addParameter(QStringLiteral("VALUE"), value);
card.addLine(line);
diff --git a/tests/testread2.cpp b/tests/testread2.cpp
index 37c2f75..e2772ef 100644
--- a/tests/testread2.cpp
+++ b/tests/testread2.cpp
@@ -43,12 +43,12 @@ int main()
Addressee::List::iterator itr1;
Addressee::List::iterator itr2;
for (itr1 = l.begin(), itr2 = parsed.begin();
- itr1 != l.end() && itr2 != parsed.end(); ++itr1, ++itr2) {
+ itr1 != l.end() && itr2 != parsed.end(); ++itr1, ++itr2) {
if ((*itr1).fullEmail() == (*itr2).fullEmail() &&
- (*itr1).organization() == (*itr2).organization() &&
- (*itr1).phoneNumbers() == (*itr2).phoneNumbers() &&
- (*itr1).emails() == (*itr2).emails() &&
- (*itr1).role() == (*itr2).role()) {
+ (*itr1).organization() == (*itr2).organization() &&
+ (*itr1).phoneNumbers() == (*itr2).phoneNumbers() &&
+ (*itr1).emails() == (*itr2).emails() &&
+ (*itr1).role() == (*itr2).role()) {
qDebug() << "\tAddressee - PASSED";
qDebug() << "\t\t" << (*itr1).fullEmail() << "VS." << \
(*itr2).fullEmail(); } else {
diff --git a/tests/testwrite.cpp b/tests/testwrite.cpp
index 4983682..12ef64f 100644
--- a/tests/testwrite.cpp
+++ b/tests/testwrite.cpp
@@ -78,9 +78,9 @@ int main(int argc, char **argv)
addressee.insertEmail(QLatin1String("tokoe82@yahoo.de"), true);
KContacts::PhoneNumber phone1(QLatin1String("3541523475"),
- KContacts::PhoneNumber::Pref | \
KContacts::PhoneNumber::Home); + \
KContacts::PhoneNumber::Pref | KContacts::PhoneNumber::Home); KContacts::PhoneNumber \
phone2(QLatin1String("+46745673475"),
- KContacts::PhoneNumber::Work);
+ KContacts::PhoneNumber::Work);
addressee.insertPhoneNumber(phone1);
addressee.insertPhoneNumber(phone2);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic