Commit 5d87bcec authored by Matthias Möller's avatar Matthias Möller
Browse files

- add dllexport and fix some linker error for windows

- add includes
- fix gl function names (from no_ext to arb extension)
- rearrange includes, so that glew.h is included before gl.h (through qt5.0) is included
- add some missing file properties

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@19018 383ad7c9-94d9-4d36-a494-682f7c89f535
parent bffecfe5
......@@ -43,14 +43,6 @@
#ifndef COLORPLUGIN_HH
#define COLORPLUGIN_HH
#include <QObject>
#include <QMenuBar>
#include "ColorPlugin.hh"
#include "ColorOptions.hh"
#include "OpenFlipper/INIFile/INIFile.hh"
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include <OpenFlipper/BasePlugin/MenuInterface.hh>
......@@ -60,6 +52,14 @@
#include "OpenFlipper/BasePlugin/OptionsInterface.hh"
#include "OpenFlipper/BasePlugin/INIInterface.hh"
#include <QObject>
#include <QMenuBar>
#include "ColorPlugin.hh"
#include "ColorOptions.hh"
#include "OpenFlipper/INIFile/INIFile.hh"
class ColorPlugin : public QObject, BaseInterface, MenuInterface, ScriptInterface, ToolbarInterface, StatusbarInterface, OptionsInterface, INIInterface
{
......
......@@ -40,10 +40,14 @@
* *
\*===========================================================================*/
#include <QtGui>
#include "ComponentsPlugin.hh"
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <MeshTools/MeshInfoT.hh>
const char *SPLIT_COMPONENTS = "SplitComponents";
......
......@@ -40,14 +40,14 @@
* *
\*===========================================================================*/
#include "DataControlPlugin.hh"
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "DataControlPlugin.hh"
#include <QLayout>
#include <QGridLayout>
#include <QItemSelectionModel>
......
......@@ -40,7 +40,7 @@
* *
\*===========================================================================*/
#include "TreeModel.hh"
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -50,8 +50,6 @@
#include <QBrush>
#include "TreeModel.hh"
#include <iostream>
......
......@@ -50,6 +50,10 @@
//== INCLUDES =================================================================
#include "DecimaterPlugin.hh"
#include <ACG/GL/GLState.hh>
#include <ACG/Scenegraph/ManipulatorNode.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -58,15 +62,10 @@
#endif
#include <memory>
#include "DecimaterPlugin.hh"
#include <iostream>
#include <ACG/GL/GLState.hh>
#include <QStringList>
#include <ACG/Scenegraph/ManipulatorNode.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#define DECIMATER "DecimaterData"
......
......@@ -40,6 +40,11 @@
* *
\*===========================================================================*/
#include "GaussCurvature.hh"
#include <ACG/GL/GLState.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -47,13 +52,6 @@
#include <QtGui>
#endif
#include "GaussCurvature.hh"
#include <ACG/GL/GLState.hh>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include <MeshTools/Curvature.hh>
#include <ObjectTypes/PolyMesh/PolyMesh.hh>
......
......@@ -49,12 +49,6 @@
//== INCLUDES =================================================================
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "MeshObjectInfoPlugin.hh"
......@@ -72,6 +66,12 @@
#include <cfloat>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
//== IMPLEMENTATION ==========================================================
......
......@@ -50,13 +50,6 @@
//== INCLUDES =================================================================
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "SkeletonObjectInfoPlugin.hh"
#include <iostream>
......@@ -73,6 +66,12 @@
#include <cfloat>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
//== IMPLEMENTATION ==========================================================
void InfoSkeletonObjectPlugin::initializePlugin() {
......
......@@ -44,13 +44,6 @@
#define ISOTROPICREMESHERPLUGIN_HH
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include <OpenFlipper/BasePlugin/ToolboxInterface.hh>
#include <OpenFlipper/BasePlugin/LoggingInterface.hh>
......@@ -65,6 +58,12 @@
#include "IsotropicRemesherToolbox.hh"
#include "ProgressEmitter.hh"
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class IsotropicRemesherPlugin : public QObject, BaseInterface, BackupInterface , ToolboxInterface, LoggingInterface,
RPCInterface, ProcessInterface, ScriptInterface
......
......@@ -41,13 +41,6 @@
\*===========================================================================*/
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "LaplacePlugin.hh"
#include <iostream>
......@@ -61,6 +54,12 @@
#include <omp.h>
#endif
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#define UNIFORM_LAPLACE_NAME "Uniform Laplace Length"
#define UNIFORM_LAPLACE_SQUARED_NAME "Uniform Laplace Squared Length"
......
......@@ -41,18 +41,12 @@
\*===========================================================================*/
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "MeanCurvature.hh"
#include <iostream>
#include <ACG/GL/GLState.hh>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <ObjectTypes/PolyMesh/PolyMesh.hh>
#include <ObjectTypes/TriangleMesh/TriangleMesh.hh>
......@@ -62,6 +56,12 @@
#include <omp.h>
#endif
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
MeanCurvaturePlugin::MeanCurvaturePlugin()
{
}
......
......@@ -41,12 +41,6 @@
\*===========================================================================*/
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "MeshRepairPlugin.hh"
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
......@@ -55,6 +49,12 @@
#include <ACG/Geometry/Algorithms.hh>
#include <Math_Tools/Math_Tools.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
//-----------------------------------------------------------------------------
MeshRepairPlugin::MeshRepairPlugin() :
......
......@@ -41,12 +41,6 @@
\*===========================================================================*/
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "MovePlugin.hh"
#include <iostream>
......@@ -64,6 +58,12 @@
#include <omp.h>
#endif
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#ifdef ENABLE_POLYLINE_SUPPORT
#include <ObjectTypes/PolyLine/PolyLine.hh>
#endif
......
......@@ -40,6 +40,8 @@
* *
\*===========================================================================*/
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include "ui_setProps.hh"
#if QT_VERSION >= 0x050000
......@@ -48,9 +50,6 @@
#include <QtGui>
#endif
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
class movePropsWidget : public QWidget, public Ui::setProps
{
Q_OBJECT
......
......@@ -8,13 +8,6 @@
//== INCLUDES =================================================================
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "PolyLinePlugin.hh"
#include <iostream>
......@@ -29,6 +22,12 @@
#include <ACG/Geometry/bsp/BSPImplT.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
namespace {
class GlutPrimitiveNode : public ACG::SceneGraph::GlutPrimitiveNode {
......
......@@ -41,12 +41,6 @@
\*===========================================================================*/
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QPrintDialog>
#include <QPrinter>
......@@ -58,6 +52,12 @@
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
void PrintPlugin::pluginsInitialized()
{
// Print menu
......
......@@ -48,13 +48,13 @@
//== INCLUDES =================================================================
#include "PropertyVisPlugin.hh"
#include <Qt>
#include <QSpacerItem>
#include <QFileDialog>
#include "PropertyVisPlugin.hh"
#include <iostream>
#include <vector>
#include <algorithm>
......
......@@ -43,12 +43,6 @@
#ifndef ADVANCEDREMESHERPLUGIN_HH
#define ADVANCEDREMESHERPLUGIN_HH
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include <OpenFlipper/BasePlugin/BackupInterface.hh>
#include <OpenFlipper/BasePlugin/ToolboxInterface.hh>
......@@ -63,6 +57,8 @@
#include "RemesherToolbox.hh"
#include "ProgressEmitter.hh"
class RemesherPlugin : public QObject, BaseInterface, BackupInterface, ToolboxInterface, LoggingInterface, RPCInterface, ProcessInterface, ScriptInterface
{
Q_OBJECT
......
......@@ -40,13 +40,6 @@
* *
\*===========================================================================*/
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "ScriptingPlugin.hh"
#include <ACG/GL/GLState.hh>
......@@ -61,7 +54,11 @@
#include <QTextStream>
#include <QSyntaxHighlighter>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
ScriptingPlugin::ScriptingPlugin() :
......
......@@ -43,14 +43,6 @@
#ifndef SLICEPLUGIN_HH
#define SLICEPLUGIN_HH
#include <QObject>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include <OpenFlipper/BasePlugin/ToolboxInterface.hh>
#include <OpenFlipper/BasePlugin/LoggingInterface.hh>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment