remove some more boost.signals leftover
This commit is contained in:
@@ -43,7 +43,6 @@
|
||||
# include <QItemSelection>
|
||||
# include <QItemSelectionModel>
|
||||
# include <QTimer>
|
||||
# include <boost/signal.hpp>
|
||||
# include <boost/bind.hpp>
|
||||
# include <Python.h>
|
||||
# include <Inventor/actions/SoSearchAction.h>
|
||||
|
||||
@@ -5,27 +5,6 @@
|
||||
# pragma warning( disable : 4251 )
|
||||
#endif
|
||||
|
||||
#if defined(signals) && defined(QOBJECTDEFS_H) && \
|
||||
!defined(QT_MOC_CPP)
|
||||
# undef signals
|
||||
# define signals signals
|
||||
#endif
|
||||
|
||||
#include <boost/signal.hpp>
|
||||
namespace boost
|
||||
{
|
||||
namespace signalslib = signals;
|
||||
}
|
||||
|
||||
#if defined(signals) && defined(QOBJECTDEFS_H) && \
|
||||
!defined(QT_MOC_CPP)
|
||||
# undef signals
|
||||
// Restore the macro definition of "signals", as it was
|
||||
// defined by Qt's <qobjectdefs.h>.
|
||||
# define signals public
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef FC_OS_WIN32
|
||||
// cmake generates this define
|
||||
# if defined (FreeCADPlugin_EXPORTS)
|
||||
@@ -36,8 +15,8 @@ namespace boost
|
||||
# define MeshExport __declspec(dllimport)
|
||||
#else // for Linux
|
||||
# define FC_PLUGIN_EXPORT
|
||||
# define MeshExport
|
||||
# define MeshExport
|
||||
#endif
|
||||
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user