From 617557b08ea94e2b65a1697ddf0b79651204d92b Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 1 Apr 2014 11:34:00 +1100
Subject: Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define

---
 source/blender/windowmanager/intern/wm_jobs.c | 38 +++++++++++++--------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'source/blender/windowmanager/intern/wm_jobs.c')

diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c
index d26723e7f8c..7c0d7bf3606 100644
--- a/source/blender/windowmanager/intern/wm_jobs.c
+++ b/source/blender/windowmanager/intern/wm_jobs.c
@@ -230,13 +230,13 @@ bool WM_jobs_test(wmWindowManager *wm, void *owner, int job_type)
 		if (wm_job->owner == owner) {
 			if (job_type == WM_JOB_TYPE_ANY || (wm_job->job_type == job_type)) {
 				if (wm_job->running || wm_job->suspended) {
-					return TRUE;
+					return true;
 				}
 			}
 		}
 	}
 
-	return FALSE;
+	return false;
 }
 
 float WM_jobs_progress(wmWindowManager *wm, void *owner)
@@ -305,7 +305,7 @@ void WM_jobs_customdata_set(wmJob *wm_job, void *customdata, void (*free)(void *
 
 	if (wm_job->running) {
 		/* signal job to end */
-		wm_job->stop = TRUE;
+		wm_job->stop = true;
 	}
 }
 
@@ -333,7 +333,7 @@ static void *do_job_thread(void *job_v)
 	wmJob *wm_job = job_v;
 	
 	wm_job->startjob(wm_job->run_customdata, &wm_job->stop, &wm_job->do_update, &wm_job->progress);
-	wm_job->ready = TRUE;
+	wm_job->ready = true;
 	
 	return NULL;
 }
@@ -342,11 +342,11 @@ static void *do_job_thread(void *job_v)
 static void wm_jobs_test_suspend_stop(wmWindowManager *wm, wmJob *test)
 {
 	wmJob *wm_job;
-	int suspend = FALSE;
+	bool suspend = false;
 	
 	/* job added with suspend flag, we wait 1 timer step before activating it */
 	if (test->flag & WM_JOB_SUSPEND) {
-		suspend = TRUE;
+		suspend = true;
 		test->flag &= ~WM_JOB_SUSPEND;
 	}
 	else {
@@ -367,11 +367,11 @@ static void wm_jobs_test_suspend_stop(wmWindowManager *wm, wmJob *test)
 				if (0 == (wm_job->flag & WM_JOB_EXCL_RENDER))
 					continue;
 
-			suspend = TRUE;
+			suspend = true;
 
 			/* if this job has higher priority, stop others */
 			if (test->flag & WM_JOB_PRIORITY) {
-				wm_job->stop = TRUE;
+				wm_job->stop = true;
 				// printf("job stopped: %s\n", wm_job->name);
 			}
 		}
@@ -388,7 +388,7 @@ void WM_jobs_start(wmWindowManager *wm, wmJob *wm_job)
 {
 	if (wm_job->running) {
 		/* signal job to end and restart */
-		wm_job->stop = TRUE;
+		wm_job->stop = true;
 		// printf("job started a running job, ending... %s\n", wm_job->name);
 	}
 	else {
@@ -397,19 +397,19 @@ void WM_jobs_start(wmWindowManager *wm, wmJob *wm_job)
 			
 			wm_jobs_test_suspend_stop(wm, wm_job);
 			
-			if (wm_job->suspended == FALSE) {
+			if (wm_job->suspended == false) {
 				/* copy to ensure proper free in end */
 				wm_job->run_customdata = wm_job->customdata;
 				wm_job->run_free = wm_job->free;
 				wm_job->free = NULL;
 				wm_job->customdata = NULL;
-				wm_job->running = TRUE;
+				wm_job->running = true;
 				
 				if (wm_job->initjob)
 					wm_job->initjob(wm_job->run_customdata);
 				
-				wm_job->stop = FALSE;
-				wm_job->ready = FALSE;
+				wm_job->stop = false;
+				wm_job->ready = false;
 				wm_job->progress = 0.0;
 
 				// printf("job started: %s\n", wm_job->name);
@@ -444,7 +444,7 @@ static void wm_jobs_kill_job(wmWindowManager *wm, wmJob *wm_job)
 {
 	if (wm_job->running) {
 		/* signal job to end */
-		wm_job->stop = TRUE;
+		wm_job->stop = true;
 		wm_job_main_thread_yield(wm_job, true);
 		BLI_end_threads(&wm_job->threads);
 
@@ -508,7 +508,7 @@ void WM_jobs_stop(wmWindowManager *wm, void *owner, void *startjob)
 	for (wm_job = wm->jobs.first; wm_job; wm_job = wm_job->next) {
 		if (wm_job->owner == owner || wm_job->startjob == startjob) {
 			if (wm_job->running) {
-				wm_job->stop = TRUE;
+				wm_job->stop = true;
 			}
 		}
 	}
@@ -573,7 +573,7 @@ void wm_jobs_timer(const bContext *C, wmWindowManager *wm, wmTimer *wt)
 
 					if (wm_job->flag & WM_JOB_PROGRESS)
 						WM_event_add_notifier(C, NC_WM | ND_JOB, NULL);
-					wm_job->do_update = FALSE;
+					wm_job->do_update = false;
 				}
 				
 				if (wm_job->ready) {
@@ -593,7 +593,7 @@ void wm_jobs_timer(const bContext *C, wmWindowManager *wm, wmTimer *wt)
 						       PIL_check_seconds_timer() - wm_job->start_time);
 					}
 
-					wm_job->running = FALSE;
+					wm_job->running = false;
 					wm_job_main_thread_yield(wm_job, true);
 					BLI_end_threads(&wm_job->threads);
 					wm_job->main_thread_mutex_ending = false;
@@ -654,9 +654,9 @@ bool WM_jobs_has_running(wmWindowManager *wm)
 
 	for (wm_job = wm->jobs.first; wm_job; wm_job = wm_job->next) {
 		if (wm_job->running) {
-			return TRUE;
+			return true;
 		}
 	}
 
-	return FALSE;
+	return false;
 }
-- 
cgit v1.2.3