From 26325b395cbc0f501f1bb140b208afa6de5ecfab Mon Sep 17 00:00:00 2001
From: John Scipione <jscipione@gmail.com>
Date: Fri, 20 Jun 2014 18:46:53 -0400
Subject: [PATCH] Tracker: NodePreloader style fixes

---
 src/kits/tracker/NodePreloader.cpp | 27 ++++++++++++++++++---------
 src/kits/tracker/NodePreloader.h   |  9 +++++----
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/kits/tracker/NodePreloader.cpp b/src/kits/tracker/NodePreloader.cpp
index dbea4199dc..e8b4471ba7 100644
--- a/src/kits/tracker/NodePreloader.cpp
+++ b/src/kits/tracker/NodePreloader.cpp
@@ -59,17 +59,20 @@ NodePreloader::InstallNodePreloader(const char* name, BLooper* host)
 		AutoLock<BLooper> lock(host);
 		if (!lock)
 			return NULL;
+
 		host->AddHandler(result);
 	}
 	result->Run();
+
 	return result;
 }
 
 
 NodePreloader::NodePreloader(const char* name)
-	:	BHandler(name),
-		fModelList(20, true),
-		fQuitRequested(false)
+	:
+	BHandler(name),
+	fModelList(20, true),
+	fQuitRequested(false)
 {
 }
 
@@ -98,6 +101,7 @@ NodePreloader::FindModel(node_ref itemNode) const
 		if (*model->NodeRef() == itemNode)
 			return model;
 	}
+
 	return NULL;
 }
 
@@ -118,8 +122,9 @@ NodePreloader::MessageReceived(BMessage* message)
 					message->FindInt32("device", &itemNode.device);
 					message->FindInt64("node", &itemNode.node);
 					Model* model = FindModel(itemNode);
-					if (!model)
+					if (model == NULL)
 						break;
+
 					//PRINT(("preloader removing file %s\n", model->Name()));
 					IconCache::sIconCache->Removing(model);
 					fModelList.RemoveItem(model);
@@ -136,8 +141,9 @@ NodePreloader::MessageReceived(BMessage* message)
 					const char* attrName;
 					message->FindString("attr", &attrName);
 					Model* model = FindModel(itemNode);
-					if (!model)
+					if (model == NULL)
 						break;
+
 					BModelOpener opener(model);
 					IconCache::sIconCache->IconChanged(model->ResolveIfLink());
 					//PRINT(("preloader updating file %s\n", model->Name()));
@@ -181,9 +187,10 @@ NodePreloader::PreloadOne(const char* dirPath)
 
 		Model* model = new Model(&ref, true);
 		if (model->InitCheck() == B_OK && model->IconFrom() == kUnknownSource) {
-			TTracker::WatchNode(model->NodeRef(), B_WATCH_STAT
-				| B_WATCH_ATTR, this);
-			IconCache::sIconCache->Preload(model, kNormalIcon, B_MINI_ICON, true);
+			TTracker::WatchNode(model->NodeRef(),
+				B_WATCH_STAT | B_WATCH_ATTR, this);
+			IconCache::sIconCache->Preload(model, kNormalIcon, B_MINI_ICON,
+				true);
 			fModelList.AddItem(model);
 			model->CloseNode();
 		} else
@@ -196,7 +203,8 @@ void
 NodePreloader::Preload()
 {
 	for (int32 count = 100; count >= 0; count--) {
-		// wait for a little bit before going ahead to reduce disk access contention
+		// wait for a little bit before going ahead to reduce disk access
+		// contention
 		snooze(100000);
 		if (fQuitRequested) {
 			fLock.Unlock();
@@ -214,6 +222,7 @@ NodePreloader::Preload()
 	BPath path;
 	if (find_directory(B_BEOS_APPS_DIRECTORY, &path) == B_OK)
 		PreloadOne(path.Path());
+
 	if (find_directory(B_BEOS_PREFERENCES_DIRECTORY, &path) == B_OK)
 		PreloadOne(path.Path());
 
diff --git a/src/kits/tracker/NodePreloader.h b/src/kits/tracker/NodePreloader.h
index b4e2b224ba..6b1abfaaae 100644
--- a/src/kits/tracker/NodePreloader.h
+++ b/src/kits/tracker/NodePreloader.h
@@ -42,13 +42,13 @@ All rights reserved.
 //  aliasing after a deletion, etc.
 //
 //  The node preloader knows which icons to preload
-#ifndef __NODE_CACHE_PRELOADER__
-#define __NODE_CACHE_PRELOADER__
+#ifndef _NODE_CACHE_PRELOADER_H
+#define _NODE_CACHE_PRELOADER_H
 
 
 #include <Handler.h>
+#include <ObjectList.h>
 
-#include "ObjectList.h"
 #include "Model.h"
 
 
@@ -82,4 +82,5 @@ private:
 
 using namespace BPrivate;
 
-#endif	// __NODE_CACHE_PRELOADER__
+
+#endif	// _NODE_CACHE_PRELOADER_H