summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-10-04 07:54:07 +0200
committerMontel Laurent <[email protected]>2017-10-04 07:54:07 +0200
commit0874efda4fdb52675a0e2b648e2c4a0592f87307 (patch)
treed316a2039f6b04c1e7135f7c8692d9a772cd9c9f
parent587924b937a421aac63901d7006bac571e40652e (diff)
Pedantic
-rw-r--r--resources/ews/ewsclient/ewsfoldershape.h8
-rw-r--r--resources/ews/ewsclient/ewsid.h4
-rw-r--r--resources/ews/ewsclient/ewsitemshape.h6
-rw-r--r--resources/ews/ewsclient/ewspoxautodiscoverrequest.h2
-rw-r--r--resources/ews/ewsclient/ewspropertyfield.cpp2
-rw-r--r--resources/ews/ewsclient/ewsserverversion.h6
-rw-r--r--resources/ews/ewsclient/ewsupdatefolderrequest.h10
-rw-r--r--resources/ews/ewsclient/ewsupdateitemrequest.h10
-rw-r--r--resources/ews/ewsclient/ewsxml.h8
-rw-r--r--resources/ews/ewsfetchfoldersincrjob.cpp2
-rw-r--r--resources/ews/ewsfetchitemdetailjob.cpp1
-rw-r--r--resources/ews/ewsfetchitemdetailjob.h1
-rw-r--r--resources/ews/test/statemonitor.h2
-rw-r--r--resources/ews/test/unittests/faketransferjob.h2
14 files changed, 32 insertions, 32 deletions
diff --git a/resources/ews/ewsclient/ewsfoldershape.h b/resources/ews/ewsclient/ewsfoldershape.h
index e1026ed..8370e67 100644
--- a/resources/ews/ewsclient/ewsfoldershape.h
+++ b/resources/ews/ewsclient/ewsfoldershape.h
@@ -29,12 +29,12 @@
class EwsFolderShape
{
public:
- explicit EwsFolderShape(EwsBaseShape shape = EwsShapeDefault) : mBaseShape(shape) {};
- ~EwsFolderShape() {};
+ explicit EwsFolderShape(EwsBaseShape shape = EwsShapeDefault) : mBaseShape(shape) {}
+ ~EwsFolderShape() {}
EwsFolderShape(const EwsFolderShape &other)
- : mBaseShape(other.mBaseShape), mProps(other.mProps) {};
+ : mBaseShape(other.mBaseShape), mProps(other.mProps) {}
EwsFolderShape(EwsFolderShape &&other)
- : mBaseShape(other.mBaseShape), mProps(other.mProps) {};
+ : mBaseShape(other.mBaseShape), mProps(other.mProps) {}
EwsFolderShape &operator=(EwsFolderShape &&other)
{
mBaseShape = other.mBaseShape;
diff --git a/resources/ews/ewsclient/ewsid.h b/resources/ews/ewsclient/ewsid.h
index 4f0d192..760fd6b 100644
--- a/resources/ews/ewsclient/ewsid.h
+++ b/resources/ews/ewsclient/ewsid.h
@@ -57,7 +57,7 @@ public:
typedef QList<EwsId> List;
- explicit EwsId(EwsDistinguishedId did) : mType(Distinguished), mDid(did) {};
+ explicit EwsId(EwsDistinguishedId did) : mType(Distinguished), mDid(did) {}
explicit EwsId(const QString &id, const QString &changeKey = QString());
EwsId(const EwsId &id)
{
@@ -69,7 +69,7 @@ public:
*this = std::move(id);
}
- EwsId() : mType(Unspecified), mDid(EwsDIdCalendar) {};
+ EwsId() : mType(Unspecified), mDid(EwsDIdCalendar) {}
explicit EwsId(QXmlStreamReader &reader);
Type type() const
diff --git a/resources/ews/ewsclient/ewsitemshape.h b/resources/ews/ewsclient/ewsitemshape.h
index b92cc9f..33740c0 100644
--- a/resources/ews/ewsclient/ewsitemshape.h
+++ b/resources/ews/ewsclient/ewsitemshape.h
@@ -40,11 +40,11 @@ public:
Q_DECLARE_FLAGS(Flags, Flag)
- explicit EwsItemShape(EwsBaseShape shape = EwsShapeDefault) : EwsFolderShape(shape), mBodyType(BodyNone) {};
+ explicit EwsItemShape(EwsBaseShape shape = EwsShapeDefault) : EwsFolderShape(shape), mBodyType(BodyNone) {}
EwsItemShape(const EwsItemShape &other)
- : EwsFolderShape(other), mBodyType(BodyNone) {};
+ : EwsFolderShape(other), mBodyType(BodyNone) {}
explicit EwsItemShape(EwsFolderShape &&other)
- : EwsFolderShape(other), mBodyType(BodyNone) {};
+ : EwsFolderShape(other), mBodyType(BodyNone) {}
EwsItemShape &operator=(EwsItemShape &&other)
{
mBaseShape = other.mBaseShape;
diff --git a/resources/ews/ewsclient/ewspoxautodiscoverrequest.h b/resources/ews/ewsclient/ewspoxautodiscoverrequest.h
index 49adc16..8b617d1 100644
--- a/resources/ews/ewsclient/ewspoxautodiscoverrequest.h
+++ b/resources/ews/ewsclient/ewspoxautodiscoverrequest.h
@@ -52,7 +52,7 @@ public:
class Protocol
{
public:
- Protocol() : mType(UnknownProto) {};
+ Protocol() : mType(UnknownProto) {}
bool isValid() const
{
diff --git a/resources/ews/ewsclient/ewspropertyfield.cpp b/resources/ews/ewsclient/ewspropertyfield.cpp
index f10a9b3..020d3b7 100644
--- a/resources/ews/ewsclient/ewspropertyfield.cpp
+++ b/resources/ews/ewsclient/ewspropertyfield.cpp
@@ -71,7 +71,7 @@ public:
: mPropType(EwsPropertyField::UnknownField), mIndex(0), mPsIdType(DistinguishedPropSet),
mPsDid(EwsPropSetMeeting), mIdType(PropName), mId(0), mHasTag(false), mTag(0),
mType(EwsPropTypeNull), mHash(0)
- {};
+ {}
enum PropSetIdType {
DistinguishedPropSet,
diff --git a/resources/ews/ewsclient/ewsserverversion.h b/resources/ews/ewsclient/ewsserverversion.h
index ed1874e..bc6f943 100644
--- a/resources/ews/ewsclient/ewsserverversion.h
+++ b/resources/ews/ewsclient/ewsserverversion.h
@@ -33,14 +33,14 @@ public:
FreeBusyChangedEvent,
};
- EwsServerVersion() : mMajor(0), mMinor(0), mMajorBuild(0), mMinorBuild(0) {};
+ EwsServerVersion() : mMajor(0), mMinor(0), mMajorBuild(0), mMinorBuild(0) {}
EwsServerVersion(uint major, uint minor, const QString &name, const QString &friendlyName)
: mMajor(major), mMinor(minor), mMajorBuild(0), mMinorBuild(0), mName(name),
- mFriendlyName(friendlyName) {};
+ mFriendlyName(friendlyName) {}
explicit EwsServerVersion(QXmlStreamReader &reader);
EwsServerVersion(const EwsServerVersion &other)
: mMajor(other.mMajor), mMinor(other.mMinor), mMajorBuild(other.mMajorBuild),
- mMinorBuild(other.mMinorBuild), mName(other.mName), mFriendlyName(other.mFriendlyName) {};
+ mMinorBuild(other.mMinorBuild), mName(other.mName), mFriendlyName(other.mFriendlyName) {}
EwsServerVersion &operator=(const EwsServerVersion &other)
{
diff --git a/resources/ews/ewsclient/ewsupdatefolderrequest.h b/resources/ews/ewsclient/ewsupdatefolderrequest.h
index 2f0f774..b45f452 100644
--- a/resources/ews/ewsclient/ewsupdatefolderrequest.h
+++ b/resources/ews/ewsclient/ewsupdatefolderrequest.h
@@ -49,7 +49,7 @@ public:
};
Update(EwsPropertyField field, const QVariant &val, Type type)
- : mField(field), mValue(val), mType(type) {};
+ : mField(field), mValue(val), mType(type) {}
EwsPropertyField mField;
QVariant mValue;
@@ -59,25 +59,25 @@ public:
class AppendUpdate : public Update
{
public:
- AppendUpdate(EwsPropertyField field, const QVariant &val) : Update(field, val, Append) {};
+ AppendUpdate(EwsPropertyField field, const QVariant &val) : Update(field, val, Append) {}
};
class SetUpdate : public Update
{
public:
- SetUpdate(EwsPropertyField field, const QVariant &val) : Update(field, val, Set) {};
+ SetUpdate(EwsPropertyField field, const QVariant &val) : Update(field, val, Set) {}
};
class DeleteUpdate : public Update
{
public:
- DeleteUpdate(EwsPropertyField field) : Update(field, QVariant(), Delete) {};
+ DeleteUpdate(EwsPropertyField field) : Update(field, QVariant(), Delete) {}
};
class FolderChange
{
public:
- FolderChange(EwsId folderId, EwsFolderType type) : mId(folderId), mType(type) {};
+ FolderChange(EwsId folderId, EwsFolderType type) : mId(folderId), mType(type) {}
void addUpdate(const Update *upd)
{
mUpdates.append(QSharedPointer<const Update>(upd));
diff --git a/resources/ews/ewsclient/ewsupdateitemrequest.h b/resources/ews/ewsclient/ewsupdateitemrequest.h
index 486bb4e..d4798d8 100644
--- a/resources/ews/ewsclient/ewsupdateitemrequest.h
+++ b/resources/ews/ewsclient/ewsupdateitemrequest.h
@@ -49,7 +49,7 @@ public:
};
Update(EwsPropertyField field, const QVariant &val, Type type)
- : mField(field), mValue(val), mType(type) {};
+ : mField(field), mValue(val), mType(type) {}
EwsPropertyField mField;
QVariant mValue;
@@ -59,25 +59,25 @@ public:
class AppendUpdate : public Update
{
public:
- AppendUpdate(EwsPropertyField field, const QVariant &val) : Update(field, val, Append) {};
+ AppendUpdate(EwsPropertyField field, const QVariant &val) : Update(field, val, Append) {}
};
class SetUpdate : public Update
{
public:
- SetUpdate(EwsPropertyField field, const QVariant &val) : Update(field, val, Set) {};
+ SetUpdate(EwsPropertyField field, const QVariant &val) : Update(field, val, Set) {}
};
class DeleteUpdate : public Update
{
public:
- DeleteUpdate(EwsPropertyField field) : Update(field, QVariant(), Delete) {};
+ DeleteUpdate(EwsPropertyField field) : Update(field, QVariant(), Delete) {}
};
class ItemChange
{
public:
- ItemChange(EwsId itemId, EwsItemType type) : mId(itemId), mType(type) {};
+ ItemChange(EwsId itemId, EwsItemType type) : mId(itemId), mType(type) {}
void addUpdate(const Update *upd)
{
mUpdates.append(QSharedPointer<const Update>(upd));
diff --git a/resources/ews/ewsclient/ewsxml.h b/resources/ews/ewsclient/ewsxml.h
index 28ebff2..051b9c0 100644
--- a/resources/ews/ewsclient/ewsxml.h
+++ b/resources/ews/ewsclient/ewsxml.h
@@ -39,23 +39,23 @@ public:
static Q_CONSTEXPR T Ignore = static_cast<T>(-1);
struct Item {
- Item() : key(Ignore) {};
+ Item() : key(Ignore) {}
Item(T k, const QString &n, ReadFunction rfn = ReadFunction(), WriteFunction wfn = WriteFunction())
- : key(k), elmName(n), readFn(rfn), writeFn(wfn) {};
+ : key(k), elmName(n), readFn(rfn), writeFn(wfn) {}
T key;
QString elmName;
ReadFunction readFn;
WriteFunction writeFn;
};
- EwsXml() {};
+ EwsXml() {}
EwsXml(const QVector<Item> &items) : mItems(items)
{
rebuildItemHash();
}
EwsXml(const EwsXml &other)
- : mItems(other.mItems), mValues(other.mValues), mItemHash(other.mItemHash) {};
+ : mItems(other.mItems), mValues(other.mValues), mItemHash(other.mItemHash) {}
void setItems(const QVector<Item> &items)
{
diff --git a/resources/ews/ewsfetchfoldersincrjob.cpp b/resources/ews/ewsfetchfoldersincrjob.cpp
index 928d2ca..df73b52 100644
--- a/resources/ews/ewsfetchfoldersincrjob.cpp
+++ b/resources/ews/ewsfetchfoldersincrjob.cpp
@@ -121,7 +121,7 @@ public:
} Flag;
Q_DECLARE_FLAGS(Flags, Flag)
- FolderDescr() {};
+ FolderDescr() {}
Akonadi::Collection collection;
Flags flags;
diff --git a/resources/ews/ewsfetchitemdetailjob.cpp b/resources/ews/ewsfetchitemdetailjob.cpp
index 75b2820..f9347da 100644
--- a/resources/ews/ewsfetchitemdetailjob.cpp
+++ b/resources/ews/ewsfetchitemdetailjob.cpp
@@ -40,6 +40,7 @@ void EwsFetchItemDetailJob::setItemLists(const Akonadi::Item::List &changedItems
mDeletedItems = deletedItems;
EwsId::List ids;
+ ids.reserve(changedItems.count());
Q_FOREACH (const Akonadi::Item &item, changedItems) {
EwsId id(item.remoteId(), item.remoteRevision());
diff --git a/resources/ews/ewsfetchitemdetailjob.h b/resources/ews/ewsfetchitemdetailjob.h
index 60839dc..efc8fab 100644
--- a/resources/ews/ewsfetchitemdetailjob.h
+++ b/resources/ews/ewsfetchitemdetailjob.h
@@ -57,7 +57,6 @@ protected:
const Akonadi::Collection mCollection;
private Q_SLOTS:
void itemDetailFetched(KJob *job);
-private:
};
#endif
diff --git a/resources/ews/test/statemonitor.h b/resources/ews/test/statemonitor.h
index dce8e77..97aa3db 100644
--- a/resources/ews/test/statemonitor.h
+++ b/resources/ews/test/statemonitor.h
@@ -31,7 +31,7 @@ class StateMonitorBase : public QObject
{
Q_OBJECT
public:
- explicit StateMonitorBase(QObject *parent) : QObject(parent) {};
+ explicit StateMonitorBase(QObject *parent) : QObject(parent) {}
virtual ~StateMonitorBase() = default;
Q_SIGNALS:
void stateReached();
diff --git a/resources/ews/test/unittests/faketransferjob.h b/resources/ews/test/unittests/faketransferjob.h
index ee25c78..8005a4d 100644
--- a/resources/ews/test/unittests/faketransferjob.h
+++ b/resources/ews/test/unittests/faketransferjob.h
@@ -33,7 +33,7 @@ class Job;
template <typename F>
struct Finally {
- Finally(F f): cleanupf{f} {};
+ Finally(F f): cleanupf{f} {}
~Finally()
{
cleanupf();