mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-12-04 15:39:34 +01:00
Make C++11 mandatory.
This commit is contained in:
@@ -20,19 +20,17 @@
|
||||
|
||||
#include <QBuffer>
|
||||
|
||||
#include "core/Global.h"
|
||||
|
||||
class FailDevice : public QBuffer
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit FailDevice(int failAfter, QObject* parent = Q_NULLPTR);
|
||||
bool open(QIODevice::OpenMode openMode) Q_DECL_OVERRIDE;
|
||||
explicit FailDevice(int failAfter, QObject* parent = nullptr);
|
||||
bool open(QIODevice::OpenMode openMode) override;
|
||||
|
||||
protected:
|
||||
qint64 readData(char* data, qint64 len) Q_DECL_OVERRIDE;
|
||||
qint64 writeData(const char* data, qint64 len) Q_DECL_OVERRIDE;
|
||||
qint64 readData(char* data, qint64 len) override;
|
||||
qint64 writeData(const char* data, qint64 len) override;
|
||||
|
||||
private:
|
||||
int m_failAfter;
|
||||
|
||||
@@ -94,7 +94,7 @@ void TestAutoType::testInternal()
|
||||
|
||||
void TestAutoType::testAutoTypeWithoutSequence()
|
||||
{
|
||||
m_autoType->performAutoType(m_entry1, Q_NULLPTR);
|
||||
m_autoType->performAutoType(m_entry1, nullptr);
|
||||
|
||||
QCOMPARE(m_test->actionCount(), 14);
|
||||
QCOMPARE(m_test->actionChars(),
|
||||
@@ -105,7 +105,7 @@ void TestAutoType::testAutoTypeWithoutSequence()
|
||||
|
||||
void TestAutoType::testAutoTypeWithSequence()
|
||||
{
|
||||
m_autoType->performAutoType(m_entry1, Q_NULLPTR, "{Username}abc{PaSsWoRd}");
|
||||
m_autoType->performAutoType(m_entry1, nullptr, "{Username}abc{PaSsWoRd}");
|
||||
|
||||
QCOMPARE(m_test->actionCount(), 15);
|
||||
QCOMPARE(m_test->actionChars(),
|
||||
|
||||
@@ -98,12 +98,12 @@ void TestKeePass2XmlReader::testMetadata()
|
||||
QCOMPARE(m_db->metadata()->protectUrl(), true);
|
||||
QCOMPARE(m_db->metadata()->protectNotes(), false);
|
||||
QCOMPARE(m_db->metadata()->recycleBinEnabled(), true);
|
||||
QVERIFY(m_db->metadata()->recycleBin() != Q_NULLPTR);
|
||||
QVERIFY(m_db->metadata()->recycleBin() != nullptr);
|
||||
QCOMPARE(m_db->metadata()->recycleBin()->name(), QString("Recycle Bin"));
|
||||
QCOMPARE(m_db->metadata()->recycleBinChanged(), genDT(2010, 8, 25, 16, 12, 57));
|
||||
QVERIFY(m_db->metadata()->entryTemplatesGroup() == Q_NULLPTR);
|
||||
QVERIFY(m_db->metadata()->entryTemplatesGroup() == nullptr);
|
||||
QCOMPARE(m_db->metadata()->entryTemplatesGroupChanged(), genDT(2010, 8, 8, 17, 24, 19));
|
||||
QVERIFY(m_db->metadata()->lastSelectedGroup() != Q_NULLPTR);
|
||||
QVERIFY(m_db->metadata()->lastSelectedGroup() != nullptr);
|
||||
QCOMPARE(m_db->metadata()->lastSelectedGroup()->name(), QString("NewDatabase"));
|
||||
QVERIFY(m_db->metadata()->lastTopVisibleGroup() == m_db->metadata()->lastSelectedGroup());
|
||||
QCOMPARE(m_db->metadata()->historyMaxItems(), -1);
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
#include "tests.h"
|
||||
#include "core/Endian.h"
|
||||
#include "core/Global.h"
|
||||
|
||||
#include <QTest>
|
||||
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
#ifndef KEEPASSX_TESTRANDOM_H
|
||||
#define KEEPASSX_TESTRANDOM_H
|
||||
|
||||
#include "core/Global.h"
|
||||
#include "crypto/Random.h"
|
||||
|
||||
#include <QObject>
|
||||
@@ -27,7 +26,7 @@ class RandomBackendTest : public RandomBackend
|
||||
{
|
||||
public:
|
||||
RandomBackendTest();
|
||||
void randomize(void* data, int len) Q_DECL_OVERRIDE;
|
||||
void randomize(void* data, int len) override;
|
||||
void setNextBytes(const QByteArray& nextBytes);
|
||||
|
||||
private:
|
||||
|
||||
Reference in New Issue
Block a user