Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/keepassxreboot/keepassxc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Geyer <debfx@fobos.de>2015-07-24 19:28:12 +0300
committerFelix Geyer <debfx@fobos.de>2015-09-12 14:55:50 +0300
commit7fa0eddc5f2d3d33a6caa27e8c43abcd36747a09 (patch)
tree409b027470d3749850073576bd7699eb0938b230 /src/keys/FileKey.h
parent0e85c98d02acd618e342998f394f3ced84d1b823 (diff)
Make C++11 mandatory.
Diffstat (limited to 'src/keys/FileKey.h')
-rw-r--r--src/keys/FileKey.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/keys/FileKey.h b/src/keys/FileKey.h
index f98543364..7a9b1caf0 100644
--- a/src/keys/FileKey.h
+++ b/src/keys/FileKey.h
@@ -20,7 +20,6 @@
#include <QXmlStreamReader>
-#include "core/Global.h"
#include "keys/Key.h"
class QIODevice;
@@ -30,11 +29,11 @@ class FileKey : public Key
public:
FileKey();
bool load(QIODevice* device);
- bool load(const QString& fileName, QString* errorMsg = Q_NULLPTR);
+ bool load(const QString& fileName, QString* errorMsg = nullptr);
QByteArray rawKey() const;
FileKey* clone() const;
static void create(QIODevice* device);
- static bool create(const QString& fileName, QString* errorMsg = Q_NULLPTR);
+ static bool create(const QString& fileName, QString* errorMsg = nullptr);
private:
bool loadXml(QIODevice* device);