Merge branch 'develop' into feature/yubikey

2017-03-10 18:01:14 +01:00
parent 2ec500f926 7851d3d987
commit 15dd783d2c
119 changed files with 616 additions and 381 deletions
--- a/src/core/Database.h
+++ b/src/core/Database.h
@@ -119,7 +119,7 @@ public:

    static Database* databaseByUuid(const Uuid& uuid);

-Q_SIGNALS:
+signals:
    void groupDataChanged(Group* group);
    void groupAboutToAdd(Group* group, int index);
    void groupAdded();
@@ -131,7 +131,7 @@ Q_SIGNALS:
    void modified();
    void modifiedImmediate();

-private Q_SLOTS:
+private slots:
    void startModifiedTimer();

 private: