Merge remote branch 'origin/V7_dev'

[modules/paravis.git] / src / PVGUI / PVGUI_Module.h

diff --git a/src/PVGUI/PVGUI_Module.h b/src/PVGUI/PVGUI_Module.h
index 8f0e03c47ac52cc7617ae401c4fe9d42ac3f42ec..bbeed82bdc63333b3f7fee268c1a9664b53d2809 100644 (file)
--- a/src/PVGUI/PVGUI_Module.h
+++ b/src/PVGUI/PVGUI_Module.h
@@ -41,7 +41,7 @@ class SUIT_ViewWindow;
 class PVGUI_Module: public LightApp_Module
 {
   Q_OBJECT
-
+   
   //! Menu actions
   enum {
     //-----------
@@ -161,7 +161,7 @@ private:
   void restoreDockWidgetsState();
 
   //! Shows or hides ParaView view window
-  void showView( bool );
+  void showView( bool );    
 
   //! Get list of embedded macros files
   QStringList getEmbeddedMacrosList();
@@ -177,7 +177,7 @@ private:
 
 private slots:
   void showHelpForProxy( const QString&, const QString& );
-
+  
   void onPreAccept();    // not used inside PARAVIS
   void onPostAccept();   // not used inside PARAVIS
   void endWaitCursor();  // not used inside PARAVIS
@@ -206,25 +206,22 @@ protected slots:
 private:
   int                    mySourcesMenuId;
   int                    myFiltersMenuId;
-#ifdef PVCATALYST_ENABLED
-  int                    myCatalystMenuId;
-#endif
   int                    myMacrosMenuId;
   int                    myRecentMenuId;
-
+  
   typedef QMap<QWidget*, bool> WgMap;
   WgMap                  myDockWidgets;
   WgMap                  myToolbars;
   WgMap                  myToolbarBreaks;
   QList<QMenu*>          myMenus;
 
-  typedef QMap<int, bool> DockWindowMap;
-  DockWindowMap           myCommonMap;
+  typedef QMap<int, bool> DockWindowMap;         
+  DockWindowMap           myCommonMap; 
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   QtMsgHandler            myOldMsgHandler;
-#else
+#else  
   QtMessageHandler        myOldMsgHandler;
-#endif
+#endif  
   vtkEventQtSlotConnect*  VTKConnect;
 
   pqPythonScriptEditor*   myTraceWindow;