Merge from default branch

2010-09-24 22:49:15 +02:00
parent 18d6799cbe
commit dc2350cee8
145 changed files with 23287 additions and 17316 deletions
--- a/rtgui/batchqueueentry.cc
+++ b/rtgui/batchqueueentry.cc
@@ -20,9 +20,9 @@
 #include <thumbbrowserbase.h>

 BatchQueueEntry::BatchQueueEntry (rtengine::ProcessingJob* pjob, const rtengine::procparams::ProcParams& pparams, Glib::ustring fname, guint8* previmg, int prevw, int prevh, Thumbnail* thumbnail) 
-    : job(pjob), ThumbBrowserEntryBase(fname), 
-        opreview(previmg), origpw(prevw), origph(prevh), progress(0), thumbnail(thumbnail), 
-        outFileName("") {
+    : ThumbBrowserEntryBase(fname),
+      opreview(previmg), origpw(prevw), origph(prevh), thumbnail(thumbnail),
+      job(pjob), progress(0), outFileName("") {

    params = pparams;