Make C++11 mandatory.

This commit is contained in:
Felix Geyer 2015-07-24 18:28:12 +02:00
parent 0e85c98d02
commit 7fa0eddc5f
112 changed files with 332 additions and 411 deletions

View file

@ -35,8 +35,8 @@ public:
void close();
protected:
qint64 readData(char* data, qint64 maxSize) Q_DECL_OVERRIDE;
qint64 writeData(const char* data, qint64 maxSize) Q_DECL_OVERRIDE;
qint64 readData(char* data, qint64 maxSize) override;
qint64 writeData(const char* data, qint64 maxSize) override;
private:
void init();

View file

@ -20,8 +20,6 @@
#include <QIODevice>
#include "core/Global.h"
class LayeredStream : public QIODevice
{
Q_OBJECT
@ -30,12 +28,12 @@ public:
explicit LayeredStream(QIODevice* baseDevice);
virtual ~LayeredStream();
bool isSequential() const Q_DECL_OVERRIDE;
bool open(QIODevice::OpenMode mode) Q_DECL_OVERRIDE;
bool isSequential() const override;
bool open(QIODevice::OpenMode mode) override;
protected:
qint64 readData(char* data, qint64 maxSize) Q_DECL_OVERRIDE;
qint64 writeData(const char* data, qint64 maxSize) Q_DECL_OVERRIDE;
qint64 readData(char* data, qint64 maxSize) override;
qint64 writeData(const char* data, qint64 maxSize) override;
QIODevice* const m_baseDevice;

View file

@ -26,11 +26,11 @@ class StoreDataStream : public LayeredStream
public:
explicit StoreDataStream(QIODevice* baseDevice);
bool open(QIODevice::OpenMode mode) Q_DECL_OVERRIDE;
bool open(QIODevice::OpenMode mode) override;
QByteArray storedData() const;
protected:
qint64 readData(char* data, qint64 maxSize) Q_DECL_OVERRIDE;
qint64 readData(char* data, qint64 maxSize) override;
private:
QByteArray m_storedData;

View file

@ -33,13 +33,13 @@ public:
SymmetricCipher::Mode mode, SymmetricCipher::Direction direction);
~SymmetricCipherStream();
bool init(const QByteArray& key, const QByteArray& iv);
bool open(QIODevice::OpenMode mode) Q_DECL_OVERRIDE;
bool reset() Q_DECL_OVERRIDE;
void close() Q_DECL_OVERRIDE;
bool open(QIODevice::OpenMode mode) override;
bool reset() override;
void close() override;
protected:
qint64 readData(char* data, qint64 maxSize) Q_DECL_OVERRIDE;
qint64 writeData(const char* data, qint64 maxSize) Q_DECL_OVERRIDE;
qint64 readData(char* data, qint64 maxSize) override;
qint64 writeData(const char* data, qint64 maxSize) override;
private:
void resetInternalState();