liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into gtk3

Browse Source
This commit is contained in:
heckflosse
2016-10-28 17:59:47 +02:00
parent 5244c44420 3a346d919d
commit b16ef8d1f5
259 changed files with 5061 additions and 3654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtgui/batchqueue.cc
View File

@@ -37,7 +37,7 @@
using namespace std;
using namespace rtengine;
BatchQueue::BatchQueue (FileCatalog* aFileCatalog) : processing(NULL), fileCatalog(aFileCatalog), sequence(0), listener(NULL)
BatchQueue::BatchQueue (FileCatalog* aFileCatalog) : processing(nullptr), fileCatalog(aFileCatalog), sequence(0), listener(nullptr)
{
location = THLOC_BATCHQUEUE;
@@ -364,7 +364,7 @@ bool BatchQueue::loadBatchQueue ()
Glib::ustring BatchQueue::getTempFilenameForParams( const Glib::ustring &filename )
{
timeval tv;
gettimeofday(&tv, 0);
gettimeofday(&tv, nullptr);
char mseconds[4];
sprintf(mseconds, "%d", (int)(tv.tv_usec / 1000));
time_t rawtime;
@@ -497,7 +497,7 @@ void BatchQueue::selectAll ()
{
MYWRITERLOCK(l, entryRW);
lastClicked = NULL;
lastClicked = nullptr;
selected.clear ();
for (size_t i = 0; i < fd.size(); i++) {
@@ -638,7 +638,7 @@ rtengine::ProcessingJob* BatchQueue::imageReady (rtengine::IImage16* img)
MYWRITERLOCK(l, entryRW);
delete processing;
processing = NULL;
processing = nullptr;
fd.erase (fd.begin());
@@ -705,7 +705,7 @@ rtengine::ProcessingJob* BatchQueue::imageReady (rtengine::IImage16* img)
redraw ();
notifyListener (queueEmptied);
return processing ? processing->job : NULL;
return processing ? processing->job : nullptr;
}
// Calculates automatic filename of processed batch entry, but just the base name
@@ -957,7 +957,7 @@ void BatchQueue::error (Glib::ustring msg)
processing->addButtonSet (bqbs);
processing->processing = false;
processing->job = rtengine::ProcessingJob::create(processing->filename, processing->thumbnail->getType() == FT_Raw, processing->params);
processing = NULL;
processing = nullptr;
redraw ();
}