From e994adddb17262f13b1c755567b20cd197c39252 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Mon, 1 Nov 2010 04:29:55 +0100
Subject: cosmetics


diff --git a/src/CSGTermRenderer.h b/src/CSGTermRenderer.h
index d992b76..fc3235e 100644
--- a/src/CSGTermRenderer.h
+++ b/src/CSGTermRenderer.h
@@ -40,7 +40,7 @@ private:
   map<int, ChildList> visitedchildren;
 
 public:
-  map<int, class CSGTerm*> stored_term;
+  map<int, class CSGTerm*> stored_term; // The term rendered from each node index
 
 	vector<CSGTerm*> *highlights;
 	vector<CSGTerm*> *background;
diff --git a/src/mainwin.cc b/src/mainwin.cc
index f812ede..be1a8ed 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -762,7 +762,7 @@ void MainWindow::compileCSG(bool procevents)
 		root_chain->import(root_norm_term);
 		
 		if (root_chain->polysets.size() > 1000) {
-			PRINTF("WARNING: Normalized tree has %d elements!", root_chain->polysets.size());
+			PRINTF("WARNING: Normalized tree has %u elements!", root_chain->polysets.size());
 			PRINTF("WARNING: OpenCSG rendering has been disabled.");
 		} else {
 			enableOpenCSG = true;
@@ -770,7 +770,7 @@ void MainWindow::compileCSG(bool procevents)
 		
 		if (highlight_terms.size() > 0)
 		{
-			PRINTF("Compiling highlights (%d CSG Trees)...", highlight_terms.size());
+			PRINTF("Compiling highlights (%u CSG Trees)...", highlight_terms.size());
 			if (procevents)
 				QApplication::processEvents();
 			
@@ -789,7 +789,7 @@ void MainWindow::compileCSG(bool procevents)
 		
 		if (background_terms.size() > 0)
 		{
-			PRINTF("Compiling background (%d CSG Trees)...", background_terms.size());
+			PRINTF("Compiling background (%u CSG Trees)...", background_terms.size());
 			if (procevents)
 				QApplication::processEvents();
 			
diff --git a/src/node.cc b/src/node.cc
index 9607b27..e1dd282 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -35,7 +35,7 @@
 #include <QRegExp>
 #include <sstream>
 
-int AbstractNode::idx_counter;
+size_t AbstractNode::idx_counter;
 
 AbstractNode::AbstractNode(const ModuleInstantiation *mi)
 {
diff --git a/src/node.h b/src/node.h
index 9127ae1..8b6e83c 100644
--- a/src/node.h
+++ b/src/node.h
@@ -23,7 +23,7 @@ class AbstractNode
 	// We can hash on pointer value or smth. else.
   //  -> remove and
 	// use smth. else to display node identifier in CSG tree output?
-	static int idx_counter;   // Node instantiation index
+	static size_t idx_counter;   // Node instantiation index
 public:
 	AbstractNode(const class ModuleInstantiation *mi);
 	virtual ~AbstractNode();
@@ -38,7 +38,7 @@ public:
 	const std::list<AbstractNode*> getChildren() const { 
 		return this->children.toList().toStdList(); 
 	}
-	int index() const { return this->idx; }
+	size_t index() const { return this->idx; }
 
 	static void resetIndexCounter() { idx_counter = 1; }
 
-- 
cgit v0.10.1