From 49e4851fd508b8510756b3b68cd70aa198ddbd83 Mon Sep 17 00:00:00 2001
From: Laurent Rineau <Laurent.Rineau__CGAL@normalesup.org>
Date: Mon, 26 Sep 2011 14:18:15 +0000
Subject: [PATCH] QVTK no longer use QT3. Port the "demo" to Qt4.

---
 CGALimageIO/demo/CGALimageIO/CMakeLists.txt       | 15 ++++++++-------
 .../demo/CGALimageIO/image_to_vtk_viewer.cpp      |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CGALimageIO/demo/CGALimageIO/CMakeLists.txt b/CGALimageIO/demo/CGALimageIO/CMakeLists.txt
index 0dbff9bf359..2ed7be1f3bd 100644
--- a/CGALimageIO/demo/CGALimageIO/CMakeLists.txt
+++ b/CGALimageIO/demo/CGALimageIO/CMakeLists.txt
@@ -30,17 +30,18 @@ endforeach()
 find_package(CGAL REQUIRED ImageIO)
 include( ${CGAL_USE_FILE} )
 find_package(VTK QUIET)
-find_package(Qt3-patched QUIET)
+find_package(Qt4 QUIET)
 
-if(QT3_FOUND AND VTK_FOUND)
+if(QT_FOUND AND VTK_FOUND)
   add_definitions(-DCGAL_USE_VTK)
   include(${VTK_USE_FILE})
+  include(${QT_USE_FILE})
 
-  add_definitions(${QT3_DEFINITIONS})
+  add_definitions(${QT_DEFINITIONS})
 
   if(VTK_USE_QVTK)
     include_directories( ${VTK_QT_INCLUDE_DIR} )
-    include_directories( ${QT3_INCLUDE_DIR} )
+    include_directories( ${QT_INCLUDE_DIR} )
     add_executable( image_to_vtk_viewer image_to_vtk_viewer.cpp )
     add_to_cached_list( CGAL_EXECUTABLE_TARGETS image_to_vtk_viewer )
 
@@ -52,7 +53,7 @@ if(QT3_FOUND AND VTK_FOUND)
       vtkCommon
       ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES}
       ${VTK_QT_QT_LIBRARY}
-      ${QT3_LIBRARIES}
+      ${QT_LIBRARIES}
       )
   else(VTK_USE_QVTK)
     message(STATUS "NOTICE: This demo needs QVTK, and will not be compiled.")
@@ -61,7 +62,7 @@ else()
   if(NOT VTK_FOUND)
     message(STATUS "NOTICE: This demo needs VTK, and will not be compiled.")
   endif()
-  if(NOT QT3_FOUND)
-    message(STATUS "NOTICE: This demo needs Qt3, and will not be compiled.")
+  if(NOT QT_FOUND)
+    message(STATUS "NOTICE: This demo needs Qt4, and will not be compiled.")
   endif()
 endif()
diff --git a/CGALimageIO/demo/CGALimageIO/image_to_vtk_viewer.cpp b/CGALimageIO/demo/CGALimageIO/image_to_vtk_viewer.cpp
index 707fbd5ad06..ad1dc7fd8d9 100644
--- a/CGALimageIO/demo/CGALimageIO/image_to_vtk_viewer.cpp
+++ b/CGALimageIO/demo/CGALimageIO/image_to_vtk_viewer.cpp
@@ -15,7 +15,7 @@
 
 #ifdef CGAL_USE_VTK
 
-#include <qapplication.h>
+#include <QApplication>
 #include <iostream>
 #include <cstdlib>
 #include <sstream>