From: vsv <vitaly.smetannikov@opencascade.com>
Date: Tue, 22 Apr 2014 12:33:14 +0000 (+0400)
Subject: Make PyConsole, PyEvent, PyInterp as shared libraries
X-Git-Tag: V_0.2~140
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=0490eb8655903ddff6e8d4669b9873a36e382e09;p=modules%2Fshaper.git

Make PyConsole, PyEvent, PyInterp as shared libraries
---

diff --git a/src/PyConsole/PyConsole_Console.h b/src/PyConsole/PyConsole_Console.h
index b2ece1f92..7f109eb3e 100644
--- a/src/PyConsole/PyConsole_Console.h
+++ b/src/PyConsole/PyConsole_Console.h
@@ -13,8 +13,7 @@ class PyConsole_Editor;
 class PyConsole_EnhInterp;
 class QMenu;
 
-//PYCONSOLE_EXPORT
-class PyConsole_Console : public QWidget//, public SUIT_PopupClient
+class PYCONSOLE_EXPORT PyConsole_Console : public QWidget//, public SUIT_PopupClient
 {
   Q_OBJECT
 
@@ -77,8 +76,8 @@ protected:
  * Similar to PyConsole_Console except that an enhanced interpreter and enhanced editor
  * are encapsulated.
  */
-//PYCONSOLE_EXPORT
-class PyConsole_EnhConsole: public PyConsole_Console
+//
+class PYCONSOLE_EXPORT PyConsole_EnhConsole: public PyConsole_Console
 {
   Q_OBJECT
 
diff --git a/src/PyConsole/PyConsole_Editor.h b/src/PyConsole/PyConsole_Editor.h
index 8c17a5bc7..f3324dc25 100644
--- a/src/PyConsole/PyConsole_Editor.h
+++ b/src/PyConsole/PyConsole_Editor.h
@@ -10,8 +10,7 @@ class PyConsole_Interp;
 class PyInterp_Request;
 class QEventLoop;
 
-//PYCONSOLE_EXPORT
-class PyConsole_Editor : public QTextEdit
+class PYCONSOLE_EXPORT PyConsole_Editor : public QTextEdit
 {
   Q_OBJECT;
 
diff --git a/src/PyConsole/PyConsole_EnhEditor.h b/src/PyConsole/PyConsole_EnhEditor.h
index defa59060..03b5e19a1 100644
--- a/src/PyConsole/PyConsole_EnhEditor.h
+++ b/src/PyConsole/PyConsole_EnhEditor.h
@@ -14,8 +14,7 @@ class PyConsole_EnhInterp;
 /**
  * Enhanced Python editor handling tab completion.
  */
-//PYCONSOLE_EXPORT
-class PyConsole_EnhEditor: public PyConsole_Editor
+class PYCONSOLE_EXPORT PyConsole_EnhEditor: public PyConsole_Editor
 {
   Q_OBJECT;
 
diff --git a/src/PyConsole/PyConsole_EnhInterp.h b/src/PyConsole/PyConsole_EnhInterp.h
index b01f68973..1af977cc0 100644
--- a/src/PyConsole/PyConsole_EnhInterp.h
+++ b/src/PyConsole/PyConsole_EnhInterp.h
@@ -15,8 +15,7 @@
  * Enhanced Python interpreter used for auto-completion.
  * This extends PyConsole_Interp with an API wrapping the Python dir() command nicely.
  */
-//PYCONSOLE_EXPORT
-class PyConsole_EnhInterp: public PyConsole_Interp
+class PYCONSOLE_EXPORT PyConsole_EnhInterp: public PyConsole_Interp
 {
 public:
   PyConsole_EnhInterp()
diff --git a/src/PyConsole/PyConsole_Interp.h b/src/PyConsole/PyConsole_Interp.h
index 5dfa7f78c..d65c9e620 100644
--- a/src/PyConsole/PyConsole_Interp.h
+++ b/src/PyConsole/PyConsole_Interp.h
@@ -6,8 +6,7 @@
 
 #include <PyInterp_Interp.h>   /// !!! WARNING !!! THIS INCLUDE MUST BE VERY FIRST !!!
 
-//PYCONSOLE_EXPORT
-class PyConsole_Interp : public PyInterp_Interp
+class PYCONSOLE_EXPORT PyConsole_Interp : public PyInterp_Interp
 {
 public:
   PyConsole_Interp();
diff --git a/src/PyEvent/PyEvent_Event.h b/src/PyEvent/PyEvent_Event.h
index 76340b94b..ed1ea7b74 100644
--- a/src/PyEvent/PyEvent_Event.h
+++ b/src/PyEvent/PyEvent_Event.h
@@ -9,8 +9,7 @@
 //! SALOME custom event type
 #define PyEvent_EVENT QEvent::Type( QEvent::User + 10000 )
 
-// PYEVENT_EXPORT
-class PyEvent_CustomEvent : public QEvent
+class PYEVENT_EXPORT PyEvent_CustomEvent : public QEvent
 {
 public:
   PyEvent_CustomEvent( int type );
@@ -25,8 +24,7 @@ private:
 
 class QSemaphore;
 
-//PYEVENT_EXPORT
-class PyEvent_Event
+class PYEVENT_EXPORT PyEvent_Event
 {
 public:
   PyEvent_Event();
diff --git a/src/PyEvent/PyEvent_EventFilter.h b/src/PyEvent/PyEvent_EventFilter.h
index d115a2802..23132de7e 100644
--- a/src/PyEvent/PyEvent_EventFilter.h
+++ b/src/PyEvent/PyEvent_EventFilter.h
@@ -17,8 +17,7 @@ class PyEvent_Event;
   This event filter can be installed by any application that intends to use PyEvent_Event mechanism asynchronously.
   This class replaced SalomeApp_EventFilter.
 */
-//PYEVENT_EXPORT
-class PyEvent_EventFilter: public QObject 
+class PYEVENT_EXPORT PyEvent_EventFilter: public QObject 
 {
 public:
   static void Init();
diff --git a/src/PyInterp/PyInterp_Dispatcher.h b/src/PyInterp/PyInterp_Dispatcher.h
index cb5da2e8a..fa98d30b0 100644
--- a/src/PyInterp/PyInterp_Dispatcher.h
+++ b/src/PyInterp/PyInterp_Dispatcher.h
@@ -14,8 +14,7 @@
 class QObject;
 class PyInterp_Watcher;
 
-//PYINTERP_EXPORT
-class PyInterp_Dispatcher : protected QThread
+class PYINTERP_EXPORT PyInterp_Dispatcher : protected QThread
 {
   PyInterp_Dispatcher(); // private constructor
 
diff --git a/src/PyInterp/PyInterp_Event.h b/src/PyInterp/PyInterp_Event.h
index b08c34246..9fdc9ebcb 100644
--- a/src/PyInterp/PyInterp_Event.h
+++ b/src/PyInterp/PyInterp_Event.h
@@ -27,8 +27,8 @@ protected:
  * Events thrown by the interpreter having executed a command and indicating
  * the return status.
  */
-//PYINTERP_EXPORT
-class PyInterp_Event : public QEvent
+//
+class PYINTERP_EXPORT PyInterp_Event : public QEvent
 {
   PyInterp_Event();
   PyInterp_Event( const PyInterp_Event& );
diff --git a/src/PyInterp/PyInterp_Interp.h b/src/PyInterp/PyInterp_Interp.h
index b93c6475a..d92bc4fc9 100644
--- a/src/PyInterp/PyInterp_Interp.h
+++ b/src/PyInterp/PyInterp_Interp.h
@@ -7,8 +7,7 @@
 #include <list>
 #include <string>
 
-//PYINTERP_EXPORT
-class PyLockWrapper
+class PYINTERP_EXPORT PyLockWrapper
 {
   PyThreadState* myThreadState;
   PyThreadState* mySaveThreadState;
@@ -20,8 +19,7 @@ public:
 
 typedef void PyOutChanged(void* data,char * c);
 
-//PYINTERP_EXPORT
-class PyInterp_Interp
+class PYINTERP_EXPORT PyInterp_Interp
 {
 public:
   static int _argc;
@@ -64,8 +62,7 @@ protected:
   virtual bool initContext() = 0;  
 };
 
-//PYINTERP_EXPORT
-class PyObjWrapper
+class PYINTERP_EXPORT PyObjWrapper
 {
   PyObject* myObject;
 public:
diff --git a/src/PyInterp/PyInterp_Request.h b/src/PyInterp/PyInterp_Request.h
index b96cd1dc2..9cc3a68ac 100644
--- a/src/PyInterp/PyInterp_Request.h
+++ b/src/PyInterp/PyInterp_Request.h
@@ -15,8 +15,7 @@ class PyInterp_Dispatcher;
 class PyInterp_ExecuteEvent;
 class PyConsole_Editor;
 
-// PYINTERP_EXPORT
-class PyInterp_Request
+class PYINTERP_EXPORT PyInterp_Request
 {
   friend class PyInterp_Dispatcher;
   friend class PyInterp_ExecuteEvent;
@@ -62,8 +61,7 @@ private:
   QObject*        myListener;
 };
 
-//PYINTERP_EXPORT
-class PyInterp_LockRequest : public PyInterp_Request
+class PYINTERP_EXPORT PyInterp_LockRequest : public PyInterp_Request
 {
 public:
 
diff --git a/src/PyInterp/PyInterp_Watcher.h b/src/PyInterp/PyInterp_Watcher.h
index 3f110c1e2..91126b7e9 100644
--- a/src/PyInterp/PyInterp_Watcher.h
+++ b/src/PyInterp/PyInterp_Watcher.h
@@ -9,8 +9,7 @@
 #include <QObject>
 
 // Private class that keeps track of destructions of request listeners
-//PYINTERP_EXPORT
-class PyInterp_Watcher : public QObject
+class PYINTERP_EXPORT PyInterp_Watcher : public QObject
 {                                           
   Q_OBJECT