Code cleanup: size() vs empty(), possible memleaks, initialization list order. On behalf of lebedev.ri, see issue 1195

This commit is contained in:
DrSlony
2012-01-08 17:35:33 +00:00
parent 02e6d9e9a5
commit 977094a912
54 changed files with 342 additions and 198 deletions

View File

@@ -335,7 +335,7 @@ void BatchQueue::selectAll () {
}
void BatchQueue::startProcessing () {
if (!processing && fd.size()>0) {
if (!processing && !fd.empty()) {
BatchQueueEntry* next;
{
@@ -421,7 +421,7 @@ rtengine::ProcessingJob* BatchQueue::imageReady (rtengine::IImage16* img) {
fd.erase (fd.begin());
// return next job
if (fd.size()==0) {
if (fd.empty()) {
queueEmptied=true;
}
else if (listener && listener->canStartNext ()) {
@@ -442,7 +442,7 @@ rtengine::ProcessingJob* BatchQueue::imageReady (rtengine::IImage16* img) {
if (saveBatchQueue( )) {
safe_g_remove( processedParams );
// Delete all files in directory \batch when finished, just to be sure to remove zombies
if( fd.size()==0 ){
if( fd.empty() ){
std::vector<Glib::ustring> names;
Glib::ustring batchdir = options.rtdir+"/batch/";
Glib::RefPtr<Gio::File> dir = Gio::File::create_for_path (batchdir);