Index: cpp/frams/model/modelparts.h
===================================================================
--- cpp/frams/model/modelparts.h	(revision 844)
+++ cpp/frams/model/modelparts.h	(revision 899)
@@ -24,5 +24,5 @@
 class MultiRange;
 
-typedef UserTags<Model, void*, 5> ModelUserTags;
+typedef UserTags<Model, void *, 5> ModelUserTags;
 
 /** Common base for model elements. */
@@ -31,7 +31,7 @@
 public:
 	SString vis_style;
-	PartBase(const SString& s) :vis_style(s), mapped(0) {}
+	PartBase(const SString &s) :vis_style(s), mapped(0) {}
 	~PartBase();
-	static SString getDefaultStyle(){ return SString("none"); }
+	static SString getDefaultStyle() { return SString("none"); }
 	MultiRange *mapped;
 	enum PartBaseFlags { Selected = 1 };
@@ -48,5 +48,5 @@
 
 	void clearMapping();
-	MultiRange* getMapping() { return mapped; }
+	MultiRange *getMapping() { return mapped; }
 	void setMapping(const IRange &mr);
 	void addMapping(const IRange &mr);
@@ -54,8 +54,8 @@
 	void addMapping(const MultiRange &mr);
 
-	void setInfo(const SString& name, const SString& value);
-	void setInfo(const SString& name, int value);
-	void setInfo(const SString& name, double value);
-	SString getInfo(const SString& name);
+	void setInfo(const SString &name, const SString &value);
+	void setInfo(const SString &name, int value);
+	void setInfo(const SString &name, double value);
+	SString getInfo(const SString &name);
 };
 
@@ -94,6 +94,6 @@
 
 	Part(enum Shape s = SHAPE_BALL_AND_STICK);
-	Part(const Part& src) :PartBase(getDefaultStyle()) { operator=(src); }
-	void operator=(const Part& src);
+	Part(const Part &src) :PartBase(getDefaultStyle()) { operator=(src); }
+	void operator=(const Part &src);
 
 	void setPositionAndRotationFromAxis(const Pt3D &p1, const Pt3D &p2);
@@ -101,5 +101,5 @@
 	void setRot(const Pt3D &r);///< set part.rot (rotation angles) and calculate part.o
 
-	static Param& getStaticParam();
+	static Param &getStaticParam();
 };
 
@@ -128,6 +128,6 @@
 
 	Joint();
-	Joint(const Joint& src) :PartBase(getDefaultStyle()) { operator=(src); }
-	void operator=(const Joint& src);
+	Joint(const Joint &src) :PartBase(getDefaultStyle()) { operator=(src); }
+	void operator=(const Joint &src);
 
 	/** connect two parts with this joint.
@@ -135,5 +135,5 @@
 		@see isDelta()
 		*/
-	void attachToParts(Part* p1, Part* p2);
+	void attachToParts(Part *p1, Part *p2);
 	/// @see attachToParts(Part*,Part*)
 	void attachToParts(int p1, int p2);
@@ -168,14 +168,16 @@
 	Pt3D vcolor;
 
-	static Param& getStaticParam();
+	static Param &getStaticParam();
 };
 
 #define JOINT_DELTA_MARKER 99999.0
 
-////////////////// NN /////////////////
+
+
+////////////////// Neural Network /////////////////
 
 class NeuroClass;
 
-typedef UserTags<NeuroClass, void*, 5> NeuroClassUserTags;
+typedef UserTags<NeuroClass, void *, 5> NeuroClassUserTags;
 
 /** Information about neuron class.
@@ -184,5 +186,5 @@
 {
 	bool ownedvectordata;
-	void operator=(const NeuroClass& nosuchthich){}
+	void operator=(const NeuroClass &nosuchthich) {}
 public:
 	SString name, longname, description;
@@ -207,10 +209,10 @@
 	/** class name for use in Neuro::setClassName(), Neuro::setDetails() (former 'moredata' field),
 		eg. "N","-",G" */
-	const SString& getName() { return name; }
+	const SString &getName() { return name; }
 	/** human friendly name, eg. "Neuron","Link","Gyroscope"  */
-	const SString& getLongName() { return longname; }
+	const SString &getLongName() { return longname; }
 	/** long description */
-	const SString& getDescription() { return description; }
-	ParamEntry* getParamTab() { return props; }
+	const SString &getDescription() { return description; }
+	ParamEntry *getParamTab() { return props; }
 
 	/** NeuroClass specific properties, recognized by all neurons of this class */
@@ -240,5 +242,5 @@
 		}
 		*/
