QAD_EXPORT

git-svn-id: svn://db.shs.com.ru/libs@719 a8b55f48-bf90-11e4-a774-851b48703e85

qad/graphic/graphic.h

@@ -6,7 +6,6 @@
 #include <QPixmap>
 #include <QMouseEvent>
 #include <QComboBox>
-///#include <QMutex>
 #include <QDebug>
 #include <QGridLayout>
 #include <QFileDialog>
@@ -18,20 +17,19 @@
 #include "graphic_conf.h"
 #include "evalspinbox.h"
 
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
 
 namespace Ui {
 	class Graphic;
 }
 
+
 class UGLWidget;
 
+
 Q_DECLARE_METATYPE(QVector<QPointF>)
 
-class Graphic: public QFrame
+
+class QAD_EXPORT Graphic: public QFrame
 {
 	Q_OBJECT
 	Q_FLAGS(Buttons)
@@ -436,13 +434,16 @@ signals:
 
 };
 
+
 Q_DECLARE_METATYPE(Graphic::GraphicsData)
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(Graphic::Buttons)
 
+
 inline QDataStream & operator <<(QDataStream & s, const Graphic::Graduation & v) {s << (int)v; return s;}
 inline QDataStream & operator >>(QDataStream & s, Graphic::Graduation & v) {s >> *((int*)(&v)); return s;}
 
+
 class __GraphicRegistrator__ {
 public:
 	__GraphicRegistrator__() {
@@ -452,8 +453,4 @@ public:
 	}
 };
 
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
 #endif // GRAPHIC_H

qad/graphic/graphic_conf.h

@@ -5,14 +5,15 @@
 #include <QCheckBox>
 #include <QPen>
 #include <QPainter>
+#include "qad_export.h"
 
 
 namespace Ui {
 	class GraphicConf;
-};
+}
 
 
-struct GraphicType {
+struct QAD_EXPORT GraphicType {
 	GraphicType(QString name_ = "y(x)", QColor color = Qt::red, Qt::PenStyle style = Qt::SolidLine, double width = 0., bool visible_ = true) {
 		pen.setColor(color);
 		pen.setStyle(style);
@@ -53,7 +54,7 @@ inline QDataStream & operator <<(QDataStream & s, const GraphicType & v) {s << v
 inline QDataStream & operator >>(QDataStream & s, GraphicType & v) {s >> v.name >> v.pen >> v.fill_color >> v.lines >> v.points >> v.fill >> v.pointWidth >> v.visible; return s;}
 
 
-class GraphicConf: public QDialog
+class QAD_EXPORT GraphicConf: public QDialog
 {
 	Q_OBJECT
 	friend class Graphic;