Merge from default. Hope I did it right...

2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions
--- a/rtgui/batchqueue.h
+++ b/rtgui/batchqueue.h
@@ -69,7 +69,7 @@ class BatchQueue  : public ThumbBrowserBase,

    void startProcessing ();
    
-    bool hasJobs () { return fd.size()>0; }
+    bool hasJobs () { return (!fd.empty()); }

    rtengine::ProcessingJob* imageReady (rtengine::IImage16* img);
    void setProgress (double p);