-	int* getSymbolGlyph()
+	int *getSymbolGlyph()
 	{
 		return vectordata;
@@ -246,5 +248,5 @@
 	void setSymbolGlyph(int *data, bool owned = 1)
 	{
-		if (vectordata&&ownedvectordata) delete[]vectordata;
+		if (vectordata && ownedvectordata) delete[]vectordata;
 		vectordata = data; ownedvectordata = owned;
 	}
@@ -282,10 +284,13 @@
 
 	static void resetActive(); ///< set default values of active and genactive for all classes
-	static void setGenActive(const char* classes[]); ///< set genactive for specified classes
-};
-
-class Neuro;
-
-/** Single processing unit in Framsticks NN.  */
+	static void setGenActive(const char *classes[]); ///< set genactive for specified classes
+};
+
+
+
+
+
+
+/** Single processing unit in Framsticks neural network.  */
 class Neuro : public PartBase
 {
@@ -305,5 +310,5 @@
 	/** set myclass and make knownclass=true */
 	void checkClass();
-	SString** inputInfo(int i);
+	SString **inputInfo(int i);
 	void defassign();
 
@@ -313,18 +318,18 @@
 	Param extraProperties();
 
-	void setInputInfo(int i, const SString& name, const SString &value);
-	void setInputInfo(int i, const SString& name, int value);
-	void setInputInfo(int i, const SString& name, double value);
+	void setInputInfo(int i, const SString &name, const SString &value);
+	void setInputInfo(int i, const SString &name, int value);
+	void setInputInfo(int i, const SString &name, double value);
 	SString getInputInfo(int i);
-	SString getInputInfo(int i, const SString& name);
-
-	NeuroClass* getClass();
-	void setClass(NeuroClass*);
+	SString getInputInfo(int i, const SString &name);
+
+	NeuroClass *getClass();
+	void setClass(NeuroClass *);
 
 	SString getClassParams() { return myclassparams; }
-	void setClassParams(const SString& cp) { myclassparams = cp; }
+	void setClassParams(const SString &cp) { myclassparams = cp; }
 
 	SString getClassName();
-	void setClassName(const SString& clazz);
+	void setClassName(const SString &clazz);
 
 	/** return neuro unit details encoded as <CLASS> ":" <PROPERTIES>
@@ -351,5 +356,5 @@
 		@see getDetails()
 		*/
-	void setDetails(const SString&);
+	void setDetails(const SString &);
 
 #define STATRICKCLASS Neuro
@@ -377,9 +382,9 @@
 	Neuro();
 	Neuro(double _state, double _inertia, double _force, double _sigmo);
-	Neuro(const Neuro& src) :PartBase(getDefaultStyle()) { operator=(src); }
+	Neuro(const Neuro &src) :PartBase(getDefaultStyle()) { operator=(src); }
 
 	~Neuro();
 
-	void operator=(const Neuro& src);
+	void operator=(const Neuro &src);
 
 	/** Attach this Neuro to the specified Part or detach it from the body if p==NULL.
@@ -387,5 +392,5 @@
 		@see getPart()
 		*/
-	void attachToPart(Part* p) { part = p; joint = 0; }
+	void attachToPart(Part *p) { part = p; joint = 0; }
 
 	/** Attach this Neuro to the specified Joint or detach it from the body if p==NULL.
@@ -393,5 +398,5 @@
 		@see getJoint()
 		*/
-	void attachToJoint(Joint* j) { joint = j; part = 0; }
+	void attachToJoint(Joint *j) { joint = j; part = 0; }
 
 	void attachToPart(int i);
@@ -422,9 +427,9 @@
 
 	/** @return the Neuro connected as i-th input */
-	Neuro* getInput(int i) const { return (i >= inputs.size()) ? 0 : inputs(i).n; }
+	Neuro *getInput(int i) const { return (i >= inputs.size()) ? 0 : inputs(i).n; }
 	/** @return the Neuro connected as i-th input.
 		@param weight
 		*/
-	Neuro* getInput(int i, double &weight) const;
+	Neuro *getInput(int i, double &weight) const;
 	/** @return connectin weight for i-th input */
 	double getInputWeight(int i) const;
@@ -432,18 +437,18 @@
 	void setInputWeight(int i, double weight);
 	/** connect i-th input with another neuron */
-	void setInput(int i, Neuro*n);
+	void setInput(int i, Neuro *n);
 	/** connect i-th input with another neuron */
-	void setInput(int i, Neuro*n, double weight);
+	void setInput(int i, Neuro *n, double weight);
 	/** add new input. @return its reference number */
-	int addInput(Neuro* child, double weight = 1.0, const SString* info = 0);
+	int addInput(Neuro *child, double weight = 1.0, const SString *info = 0);
 	/** @return reference number [0..InputCount-1] of the input
 	   or -1 if 'child' is not connected with this Neuro.*/
-	int findInput(Neuro* child) const;
+	int findInput(Neuro *child) const;
 	void removeInput(paInt refno);
 	/**    @return reference number of the child connection, like findInput() */
-	int removeInput(Neuro* child);
-
-	int findInputs(SList& result, const char* classname = 0, const Part* part = 0, const Joint* joint = 0) const;
-	int findOutputs(SList& result, const char* classname = 0, const Part* part = 0, const Joint* joint = 0) const;
+	int removeInput(Neuro *child);
+
+	int findInputs(SList &result, const char *classname = 0, const Part *part = 0, const Joint *joint = 0) const;
+	int findOutputs(SList &result, const char *classname = 0, const Part *part = 0, const Joint *joint = 0) const;
 
 	/* class database retrieval */
@@ -453,7 +458,7 @@
 		*/
 	static SString getClassName(int classindex);
-	static NeuroClass* getClass(int classindex);
-	static NeuroClass* getClass(const SString& classname);
-	static int getClassIndex(const NeuroClass*nc);
+	static NeuroClass *getClass(int classindex);
+	static NeuroClass *getClass(const SString &classname);
+	static int getClassIndex(const NeuroClass *nc);
 
 	// not really private, but you should not access those directly
@@ -468,5 +473,5 @@
 	Orient o;	///< rotation matrix calculated from "rot"
 	static ParamEntry emptyParamTab[];
-	static Param& getStaticParam();
+	static Param &getStaticParam();
 };
 
