songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use CGAL_QT_EXPORT

This commit is contained in:
Maxime Gimeno 2018-04-09 12:42:38 +02:00
parent 9c1c0b027a
commit 1c8b2a02c9
10 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GraphicsView/include/CGAL/Qt/camera.h
View File

@ -29,7 +29,7 @@
#include <QDomElement> #include <QDomElement>
#include <CGAL/Qt/vec.h> #include <CGAL/Qt/vec.h>
#include <CGAL/Qt/quaternion.h> #include <CGAL/Qt/quaternion.h>
#include <CGAL/Qt/config.h> #include <CGAL/export/Qt.h>
#include <QOpenGLFunctions_2_1> #include <QOpenGLFunctions_2_1>
class QGLViewer; class QGLViewer;
@ -99,7 +99,7 @@ class ManipulatedCameraFrame;
A Camera can also be used outside of a QGLViewer or even without OpenGL for A Camera can also be used outside of a QGLViewer or even without OpenGL for
its coordinate system conversion capabilities. Note however that some of them its coordinate system conversion capabilities. Note however that some of them
explicitly rely on the presence of a Z-buffer. \nosubgrouping */ explicitly rely on the presence of a Z-buffer. \nosubgrouping */
class QGLVIEWER_EXPORT Camera : public QObject { class CGAL_QT_EXPORT Camera : public QObject {
#ifndef DOXYGEN #ifndef DOXYGEN
friend class ::QGLViewer; friend class ::QGLViewer;
#endif #endif

11
GraphicsView/include/CGAL/Qt/constraint.h
View File

@ -26,6 +26,7 @@
#include <CGAL/Qt/quaternion.h> #include <CGAL/Qt/quaternion.h>
#include <CGAL/Qt/vec.h> #include <CGAL/Qt/vec.h>
#include <CGAL/export/Qt.h>
namespace qglviewer { namespace qglviewer {
@ -119,7 +120,7 @@ class Camera;
} }
\endcode \endcode
*/ */
class QGLVIEWER_EXPORT Constraint { class CGAL_QT_EXPORT Constraint {
public: public:
/*! Virtual destructor. Empty. */ /*! Virtual destructor. Empty. */
virtual ~Constraint() {} virtual ~Constraint() {}
@ -180,7 +181,7 @@ public:
However, adding an extra pointer to the QGLViewer::camera() in all the However, adding an extra pointer to the QGLViewer::camera() in all the
AxisPlaneConstraint derived classes (which the user would have to update in a AxisPlaneConstraint derived classes (which the user would have to update in a
multi-viewer application) was judged as an overkill. */ multi-viewer application) was judged as an overkill. */
class QGLVIEWER_EXPORT AxisPlaneConstraint : public Constraint { class CGAL_QT_EXPORT AxisPlaneConstraint : public Constraint {
public: public:
AxisPlaneConstraint(); AxisPlaneConstraint();
/*! Virtual destructor. Empty. */ /*! Virtual destructor. Empty. */
@ -310,7 +311,7 @@ private:
See the <a href="../examples/constrainedFrame.html">constrainedFrame</a> See the <a href="../examples/constrainedFrame.html">constrainedFrame</a>
example for an illustration. */ example for an illustration. */
class QGLVIEWER_EXPORT LocalConstraint : public AxisPlaneConstraint { class CGAL_QT_EXPORT LocalConstraint : public AxisPlaneConstraint {
public: public:
/*! Virtual destructor. Empty. */ /*! Virtual destructor. Empty. */
virtual ~LocalConstraint(){}; virtual ~LocalConstraint(){};
@ -328,7 +329,7 @@ public:
See the <a href="../examples/constrainedFrame.html">constrainedFrame</a> and See the <a href="../examples/constrainedFrame.html">constrainedFrame</a> and
<a href="../examples/multiView.html">multiView</a> examples for an <a href="../examples/multiView.html">multiView</a> examples for an
illustration. */ illustration. */
class QGLVIEWER_EXPORT WorldConstraint : public AxisPlaneConstraint { class CGAL_QT_EXPORT WorldConstraint : public AxisPlaneConstraint {
public: public:
/*! Virtual destructor. Empty. */ /*! Virtual destructor. Empty. */
virtual ~WorldConstraint(){}; virtual ~WorldConstraint(){};
@ -346,7 +347,7 @@ public:
See the <a href="../examples/constrainedFrame.html">constrainedFrame</a> and See the <a href="../examples/constrainedFrame.html">constrainedFrame</a> and
<a href="../examples/constrainedCamera.html">constrainedCamera</a> examples <a href="../examples/constrainedCamera.html">constrainedCamera</a> examples
for an illustration. */ for an illustration. */
class QGLVIEWER_EXPORT CameraConstraint : public AxisPlaneConstraint { class CGAL_QT_EXPORT CameraConstraint : public AxisPlaneConstraint {
public: public:
explicit CameraConstraint(const Camera *const camera); explicit CameraConstraint(const Camera *const camera);
/*! Virtual destructor. Empty. */ /*! Virtual destructor. Empty. */

4
GraphicsView/include/CGAL/Qt/frame.h
View File

@ -26,7 +26,7 @@
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include <CGAL/Qt/config.h> #include <CGAL/export/Qt.h>
#include <CGAL/Qt/vec.h> #include <CGAL/Qt/vec.h>
#include <CGAL/Qt/quaternion.h> #include <CGAL/Qt/quaternion.h>
@ -134,7 +134,7 @@ class Constraint;
scene with the mouse. scene with the mouse.
\nosubgrouping */ \nosubgrouping */
class QGLVIEWER_EXPORT Frame : public QObject { class CGAL_QT_EXPORT Frame : public QObject {
Q_OBJECT Q_OBJECT
public: public:

4
GraphicsView/include/CGAL/Qt/keyFrameInterpolator.h
View File

@ -26,7 +26,7 @@
#include <QObject> #include <QObject>
#include <QTimer> #include <QTimer>
#include <CGAL/export/Qt.h>
#include <CGAL/Qt/quaternion.h> #include <CGAL/Qt/quaternion.h>
// Not actually needed, but some bad compilers (Microsoft VS6) complain. // Not actually needed, but some bad compilers (Microsoft VS6) complain.
//#include <CGAL/Qt/frame.h> //#include <CGAL/Qt/frame.h>
@ -129,7 +129,7 @@ class Frame;
\endcode \endcode
You may want to temporally disconnect the \c kfi interpolated() signal from You may want to temporally disconnect the \c kfi interpolated() signal from
the QGLViewer::update() slot before calling this code. \nosubgrouping */ the QGLViewer::update() slot before calling this code. \nosubgrouping */
class QGLVIEWER_EXPORT KeyFrameInterpolator : public QObject { class CGAL_QT_EXPORT KeyFrameInterpolator : public QObject {
// todo closedPath, insertKeyFrames, deleteKeyFrame, replaceKeyFrame // todo closedPath, insertKeyFrames, deleteKeyFrame, replaceKeyFrame
Q_OBJECT Q_OBJECT

4
GraphicsView/include/CGAL/Qt/manipulatedCameraFrame.h
View File

@ -26,7 +26,7 @@
#define QGLVIEWER_MANIPULATED_CAMERA_FRAME_H #define QGLVIEWER_MANIPULATED_CAMERA_FRAME_H
#include <QTimer> #include <QTimer>
#include <CGAL/Qt/config.h> #include <CGAL/export/Qt.h>
#include <CGAL/Qt/manipulatedFrame.h> #include <CGAL/Qt/manipulatedFrame.h>
#include <CGAL/Qt/camera.h> #include <CGAL/Qt/camera.h>
@ -52,7 +52,7 @@ namespace qglviewer {
See the <a href="../mouse.html">mouse page</a> for a description of the See the <a href="../mouse.html">mouse page</a> for a description of the
possible actions that can be performed using the mouse and their bindings. possible actions that can be performed using the mouse and their bindings.
\nosubgrouping */ \nosubgrouping */
class QGLVIEWER_EXPORT ManipulatedCameraFrame : public ManipulatedFrame { class CGAL_QT_EXPORT ManipulatedCameraFrame : public ManipulatedFrame {
#ifndef DOXYGEN #ifndef DOXYGEN
friend class Camera; friend class Camera;
friend class ::QGLViewer; friend class ::QGLViewer;

4
GraphicsView/include/CGAL/Qt/manipulatedFrame.h
View File

@ -24,7 +24,7 @@
#ifndef QGLVIEWER_MANIPULATED_FRAME_H #ifndef QGLVIEWER_MANIPULATED_FRAME_H
#define QGLVIEWER_MANIPULATED_FRAME_H #define QGLVIEWER_MANIPULATED_FRAME_H
#include <CGAL/Qt/config.h> #include <CGAL/export/Qt.h>
#include <CGAL/Qt/frame.h> #include <CGAL/Qt/frame.h>
#include <CGAL/Qt/camera.h> #include <CGAL/Qt/camera.h>
#include <CGAL/Qt/mouseGrabber.h> #include <CGAL/Qt/mouseGrabber.h>
@ -103,7 +103,7 @@ namespace qglviewer {
button while moving the mouse fast enough (see spinningSensitivity()). See button while moving the mouse fast enough (see spinningSensitivity()). See
also translationSensitivity() and rotationSensitivity() for sensitivity also translationSensitivity() and rotationSensitivity() for sensitivity
tuning. \nosubgrouping */ tuning. \nosubgrouping */
class QGLVIEWER_EXPORT ManipulatedFrame : public Frame, public MouseGrabber { class CGAL_QT_EXPORT ManipulatedFrame : public Frame, public MouseGrabber {
#ifndef DOXYGEN #ifndef DOXYGEN
friend class Camera; friend class Camera;
friend class ::QGLViewer; friend class ::QGLViewer;

4
GraphicsView/include/CGAL/Qt/mouseGrabber.h
View File

@ -25,7 +25,7 @@
#ifndef QGLVIEWER_MOUSE_GRABBER_H #ifndef QGLVIEWER_MOUSE_GRABBER_H
#define QGLVIEWER_MOUSE_GRABBER_H #define QGLVIEWER_MOUSE_GRABBER_H
#include <CGAL/Qt/config.h> #include <CGAL/export/Qt.h>
#include <QEvent> #include <QEvent>
@ -133,7 +133,7 @@ class Camera;
\endcode \endcode
Note that the different event callback methods are called only once the Note that the different event callback methods are called only once the
MouseGrabber grabsMouse(). \nosubgrouping */ MouseGrabber grabsMouse(). \nosubgrouping */
class QGLVIEWER_EXPORT MouseGrabber { class CGAL_QT_EXPORT MouseGrabber {
#ifndef DOXYGEN #ifndef DOXYGEN
friend class ::QGLViewer; friend class ::QGLViewer;
#endif #endif

4
GraphicsView/include/CGAL/Qt/qglviewer.h
View File

@ -24,7 +24,7 @@
#ifndef QGLVIEWER_QGLVIEWER_H #ifndef QGLVIEWER_QGLVIEWER_H
#define QGLVIEWER_QGLVIEWER_H #define QGLVIEWER_QGLVIEWER_H
#include <CGAL/Qt/config.h> #include <CGAL/export/Qt.h>
#include <CGAL/Qt/viewer_actions.h> #include <CGAL/Qt/viewer_actions.h>
#include <CGAL/Qt/vec.h> #include <CGAL/Qt/vec.h>
#include <CGAL/Qt/camera.h> #include <CGAL/Qt/camera.h>
@ -76,7 +76,7 @@ href="../examples/callback.html">callback example</a> for a complete
implementation. implementation.
\nosubgrouping */ \nosubgrouping */
class QGLVIEWER_EXPORT QGLViewer : public QOpenGLWidget, public QOpenGLFunctions_2_1 { class CGAL_QT_EXPORT QGLViewer : public QOpenGLWidget, public QOpenGLFunctions_2_1 {
Q_OBJECT Q_OBJECT
public: public:

5
GraphicsView/include/CGAL/Qt/quaternion.h
View File

@ -24,10 +24,11 @@
#ifndef QGLVIEWER_QUATERNION_H #ifndef QGLVIEWER_QUATERNION_H
#define QGLVIEWER_QUATERNION_H #define QGLVIEWER_QUATERNION_H
#include <CGAL/Qt/config.h> #include <CGAL/export/Qt.h>
#include <CGAL/Qt/vec.h> #include <CGAL/Qt/vec.h>
#include <iostream> #include <iostream>
#include <math.h> #include <math.h>
#include <QOpenGLWidget>
namespace qglviewer { namespace qglviewer {
/*! \brief The Quaternion class represents 3D rotations and orientations. /*! \brief The Quaternion class represents 3D rotations and orientations.
@ -68,7 +69,7 @@ namespace qglviewer {
See also the Vec and Frame classes' documentations. See also the Vec and Frame classes' documentations.
\nosubgrouping */ \nosubgrouping */
class QGLVIEWER_EXPORT Quaternion { class CGAL_QT_EXPORT Quaternion {
public: public:
/*! @name Defining a Quaternion */ /*! @name Defining a Quaternion */
//@{ //@{

4
GraphicsView/include/CGAL/Qt/vec.h
View File

@ -31,7 +31,7 @@
#include <QDomElement> #include <QDomElement>
// Included by all files as vec.h is at the end of the include hierarchy // Included by all files as vec.h is at the end of the include hierarchy
#include <CGAL/Qt/config.h> // Specific configuration options. #include <CGAL/export/Qt.h>
namespace qglviewer { namespace qglviewer {
@ -64,7 +64,7 @@ namespace qglviewer {
See also the Quaternion and the Frame documentations. See also the Quaternion and the Frame documentations.
\nosubgrouping */ \nosubgrouping */
class QGLVIEWER_EXPORT Vec { class CGAL_QT_EXPORT Vec {
// If your compiler complains the "The class "qglviewer::Vec" has no member // If your compiler complains the "The class "qglviewer::Vec" has no member
// "x"." Add your architecture Q_OS_XXXX flag (see qglobal.h) in this list. // "x"." Add your architecture Q_OS_XXXX flag (see qglobal.h) in this list.