From e018b50e26b771a22bacc63941c31258652fda29 Mon Sep 17 00:00:00 2001 From: rnv Date: Wed, 16 Nov 2011 12:31:38 +0000 Subject: [PATCH] rnv: Prepare SALOME-6.4.0 version for windows platform. --- src/GuiHelpers/Makefile.am | 6 ++++-- src/TreeData/DataModel.hxx | 4 +++- src/TreeData/DataObject.hxx | 4 +++- src/TreeData/DataProcessor.hxx | 4 +++- src/TreeData/DockWidgets.hxx | 8 +++++--- src/TreeData/Makefile.am | 1 + src/TreeData/TreeData.hxx | 36 +++++++++++++++++++++++++++++++++ src/TreeData/TreeGuiManager.hxx | 4 +++- src/TreeData/TreeItem.hxx | 4 +++- src/TreeData/TreeModel.hxx | 4 +++- src/TreeData/TreeObserver.hxx | 4 +++- src/TreeData/TreeView.hxx | 4 +++- 12 files changed, 70 insertions(+), 13 deletions(-) create mode 100755 src/TreeData/TreeData.hxx diff --git a/src/GuiHelpers/Makefile.am b/src/GuiHelpers/Makefile.am index a59a8258e..782839856 100644 --- a/src/GuiHelpers/Makefile.am +++ b/src/GuiHelpers/Makefile.am @@ -44,6 +44,7 @@ CAS_CXXFLAGS=@CAS_CPPFLAGS@ @CAS_CXXFLAGS@ BOOST_CPPFLAGS=@BOOST_CPPFLAGS@ BOOST_LIBS=@BOOST_LIBS@ CORBA_CXXFLAGS=@OMNIORB_CXXFLAGS@ @OMNIORB_INCLUDES@ +CORBA_LIBS=@OMNIORB_LIBS@ libSalomeGuiHelpers_la_CPPFLAGS = \ $(QT_CXXFLAGS) \ @@ -60,8 +61,9 @@ libSalomeGuiHelpers_la_CPPFLAGS = \ -I$(srcdir)/../OBJECT libSalomeGuiHelpers_la_LDFLAGS = \ - $(KERNEL_LDFLAGS) -lSalomeKernelHelpers - $(builddir)/../SalomeApp/libSalomeApp.la + $(KERNEL_LDFLAGS) -lSalomeKernelHelpers \ + $(builddir)/../SalomeApp/libSalomeApp.la \ + $(CORBA_LIBS) # # ======================================================= diff --git a/src/TreeData/DataModel.hxx b/src/TreeData/DataModel.hxx index 432145137..7dd6d3b76 100644 --- a/src/TreeData/DataModel.hxx +++ b/src/TreeData/DataModel.hxx @@ -23,10 +23,12 @@ #ifndef DATAMODEL_H #define DATAMODEL_H +#include "TreeData.hxx" + #include #include "DataObject.hxx" -class DataModel { +class TREEDATA_EXPORT DataModel { public: DataModel(); diff --git a/src/TreeData/DataObject.hxx b/src/TreeData/DataObject.hxx index f67d67606..ffee2939e 100644 --- a/src/TreeData/DataObject.hxx +++ b/src/TreeData/DataObject.hxx @@ -22,11 +22,13 @@ #ifndef DATAOBJECT_H #define DATAOBJECT_H +#include "TreeData.hxx" + #include #include using namespace std; -class DataObject { +class TREEDATA_EXPORT DataObject { public: DataObject(); diff --git a/src/TreeData/DataProcessor.hxx b/src/TreeData/DataProcessor.hxx index 76b0d111b..1e914db28 100644 --- a/src/TreeData/DataProcessor.hxx +++ b/src/TreeData/DataProcessor.hxx @@ -22,6 +22,8 @@ #ifndef _DATAPROCESSOR_H_ #define _DATAPROCESSOR_H_ +#include "TreeData.hxx" + #include "DataModel.hxx" #include "DataObject.hxx" #include @@ -40,7 +42,7 @@ typedef std::vector DataObjectVector; // ================================================================= // -class DataProcessor { +class TREEDATA_EXPORT DataProcessor { public: DataProcessor(DataModel * dataModel); diff --git a/src/TreeData/DockWidgets.hxx b/src/TreeData/DockWidgets.hxx index 26487c4f6..c374c6722 100644 --- a/src/TreeData/DockWidgets.hxx +++ b/src/TreeData/DockWidgets.hxx @@ -22,6 +22,8 @@ #ifndef _DOCKWIDGETS_H_ #define _DOCKWIDGETS_H_ +#include "TreeData.hxx" + // Qt includes #include #include @@ -29,11 +31,11 @@ // SALOME includes #include -class DockWidgets { +class TREEDATA_EXPORT DockWidgets { public: DockWidgets(SalomeApp_Application* salomeApp, - bool tabify=false, - const char * title="Data Model"); + bool tabify=false, + const char * title="Data Model"); void tabify(bool tabify); void show(bool isVisible); diff --git a/src/TreeData/Makefile.am b/src/TreeData/Makefile.am index 0df8f18bd..3ec85867d 100644 --- a/src/TreeData/Makefile.am +++ b/src/TreeData/Makefile.am @@ -40,6 +40,7 @@ lib_LTLIBRARIES = libSalomeTreeData.la # Generic source files # salomeinclude_HEADERS = \ + TreeData.hxx \ DockWidgets.hxx \ TreeModel.hxx \ TreeItem.hxx \ diff --git a/src/TreeData/TreeData.hxx b/src/TreeData/TreeData.hxx new file mode 100755 index 000000000..0934b72c9 --- /dev/null +++ b/src/TreeData/TreeData.hxx @@ -0,0 +1,36 @@ +// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +#ifndef TREEDATA_HXX +#define TREEDATA_HXX + +#ifdef WIN32 +# if defined SALOMETREEDATA_EXPORTS || defined SalomeTreeData_EXPORTS +# define TREEDATA_EXPORT __declspec( dllexport ) +# else +# define TREEDATA_EXPORT __declspec( dllimport ) +# endif +#else +# define TREEDATA_EXPORT +#endif + +#endif //TREEDATA_HXX \ No newline at end of file diff --git a/src/TreeData/TreeGuiManager.hxx b/src/TreeData/TreeGuiManager.hxx index c27e75011..c705680c6 100644 --- a/src/TreeData/TreeGuiManager.hxx +++ b/src/TreeData/TreeGuiManager.hxx @@ -22,6 +22,8 @@ #ifndef _TREEGUIMANAGER_H_ #define _TREEGUIMANAGER_H_ +#include "TreeData.hxx" + // SALOME includes #include @@ -32,7 +34,7 @@ #include "TreeView.hxx" #include "TreeObserver.hxx" -class TreeGuiManager : public TreeObserver { +class TREEDATA_EXPORT TreeGuiManager : public TreeObserver { public: TreeGuiManager(SalomeApp_Application * salomeApp, const char * title="Data Model"); diff --git a/src/TreeData/TreeItem.hxx b/src/TreeData/TreeItem.hxx index fd3418859..2e813d202 100644 --- a/src/TreeData/TreeItem.hxx +++ b/src/TreeData/TreeItem.hxx @@ -22,6 +22,8 @@ #ifndef TREEITEM_H #define TREEITEM_H +#include "TreeData.hxx" + #include #include #include @@ -30,7 +32,7 @@ #include "DataObject.hxx" #include "TreeModel.hxx" -class TreeItem +class TREEDATA_EXPORT TreeItem { public: TreeItem(const QString &nameId, const QVector &columnValues, TreeItem *parent = 0); diff --git a/src/TreeData/TreeModel.hxx b/src/TreeData/TreeModel.hxx index c58823512..3cc4fe41a 100644 --- a/src/TreeData/TreeModel.hxx +++ b/src/TreeData/TreeModel.hxx @@ -23,6 +23,8 @@ #ifndef TREEMODEL_H #define TREEMODEL_H +#include "TreeData.hxx" + #include #include #include @@ -33,7 +35,7 @@ class TreeItem; class TreeView; -class TreeModel : public QAbstractItemModel +class TREEDATA_EXPORT TreeModel : public QAbstractItemModel { Q_OBJECT diff --git a/src/TreeData/TreeObserver.hxx b/src/TreeData/TreeObserver.hxx index 8d7bf6653..26aed1623 100644 --- a/src/TreeData/TreeObserver.hxx +++ b/src/TreeData/TreeObserver.hxx @@ -22,10 +22,12 @@ #ifndef _TREEOBSERVER_ #define _TREEOBSERVER_ +#include "TreeData.hxx" + #include #include "TreeView.hxx" -class TreeObserver : public QObject { +class TREEDATA_EXPORT TreeObserver : public QObject { Q_OBJECT diff --git a/src/TreeData/TreeView.hxx b/src/TreeData/TreeView.hxx index 60a4b4418..8138dbf9b 100644 --- a/src/TreeData/TreeView.hxx +++ b/src/TreeData/TreeView.hxx @@ -23,12 +23,14 @@ #ifndef TREEVIEW_H #define TREEVIEW_H +#include "TreeData.hxx" + #include #include #include #include -class TreeView : public QTreeView +class TREEDATA_EXPORT TreeView : public QTreeView { Q_OBJECT -- 2.39.2