Split mocable files into separate compile unit

OpenVolumeMesh/OVMPropertyModel.hh

@@ -47,12 +47,9 @@
 *                                                                            *
 \*===========================================================================*/
 
-#if defined(ENABLE_HEXAHEDRALMESH_SUPPORT) || defined(ENABLE_POLYHEDRALMESH_SUPPORT) || defined(ENABLE_TETRAHEDRALMESH_SUPPORT)
-
 #ifndef OVM_PROPERTY_MODEL_H
 #define OVM_PROPERTY_MODEL_H
 
-#include "SingleObjectPropertyModel.hh"
 #include "OVMPropertyVisualizer.hh"
 #include "OVMPropertyVisualizerBoolean.hh"
 #include "OVMPropertyVisualizerDouble.hh"
@@ -72,34 +69,9 @@
 
 #define PROP_VIS "PropertyVisualization"
 
-class PropertyVisPlugin;
-
-/* This class adds signal/slot support for OVMPropertyModelSubclass. This needs
- * to be done because "Sorry, Qt does not support templates that contain signals,
- * slots or Q_OBJECT"
- * http://doc.trolltech.com/qq/qq15-academic.html
- */
-class OVMPropertyModelSubclass: public SingleObjectPropertyModel
-{
-Q_OBJECT
-public:
-    OVMPropertyModelSubclass(QObject *parent = 0)
-        : SingleObjectPropertyModel(parent)
-    {
-    }
-
-public slots:
-    virtual void slotCombine(){ combine(); }
-    virtual void slotSaveProperty(){ saveProperty(); }
-    virtual void slotLoadProperty(){ loadProperty(); }
-    virtual void slotPickProperty(){ pickProperty(); }
+#include "OVMPropertyModelSubclass.hh"
 
-private:
-    virtual void combine(){}
-    virtual void saveProperty(){}
-    virtual void pickProperty(){}
-
-};
+class PropertyVisPlugin;
 
 template<typename MeshT>
 class OVMPropertyModel: public OVMPropertyModelSubclass {
@@ -258,4 +230,3 @@ INITIALIZE_PROPTYPES(Vertex)
 
 #endif /* OVM_PROPERTY_MODEL_H */
 
-#endif

OpenVolumeMesh/OVMPropertyModelSubclass.cc

+/*===========================================================================*\
+*                                                                            *
+*                              OpenFlipper                                   *
+ *           Copyright (c) 2001-2015, RWTH-Aachen University                 *
+ *           Department of Computer Graphics and Multimedia                  *
+ *                          All rights reserved.                             *
+ *                            www.openflipper.org                            *
+ *                                                                           *
+ *---------------------------------------------------------------------------*
+ * This file is part of OpenFlipper.                                         *
+ *---------------------------------------------------------------------------*
+ *                                                                           *
+ * Redistribution and use in source and binary forms, with or without        *
+ * modification, are permitted provided that the following conditions        *
+ * are met:                                                                  *
+ *                                                                           *
+ * 1. Redistributions of source code must retain the above copyright notice, *
+ *    this list of conditions and the following disclaimer.                  *
+ *                                                                           *
+ * 2. Redistributions in binary form must reproduce the above copyright      *
+ *    notice, this list of conditions and the following disclaimer in the    *
+ *    documentation and/or other materials provided with the distribution.   *
+ *                                                                           *
+ * 3. Neither the name of the copyright holder nor the names of its          *
+ *    contributors may be used to endorse or promote products derived from   *
+ *    this software without specific prior written permission.               *
+ *                                                                           *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS       *
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED *
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A           *
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER *
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  *
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,       *
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR        *
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF    *
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING      *
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS        *
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              *
+*                                                                            *
+\*===========================================================================*/
+
+/*===========================================================================*\
+*                                                                            *
+*   $Revision$                                                       *
+*   $LastChangedBy$                                                *
+*   $Date$                     *
+*                                                                            *
+\*===========================================================================*/
+
+#include "OVMPropertyModelSubclass.hh"
+
+
+OVMPropertyModelSubclass::OVMPropertyModelSubclass(QObject *parent) : SingleObjectPropertyModel(parent)
+{
+}
+
+
+void OVMPropertyModelSubclass::slotCombine(){ combine(); }
+void OVMPropertyModelSubclass::slotSaveProperty(){ saveProperty(); }
+void OVMPropertyModelSubclass::slotLoadProperty(){ loadProperty(); }
+void OVMPropertyModelSubclass::slotPickProperty(){ pickProperty(); }
+void OVMPropertyModelSubclass::combine(){}
+void OVMPropertyModelSubclass::saveProperty(){}
+void OVMPropertyModelSubclass::pickProperty(){}

OpenVolumeMesh/OVMPropertyModelSubclass.hh

+/*===========================================================================*\
+*                                                                            *
+*                              OpenFlipper                                   *
+ *           Copyright (c) 2001-2015, RWTH-Aachen University                 *
+ *           Department of Computer Graphics and Multimedia                  *
+ *                          All rights reserved.                             *
+ *                            www.openflipper.org                            *
+ *                                                                           *
+ *---------------------------------------------------------------------------*
+ * This file is part of OpenFlipper.                                         *
+ *---------------------------------------------------------------------------*
+ *                                                                           *
+ * Redistribution and use in source and binary forms, with or without        *
+ * modification, are permitted provided that the following conditions        *
+ * are met:                                                                  *
+ *                                                                           *
+ * 1. Redistributions of source code must retain the above copyright notice, *
+ *    this list of conditions and the following disclaimer.                  *
+ *                                                                           *
+ * 2. Redistributions in binary form must reproduce the above copyright      *
+ *    notice, this list of conditions and the following disclaimer in the    *
+ *    documentation and/or other materials provided with the distribution.   *
+ *                                                                           *
+ * 3. Neither the name of the copyright holder nor the names of its          *
+ *    contributors may be used to endorse or promote products derived from   *
+ *    this software without specific prior written permission.               *
+ *                                                                           *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS       *
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED *
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A           *
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER *
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  *
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,       *
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR        *
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF    *
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING      *
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS        *
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              *
+*                                                                            *
+\*===========================================================================*/
+
+/*===========================================================================*\
+*                                                                            *
+*   $Revision$                                                       *
+*   $LastChangedBy$                                                *
+*   $Date$                     *
+*                                                                            *
+\*===========================================================================*/
+
+
+#pragma once
+
+#include "SingleObjectPropertyModel.hh"
+
+
+/* This class adds signal/slot support for OVMPropertyModelSubclass. This needs
+ * to be done because "Sorry, Qt does not support templates that contain signals,
+ * slots or Q_OBJECT"
+ * http://doc.trolltech.com/qq/qq15-academic.html
+ */
+class OVMPropertyModelSubclass: public SingleObjectPropertyModel
+{
+Q_OBJECT
+public:
+    OVMPropertyModelSubclass(QObject *parent = 0);
+
+
+public slots:
+    virtual void slotCombine();
+    virtual void slotSaveProperty();
+    virtual void slotLoadProperty();
+    virtual void slotPickProperty();
+
+private:
+    virtual void combine();
+    virtual void saveProperty();
+    virtual void pickProperty();
+
+};
+