patches sent from Joel Schaerer

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..378eac2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+build

diff --git a/itk/itkRayCastInterpolateImageFunctionWithOrigin.txx b/itk/itkRayCastInterpolateImageFunctionWithOrigin.txx
index e89579e0f7d5500f98958542417c4871dac0249a..ebf73cfc2d363c215b302be2c6cdd66c45bd6802 100644 (file)
--- a/itk/itkRayCastInterpolateImageFunctionWithOrigin.txx
+++ b/itk/itkRayCastInterpolateImageFunctionWithOrigin.txx
@@ -1,4 +1,4 @@
-/*=========================================================================
+/*========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
   Authors belong to:

diff --git a/vv/vvMainWindowBase.h b/vv/vvMainWindowBase.h
index 9aaf79c64e6749dcd03702deb96789844c7ff343..3b99565378d3604704b25c072aec0dfe850aa1ce 100644 (file)
--- a/vv/vvMainWindowBase.h
+++ b/vv/vvMainWindowBase.h
@@ -25,6 +25,7 @@
 
 class vvSlicerManager;
 class QMenu;
+class QTabWidget;
 
 //------------------------------------------------------------------------------
 class vvMainWindowBase : public QMainWindow

diff --git a/vv/vvToolBase.h b/vv/vvToolBase.h
index c636a8dd5d4e0e69bed59f8170c202dd49423c68..3cd4fbfd2acc55b466b98d435c5db46b0ee0715a 100644 (file)
--- a/vv/vvToolBase.h
+++ b/vv/vvToolBase.h
@@ -21,6 +21,7 @@
 
 #include "vvToolBaseBase.h"
 #include "vvToolCreator.h"
+#include <QIcon>
 
 //------------------------------------------------------------------------------
 template<class ToolType>

diff --git a/vv/vvToolWidgetBase.cxx b/vv/vvToolWidgetBase.cxx
index d3cecbdc5de0926447e076452505c5933b1e85b1..c780768e9c86e3502cf7ade0edb86f902806db51 100644 (file)
--- a/vv/vvToolWidgetBase.cxx
+++ b/vv/vvToolWidgetBase.cxx
@@ -25,6 +25,7 @@
 #include <QMessageBox>
 #include <QKeyEvent>
 #include <QDockWidget>
+#include <QTabWidget>
 
 //------------------------------------------------------------------------------
 // Static initialisation