Merge branch 'master' into gtk3-merge-master-b8eb349

2016-10-10 23:07:41 +02:00
parent d16d244fc5 b8eb3492c9
commit 0dbea030cb
166 changed files with 15898 additions and 2285 deletions
--- a/rtgui/batchqueue.h
+++ b/rtgui/batchqueue.h
@@ -68,7 +68,7 @@ protected:
    void notifyListener (bool queueEmptied);

 public:
-    BatchQueue (FileCatalog* aFileCatalog);
+    explicit BatchQueue (FileCatalog* aFileCatalog);
    ~BatchQueue ();

    void addEntries (const std::vector<BatchQueueEntry*>& entries, bool head = false, bool save = true);