Merge branch 'master' into dev_properties_side_bar

source/app/ViewArea.cpp

@@ -165,7 +165,7 @@ void ViewArea::setMaskColor( const QColor &color )
   update();
 }
 
-void ViewArea::setTool( Tool tool )
+void ViewArea::setTool( eTool tool )
 {
   m_tool = tool;
 }
@@ -874,5 +874,4 @@ InputStream* ViewArea::getInputStream()
   return m_pStream;
 }
 
-
 } // NameSpace plaYUVer