mepp now compatible with qt5 (and of course qt4...)

nikdatrix · Jun 24, 2013 · 1a58a8e · 1a58a8e
1 parent 46fd1ce
commit 1a58a8e
Show file tree

Hide file tree

Showing 50 changed files with 91 additions and 52 deletions.
diff --git a/src/components/Analysis/Curvature/CMakeLists.txt b/src/components/Analysis/Curvature/CMakeLists.txt
@@ -177,7 +177,7 @@ file(
 )
 
 if (WITH_QT5)
- qt5_wrap_cpp( MOC_FILES ${hxx_header_files} ../../../mepp/mepp_action.hxx )
+ set( MOC_FILES "" ) # because CMAKE_AUTOMOC is ON
  qt5_wrap_ui( UI_FILES ${all_ui_files} ../../../mepp/mainwindow.ui )
 else(WITH_QT5) 
  qt4_wrap_cpp( MOC_FILES ${hxx_header_files} ../../../mepp/mepp_action.hxx )
@@ -193,6 +193,8 @@ file(
  source_files
  src/*
 )
+set( source_files ${source_files} ../../../mepp/mepp_action.hxx )
+
 add_library(
  ${COMPONENT_NAME}
  SHARED

diff --git a/src/components/Analysis/Curvature/src/dialSettings.hxx b/src/components/Analysis/Curvature/src/dialSettings.hxx
@@ -12,7 +12,7 @@
 #pragma GCC diagnostic warning "-Wuninitialized"
 #endif
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION >= 0x050000
 #include <QtWidgets>
 #endif
 

diff --git a/src/components/Analysis/Curvature/src/mepp_component_Curvature_plugin.cpp b/src/components/Analysis/Curvature/src/mepp_component_Curvature_plugin.cpp
@@ -224,7 +224,7 @@ void mepp_component_Curvature_plugin::OnDisplayMaxDir()
  QApplication::restoreOverrideCursor();
 }
 
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(mepp_component_Curvature_plugin, mepp_component_Curvature_plugin);
 #endif
 

diff --git a/src/components/Analysis/Curvature/src/mepp_component_Curvature_plugin.hxx b/src/components/Analysis/Curvature/src/mepp_component_Curvature_plugin.hxx
@@ -1,6 +1,8 @@
 #ifndef HEADER_MEPP_COMPONENT_CURVATURE_PLUGIN_INTERFACE_H
 #define HEADER_MEPP_COMPONENT_CURVATURE_PLUGIN_INTERFACE_H
 
+#include <QtGlobal> // important, for QT_VERSION
+
 #include <QObject>
 
 #include <mepp_config.h>
@@ -23,7 +25,7 @@ class mepp_component_Curvature_plugin :
 {
  Q_OBJECT
  Q_INTERFACES(mepp_component_plugin_interface);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION >= 0x050000
  Q_PLUGIN_METADATA(IID "mepp_component_Curvature_plugin")
 #endif
 

diff --git a/src/components/Compression/Compression_Valence/CMakeLists.txt b/src/components/Compression/Compression_Valence/CMakeLists.txt
@@ -177,7 +177,7 @@ file(
 )
 
 if (WITH_QT5)
- qt5_wrap_cpp( MOC_FILES ${hxx_header_files} ../../../mepp/mepp_action.hxx )
+ set( MOC_FILES "" ) # because CMAKE_AUTOMOC is ON
  qt5_wrap_ui( UI_FILES ${all_ui_files} ../../../mepp/mainwindow.ui )
 else(WITH_QT5) 
  qt4_wrap_cpp( MOC_FILES ${hxx_header_files} ../../../mepp/mepp_action.hxx )
@@ -193,6 +193,8 @@ file(
  source_files
  src/*
 )
+set( source_files ${source_files} ../../../mepp/mepp_action.hxx )
+
 add_library(
  ${COMPONENT_NAME}
  SHARED

diff --git a/src/components/Compression/Compression_Valence/src/dialSettingsComp.hxx b/src/components/Compression/Compression_Valence/src/dialSettingsComp.hxx
@@ -12,7 +12,7 @@
 #pragma GCC diagnostic warning "-Wuninitialized"
 #endif
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION >= 0x050000
 #include <QtWidgets>
 #endif
 

diff --git a/src/components/Compression/Compression_Valence/src/dialSettingsDecomp.hxx b/src/components/Compression/Compression_Valence/src/dialSettingsDecomp.hxx
@@ -12,7 +12,7 @@
 #pragma GCC diagnostic warning "-Wuninitialized"
 #endif
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION >= 0x050000
 #include <QtWidgets>
 #endif
 

diff --git a/src/components/Compression/Compression_Valence/src/dialSettingsJCW.hxx b/src/components/Compression/Compression_Valence/src/dialSettingsJCW.hxx
@@ -12,7 +12,7 @@
 #pragma GCC diagnostic warning "-Wuninitialized"
 #endif
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION >= 0x050000
 #include <QtWidgets>
 #endif
 

diff --git a/...ponents/Compression/Compression_Valence/src/mepp_component_Compression_Valence_plugin.cpp b/...ponents/Compression/Compression_Valence/src/mepp_component_Compression_Valence_plugin.cpp
@@ -695,7 +695,7 @@ void mepp_component_Compression_Valence_plugin::OnJCWdecompress_without_extracti
  }
 }
 
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(mepp_component_Compression_Valence_plugin, mepp_component_Compression_Valence_plugin);
 #endif
 

diff --git a/...ponents/Compression/Compression_Valence/src/mepp_component_Compression_Valence_plugin.hxx b/...ponents/Compression/Compression_Valence/src/mepp_component_Compression_Valence_plugin.hxx
@@ -1,6 +1,8 @@
 #ifndef HEADER_MEPP_COMPONENT_COMPRESSION_VALENCE_PLUGIN_INTERFACE_H
 #define HEADER_MEPP_COMPONENT_COMPRESSION_VALENCE_PLUGIN_INTERFACE_H
 
+#include <QtGlobal> // important, for QT_VERSION
+
 #include <QObject>
 
 #include <mepp_config.h>
@@ -25,7 +27,7 @@ class mepp_component_Compression_Valence_plugin :
 
  Q_OBJECT
  Q_INTERFACES(mepp_component_plugin_interface);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION >= 0x050000
  Q_PLUGIN_METADATA(IID "mepp_component_Compression_Valence_plugin")
 #endif
 

diff --git a/src/components/Distance/MSDM/CMakeLists.txt b/src/components/Distance/MSDM/CMakeLists.txt
@@ -177,7 +177,7 @@ file(
 )
 
 if (WITH_QT5)
- qt5_wrap_cpp( MOC_FILES ${hxx_header_files} ../../../mepp/mepp_action.hxx )
+ set( MOC_FILES "" ) # because CMAKE_AUTOMOC is ON
  qt5_wrap_ui( UI_FILES ${all_ui_files} ../../../mepp/mainwindow.ui )
 else(WITH_QT5) 
  qt4_wrap_cpp( MOC_FILES ${hxx_header_files} ../../../mepp/mepp_action.hxx )
@@ -193,6 +193,8 @@ file(
  source_files
  src/*
 )
+set( source_files ${source_files} ../../../mepp/mepp_action.hxx )
+
 add_library(
  ${COMPONENT_NAME}
  SHARED

diff --git a/src/components/Distance/MSDM/src/dialSettings.hxx b/src/components/Distance/MSDM/src/dialSettings.hxx
@@ -17,7 +17,7 @@
 #pragma GCC diagnostic warning "-Wuninitialized"
 #endif
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION >= 0x050000
 #include <QtWidgets>
 #endif
 

diff --git a/src/components/Distance/MSDM/src/mepp_component_MSDM_plugin.cpp b/src/components/Distance/MSDM/src/mepp_component_MSDM_plugin.cpp
@@ -137,7 +137,7 @@ void mepp_component_MSDM_plugin::DistanceToColorMap()
 }
 
 
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(mepp_component_MSDM_plugin, mepp_component_MSDM_plugin);
 #endif
 

diff --git a/src/components/Distance/MSDM/src/mepp_component_MSDM_plugin.hxx b/src/components/Distance/MSDM/src/mepp_component_MSDM_plugin.hxx
@@ -7,6 +7,7 @@
 #ifndef HEADER_MEPP_COMPONENT_MSDM_PLUGIN_INTERFACE_H
 #define HEADER_MEPP_COMPONENT_MSDM_PLUGIN_INTERFACE_H
 
+#include <QtGlobal> // important, for QT_VERSION
 
 #include <QObject>
 
@@ -32,7 +33,7 @@ class mepp_component_MSDM_plugin :
 {
  Q_OBJECT
  Q_INTERFACES(mepp_component_plugin_interface);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION >= 0x050000
  Q_PLUGIN_METADATA(IID "mepp_component_MSDM_plugin")
 #endif
 

diff --git a/src/components/Distance/MSDM2/CMakeLists.txt b/src/components/Distance/MSDM2/CMakeLists.txt
@@ -177,7 +177,7 @@ file(
 )
 
 if (WITH_QT5)
- qt5_wrap_cpp( MOC_FILES ${hxx_header_files} ../../../mepp/mepp_action.hxx )
+ set( MOC_FILES "" ) # because CMAKE_AUTOMOC is ON
  qt5_wrap_ui( UI_FILES ${all_ui_files} ../../../mepp/mainwindow.ui )
 else(WITH_QT5) 
  qt4_wrap_cpp( MOC_FILES ${hxx_header_files} ../../../mepp/mepp_action.hxx )
@@ -193,6 +193,8 @@ file(
  source_files
  src/*
 )
+set( source_files ${source_files} ../../../mepp/mepp_action.hxx )
+
 add_library(
  ${COMPONENT_NAME}
  SHARED

diff --git a/src/components/Distance/MSDM2/src/dialSettings.hxx b/src/components/Distance/MSDM2/src/dialSettings.hxx
@@ -17,7 +17,7 @@
 #pragma GCC diagnostic warning "-Wuninitialized"
 #endif
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION >= 0x050000
 #include <QtWidgets>
 #endif
 

diff --git a/src/components/Distance/MSDM2/src/mepp_component_MSDM2_plugin.cpp b/src/components/Distance/MSDM2/src/mepp_component_MSDM2_plugin.cpp
@@ -172,7 +172,7 @@ void mepp_component_MSDM2_plugin::DistanceToColorMap()
 
 
 
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(mepp_component_MSDM2_plugin, mepp_component_MSDM2_plugin);
 #endif
 

diff --git a/src/components/Distance/MSDM2/src/mepp_component_MSDM2_plugin.hxx b/src/components/Distance/MSDM2/src/mepp_component_MSDM2_plugin.hxx
@@ -11,6 +11,8 @@
 #ifndef HEADER_MEPP_COMPONENT_MSDM2_PLUGIN_INTERFACE_H
 #define HEADER_MEPP_COMPONENT_MSDM2_PLUGIN_INTERFACE_H
 
+#include <QtGlobal> // important, for QT_VERSION
+
 #include <QObject>
 
 #include <mepp_config.h>
@@ -27,7 +29,7 @@ class mepp_component_MSDM2_plugin :
 {
  Q_OBJECT
  Q_INTERFACES(mepp_component_plugin_interface);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION >= 0x050000
  Q_PLUGIN_METADATA(IID "mepp_component_MSDM2_plugin")
 #endif
 

diff --git a/src/components/Examples/CGAL_Example/CMakeLists.txt b/src/components/Examples/CGAL_Example/CMakeLists.txt
@@ -177,7 +177,7 @@ file(
 )
 
 if (WITH_QT5)
- qt5_wrap_cpp( MOC_FILES ${hxx_header_files} ../../../mepp/mepp_action.hxx )
+ set( MOC_FILES "" ) # because CMAKE_AUTOMOC is ON
  qt5_wrap_ui( UI_FILES ${all_ui_files} ../../../mepp/mainwindow.ui )
 else(WITH_QT5) 
  qt4_wrap_cpp( MOC_FILES ${hxx_header_files} ../../../mepp/mepp_action.hxx )
@@ -193,6 +193,8 @@ file(
  source_files
  src/*
 )
+set( source_files ${source_files} ../../../mepp/mepp_action.hxx )
+
 add_library(
  ${COMPONENT_NAME}
  SHARED

diff --git a/src/components/Examples/CGAL_Example/src/dialSettings_CGAL_Example.hxx b/src/components/Examples/CGAL_Example/src/dialSettings_CGAL_Example.hxx
@@ -17,7 +17,7 @@
 #pragma GCC diagnostic warning "-Wuninitialized"
 #endif
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION >= 0x050000
 #include <QtWidgets>
 #endif
 

diff --git a/src/components/Examples/CGAL_Example/src/mepp_component_CGAL_Example_plugin.cpp b/src/components/Examples/CGAL_Example/src/mepp_component_CGAL_Example_plugin.cpp
@@ -606,7 +606,7 @@ void mepp_component_CGAL_Example_plugin::example()
  QApplication::restoreOverrideCursor();
 }
 
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(mepp_component_CGAL_Example_plugin, mepp_component_CGAL_Example_plugin);
 #endif
 

diff --git a/src/components/Examples/CGAL_Example/src/mepp_component_CGAL_Example_plugin.hxx b/src/components/Examples/CGAL_Example/src/mepp_component_CGAL_Example_plugin.hxx
@@ -6,6 +6,8 @@
 #ifndef HEADER_MEPP_COMPONENT_CGAL_EXAMPLE_PLUGIN_INTERFACE_H
 #define HEADER_MEPP_COMPONENT_CGAL_EXAMPLE_PLUGIN_INTERFACE_H
 
+#include <QtGlobal> // important, for QT_VERSION
+
 #include <QObject>
 
 #include <mepp_config.h>
@@ -22,7 +24,7 @@ class mepp_component_CGAL_Example_plugin :
 {
  Q_OBJECT
  Q_INTERFACES(mepp_component_plugin_interface);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION >= 0x050000
  Q_PLUGIN_METADATA(IID "mepp_component_CGAL_Example_plugin")
 #endif
 

diff --git a/src/components/Remeshing/Canonical/CMakeLists.txt b/src/components/Remeshing/Canonical/CMakeLists.txt
@@ -177,7 +177,7 @@ file(
 )
 
 if (WITH_QT5)
- qt5_wrap_cpp( MOC_FILES ${hxx_header_files} ../../../mepp/mepp_action.hxx )
+ set( MOC_FILES "" ) # because CMAKE_AUTOMOC is ON
  qt5_wrap_ui( UI_FILES ${all_ui_files} ../../../mepp/mainwindow.ui )
 else(WITH_QT5) 
  qt4_wrap_cpp( MOC_FILES ${hxx_header_files} ../../../mepp/mepp_action.hxx )
@@ -193,6 +193,8 @@ file(
  source_files
  src/*
 )
+set( source_files ${source_files} ../../../mepp/mepp_action.hxx )
+
 add_library(
  ${COMPONENT_NAME}
  SHARED

diff --git a/src/components/Remeshing/Canonical/src/dialSettings.hxx b/src/components/Remeshing/Canonical/src/dialSettings.hxx
@@ -12,7 +12,7 @@
 #pragma GCC diagnostic warning "-Wuninitialized"
 #endif
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION >= 0x050000
 #include <QtWidgets>
 #endif
 

diff --git a/src/components/Remeshing/Canonical/src/mepp_component_Canonical_plugin.cpp b/src/components/Remeshing/Canonical/src/mepp_component_Canonical_plugin.cpp
@@ -114,7 +114,7 @@ void mepp_component_Canonical_plugin::ValenceDrivenSimplification()
  QApplication::restoreOverrideCursor();
 }
 
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(mepp_component_Canonical_plugin, mepp_component_Canonical_plugin);
 #endif
 

diff --git a/src/components/Remeshing/Canonical/src/mepp_component_Canonical_plugin.hxx b/src/components/Remeshing/Canonical/src/mepp_component_Canonical_plugin.hxx
@@ -1,6 +1,8 @@
 #ifndef HEADER_MEPP_COMPONENT_CANONICAL_PLUGIN_INTERFACE_H
 #define HEADER_MEPP_COMPONENT_CANONICAL_PLUGIN_INTERFACE_H
 
+#include <QtGlobal> // important, for QT_VERSION
+
 #include <QObject>
 
 #include <mepp_config.h>
@@ -17,7 +19,7 @@ class mepp_component_Canonical_plugin :
 {
  Q_OBJECT
  Q_INTERFACES(mepp_component_plugin_interface);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION >= 0x050000
  Q_PLUGIN_METADATA(IID "mepp_component_Canonical_plugin")
 #endif
 

diff --git a/src/components/Segmentation/VSA/CMakeLists.txt b/src/components/Segmentation/VSA/CMakeLists.txt
@@ -177,7 +177,7 @@ file(
 )
 
 if (WITH_QT5)
- qt5_wrap_cpp( MOC_FILES ${hxx_header_files} ../../../mepp/mepp_action.hxx )
+ set( MOC_FILES "" ) # because CMAKE_AUTOMOC is ON
  qt5_wrap_ui( UI_FILES ${all_ui_files} ../../../mepp/mainwindow.ui )
 else(WITH_QT5) 
  qt4_wrap_cpp( MOC_FILES ${hxx_header_files} ../../../mepp/mepp_action.hxx )
@@ -193,6 +193,8 @@ file(
  source_files
  src/*
 )
+set( source_files ${source_files} ../../../mepp/mepp_action.hxx )
+
 add_library(
  ${COMPONENT_NAME}
  SHARED

diff --git a/src/components/Segmentation/VSA/src/dialSettings.hxx b/src/components/Segmentation/VSA/src/dialSettings.hxx
@@ -12,7 +12,7 @@
 #pragma GCC diagnostic warning "-Wuninitialized"
 #endif
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION >= 0x050000
 #include <QtWidgets>
 #endif
 

diff --git a/src/components/Segmentation/VSA/src/mepp_component_VSA_plugin.cpp b/src/components/Segmentation/VSA/src/mepp_component_VSA_plugin.cpp
@@ -103,7 +103,7 @@ void mepp_component_VSA_plugin::FaceLabelsToColorMap()
  QApplication::restoreOverrideCursor();
 }
 
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(mepp_component_VSA_plugin, mepp_component_VSA_plugin);
 #endif
 

diff --git a/src/components/Segmentation/VSA/src/mepp_component_VSA_plugin.hxx b/src/components/Segmentation/VSA/src/mepp_component_VSA_plugin.hxx
@@ -1,6 +1,8 @@
 #ifndef HEADER_MEPP_COMPONENT_VSA_PLUGIN_INTERFACE_H
 #define HEADER_MEPP_COMPONENT_VSA_PLUGIN_INTERFACE_H
 
+#include <QtGlobal> // important, for QT_VERSION
+
 #include <QObject>
 
 #include <mepp_config.h>
@@ -23,7 +25,7 @@ class mepp_component_VSA_plugin :
 {
  Q_OBJECT
  Q_INTERFACES(mepp_component_plugin_interface);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#if QT_VERSION >= 0x050000
  Q_PLUGIN_METADATA(IID "mepp_component_VSA_plugin")
 #endif