From d8b10ef03c8edcec9e81ee126fd5a83e350b1571 Mon Sep 17 00:00:00 2001 From: Michael Marley Date: Sun, 8 Feb 2015 13:44:33 -0500 Subject: [PATCH] Convert the Storage::HashVersion names to CamelCase --- src/core/postgresqlstorage.cpp | 4 ++-- src/core/sqlitestorage.cpp | 4 ++-- src/core/storage.cpp | 6 +++--- src/core/storage.h | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/core/postgresqlstorage.cpp b/src/core/postgresqlstorage.cpp index 7c20a05b..ca865704 100644 --- a/src/core/postgresqlstorage.cpp +++ b/src/core/postgresqlstorage.cpp @@ -208,7 +208,7 @@ UserId PostgreSqlStorage::addUser(const QString &user, const QString &password) query.prepare(queryString("insert_quasseluser")); query.bindValue(":username", user); query.bindValue(":password", hashPassword(password)); - query.bindValue(":hashversion", Storage::HashVersion::latest); + query.bindValue(":hashversion", Storage::HashVersion::Latest); safeExec(query); if (!watchQuery(query)) return 0; @@ -226,7 +226,7 @@ bool PostgreSqlStorage::updateUser(UserId user, const QString &password) query.prepare(queryString("update_userpassword")); query.bindValue(":userid", user.toInt()); query.bindValue(":password", hashPassword(password)); - query.bindValue(":hashversion", Storage::HashVersion::latest); + query.bindValue(":hashversion", Storage::HashVersion::Latest); safeExec(query); watchQuery(query); return query.numRowsAffected() != 0; diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp index 0b640f46..46e2c70e 100644 --- a/src/core/sqlitestorage.cpp +++ b/src/core/sqlitestorage.cpp @@ -130,7 +130,7 @@ UserId SqliteStorage::addUser(const QString &user, const QString &password) query.prepare(queryString("insert_quasseluser")); query.bindValue(":username", user); query.bindValue(":password", hashPassword(password)); - query.bindValue(":hashversion", Storage::HashVersion::latest); + query.bindValue(":hashversion", Storage::HashVersion::Latest); lockForWrite(); safeExec(query); if (query.lastError().isValid() && query.lastError().number() == 19) { // user already exists - sadly 19 seems to be the general constraint violation error... @@ -160,7 +160,7 @@ bool SqliteStorage::updateUser(UserId user, const QString &password) query.prepare(queryString("update_userpassword")); query.bindValue(":userid", user.toInt()); query.bindValue(":password", hashPassword(password)); - query.bindValue(":hashversion", Storage::HashVersion::latest); + query.bindValue(":hashversion", Storage::HashVersion::Latest); lockForWrite(); safeExec(query); success = query.numRowsAffected() != 0; diff --git a/src/core/storage.cpp b/src/core/storage.cpp index f8d60b76..850eb113 100644 --- a/src/core/storage.cpp +++ b/src/core/storage.cpp @@ -41,12 +41,12 @@ bool Storage::checkHashedPassword(const UserId user, const QString &password, co bool passwordCorrect = false; switch (version) { - case Storage::HashVersion::sha1: + case Storage::HashVersion::Sha1: passwordCorrect = checkHashedPasswordSha1(password, hashedPassword); break; #if QT_VERSION >= 0x050000 - case Storage::HashVersion::sha2_512: + case Storage::HashVersion::Sha2_512: passwordCorrect = checkHashedPasswordSha2_512(password, hashedPassword); break; #endif @@ -55,7 +55,7 @@ bool Storage::checkHashedPassword(const UserId user, const QString &password, co qWarning() << "Password hash version" << QString(version) << "is not supported, please reset password"; } - if (passwordCorrect && version < Storage::HashVersion::latest) { + if (passwordCorrect && version < Storage::HashVersion::Latest) { updateUser(user, password); } diff --git a/src/core/storage.h b/src/core/storage.h index 989f3314..9b9ce4f0 100644 --- a/src/core/storage.h +++ b/src/core/storage.h @@ -43,12 +43,12 @@ public: }; enum HashVersion { - sha1, + Sha1, #if QT_VERSION >= 0x050000 - sha2_512, - latest=sha2_512 + Sha2_512, + Latest=Sha2_512 #else - latest=sha1 + Latest=Sha1 #endif }; -- 2.20.1