ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-01 04:10:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation problems on Win32 Platform:

Browse Source 
- export classes
This commit is contained in:
abd 2008-10-07 13:23:26 +00:00
parent 00a9b6bc08
commit bd7c31d320
8 changed files with 93 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.h
View File

@ -10,6 +10,8 @@
#ifndef DLGREF_1SEL5SPIN1CHECK_QTD_H #ifndef DLGREF_1SEL5SPIN1CHECK_QTD_H
#define DLGREF_1SEL5SPIN1CHECK_QTD_H #define DLGREF_1SEL5SPIN1CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
@ -24,7 +26,7 @@ class QSpinBox;
class QCheckBox; class QCheckBox;
class QLineEdit; class QLineEdit;
class DlgRef_1Sel5Spin1Check_QTD : public QWidget class GEOM_DLGREF_EXPORT DlgRef_1Sel5Spin1Check_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

4
src/DlgRef/DlgRef_2Sel2List_QTD.h
View File

@ -10,6 +10,8 @@
#ifndef DLGREF_2SEL2LIST_QTD_H #ifndef DLGREF_2SEL2LIST_QTD_H
#define DLGREF_2SEL2LIST_QTD_H #define DLGREF_2SEL2LIST_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
@ -23,7 +25,7 @@ class QComboBox;
class QLabel; class QLabel;
class QPushButton; class QPushButton;
class DlgRef_2Sel2List_QTD : public QWidget class GEOM_DLGREF_EXPORT DlgRef_2Sel2List_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

2
src/DlgRef/DlgRef_2Sel3Spin2Rb.cxx
View File

@ -4,7 +4,7 @@
// $Header: // $Header:
#include "DlgRef_2Sel3Spin2Rb.h" #include "DlgRef_2Sel3Spin2Rb.h"
#include <iostream.h> #include <iostream>
#include <qlayout.h> #include <qlayout.h>
#include <qspinbox.h> #include <qspinbox.h>

15
src/DlgRef/DlgRef_2Sel3Spin2Rb.h
View File

@ -6,19 +6,12 @@
#ifndef DLGREF_2SEL3SPIN2RB_H #ifndef DLGREF_2SEL3SPIN2RB_H
#define DLGREF_2SEL3SPIN2RB_H #define DLGREF_2SEL3SPIN2RB_H
#include "GEOM_DlgRef.hxx"
#include "DlgRef_2Sel3Spin2Rb_QTD.h" #include "DlgRef_2Sel3Spin2Rb_QTD.h"
#include "DlgRef_SpinBox.h" #include "DlgRef_SpinBox.h"
//#if defined WNT
//#include <SALOME_WNT.hxx> class GEOM_DLGREF_EXPORT DlgRef_2Sel3Spin2Rb : public DlgRef_2Sel3Spin2Rb_QTD
//#else
//#define SALOME_WNT_EXPORT
//#endif
#if defined WNT && defined WIN32 && defined SALOME_WNT_EXPORTS
#define DLGREF_WNT_EXPORT __declspec( dllexport )
#else
#define DLGREF_WNT_EXPORT
#endif
class DLGREF_WNT_EXPORT DlgRef_2Sel3Spin2Rb : public DlgRef_2Sel3Spin2Rb_QTD
{ {
Q_OBJECT Q_OBJECT

4
src/DlgRef/DlgRef_3Sel3Spin2Check_QTD.h
View File

@ -10,6 +10,8 @@
#ifndef DLGREF_3SEL3SPIN2CHECK_QTD_H #ifndef DLGREF_3SEL3SPIN2CHECK_QTD_H
#define DLGREF_3SEL3SPIN2CHECK_QTD_H #define DLGREF_3SEL3SPIN2CHECK_QTD_H
#include "GEOM_DlgRef.hxx"
#include <qvariant.h> #include <qvariant.h>
#include <qwidget.h> #include <qwidget.h>
@ -24,7 +26,7 @@ class QLineEdit;
class QPushButton; class QPushButton;
class QCheckBox; class QCheckBox;
class DlgRef_3Sel3Spin2Check_QTD : public QWidget class GEOM_DLGREF_EXPORT DlgRef_3Sel3Spin2Check_QTD : public QWidget
{ {
Q_OBJECT Q_OBJECT

3
src/GEOMImpl/GEOMImpl_IPipeBiNormal.hxx
View File

@ -22,6 +22,7 @@
#ifndef _GEOMImpl_IPIPEBINORMAL_HXX_ #ifndef _GEOMImpl_IPIPEBINORMAL_HXX_
#define _GEOMImpl_IPIPEBINORMAL_HXX_ #define _GEOMImpl_IPIPEBINORMAL_HXX_
#include "GEOM_GEOMImpl.hxx"
#include "GEOM_Function.hxx" #include "GEOM_Function.hxx"
#ifndef _GEOMImpl_IPIPE_HXX_ #ifndef _GEOMImpl_IPIPE_HXX_
@ -32,7 +33,7 @@
#define PIPE_ARG_PATH 2 #define PIPE_ARG_PATH 2
#define PIPE_ARG_VEC 3 #define PIPE_ARG_VEC 3
class GEOMImpl_IPipeBiNormal : public GEOMImpl_IPipe class GEOMIMPL_EXPORT GEOMImpl_IPipeBiNormal : public GEOMImpl_IPipe
{ {
public: public:

12
src/GEOMImpl/GEOM_GEOMImpl.hxx
View File

@ -26,19 +26,11 @@
#ifndef _GEOM_GEOMImpl_HXX_ #ifndef _GEOM_GEOMImpl_HXX_
#define _GEOM_GEOMImpl_HXX_ #define _GEOM_GEOMImpl_HXX_
#ifdef WNT #ifdef WIN32
#if defined GEOMIMPL_EXPORTS # ifdef GEOMIMPL_EXPORTS
#if defined WIN32
# define GEOMIMPL_EXPORT __declspec( dllexport ) # define GEOMIMPL_EXPORT __declspec( dllexport )
# else # else
#define GEOMIMPL_EXPORT
#endif
#else
#if defined WIN32
# define GEOMIMPL_EXPORT __declspec( dllimport ) # define GEOMIMPL_EXPORT __declspec( dllimport )
#else
#define GEOMIMPL_EXPORT
#endif
# endif # endif
#else #else
# define GEOMIMPL_EXPORT # define GEOMIMPL_EXPORT

12
src/OBJECT/GEOM_OBJECT_defs.hxx
View File

@ -26,19 +26,11 @@
#ifndef _GEOM_OBJECT_defs_HXX_ #ifndef _GEOM_OBJECT_defs_HXX_
#define _GEOM_OBJECT_defs_HXX_ #define _GEOM_OBJECT_defs_HXX_
#ifdef WNT #ifdef WIN32
#if defined OBJECT_EXPORTS # ifdef GEOM_OBJECT_EXPORTS
#if defined WIN32
# define GEOM_OBJECT_EXPORT __declspec( dllexport ) # define GEOM_OBJECT_EXPORT __declspec( dllexport )
# else # else
#define GEOM_OBJECT_EXPORT
#endif
#else
#if defined WIN32
# define GEOM_OBJECT_EXPORT __declspec( dllimport ) # define GEOM_OBJECT_EXPORT __declspec( dllimport )
#else
#define GEOM_OBJECT_EXPORT
#endif
# endif # endif
#else #else
# define GEOM_OBJECT_EXPORT # define GEOM_OBJECT_EXPORT