aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-10-22 07:38:56 (GMT)
committerMontel Laurent <montel@kde.org>2016-10-22 07:38:56 (GMT)
commit073770362c52932f4f8e417b150f082a73230905 (patch)
tree81104a80eebf6c2a7202a788eac0efea98878f5f
parent54623589583c0130c76649f305ffab43293f3413 (diff)
Astyle kdelibs
-rw-r--r--autotests/birthdaytest.cpp42
-rw-r--r--autotests/datetimetest.cpp1
-rw-r--r--src/addressee.h2
-rw-r--r--src/vcardtool.cpp6
4 files changed, 23 insertions, 28 deletions
diff --git a/autotests/birthdaytest.cpp b/autotests/birthdaytest.cpp
index ea80946..0dc1f35 100644
--- a/autotests/birthdaytest.cpp
+++ b/autotests/birthdaytest.cpp
@@ -38,13 +38,13 @@ BirthDayTest::~BirthDayTest()
void BirthDayTest::shouldParseBirthDay()
{
QByteArray vcarddata("BEGIN:VCARD\r\n"
- "VERSION:4.0\r\n"
- "BDAY:19760505T120505\r\n"
- "EMAIL:foo@kde.org\r\n"
- "EMAIL:bla@kde.org\r\n"
- "N:;;;;\r\n"
- "UID:testuid\r\n"
- "END:VCARD\r\n\r\n");
+ "VERSION:4.0\r\n"
+ "BDAY:19760505T120505\r\n"
+ "EMAIL:foo@kde.org\r\n"
+ "EMAIL:bla@kde.org\r\n"
+ "N:;;;;\r\n"
+ "UID:testuid\r\n"
+ "END:VCARD\r\n\r\n");
KContacts::VCardTool vcard;
const KContacts::AddresseeList lst = vcard.parseVCards(vcarddata);
@@ -57,13 +57,13 @@ void BirthDayTest::shouldParseBirthDay()
void BirthDayTest::shouldParseBirthDayWithoutTime()
{
QByteArray vcarddata("BEGIN:VCARD\r\n"
- "VERSION:4.0\r\n"
- "BDAY:19760505\r\n"
- "EMAIL:foo@kde.org\r\n"
- "EMAIL:bla@kde.org\r\n"
- "N:;;;;\r\n"
- "UID:testuid\r\n"
- "END:VCARD\r\n\r\n");
+ "VERSION:4.0\r\n"
+ "BDAY:19760505\r\n"
+ "EMAIL:foo@kde.org\r\n"
+ "EMAIL:bla@kde.org\r\n"
+ "N:;;;;\r\n"
+ "UID:testuid\r\n"
+ "END:VCARD\r\n\r\n");
KContacts::VCardTool vcard;
const KContacts::AddresseeList lst = vcard.parseVCards(vcarddata);
@@ -76,13 +76,13 @@ void BirthDayTest::shouldParseBirthDayWithoutTime()
void BirthDayTest::shouldParseBirthDayWithoutTimeAndYear()
{
QByteArray vcarddata("BEGIN:VCARD\r\n"
- "VERSION:4.0\r\n"
- "BDAY:--0505\r\n"
- "EMAIL:foo@kde.org\r\n"
- "EMAIL:bla@kde.org\r\n"
- "N:;;;;\r\n"
- "UID:testuid\r\n"
- "END:VCARD\r\n\r\n");
+ "VERSION:4.0\r\n"
+ "BDAY:--0505\r\n"
+ "EMAIL:foo@kde.org\r\n"
+ "EMAIL:bla@kde.org\r\n"
+ "N:;;;;\r\n"
+ "UID:testuid\r\n"
+ "END:VCARD\r\n\r\n");
KContacts::VCardTool vcard;
const KContacts::AddresseeList lst = vcard.parseVCards(vcarddata);
diff --git a/autotests/datetimetest.cpp b/autotests/datetimetest.cpp
index 8f526c5..176d7f2 100644
--- a/autotests/datetimetest.cpp
+++ b/autotests/datetimetest.cpp
@@ -22,7 +22,6 @@
#include <QTest>
#include <vcardtool.h>
-
DateTimeTest::DateTimeTest(QObject *parent)
: QObject(parent)
{
diff --git a/src/addressee.h b/src/addressee.h
index b41c06c..b94c6f8 100644
--- a/src/addressee.h
+++ b/src/addressee.h
@@ -273,7 +273,6 @@ public:
void setExtraNickNameList(const NickName::List &nickNameList);
NickName::List extraNickNameList() const;
-
/**
Return nick name.
*/
@@ -520,7 +519,6 @@ public:
void setExtraOrganizationList(const Org::List &orgList);
Org::List extraOrganizationList() const;
-
/**
Return organization.
*/
diff --git a/src/vcardtool.cpp b/src/vcardtool.cpp
index 138a048..dce4792 100644
--- a/src/vcardtool.cpp
+++ b/src/vcardtool.cpp
@@ -1224,8 +1224,7 @@ QDateTime VCardTool::parseDateTime(const QString &str, bool *timeValid)
timeString = timeString.replace(QLatin1String(":"), QString());
QStringList timeStrings = timeString.split(QRegularExpression(QStringLiteral("[Z+-]")));
const QString hhmmssString = timeStrings.at(0);
- switch(hhmmssString.size())
- {
+ switch (hhmmssString.size()) {
case 2:
time = QTime::fromString(hhmmssString, QStringLiteral("hh"));
break;
@@ -1243,8 +1242,7 @@ QDateTime VCardTool::parseDateTime(const QString &str, bool *timeValid)
spec = Qt::OffsetFromUTC;
QTime offsetTime;
const QString offsetString = timeStrings.at(1);
- switch(offsetString.size())
- {
+ switch (offsetString.size()) {
case 2:
offsetTime = QTime::fromString(offsetString, QStringLiteral("hh"));
break;