From cc1d74e22566ee7b385fb776a66271b92a646564 Mon Sep 17 00:00:00 2001
From: vro <vro@opencascade.com>
Date: Fri, 5 Oct 2012 14:17:17 +0400
Subject: [PATCH] 0021189: Clean up KAS:dev:ros and Products

Removal of VoxelClient
VoxelDemo sample is redesigned so that it doesn't require compilation of OpenGl classes. It refers to TKOpenGl.dll as to an external library.
Some minor bugs are fixed in OCAF and Viewer 3d standard MFC samples
---
 adm/UDLIST                                    |   1 -
 .../standard/04_Viewer3d/src/Viewer3dView.cpp |  50 +-
 samples/mfc/standard/06_Ocaf/src/OcafApp.cpp  |   2 +-
 samples/mfc/standard/06_Ocaf/src/OcafDoc.cpp  |  27 +-
 samples/qt/VoxelDemo/VoxelDemo.sln            |  20 +
 samples/qt/VoxelDemo/VoxelDemo.vcproj         | 291 ++++++++
 .../inc/Application.h                         |   0
 .../inc/ConversionThread.h                    |   0
 .../qt/{voxeldemo => VoxelDemo}/inc/Timer.h   |   0
 .../qt/{voxeldemo => VoxelDemo}/inc/Viewer.h  |   0
 .../qt/VoxelDemo/inc}/VoxelClient_VisDrawer.h |   4 +-
 samples/qt/VoxelDemo/msvc.bat                 |   6 +
 .../src/Application.cpp                       |   0
 .../src/ConversionThread.cpp                  |   0
 .../qt/{voxeldemo => VoxelDemo}/src/Main.cpp  |   0
 .../qt/{voxeldemo => VoxelDemo}/src/Timer.cpp |   0
 .../{voxeldemo => VoxelDemo}/src/Viewer.cpp   |   0
 .../VoxelDemo/src}/VoxelClient_VisDrawer.cxx  |  13 +-
 samples/qt/voxeldemo/OpenGl/OpenGl.vcproj     | 643 ------------------
 samples/qt/voxeldemo/VoxelDemo-vc8.sln        |  29 -
 samples/qt/voxeldemo/VoxelDemo-vc9.sln        |  29 -
 samples/qt/voxeldemo/VoxelDemo.vcproj         | 438 ------------
 samples/qt/voxeldemo/env.bat                  |  16 -
 samples/qt/voxeldemo/msvc.bat                 |   4 -
 samples/qt/voxeldemo/run.bat                  |  18 -
 src/OS/Visualization.tcl                      |   1 -
 src/VoxelClient/FILES                         |   2 -
 27 files changed, 383 insertions(+), 1211 deletions(-)
 create mode 100644 samples/qt/VoxelDemo/VoxelDemo.sln
 create mode 100644 samples/qt/VoxelDemo/VoxelDemo.vcproj
 rename samples/qt/{voxeldemo => VoxelDemo}/inc/Application.h (100%)
 mode change 100755 => 100644
 rename samples/qt/{voxeldemo => VoxelDemo}/inc/ConversionThread.h (100%)
 mode change 100755 => 100644
 rename samples/qt/{voxeldemo => VoxelDemo}/inc/Timer.h (100%)
 mode change 100755 => 100644
 rename samples/qt/{voxeldemo => VoxelDemo}/inc/Viewer.h (100%)
 mode change 100755 => 100644
 rename {src/VoxelClient => samples/qt/VoxelDemo/inc}/VoxelClient_VisDrawer.h (94%)
 mode change 100755 => 100644
 create mode 100644 samples/qt/VoxelDemo/msvc.bat
 rename samples/qt/{voxeldemo => VoxelDemo}/src/Application.cpp (100%)
 mode change 100755 => 100644
 rename samples/qt/{voxeldemo => VoxelDemo}/src/ConversionThread.cpp (100%)
 mode change 100755 => 100644
 rename samples/qt/{voxeldemo => VoxelDemo}/src/Main.cpp (100%)
 mode change 100755 => 100644
 rename samples/qt/{voxeldemo => VoxelDemo}/src/Timer.cpp (100%)
 mode change 100755 => 100644
 rename samples/qt/{voxeldemo => VoxelDemo}/src/Viewer.cpp (100%)
 mode change 100755 => 100644
 rename {src/VoxelClient => samples/qt/VoxelDemo/src}/VoxelClient_VisDrawer.cxx (99%)
 mode change 100755 => 100644
 delete mode 100755 samples/qt/voxeldemo/OpenGl/OpenGl.vcproj
 delete mode 100644 samples/qt/voxeldemo/VoxelDemo-vc8.sln
 delete mode 100644 samples/qt/voxeldemo/VoxelDemo-vc9.sln
 delete mode 100755 samples/qt/voxeldemo/VoxelDemo.vcproj
 delete mode 100755 samples/qt/voxeldemo/env.bat
 delete mode 100644 samples/qt/voxeldemo/msvc.bat
 delete mode 100644 samples/qt/voxeldemo/run.bat
 delete mode 100755 src/VoxelClient/FILES

diff --git a/adm/UDLIST b/adm/UDLIST
index 2165d54dd0..c2f073ced8 100644
--- a/adm/UDLIST
+++ b/adm/UDLIST
@@ -207,7 +207,6 @@ t TKShHealing
 t TKTopAlgo
 t TKXMesh
 n InterfaceGraphic
-n VoxelClient
 p AIS
 p AIS2D
 p AlienImage
diff --git a/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp b/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp
index 70da435841..d04a262957 100755
--- a/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp
+++ b/samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp
@@ -1088,11 +1088,30 @@ GetDocument()->UpdateResultMessageDlg("SetAntialiasingOn/SetAntialiasingOff",Mes
 void CViewer3dView::OnClearLights() 
 {
 //	Setting Off all viewer active lights
+    TColStd_ListOfTransient lights;
 	for(myView->Viewer()->InitActiveLights(); myView->Viewer()->MoreActiveLights(); myView->Viewer()->NextActiveLights())
-		myView->Viewer()->SetLightOff(myView->Viewer()->ActiveLight());
+    {
+        lights.Append(myView->Viewer()->ActiveLight());
+    }
+    TColStd_ListIteratorOfListOfTransient itrLights(lights);
+    for (; itrLights.More(); itrLights.Next())
+    {
+        Handle(V3d_Light) light = Handle(V3d_Light)::DownCast(itrLights.Value());
+        myView->Viewer()->SetLightOff(light);
+    }
+
 //	Setting Off all view active lights
-	for(myView->InitActiveLights(); myView->MoreActiveLights(); myView->NextActiveLights())
-		myView->SetLightOff(myView->ActiveLight());
+    lights.Clear();
+    for(myView->InitActiveLights(); myView->MoreActiveLights(); myView->NextActiveLights())
+    {
+        lights.Append(myView->ActiveLight());
+    }
+    itrLights.Initialize(lights);
+    for (; itrLights.More(); itrLights.Next())
+    {
+        Handle(V3d_Light) light = Handle(V3d_Light)::DownCast(itrLights.Value());
+        myView->SetLightOff(light);
+    }
 
 	myView->Viewer()->SetDefaultLights();// Setting the default lights on
 
@@ -1101,10 +1120,31 @@ void CViewer3dView::OnClearLights()
 	myView->Update();
 
 TCollection_AsciiString Message("\
+//	Setting Off all viewer active lights\n\
+TColStd_ListOfTransient lights;\n\
 for(myView->Viewer()->InitActiveLights(); myView->Viewer()->MoreActiveLights(); myView->Viewer()->NextActiveLights())\n\
-	myView->Viewer()->SetLightOff(myView->Viewer()->ActiveLight()); //Setting Off all viewer active lights\n\
+{\n\
+    lights.Append(myView->Viewer()->ActiveLight());\n\
+}\n\
+TColStd_ListIteratorOfListOfTransient itrLights(lights);\n\
+for (; itrLights.More(); itrLights.Next())\n\
+{\n\
+    Handle(V3d_Light) light = Handle(V3d_Light)::DownCast(itrLights.Value());\n\
+    myView->Viewer()->SetLightOff(light);\n\
+}\n\
+\n\
+//	Setting Off all view active lights\n\
+lights.Clear();\n\
 for(myView->InitActiveLights(); myView->MoreActiveLights(); myView->NextActiveLights())\n\
-	myView->SetLightOff(myView->ActiveLight()); //Setting Off all view active lights\n\
+{\n\
+    lights.Append(myView->ActiveLight());\n\
+}\n\
+itrLights.Initialize(lights);\n\
+for (; itrLights.More(); itrLights.Next())\n\
+{\n\
+    Handle(V3d_Light) light = Handle(V3d_Light)::DownCast(itrLights.Value());\n\
+    myView->SetLightOff(light);\n\
+}\n\
 \n\
 myView->Viewer()->SetDefaultLights();// Setting the default lights on\n\
   ");
diff --git a/samples/mfc/standard/06_Ocaf/src/OcafApp.cpp b/samples/mfc/standard/06_Ocaf/src/OcafApp.cpp
index ed5d3a8758..6a106f5288 100755
--- a/samples/mfc/standard/06_Ocaf/src/OcafApp.cpp
+++ b/samples/mfc/standard/06_Ocaf/src/OcafApp.cpp
@@ -143,7 +143,7 @@ BOOL COcafApp::IsViewExisting(CDocument * pDoc, CRuntimeClass * pViewClass, CVie
 void COcafApp::OnFileOpen() 
 {
 	CFileDialog aDlg(TRUE, NULL, NULL, OFN_FILEMUSTEXIST|OFN_HIDEREADONLY,
-	   "OCAFSample(STA) (*.sta)|*.sta|OCAFSample(XML) (*.xml)|*.xml|OCAFSample(Binary) (*.cbf)|*.cbf||");
+	   "OCAFSample(STD) (*.std)|*.std|OCAFSample(XML) (*.xml)|*.xml|OCAFSample(Binary) (*.cbf)|*.cbf||");
 
 	if (aDlg.DoModal() != IDOK) 
         return;
diff --git a/samples/mfc/standard/06_Ocaf/src/OcafDoc.cpp b/samples/mfc/standard/06_Ocaf/src/OcafDoc.cpp
index 75234c6a64..329dff7d16 100755
--- a/samples/mfc/standard/06_Ocaf/src/OcafDoc.cpp
+++ b/samples/mfc/standard/06_Ocaf/src/OcafDoc.cpp
@@ -603,7 +603,8 @@ D->CommitCommand(); \n\
 
 		// Get the TOcafFunction_CutDriver using its Standard_GUID in the TFunction_DriverTable
 		Handle(TOcafFunction_CutDriver) myCutDriver;
-		TFunction_DriverTable::Get()->FindDriver(myDriverID, myCutDriver);
+		if (TFunction_DriverTable::Get()->FindDriver(myDriverID, myCutDriver))
+            myCutDriver->Init(LabObject);
 
 		// Recompute the cut object if it must be (look at the MustExecute function code)
 //		if (myCutDriver->MustExecute(log))
@@ -904,21 +905,21 @@ void COcafDoc::OnFileSaveAs()
 	CString Filter;
 
 	if (TPathName.SearchFromEnd(".xml") > 0){
-		Filter = "OCAFSample(XML) (*.xml)|*.xml|OCAFSample(STA) (*.sta)|*.sta|OCAFSample(Binary) (*.cbf)|*.cbf||";
+		Filter = "OCAFSample(XML) (*.xml)|*.xml|OCAFSample(STD) (*.std)|*.std|OCAFSample(Binary) (*.cbf)|*.cbf||";
 	}
 	else if (TPathName.SearchFromEnd(".cbf") > 0){
-		Filter = "OCAFSample(Binary) (*.cbf)|*.cbf|OCAFSample(STA) (*.sta)|*.sta|OCAFSample(XML) (*.xml)|*.xml||";
+		Filter = "OCAFSample(Binary) (*.cbf)|*.cbf|OCAFSample(STD) (*.std)|*.std|OCAFSample(XML) (*.xml)|*.xml||";
 	}
 	else{
-		Filter = "OCAFSample(STA) (*.sta)|*.sta|OCAFSample(XML) (*.xml)|*.xml|OCAFSample(Binary) (*.cbf)|*.cbf||";
+		Filter = "OCAFSample(STD) (*.std)|*.std|OCAFSample(XML) (*.xml)|*.xml|OCAFSample(Binary) (*.cbf)|*.cbf||";
 	}
 	
 	CFileDialog dlg(FALSE,
-			"sta",
+			"std",
 			GetTitle(),
 			OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
 			Filter,
-//			"sta Files (*.sta)|*.sta; |All Files (*.*)|*.*||", 
+//			"std Files (*.std)|*.std; |All Files (*.*)|*.*||", 
 			NULL );
 	
 
@@ -930,8 +931,8 @@ void COcafDoc::OnFileSaveAs()
 	CWaitCursor aWaitCursor;
 	CString CSPath = dlg.GetPathName();
 
-//	if((CSPath.Find(CString(".sta")))==-1 )
-//		CSPath = CSPath + ".sta";
+//	if((CSPath.Find(CString(".std")))==-1 )
+//		CSPath = CSPath + ".std";
 
 	cout << "Save As " << CSPath << endl;
 	PathName=CSPath;
@@ -1042,11 +1043,11 @@ m_App->SaveAs(myOcafDoc,(TCollection_ExtendedString) TPath); \n\
 	}
 
 	CFileDialog dlg(FALSE,
-			"sta",
+			"std",
 			GetTitle(),
 			OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
-			"OCAFSample(STA) (*.sta)|*.sta|OCAFSample(XML) (*.xml)|*.xml|OCAFSample(Binary) (*.cbf)|*.cbf||",
-//			"sta Files (*.sta)|*.sta; |All Files (*.*)|*.*||", 
+			"OCAFSample(STD) (*.std)|*.std|OCAFSample(XML) (*.xml)|*.xml|OCAFSample(Binary) (*.cbf)|*.cbf||",
+//			"std Files (*.std)|*.std; |All Files (*.*)|*.*||", 
 			NULL );
 
 	if (dlg.DoModal() != IDOK) return;
@@ -1088,8 +1089,8 @@ m_App->SaveAs(myOcafDoc,(TCollection_ExtendedString) TPath); \n\
    }
 
 
-//	if((CSPath.Find(CString(".sta")))==-1 )
-//		CSPath = CSPath + ".sta";
+//	if((CSPath.Find(CString(".std")))==-1 )
+//		CSPath = CSPath + ".std";
 
 //	cout << "Save As " << CSPath << endl;
 //	PathName=CSPath;
diff --git a/samples/qt/VoxelDemo/VoxelDemo.sln b/samples/qt/VoxelDemo/VoxelDemo.sln
new file mode 100644
index 0000000000..1e5a741470
--- /dev/null
+++ b/samples/qt/VoxelDemo/VoxelDemo.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VoxelDemo", "VoxelDemo.vcproj", "{EF9DFAE9-E10E-42D4-87D1-52431728AFDF}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{EF9DFAE9-E10E-42D4-87D1-52431728AFDF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EF9DFAE9-E10E-42D4-87D1-52431728AFDF}.Debug|Win32.Build.0 = Debug|Win32
+		{EF9DFAE9-E10E-42D4-87D1-52431728AFDF}.Release|Win32.ActiveCfg = Release|Win32
+		{EF9DFAE9-E10E-42D4-87D1-52431728AFDF}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/samples/qt/VoxelDemo/VoxelDemo.vcproj b/samples/qt/VoxelDemo/VoxelDemo.vcproj
new file mode 100644
index 0000000000..538b89c1e2
--- /dev/null
+++ b/samples/qt/VoxelDemo/VoxelDemo.vcproj
@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="windows-1251"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8,00"
+	Name="VoxelDemo"
+	ProjectGUID="{EF9DFAE9-E10E-42D4-87D1-52431728AFDF}"
+	RootNamespace="VoxelDemo"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="$(CSF_OPT_INC);.\inc"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WNT"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="opengl32.lib glu32.lib TKernel.lib TKMath.lib TKGeomBase.lib TKV3d.lib TKService.lib TKG3d.lib TKVoxel.lib TKTopAlgo.lib TKBRep.lib TKPrim.lib TKOpenGl.lib vfw32.lib QtCore4.lib QtGui4.lib "
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="$(CSF_OPT_LIB32D)"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="$(CSF_OPT_INC);.\inc"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WNT"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="opengl32.lib glu32.lib TKernel.lib TKMath.lib TKGeomBase.lib TKV3d.lib TKService.lib TKG3d.lib TKVoxel.lib TKTopAlgo.lib TKBRep.lib TKPrim.lib TKOpenGl.lib vfw32.lib QtCore4.lib QtGui4.lib "
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(CSF_OPT_LIB32)"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\src\Application.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\ConversionThread.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\Main.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\Timer.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\Viewer.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\VoxelClient_VisDrawer.cxx"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\inc\Application.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="moc.exe inc\$(InputFileName) -o moc\moc_$(InputName).cpp"
+						Outputs="moc\moc_$(InputName).cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="moc.exe inc\$(InputFileName) -o moc\moc_$(InputName).cpp"
+						Outputs="moc\moc_$(InputName).cpp"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\inc\ConversionThread.h"
+				>
+			</File>
+			<File
+				RelativePath=".\inc\Timer.h"
+				>
+			</File>
+			<File
+				RelativePath=".\inc\Viewer.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="moc.exe inc\$(InputFileName) -o moc\moc_$(InputName).cpp&#x0D;&#x0A;"
+						Outputs="moc\moc_$(InputName).cpp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="moc.exe inc\$(InputFileName) -o moc\moc_$(InputName).cpp&#x0D;&#x0A;"
+						Outputs="moc\moc_$(InputName).cpp"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\inc\VoxelClient_VisDrawer.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+		<Filter
+			Name="moc"
+			>
+			<File
+				RelativePath=".\moc\moc_Application.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\moc\moc_Viewer.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/samples/qt/voxeldemo/inc/Application.h b/samples/qt/VoxelDemo/inc/Application.h
old mode 100755
new mode 100644
similarity index 100%
rename from samples/qt/voxeldemo/inc/Application.h
rename to samples/qt/VoxelDemo/inc/Application.h
diff --git a/samples/qt/voxeldemo/inc/ConversionThread.h b/samples/qt/VoxelDemo/inc/ConversionThread.h
old mode 100755
new mode 100644
similarity index 100%
rename from samples/qt/voxeldemo/inc/ConversionThread.h
rename to samples/qt/VoxelDemo/inc/ConversionThread.h
diff --git a/samples/qt/voxeldemo/inc/Timer.h b/samples/qt/VoxelDemo/inc/Timer.h
old mode 100755
new mode 100644
similarity index 100%
rename from samples/qt/voxeldemo/inc/Timer.h
rename to samples/qt/VoxelDemo/inc/Timer.h
diff --git a/samples/qt/voxeldemo/inc/Viewer.h b/samples/qt/VoxelDemo/inc/Viewer.h
old mode 100755
new mode 100644
similarity index 100%
rename from samples/qt/voxeldemo/inc/Viewer.h
rename to samples/qt/VoxelDemo/inc/Viewer.h
diff --git a/src/VoxelClient/VoxelClient_VisDrawer.h b/samples/qt/VoxelDemo/inc/VoxelClient_VisDrawer.h
old mode 100755
new mode 100644
similarity index 94%
rename from src/VoxelClient/VoxelClient_VisDrawer.h
rename to samples/qt/VoxelDemo/inc/VoxelClient_VisDrawer.h
index a36cca95ea..cb89ac2bfd
--- a/src/VoxelClient/VoxelClient_VisDrawer.h
+++ b/samples/qt/VoxelDemo/inc/VoxelClient_VisDrawer.h
@@ -24,8 +24,6 @@
 #include "Voxel_VisData.h"
 #include <Graphic3d_CBounds.hxx>
 
-class Handle(OpenGl_GraphicDriver);
-
 class VoxelClient_VisDrawer
 {
 public:
@@ -34,7 +32,7 @@ public:
 
 public:
 
-  Standard_EXPORT static void Init (Handle(OpenGl_GraphicDriver)& theDriver);
+    Standard_EXPORT static void Init();
 
 	Standard_EXPORT VoxelClient_VisDrawer(Voxel_VisData* theData);
 	Standard_EXPORT virtual ~VoxelClient_VisDrawer();
diff --git a/samples/qt/VoxelDemo/msvc.bat b/samples/qt/VoxelDemo/msvc.bat
new file mode 100644
index 0000000000..fc4216854b
--- /dev/null
+++ b/samples/qt/VoxelDemo/msvc.bat
@@ -0,0 +1,6 @@
+set CASROOT=D:\OCC653\ros
+set QTDIR=D:\qt\4.8.2
+set PATH=%QTDIR%\bin;%PATH%
+
+call %CASROOT%/env.bat %1 %2 %3
+call %CASROOT%/msvc.bat %1 %2 %3 VoxelDemo.sln
diff --git a/samples/qt/voxeldemo/src/Application.cpp b/samples/qt/VoxelDemo/src/Application.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from samples/qt/voxeldemo/src/Application.cpp
rename to samples/qt/VoxelDemo/src/Application.cpp
diff --git a/samples/qt/voxeldemo/src/ConversionThread.cpp b/samples/qt/VoxelDemo/src/ConversionThread.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from samples/qt/voxeldemo/src/ConversionThread.cpp
rename to samples/qt/VoxelDemo/src/ConversionThread.cpp
diff --git a/samples/qt/voxeldemo/src/Main.cpp b/samples/qt/VoxelDemo/src/Main.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from samples/qt/voxeldemo/src/Main.cpp
rename to samples/qt/VoxelDemo/src/Main.cpp
diff --git a/samples/qt/voxeldemo/src/Timer.cpp b/samples/qt/VoxelDemo/src/Timer.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from samples/qt/voxeldemo/src/Timer.cpp
rename to samples/qt/VoxelDemo/src/Timer.cpp
diff --git a/samples/qt/voxeldemo/src/Viewer.cpp b/samples/qt/VoxelDemo/src/Viewer.cpp
old mode 100755
new mode 100644
similarity index 100%
rename from samples/qt/voxeldemo/src/Viewer.cpp
rename to samples/qt/VoxelDemo/src/Viewer.cpp
diff --git a/src/VoxelClient/VoxelClient_VisDrawer.cxx b/samples/qt/VoxelDemo/src/VoxelClient_VisDrawer.cxx
old mode 100755
new mode 100644
similarity index 99%
rename from src/VoxelClient/VoxelClient_VisDrawer.cxx
rename to samples/qt/VoxelDemo/src/VoxelClient_VisDrawer.cxx
index 88497ec46d..e75fbc7228
--- a/src/VoxelClient/VoxelClient_VisDrawer.cxx
+++ b/samples/qt/VoxelDemo/src/VoxelClient_VisDrawer.cxx
@@ -27,7 +27,7 @@
 
 #include <InterfaceGraphic_telem.hxx>
 #include <OpenGl_Element.hxx>
-#include <OpenGl_GraphicDriver.hxx>
+#include <OpenGl_Callback.hxx>
 #include <OpenGl_NamedStatus.hxx>
 
 #include <GL/gl.h>
@@ -46,11 +46,6 @@ public:
 
   void Render (const Handle(OpenGl_Workspace) &theWorkspace) const;
 
-  virtual void Release (const Handle(OpenGl_Context)& theContext)
-  {
-    //
-  }
-
 private:
 
   VoxelClient_VisDrawer* myHandler;
@@ -131,14 +126,16 @@ static OpenGl_Element* VisDrawerCallBack (const Graphic3d_CUserDraw* theUserDraw
 }
 
 /**************************************************************************/
-void VoxelClient_VisDrawer::Init (Handle(OpenGl_GraphicDriver)& theDriver)
+void VoxelClient_VisDrawer::Init()
 {
     static Standard_Boolean isInitializeded(Standard_False);
 
     if (!isInitializeded)
     {
         isInitializeded = Standard_True;
-        theDriver->UserDrawCallback() = VisDrawerCallBack;
+
+        OpenGl_UserDrawCallback& aCallback = UserDrawCallback ();
+        aCallback = VisDrawerCallBack;
     }
 }
 
diff --git a/samples/qt/voxeldemo/OpenGl/OpenGl.vcproj b/samples/qt/voxeldemo/OpenGl/OpenGl.vcproj
deleted file mode 100755
index 7bda01bb53..0000000000
--- a/samples/qt/voxeldemo/OpenGl/OpenGl.vcproj
+++ /dev/null
@@ -1,643 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="OpenGl"
-	ProjectGUID="{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}"
-	RootNamespace="OpenGl"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/OpenGl.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="$(CSF_OPT_INC)"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OPENGL_EXPORTS;WNT"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/OpenGl.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib glu32.lib TKernel.lib TKMath.lib TKGeomBase.lib TKV3d.lib TKService.lib TKG3d.lib TKVoxel.lib vfw32.lib odbc32.lib odbccp32.lib gl2ps.lib ftgl_dynamic_MTD.lib"
-				OutputFile="Debug/VoxelOpenGl.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CSF_OPT_LIB32D)"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/VoxelOpenGl.pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=".\Debug/VoxelOpenGl.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/OpenGl.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/OpenGl.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(CSF_OPT_INC)"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OPENGL_EXPORTS;WNT"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/OpenGl.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib glu32.lib TKernel.lib TKMath.lib TKGeomBase.lib TKV3d.lib TKService.lib TKG3d.lib TKVoxel.lib vfw32.lib odbc32.lib odbccp32.lib gl2ps.lib ftgl_dynamic_MTD.lib"
-				OutputFile="Release/VoxelOpenGl.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile=".\Release/VoxelOpenGl.pdb"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary=".\Release/VoxelOpenGl.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/OpenGl.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\glext.h"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\Handle_OpenGl_Context.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\Handle_OpenGl_Display.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\Handle_OpenGl_GraduatedTrihedron.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\Handle_OpenGl_GraphicDriver.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\Handle_OpenGl_Trihedron.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\Handle_OpenGl_View.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\Handle_OpenGl_Window.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\Handle_OpenGl_Workspace.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_ArbVBO.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_AspectFace.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_AspectFace.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_AspectLine.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_AspectLine.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_AspectMarker.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_AspectMarker.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_AspectText.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_AspectText.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_AVIWriter.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Context.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_CView.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Display.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Display.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Display_1.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Display_2.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Element.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_ExtFBO.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_FontMgr.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_FrameBuffer.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_FrameBuffer.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GlCore11.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GlCore12.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GlCore13.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GlCore14.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GlCore15.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GlCore20.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraduatedTrihedron.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_1.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_2.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_3.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_4.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_7.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_703.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_705.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_710.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_713.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_8.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_9.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_Export.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_Layer.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_GraphicDriver_print.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Group.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Group.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_ImageBox.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_LayerList.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_LayerList.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Light.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Marker.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Marker.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_MarkerSet.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_MarkerSet.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Matrix.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Matrix.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_NamedStatus.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Polygon.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Polygon.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Polyline.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Polyline.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_PrimitiveArray.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_PrimitiveArray.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_PrinterContext.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_PriorityList.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_PriorityList.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Resource.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Resource.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_ResourceCleaner.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_ResourceTexture.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_ResourceVBO.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Structure.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Structure.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_telem_util.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_telem_view.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Text.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Text.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_TextParam.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_TextureBox.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Trihedron.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Trihedron.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_View.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_View.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_View_1.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_View_2.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Window.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Window.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Workspace.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Workspace.hxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Workspace_1.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Workspace_2.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Workspace_3.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Workspace_4.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\OpenGl\OpenGl_Workspace_5.cxx"
-				>
-			</File>
-			<File
-				RelativePath="$(CASROOT)\src\voxelclient\VoxelClient_VisDrawer.cxx"
-				>
-			</File>
-		</Filter>
-		
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/samples/qt/voxeldemo/VoxelDemo-vc8.sln b/samples/qt/voxeldemo/VoxelDemo-vc8.sln
deleted file mode 100644
index c3f4ef625a..0000000000
--- a/samples/qt/voxeldemo/VoxelDemo-vc8.sln
+++ /dev/null
@@ -1,29 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenGl", "OpenGl\OpenGl.vcproj", "{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VoxelDemo", "VoxelDemo.vcproj", "{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5} = {CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Debug|Win32.Build.0 = Debug|Win32
-		{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Release|Win32.ActiveCfg = Release|Win32
-		{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Release|Win32.Build.0 = Release|Win32
-		{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Debug|Win32.Build.0 = Debug|Win32
-		{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Release|Win32.ActiveCfg = Release|Win32
-		{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/samples/qt/voxeldemo/VoxelDemo-vc9.sln b/samples/qt/voxeldemo/VoxelDemo-vc9.sln
deleted file mode 100644
index c9e690cf94..0000000000
--- a/samples/qt/voxeldemo/VoxelDemo-vc9.sln
+++ /dev/null
@@ -1,29 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenGl", "OpenGl\OpenGl.vcproj", "{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VoxelDemo", "VoxelDemo.vcproj", "{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5} = {CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Debug|Win32.Build.0 = Debug|Win32
-		{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Release|Win32.ActiveCfg = Release|Win32
-		{CD1C9AFB-8D5D-4A45-ABF5-56DBCED629A5}.Release|Win32.Build.0 = Release|Win32
-		{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Debug|Win32.Build.0 = Debug|Win32
-		{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Release|Win32.ActiveCfg = Release|Win32
-		{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/samples/qt/voxeldemo/VoxelDemo.vcproj b/samples/qt/voxeldemo/VoxelDemo.vcproj
deleted file mode 100755
index a5ffc00c1a..0000000000
--- a/samples/qt/voxeldemo/VoxelDemo.vcproj
+++ /dev/null
@@ -1,438 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="VoxelDemo"
-	ProjectGUID="{2739AAB7-4D99-41F6-9A9C-0C9EB34DEA82}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/VoxelDemo.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".\inc,$(CSF_OPT_INC)"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WNT;QT_THREAD_SUPPORT"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/VoxelDemo.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="TKV3d.lib TKernel.lib TKBRep.lib TKG3d.lib TKTopAlgo.lib TKMath.lib TKService.lib TKPrim.lib TKVoxel.lib QtCore4.lib QtGui4.lib odbc32.lib odbccp32.lib"
-				OutputFile=".\Release/VoxelDemo.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CSF_OPT_LIB32)"
-				ProgramDatabaseFile=".\Release/VoxelDemo.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/VoxelDemo.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/VoxelDemo.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\inc,$(CSF_OPT_INC)"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WNT;QT_THREAD_SUPPORT;TEST"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/VoxelDemo.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="TKV3d.lib TKernel.lib TKBRep.lib TKG3d.lib TKTopAlgo.lib TKMath.lib TKService.lib TKPrim.lib TKVoxel.lib QtCore4.lib QtGui4.lib odbc32.lib odbccp32.lib"
-				OutputFile=".\Debug/VoxelDemo.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="$(CSF_OPT_LIB32D)"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/VoxelDemo.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/VoxelDemo.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="src\Application.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="src\ConversionThread.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="src\Main.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="src\Timer.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="src\Viewer.cpp"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="inc\Application.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Moc&apos;ing $(InputName).h ..."
-						CommandLine="moc.exe $(InputDir)$(InputName).h -o .\moc\moc_$(InputName).cxx&#x0D;&#x0A;"
-						Outputs=".\moc\moc_$(InputName).cxx"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Moc&apos;ing $(InputName).h ..."
-						CommandLine="moc.exe $(InputDir)$(InputName).h -o .\moc\moc_$(InputName).cxx&#x0D;&#x0A;"
-						Outputs="moc\moc_$(InputName).cxx"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="inc\ConversionThread.h"
-				>
-			</File>
-			<File
-				RelativePath="inc\Timer.h"
-				>
-			</File>
-			<File
-				RelativePath="inc\Viewer.h"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Moc&apos;ing $(InputName).h ..."
-						CommandLine="moc.exe $(InputDir)$(InputName).h -o .\moc\moc_$(InputName).cxx&#x0D;&#x0A;"
-						Outputs=".\moc\moc_$(InputName).cxx"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Moc&apos;ing $(InputName).h ..."
-						CommandLine="moc.exe $(InputDir)$(InputName).h -o .\moc\moc_$(InputName).cxx&#x0D;&#x0A;"
-						Outputs=".\moc\moc_$(InputName).cxx"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Moc files"
-			Filter="cxx"
-			>
-			<File
-				RelativePath="moc\moc_Application.cxx"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="moc\moc_Viewer.cxx"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/samples/qt/voxeldemo/env.bat b/samples/qt/voxeldemo/env.bat
deleted file mode 100755
index b07d52967e..0000000000
--- a/samples/qt/voxeldemo/env.bat
+++ /dev/null
@@ -1,16 +0,0 @@
-@ECHO OFF
-
-IF not "%CASDEB%" EQU "" (
-SET BIN_DIR=Debug
-) ELSE (
-SET BIN_DIR=Release
-)
-
-SET PATH=%~dp0%BIN_DIR%;%PATH%
-
-SET CSF_GraphicShr=OpenGl\%BIN_DIR%\VoxelOpenGl.dll
-
-SET PATH=%~dp0OpenGl\%BIN_DIR%;%PATH%
-
-SET CSF_TEX_FONT=2
-SET MMGT_REENTRANT=1
diff --git a/samples/qt/voxeldemo/msvc.bat b/samples/qt/voxeldemo/msvc.bat
deleted file mode 100644
index f0e56be8cd..0000000000
--- a/samples/qt/voxeldemo/msvc.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-call ../../../env.bat %1 %2 %3
-call %~dp0env.bat
-if not ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% %CASDEB% VoxelDemo-%VCVER%.sln
-if ["%CASDEB%"] == [""] call ../../../msvc.bat %VCVER% win%ARCH% "" VoxelDemo-%VCVER%.sln
\ No newline at end of file
diff --git a/samples/qt/voxeldemo/run.bat b/samples/qt/voxeldemo/run.bat
deleted file mode 100644
index d6571cce86..0000000000
--- a/samples/qt/voxeldemo/run.bat
+++ /dev/null
@@ -1,18 +0,0 @@
-call ../../../env.bat %1 %2 %3
-
-call %~dp0env.bat
-
-if not exist "%BIN_DIR%\VoxelDemo.exe" goto ERR_EXE
-
-echo Starting VoxelDemo .....
-start /D "%BIN_DIR%" VoxelDemo.exe
-
-goto END
-
-:ERR_EXE
-echo Executable %BIN_DIR%\VoxelDemo.exe not found."
-echo Probably you didn't compile the application.
-pause
-goto END
-
-:END
\ No newline at end of file
diff --git a/src/OS/Visualization.tcl b/src/OS/Visualization.tcl
index db96db5335..a34ff23b5c 100755
--- a/src/OS/Visualization.tcl
+++ b/src/OS/Visualization.tcl
@@ -35,7 +35,6 @@ proc Visualization:ressources { } {
     return [list \
 	   [list both r FontMFT {}] \
 	   [list both r Textures {}] \
-	   [list both n VoxelClient {}] \
 	    ]
 }
 ;#
diff --git a/src/VoxelClient/FILES b/src/VoxelClient/FILES
deleted file mode 100755
index 4ad113e873..0000000000
--- a/src/VoxelClient/FILES
+++ /dev/null
@@ -1,2 +0,0 @@
-VoxelClient_VisDrawer.h
-VoxelClient_VisDrawer.cxx