Index: trunk/VUT/Ogre/include/OgreOcclusionQueriesQueryManager.h
===================================================================
--- trunk/VUT/Ogre/include/OgreOcclusionQueriesQueryManager.h	(revision 174)
+++ trunk/VUT/Ogre/include/OgreOcclusionQueriesQueryManager.h	(revision 316)
@@ -19,7 +19,7 @@
     
     void ComputeCameraVisibility(const Camera &camera,
-			    InfoContainer<GtpVisibility::NodeInfo> *visibleNodes,
-			    InfoContainer<GtpVisibility::MeshInfo> *visibleGeometry,
-				InfoContainer<GtpVisibility::PatchInfo> *visiblePatches,
+			    GtpVisibility::NodeInfoContainer *visibleNodes,
+			    GtpVisibility::MeshInfoContainer *visibleGeometry,
+				GtpVisibility::PatchInfoContainer *visiblePatches,
 			    bool relativeVisibility = false);
     
@@ -29,7 +29,7 @@
     */
     void ComputeFromPointVisibility(const Vector3 &point,
-			       InfoContainer<GtpVisibility::NodeInfo> *visibleNodes,
-			       InfoContainer<GtpVisibility::MeshInfo> *visibleGeometry,
-				   InfoContainer<GtpVisibility::PatchInfo> *visiblePatches,
+			       GtpVisibility::NodeInfoContainer *visibleNodes,
+			       GtpVisibility::MeshInfoContainer *visibleGeometry,
+				   GtpVisibility::PatchInfoContainer *visiblePatches,
 			       bool relativeVisibility = false);
     
@@ -40,5 +40,5 @@
 								   GtpVisibility::QueryList::iterator &projQueryIt,
 								   GtpVisibility::GeometryList *geometryList, 
-								   InfoContainer<GtpVisibility::MeshInfo> *visibleGeometry,
+								   GtpVisibility::MeshInfoContainer *visibleGeometry,
 								   bool relativeVisibility);
 
@@ -46,25 +46,25 @@
 							   GtpVisibility::QueryList::iterator &projQueryIt,
 							   GtpVisibility::HierarchyNodeList *nodeList, 
-							   InfoContainer<GtpVisibility::NodeInfo> *visibleNodes,
+							   GtpVisibility::NodeInfoContainer *visibleNodes,
 							   bool relativeVisibility);
 
 	void CollectRelativeGeometryVisibilityForItemBuffer(GtpVisibility::QueryList::iterator &projQueryIt,
 												GtpVisibility::GeometryList *geometryList, 
-												InfoContainer<GtpVisibility::MeshInfo> *visibleGeometry);
+												GtpVisibility::MeshInfoContainer *visibleGeometry);
 
 	void CollectRelativePatchVisibilityForItemBuffer(
 									GtpVisibility::QueryList::iterator &projQueryIt,
 									GtpVisibility::PatchList *patchList, 
-									InfoContainer<GtpVisibility::PatchInfo> *visiblePatches);
+									GtpVisibility::PatchInfoContainer *visiblePatches);
 
 	void CollectPatchVisibility(GtpVisibility::QueryList::iterator &visQueryIt, 
 								GtpVisibility::QueryList::iterator &projQueryIt,
 								GtpVisibility::PatchList *patchList, 
-								InfoContainer<GtpVisibility::PatchInfo> *visiblePatches,
+								GtpVisibility::PatchInfoContainer *visiblePatches,
 								bool relativeVisibility);
 
-	void RemoveDuplicateNodes(InfoContainer<GtpVisibility::NodeInfo> *visibleNodes);
-	void RemoveDuplicateGeometry(InfoContainer<GtpVisibility::MeshInfo> *visibleMesh);
-	void RemoveDuplicatePatches(InfoContainer<GtpVisibility::PatchInfo> *visiblePatches);
+	void RemoveDuplicateNodes(GtpVisibility::NodeInfoContainer *visibleNodes);
+	void RemoveDuplicateGeometry(GtpVisibility::MeshInfoContainer *visibleMesh);
+	void RemoveDuplicatePatches(GtpVisibility::PatchInfoContainer *visiblePatches);
 
 	/** Returns the patches of the geometry of a given node. 
Index: trunk/VUT/Ogre/include/OgrePlatformQueryManager.h
===================================================================
--- trunk/VUT/Ogre/include/OgrePlatformQueryManager.h	(revision 174)
+++ trunk/VUT/Ogre/include/OgrePlatformQueryManager.h	(revision 316)
@@ -25,13 +25,13 @@
     */
     void ComputeFromPointVisibility(const Vector3 &point,
-			       InfoContainer<GtpVisibility::NodeInfo> *visibleNodes,
-			       InfoContainer<GtpVisibility::MeshInfo> *visibleGeometry,
-				   InfoContainer<GtpVisibility::PatchInfo> *visiblePatches,
+			       GtpVisibility::NodeInfoContainer *visibleNodes,
+			       GtpVisibility::MeshInfoContainer *visibleGeometry,
+				   GtpVisibility::PatchInfoContainer *visiblePatches,
 			       bool relativeVisibility = false);
   
 	void ComputeCameraVisibility(const Camera &camera,
-			       InfoContainer<GtpVisibility::NodeInfo> *visibleNodes,
-			       InfoContainer<GtpVisibility::MeshInfo> *visibleGeometry,
-				   InfoContainer<GtpVisibility::PatchInfo> *visiblePatches,
+			       GtpVisibility::NodeInfoContainer *visibleNodes,
+			       GtpVisibility::MeshInfoContainer *visibleGeometry,
+				   GtpVisibility::PatchInfoContainer *visiblePatches,
 			       bool relativeVisibility = false);
   
@@ -45,9 +45,9 @@
 
 	void CollectItemBufferResults(
-				InfoContainer<GtpVisibility::MeshInfo> *visibleGeometry,
-				InfoContainer<GtpVisibility::PatchInfo> *visiblePatches);
+				GtpVisibility::MeshInfoContainer *visibleGeometry,
+				GtpVisibility::PatchInfoContainer *visiblePatches);
 
-	void InitItemBuffer(InfoContainer<GtpVisibility::MeshInfo> *visibleGeometry,
-						InfoContainer<GtpVisibility::PatchInfo> *visiblePatches);
+	void InitItemBuffer(GtpVisibility::MeshInfoContainer *visibleGeometry,
+						GtpVisibility::PatchInfoContainer *visiblePatches);
 
 	Viewport *mViewport;
