[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [libgravatar] /: GIT_SILENT: coding style (silent)
From: Laurent Montel <null () kde ! org>
Date: 2018-04-30 15:01:47
Message-ID: E1fDAJH-0004vS-Hk () code ! kde ! org
[Download RAW message or body]
Git commit f6b0ab894be56e62f993a873b9d7957f00698503 by Laurent Montel.
Committed on 30/04/2018 at 15:01.
Pushed by mlaurent into branch 'master'.
GIT_SILENT: coding style
M +0 -1 autotests/gravatarconfiguresettingsdialogtest.cpp
M +1 -1 autotests/gravatarresolvurljobtest.cpp
M +6 -4 src/job/gravatarresolvurljob.cpp
M +35 -31 src/misc/gravatarcache.cpp
M +30 -29 src/misc/hash.cpp
M +4 -4 src/misc/hash.h
https://commits.kde.org/libgravatar/f6b0ab894be56e62f993a873b9d7957f00698503
diff --git a/autotests/gravatarconfiguresettingsdialogtest.cpp \
b/autotests/gravatarconfiguresettingsdialogtest.cpp index 7b1e1ba..19a3982 100644
--- a/autotests/gravatarconfiguresettingsdialogtest.cpp
+++ b/autotests/gravatarconfiguresettingsdialogtest.cpp
@@ -50,7 +50,6 @@ void GravatarConfigureSettingsDialogTest::shouldHaveDefaultValue()
KPluralHandlingSpinBox *gravatarCacheSize = dlg.findChild<KPluralHandlingSpinBox \
*>(QStringLiteral("gravatarcachesize")); QVERIFY(gravatarCacheSize);
-
QLabel *label = dlg.findChild<QLabel *>(QStringLiteral("labelwarning"));
QVERIFY(label);
QVERIFY(!label->text().isEmpty());
diff --git a/autotests/gravatarresolvurljobtest.cpp \
b/autotests/gravatarresolvurljobtest.cpp index fac943f..dedba20 100644
--- a/autotests/gravatarresolvurljobtest.cpp
+++ b/autotests/gravatarresolvurljobtest.cpp
@@ -127,7 +127,7 @@ void GravatarResolvUrlJobTest::shouldGenerateGravatarUrl_data()
QTest::newRow("empty") << QString() << QString() << QUrl();
QTest::newRow("no domain") << QStringLiteral("foo") << QString() << QUrl();
QTest::newRow("validemail") << QStringLiteral("foo@kde.org") << \
QStringLiteral("89b4e14cf2fc6d426275c019c6dc9de6")
- << \
QUrl(QStringLiteral("https://secure.gravatar.com:443/avatar/89b4e14cf2fc6d426275c019c6dc9de6?d=404"));;
+ << \
QUrl(QStringLiteral("https://secure.gravatar.com:443/avatar/89b4e14cf2fc6d426275c019c6dc9de6?d=404"));
}
void GravatarResolvUrlJobTest::shouldGenerateGravatarUrl()
diff --git a/src/job/gravatarresolvurljob.cpp b/src/job/gravatarresolvurljob.cpp
index a68a617..688e31d 100644
--- a/src/job/gravatarresolvurljob.cpp
+++ b/src/job/gravatarresolvurljob.cpp
@@ -122,10 +122,11 @@ void GravatarResolvUrlJob::processNextBackend()
}
Q_EMIT resolvUrl(url);
- if (!cacheLookup(d->mCalculatedHash))
+ if (!cacheLookup(d->mCalculatedHash)) {
startNetworkManager(url);
- else
+ } else {
processNextBackend();
+ }
}
void GravatarResolvUrlJob::slotFinishLoadPixmap(QNetworkReply *reply)
@@ -138,10 +139,11 @@ void GravatarResolvUrlJob::slotFinishLoadPixmap(QNetworkReply \
*reply)
GravatarCache::self()->saveGravatarPixmap(d->mCalculatedHash, \
d->mPixmap); }
} else {
- if (reply->error() == QNetworkReply::ContentNotFoundError)
+ if (reply->error() == QNetworkReply::ContentNotFoundError) {
GravatarCache::self()->saveMissingGravatar(d->mCalculatedHash);
- else
+ } else {
qCDebug(GRAVATAR_LOG) << "Network error:" << reply->request().url() << \
reply->errorString(); + }
}
processNextBackend();
diff --git a/src/misc/gravatarcache.cpp b/src/misc/gravatarcache.cpp
index 3ca21a3..899e33c 100644
--- a/src/misc/gravatarcache.cpp
+++ b/src/misc/gravatarcache.cpp
@@ -38,16 +38,17 @@ Q_GLOBAL_STATIC(GravatarCache, s_gravatarCache)
class Q_DECL_HIDDEN Gravatar::GravatarCachePrivate
{
public:
- template <typename T>
+ template<typename T>
inline void insertMissingHash(std::vector<T> &vec, const T &hash)
{
auto it = std::lower_bound(vec.begin(), vec.end(), hash);
- if (it != vec.end() && *it == hash)
+ if (it != vec.end() && *it == hash) {
return; // already present (shouldn't happen)
+ }
vec.insert(it, hash);
}
- template <typename T>
+ template<typename T>
inline void saveVector(const std::vector<T> &vec, const QString &fileName)
{
QSaveFile f(mGravatarPath + fileName);
@@ -57,26 +58,27 @@ public:
}
f.resize(vec.size() * sizeof(T));
- f.write(reinterpret_cast<const char*>(vec.data()), vec.size() * sizeof(T));
+ f.write(reinterpret_cast<const char *>(vec.data()), vec.size() * sizeof(T));
f.commit();
}
- template <typename T>
+ template<typename T>
inline void loadVector(std::vector<T> &vec, const QString &fileName)
{
- if (!vec.empty()) // already loaded
+ if (!vec.empty()) { // already loaded
return;
+ }
QFile f(mGravatarPath + fileName);
- if (!f.open(QFile::ReadOnly))
+ if (!f.open(QFile::ReadOnly)) {
return; // does not exist yet
-
+ }
if (f.size() % sizeof(T) != 0) {
qCWarning(GRAVATAR_LOG) << "Missing hash cache is corrupt:" << \
f.fileName(); return;
}
vec.resize(f.size() / sizeof(T));
- f.read(reinterpret_cast<char*>(vec.data()), f.size());
+ f.read(reinterpret_cast<char *>(vec.data()), f.size());
}
QCache<Hash, QPixmap> mCachePixmap;
@@ -106,8 +108,9 @@ GravatarCache *GravatarCache::self()
void GravatarCache::saveGravatarPixmap(const Hash &hash, const QPixmap &pixmap)
{
- if (!hash.isValid() || pixmap.isNull())
+ if (!hash.isValid() || pixmap.isNull()) {
return;
+ }
const QString path = d->mGravatarPath + hash.hexString() + \
QLatin1String(".png"); qCDebug(GRAVATAR_LOG) << " path " << path;
@@ -120,16 +123,16 @@ void GravatarCache::saveGravatarPixmap(const Hash &hash, const \
QPixmap &pixmap) void GravatarCache::saveMissingGravatar(const Hash &hash)
{
switch (hash.type()) {
- case Hash::Invalid:
- break;
- case Hash::Md5:
- d->insertMissingHash(d->mMd5Misses, hash.md5());
- d->saveVector(d->mMd5Misses, QStringLiteral("missing.md5"));
- break;
- case Hash::Sha256:
- d->insertMissingHash(d->mSha256Misses, hash.sha256());
- d->saveVector(d->mSha256Misses, QStringLiteral("missing.sha256"));
- break;
+ case Hash::Invalid:
+ break;
+ case Hash::Md5:
+ d->insertMissingHash(d->mMd5Misses, hash.md5());
+ d->saveVector(d->mMd5Misses, QStringLiteral("missing.md5"));
+ break;
+ case Hash::Sha256:
+ d->insertMissingHash(d->mSha256Misses, hash.sha256());
+ d->saveVector(d->mSha256Misses, QStringLiteral("missing.sha256"));
+ break;
}
}
@@ -137,8 +140,9 @@ QPixmap GravatarCache::loadGravatarPixmap(const Hash &hash, bool \
&gravatarStored {
gravatarStored = false;
qCDebug(GRAVATAR_LOG) << " hashStr" << hash.hexString();
- if (!hash.isValid())
+ if (!hash.isValid()) {
return QPixmap();
+ }
// in-memory cache
if (d->mCachePixmap.contains(hash)) {
@@ -161,16 +165,16 @@ QPixmap GravatarCache::loadGravatarPixmap(const Hash &hash, \
bool &gravatarStored
// missing gravatar cache (ie. known to not exist one)
switch (hash.type()) {
- case Hash::Invalid:
- break;
- case Hash::Md5:
- d->loadVector(d->mMd5Misses, QStringLiteral("missing.md5"));
- gravatarStored = std::binary_search(d->mMd5Misses.begin(), \
d->mMd5Misses.end(), hash.md5());
- break;
- case Hash::Sha256:
- d->loadVector(d->mSha256Misses, QStringLiteral("missing.sha256"));
- gravatarStored = std::binary_search(d->mSha256Misses.begin(), \
d->mSha256Misses.end(), hash.sha256());
- break;
+ case Hash::Invalid:
+ break;
+ case Hash::Md5:
+ d->loadVector(d->mMd5Misses, QStringLiteral("missing.md5"));
+ gravatarStored = std::binary_search(d->mMd5Misses.begin(), \
d->mMd5Misses.end(), hash.md5()); + break;
+ case Hash::Sha256:
+ d->loadVector(d->mSha256Misses, QStringLiteral("missing.sha256"));
+ gravatarStored = std::binary_search(d->mSha256Misses.begin(), \
d->mSha256Misses.end(), hash.sha256()); + break;
}
return QPixmap();
diff --git a/src/misc/hash.cpp b/src/misc/hash.cpp
index d5e81b3..d5c20a1 100644
--- a/src/misc/hash.cpp
+++ b/src/misc/hash.cpp
@@ -33,30 +33,31 @@ Hash::Hash(const QByteArray &data, Type type)
: m_type(type)
{
switch (type) {
- case Invalid:
- break;
- case Md5:
- Q_ASSERT(sizeof(Hash128) == data.size());
- m_hash.md5 = *reinterpret_cast<const Hash128*>(data.constData());
- break;
- case Sha256:
- Q_ASSERT(sizeof(Hash256) == data.size());
- m_hash.sha256 = *reinterpret_cast<const Hash256*>(data.constData());
- break;
+ case Invalid:
+ break;
+ case Md5:
+ Q_ASSERT(sizeof(Hash128) == data.size());
+ m_hash.md5 = *reinterpret_cast<const Hash128 *>(data.constData());
+ break;
+ case Sha256:
+ Q_ASSERT(sizeof(Hash256) == data.size());
+ m_hash.sha256 = *reinterpret_cast<const Hash256 *>(data.constData());
+ break;
}
}
bool Hash::operator==(const Hash &other) const
{
- if (m_type != other.m_type)
+ if (m_type != other.m_type) {
return false;
+ }
switch (m_type) {
- case Invalid:
- return true;
- case Md5:
- return m_hash.md5 == other.m_hash.md5;
- case Sha256:
- return m_hash.sha256 == other.m_hash.sha256;
+ case Invalid:
+ return true;
+ case Md5:
+ return m_hash.md5 == other.m_hash.md5;
+ case Sha256:
+ return m_hash.sha256 == other.m_hash.sha256;
}
Q_UNREACHABLE();
}
@@ -84,12 +85,12 @@ Hash256 Hash::sha256() const
QString Hash::hexString() const
{
switch (m_type) {
- case Invalid:
- return QString();
- case Md5:
- return QString::fromLatin1(QByteArray::fromRawData(reinterpret_cast<const \
char*>(&m_hash.md5), sizeof(Hash128)).toHex());
- case Sha256:
- return QString::fromLatin1(QByteArray::fromRawData(reinterpret_cast<const \
char*>(&m_hash.sha256), sizeof(Hash256)).toHex()); + case Invalid:
+ return QString();
+ case Md5:
+ return QString::fromLatin1(QByteArray::fromRawData(reinterpret_cast<const \
char *>(&m_hash.md5), sizeof(Hash128)).toHex()); + case Sha256:
+ return QString::fromLatin1(QByteArray::fromRawData(reinterpret_cast<const \
char *>(&m_hash.sha256), sizeof(Hash256)).toHex()); }
Q_UNREACHABLE();
}
@@ -97,12 +98,12 @@ QString Hash::hexString() const
uint Gravatar::qHash(const Hash &h, uint seed)
{
switch (h.type()) {
- case Hash::Invalid:
- return seed;
- case Hash::Md5:
- return qHashBits(&h.m_hash.md5, sizeof(Hash128), seed);
- case Hash::Sha256:
- return qHashBits(&h.m_hash.sha256, sizeof(Hash256), seed);
+ case Hash::Invalid:
+ return seed;
+ case Hash::Md5:
+ return qHashBits(&h.m_hash.md5, sizeof(Hash128), seed);
+ case Hash::Sha256:
+ return qHashBits(&h.m_hash.sha256, sizeof(Hash256), seed);
}
Q_UNREACHABLE();
}
diff --git a/src/misc/hash.h b/src/misc/hash.h
index bb8d577..f001abd 100644
--- a/src/misc/hash.h
+++ b/src/misc/hash.h
@@ -29,8 +29,7 @@ class QByteArray;
class QString;
namespace Gravatar {
-
-template <int Size> struct UnsignedInt
+template<int Size> struct UnsignedInt
{
bool operator<(const UnsignedInt<Size> &other) const
{
@@ -54,7 +53,9 @@ unsigned int qHash(const Hash &h, unsigned int seed = 0);
class GRAVATAR_TESTS_EXPORT Hash
{
public:
- enum Type { Invalid, Md5, Sha256 };
+ enum Type {
+ Invalid, Md5, Sha256
+ };
Hash();
explicit Hash(const QByteArray &data, Type type);
@@ -76,7 +77,6 @@ private:
} m_hash;
Type m_type;
};
-
}
#endif // GRAVATAR_HASH_H
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic