From: vsr <vsr@opencascade.com>
Date: Mon, 5 Dec 2011 08:15:15 +0000 (+0000)
Subject: Merge from V6_4_0_BR 05/12/2011 (V6_4_0rc2)
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c773c5ff7aceaa6b012fb13a05b9ade13a613640;p=modules%2Fgui.git

Merge from V6_4_0_BR 05/12/2011 (V6_4_0rc2)
---

diff --git a/src/CAM/CAM_Application.cxx b/src/CAM/CAM_Application.cxx
index 7993d9f94..8aa677e3c 100755
--- a/src/CAM/CAM_Application.cxx
+++ b/src/CAM/CAM_Application.cxx
@@ -45,6 +45,8 @@
 
 #include <cstdio>
 
+namespace
+{
 class BusyLocker
 {
 public:
@@ -54,6 +56,7 @@ private:
   bool  myPrev;
   bool& myBusy;
 };
+}
 
 /*!
   \brief Create new instance of CAM_Application.
@@ -361,10 +364,10 @@ CAM_Module* CAM_Application::loadModule( const QString& modName, const bool show
   if(version) {    
     for ( ModuleInfoList::iterator it = myInfoList.begin(); it != myInfoList.end(); ++it ) {
       if ( (*it).title == modName ) {
-	if( (*it).version.isEmpty() ) {
-	  (*it).version = QString(version);
-	}
-	break;
+        if( (*it).version.isEmpty() ) {
+          (*it).version = QString(version);
+        }
+        break;
       }
     }
   }
diff --git a/src/VTKViewer/VTKViewer_TransformFilter.cxx b/src/VTKViewer/VTKViewer_TransformFilter.cxx
index dc2bc83cc..eec36008a 100755
--- a/src/VTKViewer/VTKViewer_TransformFilter.cxx
+++ b/src/VTKViewer/VTKViewer_TransformFilter.cxx
@@ -79,6 +79,7 @@ int VTKViewer_TransformFilter::RequestData(
   }
   outPD->PassData(pd);
   outCD->PassData(cd);
+  InvokeEvent("VTKViewer_TransformFilter::TransformationFinished");
   
   return 1;
 }