Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Coding style fixes.

Browse Source
This commit is contained in:
Felix Geyer 2012-07-01 21:58:45 +02:00
parent c844c6b712
commit 782223a643
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/Entry.cpp
View File

@ -23,6 +23,8 @@
#include "core/Metadata.h" #include "core/Metadata.h"
#include "core/Tools.h" #include "core/Tools.h"
const int Entry::DefaultIconNumber = 0;
Entry::Entry() Entry::Entry()
{ {
m_updateTimeinfo = true; m_updateTimeinfo = true;
@ -56,8 +58,6 @@ Entry::~Entry()
qDeleteAll(m_history); qDeleteAll(m_history);
} }
const int Entry::DefaultIconNumber = 0;
template <class T> bool Entry::set(T& property, const T& value) template <class T> bool Entry::set(T& property, const T& value)
{ {
if (property != value) { if (property != value) {

4
src/core/Group.cpp
View File

@ -22,6 +22,8 @@
#include "core/Metadata.h" #include "core/Metadata.h"
#include "core/Tools.h" #include "core/Tools.h"
const int Group::DefaultIconNumber = 48;
Group::Group() Group::Group()
{ {
m_iconNumber = DefaultIconNumber; m_iconNumber = DefaultIconNumber;
@ -56,8 +58,6 @@ Group::~Group()
} }
} }
const int Group::DefaultIconNumber = 48;
template <class P, class V> bool Group::set(P& property, const V& value) { template <class P, class V> bool Group::set(P& property, const V& value) {
if (property != value) { if (property != value) {
property = value; property = value;

6
src/core/Metadata.cpp
View File

@ -21,6 +21,9 @@
#include "core/Group.h" #include "core/Group.h"
#include "core/Tools.h" #include "core/Tools.h"
const int Metadata::DefaultHistoryMaxItems = 10;
const int Metadata::DefaultHistoryMaxSize = 6 * 1024 * 1024;
Metadata::Metadata(QObject* parent) Metadata::Metadata(QObject* parent)
: QObject(parent) : QObject(parent)
{ {
@ -50,9 +53,6 @@ Metadata::Metadata(QObject* parent)
m_updateDatetime = true; m_updateDatetime = true;
} }
const int Metadata::DefaultHistoryMaxItems = 10;
const int Metadata::DefaultHistoryMaxSize = 6291456;
template <class P, class V> bool Metadata::set(P& property, const V& value) template <class P, class V> bool Metadata::set(P& property, const V& value)
{ {
if (property != value) { if (property != value) {

10
tests/TestKeePass2RandomStream.cpp
View File

@ -34,7 +34,7 @@ void TestKeePass2RandomStream::initTestCase()
void TestKeePass2RandomStream::test() void TestKeePass2RandomStream::test()
{ {
const QByteArray key("\x11\x22\x33\x44\x55\x66\x77\x88"); const QByteArray key("\x11\x22\x33\x44\x55\x66\x77\x88");
const int SIZE = 128; const int Size = 128;
SymmetricCipher cipher(SymmetricCipher::Salsa20, SymmetricCipher::Stream, SymmetricCipher::Encrypt, SymmetricCipher cipher(SymmetricCipher::Salsa20, SymmetricCipher::Stream, SymmetricCipher::Encrypt,
@ -46,13 +46,13 @@ void TestKeePass2RandomStream::test()
"1e36b26bd1ebc670d1bd1d665620abf74f78a7f6d29809585a97daec58c6b050")); "1e36b26bd1ebc670d1bd1d665620abf74f78a7f6d29809585a97daec58c6b050"));
QByteArray cipherPad; QByteArray cipherPad;
cipherPad.fill('\0', SIZE); cipherPad.fill('\0', Size);
cipher.processInPlace(cipherPad); cipher.processInPlace(cipherPad);
QByteArray cipherData; QByteArray cipherData;
cipherData.resize(SIZE); cipherData.resize(Size);
for (int i = 0; i < SIZE; i++) { for (int i = 0; i < Size; i++) {
cipherData[i] = data[i] ^ cipherPad[i]; cipherData[i] = data[i] ^ cipherPad[i];
} }
@ -73,7 +73,7 @@ void TestKeePass2RandomStream::test()
QByteArray cipherDataEncrypt = cipherEncrypt.process(data); QByteArray cipherDataEncrypt = cipherEncrypt.process(data);
QCOMPARE(randomStreamData.size(), SIZE); QCOMPARE(randomStreamData.size(), Size);
QCOMPARE(cipherData, cipherDataEncrypt); QCOMPARE(cipherData, cipherDataEncrypt);
QCOMPARE(randomStreamData, cipherData); QCOMPARE(randomStreamData, cipherData);
} }