Removed qt3 support and replaced qt macros

src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.h

@@ -55,7 +55,7 @@ private:
   DlgRef_3Radio*                     GroupPattern;
   GEOM::pattern                      myPattern;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();

src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.h

@@ -60,7 +60,7 @@ private:
   int                                myOrientation;
   GEOM::pattern                      myPattern;
   
-private slots:
+private Q_SLOTS:
   void                               ConstructorsClicked ( int );
   void                               ClickOnOk();
   bool                               ClickOnApply();

src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.h

@@ -115,7 +115,7 @@ private:
   bool myOkPoint1, myOkPoint2, myOkPoint3;
   ObjectList pipeTShapeGroupObjects;
 
-private slots:
+private Q_SLOTS:
   void ClickOnOk();
   bool ClickOnApply();
   void ActivateThisDialog();

src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.cxx

@@ -255,7 +255,7 @@ int AdvancedGUI_SmoothingSurfaceDlg::getNbPoints() const
 {
   TopTools_IndexedMapOfShape aMap;
 
-  foreach (GEOM::GeomObjPtr anObj, myPoints) {
+  Q_FOREACH (GEOM::GeomObjPtr anObj, myPoints) {
     TopoDS_Shape aShape;
 
     if(anObj && GEOMBase::GetShape(anObj.get(), aShape) && !aShape.IsNull()) {
@@ -286,7 +286,7 @@ void AdvancedGUI_SmoothingSurfaceDlg::SelectionIntoArgument()
   QList<GEOM::GeomObjPtr> points = getSelected( aTypes, -1 );
 
   // Check the selected compounds if they consist of points only.
-  foreach (GEOM::GeomObjPtr anObj, points) {
+  Q_FOREACH (GEOM::GeomObjPtr anObj, points) {
     TopoDS_Shape aShape;
 
     if(anObj && GEOMBase::GetShape(anObj.get(), aShape) && !aShape.IsNull()) {

src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.h

@@ -58,7 +58,7 @@ private:
   SalomeApp_IntSpinBox              *myDegMaxSpin;
   SalomeApp_DoubleSpinBox           *myDMaxSpin;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   

src/BasicGUI/BasicGUI_ArcDlg.h

@@ -63,7 +63,7 @@ private:
   DlgRef_3Sel1Check*                 Group3Pnts2;
   DlgRef_3Sel*                       Group3Pnts3;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   

src/BasicGUI/BasicGUI_CircleDlg.h

@@ -65,7 +65,7 @@ private:
   DlgRef_3Sel*                       Group3Pnts;
   DlgRef_3Sel*                       GroupCenter2Pnts;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 

src/BasicGUI/BasicGUI_CurveDlg.h

@@ -77,7 +77,7 @@ private:
   QList<GEOM::GeomObjPtr>            myPoints;
   GEOM::GeomObjPtr                   myVec1, myVec2;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 

src/BasicGUI/BasicGUI_EllipseDlg.h

@@ -60,7 +60,7 @@ private:
   
   DlgRef_3Sel2Spin*                  GroupPoints;
   
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   

src/BasicGUI/BasicGUI_LineDlg.h

@@ -64,7 +64,7 @@ private:
   DlgRef_2Sel*                       GroupPoints;
   DlgRef_2Sel*                       GroupFaces;
     
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 

src/BasicGUI/BasicGUI_MarkerDlg.h

@@ -69,7 +69,7 @@ private:
   GEOM::GeomObjPtr              myVectorX;
   GEOM::GeomObjPtr              myVectorY;
 
-private slots:
+private Q_SLOTS:
   void                          onOk();
   bool                          onApply();
   void                          onActivate();

src/BasicGUI/BasicGUI_PlaneDlg.h

@@ -70,7 +70,7 @@ private:
   DlgRef_2Sel1Spin*                  Group2Vec;
   DlgRef_3Radio1Sel1Spin*            GroupLCS;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   

src/BasicGUI/BasicGUI_PointDlg.h

@@ -104,7 +104,7 @@ private:
 
   TopAbs_ShapeEnum                   myNeedType;
   
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();

src/BasicGUI/BasicGUI_VectorDlg.h

@@ -62,7 +62,7 @@ private:
   DlgRef_2Sel*                       GroupPoints;
   DlgRef_3Spin1Check*                GroupDimensions;
     
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 

src/BasicGUI/BasicGUI_WorkingPlaneDlg.h

@@ -68,7 +68,7 @@ private:
   
   gp_Ax3                myWPlane;
   
-private slots:
+private Q_SLOTS:
   void                  ClickOnOk();
   bool                  ClickOnApply();
   

src/BlocksGUI/BlocksGUI_BlockDlg.h

@@ -68,7 +68,7 @@ private:
   DlgRef_2Sel*                       Group2F;
   DlgRef_6Sel*                       Group6F;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();

src/BlocksGUI/BlocksGUI_ExplodeDlg.h

@@ -74,7 +74,7 @@ private:
 
   DlgRef_1Sel2Spin1View1Check*       myGrp1;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();

src/BlocksGUI/BlocksGUI_PropagateDlg.h

@@ -50,7 +50,7 @@ protected:
   virtual bool                       execute( ObjectList& );
   virtual GEOM::GEOM_Object_ptr      getFather( GEOM::GEOM_Object_ptr );
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 

src/BlocksGUI/BlocksGUI_QuadFaceDlg.h

@@ -85,7 +85,7 @@ private:
   QMap<int, QPushButton*>            mySelBtn;
   QMap<int, QLineEdit*>              mySelName;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();

src/BlocksGUI/BlocksGUI_TrsfDlg.h

@@ -82,7 +82,7 @@ private:
   QMap<int, QLineEdit*>              mySelName;
   QMap<int, SalomeApp_IntSpinBox*>   mySpinBox;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();

src/BooleanGUI/BooleanGUI_Dialog.h

@@ -67,7 +67,7 @@ private:
   
   DlgRef_2Sel2Spin3Check*            myGroup;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               SetEditCurrentArgument();

src/BuildGUI/BuildGUI_CompoundDlg.h

@@ -60,7 +60,7 @@ private:
   
   DlgRef_1Sel*                       GroupShapes;
     
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();

src/BuildGUI/BuildGUI_EdgeDlg.h

@@ -67,7 +67,7 @@ private:
   DlgRef_1Sel2Spin*                  GroupWire;
   DlgRef_2Sel1Spin*                  GroupOnCurve;
 
-private slots:
+private Q_SLOTS:
   void                               ConstructorsClicked (int);
   void                               ClickOnOk();
   bool                               ClickOnApply();

src/BuildGUI/BuildGUI_FaceDlg.h

@@ -59,7 +59,7 @@ private:
   
   DlgRef_1Sel1Check*                 GroupWire;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();

src/BuildGUI/BuildGUI_ShellDlg.h

@@ -59,7 +59,7 @@ private:
   
   DlgRef_1Sel*                       GroupShell;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               SetEditCurrentArgument();

src/BuildGUI/BuildGUI_SolidDlg.h

@@ -60,7 +60,7 @@ private:
 
   DlgRef_1Sel1Check*                 GroupSolid;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               SetEditCurrentArgument();

src/BuildGUI/BuildGUI_WireDlg.h

@@ -62,7 +62,7 @@ private:
   DlgRef_1Sel1Spin*                  GroupArgs;
   DlgRef_3Radio*                     GroupType;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();

src/CurveCreator/CurveCreator_NewPointDlg.cxx

@@ -165,7 +165,7 @@ void CurveCreator_NewPointDlg::setCoordinates( const CurveCreator::Coordinates&
     myZ->setValue(aZ);
   }
   if( isInstantSketchingEnabled() )
-    emit addPoint();
+    Q_EMIT addPoint();
 }
 
 bool CurveCreator_NewPointDlg::isInstantSketchingEnabled() const

src/CurveCreator/CurveCreator_NewPointDlg.h

@@ -44,12 +44,12 @@ public:
   void setDimension(CurveCreator::Dimension theDim);
   bool isInstantSketchingEnabled() const;
   void setInstantSketchingEnabled( const bool theState );
-signals:
+Q_SIGNALS:
   void addPoint();
   void modifyPoint();
   void cancelPoint();
-public slots:
-protected slots:
+public Q_SLOTS:
+protected Q_SLOTS:
 protected:
   void updateTitle();
   void initSpinBox(QDoubleSpinBox *theSpinBox);

src/CurveCreator/CurveCreator_NewSectionDlg.h

@@ -49,12 +49,12 @@ public:
   void    clear();
   void    setEditMode( bool isEdit );
 
-signals:
+Q_SIGNALS:
   void    addSection();
   void    modifySection();
   void    cancelSection();
-public slots:
-protected slots:
+public Q_SLOTS:
+protected Q_SLOTS:
 protected:
   void    updateTitle();
 private:

src/CurveCreator/CurveCreator_TreeView.cxx

@@ -469,11 +469,11 @@ void CurveCreator_TreeView::onActivated( QModelIndex theIndx )
     return;
   int aSect = aModel->getSection(theIndx);
   if( aModel->isSection(theIndx) ){
-    emit sectionEntered( aSect );
+    Q_EMIT sectionEntered( aSect );
     return;
   }
   int aPointNum = aModel->getPoint( theIndx );
-  emit pointEntered( aSect, aPointNum );
+  Q_EMIT pointEntered( aSect, aPointNum );
 }
 
 void CurveCreator_TreeView::setCurve( CurveCreator_Curve* theCurve )

src/CurveCreator/CurveCreator_TreeView.h

@@ -79,12 +79,12 @@ public:
 
   void    setCurve( CurveCreator_Curve* theCurve );
 
-signals:
+Q_SIGNALS:
   void    selectionChanged();
   void    sectionEntered(int);
   void    pointEntered(int,int);
-public slots:
-protected slots:
+public Q_SLOTS:
+protected Q_SLOTS:
   void onActivated( QModelIndex theIndx );
 protected:
   void setIndexState( const QModelIndex& theIndx, bool& isExpanded, bool& isSelected, bool& isCurrent );

src/CurveCreator/CurveCreator_UndoOptsDlg.h

@@ -54,7 +54,7 @@ private:
 
   void setTabOrder();
 
-private slots:
+private Q_SLOTS:
 
   void optionChanged(int theId);
 

src/CurveCreator/CurveCreator_Widget.cxx

@@ -326,7 +326,7 @@ void CurveCreator_Widget::onSelectionChanged()
       }
     }
   }
-  emit selectionChanged();
+  Q_EMIT selectionChanged();
 }
 
 void CurveCreator_Widget::onAdditionMode(bool checked)
@@ -380,7 +380,7 @@ void CurveCreator_Widget::onAdditionMode(bool checked)
   myNewPointEditor->setSectionName(aSectName);
   myNewPointEditor->setDimension(myCurve->getDimension());
 */
-//  emit subOperationStarted( myNewPointEditor );
+//  Q_EMIT subOperationStarted( myNewPointEditor );
 }
 
 void CurveCreator_Widget::onModificationMode(bool checked)
@@ -462,7 +462,7 @@ void CurveCreator_Widget::onNewSection()
   myNewSectionEditor->setEditMode(false);
   QString aSectName = QString( myCurve->getUnicSectionName().c_str() );
   myNewSectionEditor->setSectionParameters(aSectName, true, CurveCreator::Polyline );
-  emit subOperationStarted( myNewSectionEditor );
+  Q_EMIT subOperationStarted( myNewSectionEditor );
 }
 
 void CurveCreator_Widget::onAddNewSection()
@@ -483,12 +483,12 @@ void CurveCreator_Widget::onAddNewSection()
 
 void CurveCreator_Widget::onCancelPoint()
 {
-  emit subOperationFinished( myNewPointEditor );
+  Q_EMIT subOperationFinished( myNewPointEditor );
 }
 
 void CurveCreator_Widget::onCancelSection()
 {
-  emit subOperationFinished( myNewSectionEditor );
+  Q_EMIT subOperationFinished( myNewSectionEditor );
 }
 
 QAction* CurveCreator_Widget::createAction( ActionId theId, const QString& theName, const QPixmap& theImage,
@@ -522,7 +522,7 @@ void CurveCreator_Widget::onEditSection( int theSection )
   myNewSectionEditor->setEditMode(true);
   myNewSectionEditor->setSectionParameters( aSectName, isClosed, aType );
 
-  emit subOperationStarted( myNewSectionEditor );
+  Q_EMIT subOperationStarted( myNewSectionEditor );
 }
 
 void CurveCreator_Widget::onModifySection()
@@ -554,7 +554,7 @@ void CurveCreator_Widget::onEditPoint( int theSection, int thePoint )
   myNewPointEditor->setDimension( myCurve->getDimension() );
   CurveCreator::Coordinates aCoords = myCurve->getCoordinates(theSection,thePoint);
   myNewPointEditor->setCoordinates(aCoords);
-  emit subOperationStarted( myNewPointEditor );
+  Q_EMIT subOperationStarted( myNewPointEditor );
 }
 
 void CurveCreator_Widget::onModifyPoint()

src/CurveCreator/CurveCreator_Widget.h

@@ -51,14 +51,14 @@ public:
     bool isInstantSketchingEnabled() const;
     void setInstantSketchingEnabled( const bool theState );
 
-signals:
+Q_SIGNALS:
     void selectionChanged();
     void subOperationStarted( QWidget* );
     void subOperationFinished( QWidget* );
 
-public slots:
+public Q_SLOTS:
 
-protected slots:
+protected Q_SLOTS:
     void     onAdditionMode(bool checked);
     void     onModificationMode(bool checked);
     void     onDetectPoints(bool checked);

src/DependencyTree/DependencyTree_View.h

@@ -64,11 +64,11 @@ public:
 
   DependencyTree_Object*  getObjectByEntry( const std::string& );
 
-public slots:
+public Q_SLOTS:
 
   void                    onRebuildModel();
 
-private slots:
+private Q_SLOTS:
 
   void                    onUpdateModel();
   void                    onMoveNodes( bool );

src/DependencyTree/DependencyTree_ViewModel.h

@@ -37,7 +37,7 @@ public:
 
   virtual void  contextMenuPopup( QMenu* );
 
-private slots:
+private Q_SLOTS:
 
   void          onShowSelected();
   void          onShowOnlySelected();

src/EntityGUI/EntityGUI_3DSketcherDlg.cxx

@@ -1742,7 +1742,7 @@ bool EntityGUI_3DSketcherDlg::createShapes (GEOM::GEOM_Object_ptr /*theObject*/,
                                             TopoDS_Shape&         theLastSegment)
 {
   QList<gp_Pnt> points;
-  foreach (XYZ xyz, myPointsList) {
+  Q_FOREACH (XYZ xyz, myPointsList) {
     gp_Pnt p(xyz.x, xyz.y, xyz.z);
     if (points.isEmpty() || points.last().Distance(p) > gp::Resolution())
       points << p;
@@ -1756,7 +1756,7 @@ bool EntityGUI_3DSketcherDlg::createShapes (GEOM::GEOM_Object_ptr /*theObject*/,
   else if (points.count() > 1) {
     // wire is created
     BRepBuilderAPI_MakePolygon mkWire;
-    foreach(gp_Pnt p, points)
+    Q_FOREACH(gp_Pnt p, points)
       mkWire.Add(p);
     theApplyedWire = mkWire.Shape();
   }

src/EntityGUI/EntityGUI_3DSketcherDlg.h

@@ -181,7 +181,7 @@ private:
   bool                               myIsUndoRedo;
   XYZ                                myWorkPoint;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   void                               ClickOnAddPoint();
   bool                               ClickOnApply();

src/EntityGUI/EntityGUI_FeatureDetectorDlg.h

@@ -73,7 +73,7 @@ private:
   ShapeRec_Parameters*               parametersChanged();
 
   
-private slots:
+private Q_SLOTS:
   void                               SelectionIntoArgument();
   void                               ConstructorsClicked( int );
 //   void                               onViewClicked( int );

src/EntityGUI/EntityGUI_FieldDlg.cxx

@@ -531,7 +531,7 @@ QList<int> EntityGUI_FieldDlg::StepTable::selectedRows()
   QTableWidgetItem* anItem;
   QList<int> rows;
 
-  foreach( anItem, selItems ) {
+  Q_FOREACH( anItem, selItems ) {
     int r = row( anItem );
     if ( !rows.contains( r ) ) rows.append( r );
   }

src/EntityGUI/EntityGUI_FieldDlg.h

@@ -71,7 +71,7 @@ protected:
   virtual bool                        isValid (QString&);
   virtual bool                        execute ();
 
-private slots:
+private Q_SLOTS:
   void                                ClickOnOk();
   bool                                ClickOnApply();
   void                                ActivateThisDialog();
@@ -184,7 +184,7 @@ public:
   GEOM::GEOM_FieldStep_var getStep() { return myStep; }
   void                     setValues(GEOM::GEOM_FieldStep_var& step);
 
-public slots:
+public Q_SLOTS:
   void                     setIsChanged() { myIsChanged = true; }
   void                     headerDblClicked( int );
 };

src/EntityGUI/EntityGUI_IsolineDlg.h

@@ -68,7 +68,7 @@ private:
   GEOM::GeomObjPtr                   myFace;
 
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 

src/EntityGUI/EntityGUI_PictureImportDlg.h

@@ -59,7 +59,7 @@ private:
   QPushButton*                       myPushButton;
   QLineEdit*                         myLineEdit;
   
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 // 

src/EntityGUI/EntityGUI_SketcherDlg.h

@@ -207,7 +207,7 @@ private:
                     DIR_TAN_LENGTH, DIR_TAN_X, DIR_TAN_Y,
                     DIR_DXDY_LENGTH, DIR_DXDY_X, DIR_DXDY_Y };
   
-private slots:
+private Q_SLOTS:
   void                               ClickOnEnd();
   void                               ClickOnCancel();
   bool                               ClickOnApply();

src/EntityGUI/EntityGUI_SubShapeDlg.h

@@ -55,7 +55,7 @@ protected:
 
   void                                closeEvent (QCloseEvent*);
 
-private slots:
+private Q_SLOTS:
   void                                ClickOnOk();
   bool                                ClickOnApply();
   void                                ActivateThisDialog();

src/GEOMBase/GEOMBase.cxx

@@ -297,7 +297,7 @@ Handle(GEOM_AISShape) GEOMBase::ConvertIORinGEOMAISShape(const QString& IOR, boo
         views.append( SUIT_Session::session()->activeApplication()->desktop()->activeWindow() );
       else 
         views = SUIT_Session::session()->activeApplication()->desktop()->windows();
-      foreach ( SUIT_ViewWindow* view, views ) {
+      Q_FOREACH ( SUIT_ViewWindow* view, views ) {
         if ( view && view->getViewManager()->getType() == OCCViewer_Viewer::Type() ) {
           Handle(AIS_InteractiveContext) ic = ((OCCViewer_Viewer*)view->getViewManager()->getViewModel())->getAISContext();
 
@@ -345,7 +345,7 @@ GEOM_Actor* GEOMBase::ConvertIORinGEOMActor(const QString& IOR, bool onlyInActiv
         views.append( SUIT_Session::session()->activeApplication()->desktop()->activeWindow() );
       else 
         views = SUIT_Session::session()->activeApplication()->desktop()->windows();
-      foreach ( SUIT_ViewWindow* view, views ) {
+      Q_FOREACH ( SUIT_ViewWindow* view, views ) {
         if ( view && view->getViewManager()->getType() == SVTK_Viewer::Type() ) {
           SVTK_ViewWindow* aVTKViewWindow = dynamic_cast<SVTK_ViewWindow*>( view );
           if( !aVTKViewWindow )
@@ -389,7 +389,7 @@ Handle(AIS_InteractiveObject) GEOMBase::GetAIS( const Handle(SALOME_InteractiveO
     else 
       views = SUIT_Session::session()->activeApplication()->desktop()->windows();
     
-    foreach ( SUIT_ViewWindow* view, views ) {
+    Q_FOREACH ( SUIT_ViewWindow* view, views ) {
       if ( view && view->getViewManager()->getType() == OCCViewer_Viewer::Type() ) {
         OCCViewer_Viewer* occViewer=(OCCViewer_Viewer*)view->getViewManager()->getViewModel();
         SOCC_Viewer* soccViewer = dynamic_cast<SOCC_Viewer*>(occViewer);

src/GEOMBase/GEOMBase_Skeleton.h

@@ -105,7 +105,7 @@ protected:
     QButtonGroup*       myRBGroup;             //!< radio button group
     DlgRef_Skeleton*    myMainFrame;           //!< dialog box's mainframe widgetx
 
-protected slots:
+protected Q_SLOTS:
     virtual void        ClickOnCancel();
     virtual void        processPreview();
     void                LineEditReturnPressed();
@@ -113,7 +113,7 @@ protected slots:
     void                ActivateThisDialog();
     void                ClickOnHelp();
 
-signals:
+Q_SIGNALS:
     void                constructorsClicked( int );
 };
 

src/GEOMGUI/GEOM_Displayer.cxx

@@ -2641,7 +2641,7 @@ void GEOM_Displayer::EraseWithChildren(const Handle(SALOME_InteractiveObject)& t
   SALOME_View* view;
   ViewManagerList vmans = app->viewManagers();
   SUIT_ViewManager* vman;
-  foreach ( vman, vmans ) {
+  Q_FOREACH ( vman, vmans ) {
     SUIT_ViewModel* vmod = vman->getViewModel();
     view = dynamic_cast<SALOME_View*> ( vmod );
     if ( view )
@@ -2654,10 +2654,10 @@ void GEOM_Displayer::EraseWithChildren(const Handle(SALOME_InteractiveObject)& t
   //Erase childrens w/o update views
   DataObjectList listObj = parent->children( true );
   SUIT_DataObject* obj;
-  foreach( obj, listObj ) {
+  Q_FOREACH( obj, listObj ) {
     LightApp_DataObject* l_obj = dynamic_cast<LightApp_DataObject*>(obj);
     if(l_obj)
-      foreach ( view, views ) {
+      Q_FOREACH ( view, views ) {
       Handle(SALOME_InteractiveObject) anIO =
         new SALOME_InteractiveObject(qPrintable(l_obj->entry()), "GEOM", "");
       Erase(anIO, false, false, view);
@@ -2665,7 +2665,7 @@ void GEOM_Displayer::EraseWithChildren(const Handle(SALOME_InteractiveObject)& t
   }
 
   //Erase parent with view update or repaint views
-  foreach ( view, views ) {
+  Q_FOREACH ( view, views ) {
     if(!eraseOnlyChildren)
       Erase(theIO, false, true, view);
     else

src/GEOMGUI/GeometryGUI.cxx

@@ -385,7 +385,7 @@ void GeometryGUI::SetActiveDialogBox( QDialog* aDlg )
 //=======================================================================
 void GeometryGUI::EmitSignalDeactivateDialog()
 {
-  emit SignalDeactivateActiveDialog();
+  Q_EMIT SignalDeactivateActiveDialog();
 }
 
 //=======================================================================
@@ -394,7 +394,7 @@ void GeometryGUI::EmitSignalDeactivateDialog()
 //=======================================================================
 void GeometryGUI::EmitSignalCloseAllDialogs()
 {
-  emit SignalCloseAllDialogs();
+  Q_EMIT SignalCloseAllDialogs();
 }
 
 //=======================================================================
@@ -404,7 +404,7 @@ void GeometryGUI::EmitSignalCloseAllDialogs()
 //=======================================================================
 void GeometryGUI::EmitSignalDefaultStepValueChanged(double newVal)
 {
-  emit SignalDefaultStepValueChanged(newVal);
+  Q_EMIT SignalDefaultStepValueChanged(newVal);
 }
 
 //=======================================================================
@@ -793,7 +793,7 @@ void GeometryGUI::OnKeyPress( SUIT_ViewWindow* w, QKeyEvent* e )
 {
   if ( !application() )
     return;
-  foreach ( GEOMGUI* lib, myGUIMap )
+  Q_FOREACH ( GEOMGUI* lib, myGUIMap )
     lib->OnKeyPress( e, application()->desktop(), w );
 }
 
@@ -805,7 +805,7 @@ void GeometryGUI::OnMouseMove( SUIT_ViewWindow* w, QMouseEvent* e )
 {
   if ( !application() )
     return;
-  foreach ( GEOMGUI* lib, myGUIMap )
+  Q_FOREACH ( GEOMGUI* lib, myGUIMap )
     lib->OnMouseMove( e, application()->desktop(), w );
 }
 
@@ -817,7 +817,7 @@ void GeometryGUI::OnMouseRelease( SUIT_ViewWindow* w, QMouseEvent* e )
 {
   if ( !application() )
     return;
-  foreach ( GEOMGUI* lib, myGUIMap )
+  Q_FOREACH ( GEOMGUI* lib, myGUIMap )
     lib->OnMouseRelease( e, application()->desktop(), w );
 }
 
@@ -829,7 +829,7 @@ void GeometryGUI::OnMousePress( SUIT_ViewWindow* w, QMouseEvent* e )
 {
   if ( !application() )
     return;
-  foreach ( GEOMGUI* lib, myGUIMap )
+  Q_FOREACH ( GEOMGUI* lib, myGUIMap )
     lib->OnMousePress( e, application()->desktop(), w );
 }
 
@@ -1754,7 +1754,7 @@ void GeometryGUI::addPluginActions()
                        QString() /*shortcutAction*/);
 
           int menuId = -1;
-          foreach (QString subMenu, smenus) {
+          Q_FOREACH (QString subMenu, smenus) {
             subMenu = subMenu.toUpper().prepend("MEN_");
             menuId = createMenu(tr(subMenu.toLatin1().constData()), menuId, -1);
           }
@@ -2270,7 +2270,7 @@ void GeometryGUI::contextMenuPopup( const QString& client, QMenu* menu, QString&
       // get list of all predefined materials
       QStringList materials = Material_ResourceMgr::resourceMgr()->materials();
       bool found = false;
-      foreach ( QString material, materials )
+      Q_FOREACH ( QString material, materials )
       {
         QAction* menAct = matMenu->addAction( material );
         connect(menAct, SIGNAL( toggled( bool ) ), signalMapper, SLOT( map() ) );
@@ -2752,7 +2752,7 @@ void GeometryGUI::preferencesChanged( const QString& section, const QString& par
       aDisplayer.UpdateViewer();
     }
     else if ( param.startsWith( "dependency_tree") )
-      emit SignalDependencyTreeParamChanged( section, param );
+      Q_EMIT SignalDependencyTreeParamChanged( section, param );
   }
 }
 
@@ -3319,7 +3319,7 @@ bool GeometryGUI::renameObject( const QString& entry, const QString& name)
       GEOM::GEOM_Object_var anObj = GEOM::GEOM_Object::_narrow(GeometryGUI::ClientSObjectToObject(obj));
       if (!CORBA::is_nil(anObj)) {
         anObj->SetName( name.toLatin1().data() );  // Rename the corresponding GEOM_Object
-        emit SignalDependencyTreeRenameObject( anObj->GetEntry() );
+        Q_EMIT SignalDependencyTreeRenameObject( anObj->GetEntry() );
       }
       result = true;
     }

src/GEOMGUI/GeometryGUI.h

@@ -156,7 +156,7 @@ public:
 					   SUIT_DataObject* where,
 					   const int row, Qt::DropAction action );
 
-public slots:
+public Q_SLOTS:
   virtual bool                deactivateModule( SUIT_Study* );
   virtual bool                activateModule( SUIT_Study* );
   virtual void                OnKeyPress  ( SUIT_ViewWindow*, QKeyEvent*   );
@@ -164,11 +164,11 @@ public slots:
   virtual void                OnMouseMove ( SUIT_ViewWindow*, QMouseEvent* );
   virtual void                OnMouseRelease ( SUIT_ViewWindow*, QMouseEvent* );
 
-protected slots:
+protected Q_SLOTS:
   virtual void                onViewManagerAdded( SUIT_ViewManager* );
   virtual void                onViewManagerRemoved( SUIT_ViewManager* );
 
-private slots:
+private Q_SLOTS:
   void                        OnGUIEvent();
   void                        onWindowActivated( SUIT_ViewWindow* );
   void                        onViewAboutToShow();
@@ -178,7 +178,7 @@ private slots:
   void                        onAutoBringToFront();
   void                        updateFieldColorScale();
 
-signals :
+Q_SIGNALS:
   void                        SignalDeactivateActiveDialog();
   void                        SignalCloseAllDialogs();
   void                        SignalDefaultStepValueChanged( double newVal );

src/GEOMToolsGUI/GEOMToolsGUI.cxx

@@ -562,7 +562,7 @@ void GEOMToolsGUI::OnEditDelete()
   SALOME_View* view;
   ViewManagerList vmans = app->viewManagers();
   SUIT_ViewManager* vman;
-  foreach ( vman, vmans ) {
+  Q_FOREACH ( vman, vmans ) {
     SUIT_ViewModel* vmod = vman->getViewModel();
     view = dynamic_cast<SALOME_View*> ( vmod ); // must work for OCC and VTK views
     if ( view )

src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h

@@ -45,7 +45,7 @@ public:
   double    getTheDC() const;
   void      setTheDC( const double );
 
-private slots:
+private Q_SLOTS:
   void      ClickOnHelp();
 
 private:

src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.h

@@ -45,7 +45,7 @@ public:
   int       getTheLW() const;
   void      setTheLW( const int );
 
-private slots:
+private Q_SLOTS:
   void      ClickOnHelp();
 
 private:

src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.h

@@ -59,7 +59,7 @@ private:
   void                             addTexture( int, bool = false ) const;
   SalomeApp_Study*                 getStudy() const;
 
-private slots:
+private Q_SLOTS:
   void                             browse();
   void                             help();
 

src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx

@@ -78,7 +78,7 @@ GEOMToolsGUI_MaterialList::GEOMToolsGUI_MaterialList( QWidget* parent )
 */
 void GEOMToolsGUI_MaterialList::contextMenuEvent( QContextMenuEvent* e )
 {
-  emit contextMenu( e );
+  Q_EMIT contextMenu( e );
 }
 
 /*!
@@ -264,7 +264,7 @@ GEOMToolsGUI_MaterialPropertiesDlg::GEOMToolsGUI_MaterialPropertiesDlg( QWidget*
   item->setData( TypeRole, QVariant( Current ) );
   myMaterials->addItem( item );
   // - global materials
-  foreach( QString material, globalMaterials ) {
+  Q_FOREACH( QString material, globalMaterials ) {
     item = new QListWidgetItem( material );
     item->setForeground( QColor( Qt::blue ) );
     item->setData( TypeRole, QVariant( Global ) );
@@ -272,7 +272,7 @@ GEOMToolsGUI_MaterialPropertiesDlg::GEOMToolsGUI_MaterialPropertiesDlg( QWidget*
     myMaterials->addItem( item );
   }
   // - user materials
-  foreach ( QString material, userMaterials ) {
+  Q_FOREACH ( QString material, userMaterials ) {
     item = new QListWidgetItem( material );
     item->setData( TypeRole, QVariant( User ) );
     item->setData( NameRole, QVariant( material ) );

src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.h

@@ -60,10 +60,10 @@ private:
                                         QListWidgetItem* = 0,
                                         bool = false );
 
-signals:
+Q_SIGNALS:
   void                  changed();
 
-private slots:
+private Q_SLOTS:
   void                  onChanged();
   void                  onMaterialChanged();
   void                  onItemChanged( QListWidgetItem* );
@@ -108,7 +108,7 @@ public:
   GEOMToolsGUI_MaterialList( QWidget* parent );
 protected:
   void contextMenuEvent( QContextMenuEvent* e );
-signals:
+Q_SIGNALS:
   void contextMenu( QContextMenuEvent* );
 };
 

src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h

@@ -51,7 +51,7 @@ public:
   void      setU( const int );
   void      setV( const int );
   
-private slots:
+private Q_SLOTS:
   void      ClickOnHelp();
 
 private:

src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.h

@@ -65,7 +65,7 @@ protected:
   void               getDrawableList(QTreeWidgetItem* theItem, QList<QTreeWidgetItem*>& theList);
   void               getTails(QTreeWidgetItem* theItem, QList<QTreeWidgetItem*>& theList);
   
-protected slots:
+protected Q_SLOTS:
   void clickOnOk();
   void clickOnApply();
   void clickOnSelectAll();

src/GEOMToolsGUI/GEOMToolsGUI_ReduceStudyDlg.h

@@ -65,7 +65,7 @@ public:
   GEOMToolsGUI_ReduceStudyDlg( QWidget* );
   ~GEOMToolsGUI_ReduceStudyDlg();
 
-private slots:
+private Q_SLOTS:
   void                          onItemClicked(QTreeWidgetItem*, int );
   void                          onHeaderClicked( int );
 

src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h

@@ -56,7 +56,7 @@ private:
   QLabel*   myValueLab;
   QString   myHelpFileName;
 
-private slots: 
+private Q_SLOTS:
   void      ClickOnOk();
   void      ClickOnClose();
   void      ClickOnHelp();

src/GenerationGUI/GenerationGUI_FillingDlg.h

@@ -58,7 +58,7 @@ private:
   GEOM::GeomObjPtr                   myCompound; /* compound of curves */
   DlgRef_1Sel5Spin1Check*            GroupPoints;
     
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();

src/GenerationGUI/GenerationGUI_PipeDlg.h

@@ -66,7 +66,7 @@ private:
   DlgRef_3Sel1Check*                 GroupPoints;
   DlgRef_3Sel2Check3Spin*            GroupMakePoints;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();

src/GenerationGUI/GenerationGUI_PipePathDlg.h

@@ -61,7 +61,7 @@ private:
 
   DlgRef_3Sel1Check*                 GroupPoints;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();

src/GenerationGUI/GenerationGUI_PrismDlg.h

@@ -69,7 +69,7 @@ private:
   DlgRef_1Sel3Spin2Check1Spin*       GroupDXDYDZ;
   DlgRef_1Check1Spin1Check*          GroupThickening;
   
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();

src/GenerationGUI/GenerationGUI_RevolDlg.h

@@ -63,7 +63,7 @@ private:
   
   DlgRef_2Sel1Spin2Check*            GroupPoints;
     
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();

src/GroupGUI/GroupGUI_BooleanDlg.h

@@ -58,7 +58,7 @@ private:
   void                               Init();
   void                               enterEvent (QEvent*);
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               SetEditCurrentArgument();

src/GroupGUI/GroupGUI_GroupDlg.h

@@ -64,7 +64,7 @@ protected:
 
   void                                closeEvent (QCloseEvent*);
 
-private slots:
+private Q_SLOTS:
   void                                ClickOnOk();
   bool                                ClickOnApply();
   void                                ActivateThisDialog();

src/ImportExportGUI/ImportExportGUI_ExportXAODlg.h

@@ -64,7 +64,7 @@ private:
     QPushButton* btnShapeSelect;
     QPushButton* btnFileSelect;
 
-private slots:
+private Q_SLOTS:
     void ClickOnOk();
     bool ClickOnApply();
     void ActivateThisDialog();

src/ImportExportGUI/ImportExportGUI_ImportXAODlg.h

@@ -57,7 +57,7 @@ private:
     QPushButton* btnFileSelect;
     GEOM::GEOM_Object_var m_mainShape;
 
-private slots:
+private Q_SLOTS:
     void ClickOnOk();
     bool ClickOnApply();
     void ActivateThisDialog();

src/Material/Material_Model.cxx

@@ -57,7 +57,7 @@ void Material_Model::fromProperties( const QString& props )
 
   // parse material properties
   QStringList propList = props.split( ":", QString::SkipEmptyParts );
-  foreach ( QString prop, propList ) 
+  Q_FOREACH ( QString prop, propList )
   {
     QStringList pdata = prop.split( "=" );
     if ( pdata.count() < 2 ) continue;

src/Material/Material_ResourceMgr.cxx

@@ -217,5 +217,5 @@ void Material_ResourceMgr::saved()
 void Material_ResourceMgr::update()
 {
   Updater( this ).wait();
-  emit changed();
+  Q_EMIT changed();
 }

src/Material/Material_ResourceMgr.h

@@ -52,14 +52,14 @@ public:
 
   QStringList materials( MaterialType = All, bool = true );
 
-signals:
+Q_SIGNALS:
   void changed();
 
 private:
   void watchUserFile( bool );
   void saved();
 
-private slots:
+private Q_SLOTS:
   void update();
 
 private:

src/MeasureGUI/MeasureGUI.h

@@ -54,7 +54,7 @@ public:
   void ChangeDimensionsVisibility( const bool theIsVisible );
 private:
   QDialog* myManageDimensionDlg;
-private slots:
+private Q_SLOTS:
   void onFinished(int);
 };
 

src/MeasureGUI/MeasureGUI_BndBoxDlg.h

@@ -62,7 +62,7 @@ private:
   GEOM::GEOM_Object_var              myObj;
   MeasureGUI_1Sel6LineEdit*          myGrp;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               SelectionIntoArgument();

src/MeasureGUI/MeasureGUI_CenterMassDlg.h

@@ -49,7 +49,7 @@ protected:
   virtual bool                        isValid( QString& );
   virtual bool                        execute( ObjectList& );
 
-private slots:
+private Q_SLOTS:
   void                                ClickOnOk();
   bool                                ClickOnApply();
   void                                ActivateThisDialog();

src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h

@@ -51,7 +51,7 @@ protected:
   virtual bool                        execute( ObjectList& );
   virtual void                        processObject();
 
-private slots:
+private Q_SLOTS:
   void                                ClickOnOk();
   bool                                ClickOnApply();
   void                                ActivateThisDialog();

src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.h

@@ -47,7 +47,7 @@ protected:
   // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
   virtual void                        processObject();
 
-private slots:
+private Q_SLOTS:
   void                                onErrorsListSelectionChanged();
   void                                onSubShapesListSelectionChanged();
 

src/MeasureGUI/MeasureGUI_CheckShapeDlg.h

@@ -52,7 +52,7 @@ protected:
   virtual bool                        isValid( QString& );
   virtual bool extractPrefix() const;
 
-private slots:
+private Q_SLOTS:
   void                                SelectionIntoArgument();
   void                                ClickOnOk();
   bool                                ClickOnApply();

src/MeasureGUI/MeasureGUI_CreateDimensionDlg.cxx

@@ -390,7 +390,7 @@ bool MeasureGUI_CreateDimensionDlg::ClickOnApply()
 
   if ( !isApplyAndClose() )
   {
-    emit applyClicked();
+    Q_EMIT applyClicked();
     Init();
     ConstructTypeChanged( getConstructorId() );
   }
@@ -920,8 +920,8 @@ void MeasureGUI_CreateDimensionDlg::BaseSelectorPane::SelectionIntoArguments( co
   mySelectionButtons[myCurrentSelector]->setDown( false );
 
   // every selector is populated - construct presentation
-  emit StopSelection();
-  emit SelectionDone();
+  Q_EMIT StopSelection();
+  Q_EMIT SelectionDone();
 }
 
 //=================================================================================
@@ -968,7 +968,7 @@ void MeasureGUI_CreateDimensionDlg::BaseSelectorPane::OnSelectorClicked()
     aButton->setDown( isClickedOnes );
   }
 
-  emit StartSelection( mySelectionModes[myCurrentSelector] );
+  Q_EMIT StartSelection( mySelectionModes[myCurrentSelector] );
 }
 
 //=================================================================================
@@ -992,7 +992,7 @@ void MeasureGUI_CreateDimensionDlg::BaseSelectorPane::OnTabChanged()
 
   mySelectionButtons[aFirstSelector]->click();
 
-  emit TabChanged();
+  Q_EMIT TabChanged();
 }
 
 //=================================================================================

src/MeasureGUI/MeasureGUI_CreateDimensionDlg.h

@@ -84,11 +84,11 @@ public:
   void                                Init();
 
 
-signals:
+Q_SIGNALS:
   void                                applyClicked();
 
 /* User event logics */
-protected slots:
+protected Q_SLOTS:
   void                                ConstructTypeChanged( int theType );
   void                                OnArgumentTabChanged();
   void                                OnStartSelection( const QList<TopAbs_ShapeEnum>& theModes );
@@ -142,7 +142,7 @@ public:
 public:
   BaseSelectorPane( QWidget* theParent );
 
-signals:
+Q_SIGNALS:
   void               StartSelection( const QList<TopAbs_ShapeEnum>& theModes );
   void               StopSelection();
   void               SelectionDone();
@@ -154,7 +154,7 @@ public:
   void               SelectionIntoArguments( const GEOM::GeomObjPtr& theSelected );
   GEOM::GeomObjPtr   GetSelection( QLineEdit* theSelector ) const;
 
-public slots:
+public Q_SLOTS:
   void               OnSelectorClicked();
   void               OnTabChanged();
 

src/MeasureGUI/MeasureGUI_DimensionInteractor.cxx

@@ -732,7 +732,7 @@ bool MeasureGUI_DimensionInteractor::eventFilter( QObject* theObject, QEvent* th
       anAISContext->ClearSelected( Standard_False );
       anAISContext->AddOrRemoveSelected( aDetectedOwner );
 
-      emit InteractionStarted( myInteractedIO );
+      Q_EMIT InteractionStarted( myInteractedIO );
 
       return true;
     }
@@ -757,7 +757,7 @@ bool MeasureGUI_DimensionInteractor::eventFilter( QObject* theObject, QEvent* th
 
         myOperation = Operation_None;
 
-        emit InteractionFinished( myInteractedIO );
+        Q_EMIT InteractionFinished( myInteractedIO );
 
         return true;
       }

src/MeasureGUI/MeasureGUI_DimensionInteractor.h

@@ -125,7 +125,7 @@ protected:
    */
   void                   MoveText( const Handle(V3d_View)& theView, const int theX, const int theY );
 
-signals:
+Q_SIGNALS:
   void                   InteractionStarted( Handle_AIS_InteractiveObject theIO );
   void                   InteractionFinished( Handle_AIS_InteractiveObject theIO );
 
@@ -155,7 +155,7 @@ protected:
    */
   virtual bool           eventFilter( QObject*, QEvent* );
 
-protected slots:
+protected Q_SLOTS:
   void                   OnViewCreated( SUIT_ViewWindow* );
   void                   OnViewRemoved( SUIT_ViewWindow* );
 

src/MeasureGUI/MeasureGUI_DistanceDlg.h

@@ -116,7 +116,7 @@ private:
   MeasureGUI_DistanceGroup*           myGrp;
   GEOM::ListOfDouble_var              myDbls;
 
-private slots:
+private Q_SLOTS:
   void                                ClickOnOk();
   bool                                ClickOnApply();
   void                                ActivateThisDialog();

src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.h

@@ -49,7 +49,7 @@ protected:
   virtual bool                        execute (ObjectList&);
   virtual GEOM::GEOM_Object_ptr       getFather (GEOM::GEOM_Object_ptr);
 
-private slots:
+private Q_SLOTS:
   void                                ClickOnOk();
   bool                                ClickOnApply();
   void                                ActivateThisDialog();

src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.h

@@ -61,7 +61,7 @@ protected:
   };
 
 /* User event logics */
-protected slots:
+protected Q_SLOTS:
   void                            StartObjectSelection() { StartSelection( Selection_Object ); }
   void                            StartSelection( const Selection theSelection );
   void                            StopSelection();

src/MeasureGUI/MeasureGUI_NormaleDlg.h

@@ -56,7 +56,7 @@ private:
 
   DlgRef_2Sel*                       GroupArgs;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 

src/MeasureGUI/MeasureGUI_Skeleton.h

@@ -44,7 +44,7 @@ public:
   MeasureGUI_Skeleton( GeometryGUI*, QWidget* = 0, bool = false, Qt::WindowFlags = 0 );
   ~MeasureGUI_Skeleton();
   
-protected slots:
+protected Q_SLOTS:
   virtual void                       ClickOnCancel();
   virtual void                       ClickOnHelp(); 
   virtual void                       DeactivateActiveDialog();

src/MeasureGUI/MeasureGUI_WhatisDlg.h

@@ -49,7 +49,7 @@ protected:
   // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
   virtual void                        processObject();
   
-protected slots:
+protected Q_SLOTS:
   virtual void                        ClickOnProperties();
 
 private:

src/OperationGUI/OperationGUI_ArchimedeDlg.h

@@ -58,7 +58,7 @@ private:
   DlgRef_1Sel3Spin*                   GroupPoints;
   double                              myStep;
 
-private slots:
+private Q_SLOTS:
   void                                ClickOnOk();
   bool                                ClickOnApply();
   void                                ActivateThisDialog();

src/OperationGUI/OperationGUI_ChamferDlg.h

@@ -67,7 +67,7 @@ protected:
   virtual                             bool isValid( QString& );
   virtual                             bool execute( ObjectList& );    
 
-private slots:
+private Q_SLOTS:
   void                                ClickOnOk();
   bool                                ClickOnApply();
   void                                ActivateThisDialog();

src/OperationGUI/OperationGUI_ClippingDlg.h

@@ -65,7 +65,7 @@ private:
   QPushButton*      resetButton;
   QComboBox*        TypeCB;
 
-private slots:
+private Q_SLOTS:
   void              ClickOnOk();
   bool              ClickOnApply();
   void              onActivate();

src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.h

@@ -75,7 +75,7 @@ private:
   
   DlgRef_2Sel2Spin2Push*      myGroup;
   
-private slots:
+private Q_SLOTS:
   void                        ClickOnOk();
   bool                        ClickOnApply();
   void                        ActivateThisDialog();

src/OperationGUI/OperationGUI_Fillet1d2dDlg.h

@@ -48,7 +48,7 @@ protected:
   virtual                             bool isValid( QString& );
   virtual                             bool execute( ObjectList& );
 
-private slots:
+private Q_SLOTS:
   void                                ClickOnOk();
   bool                                ClickOnApply();
   void                                ActivateThisDialog();

src/OperationGUI/OperationGUI_FilletDlg.h

@@ -52,7 +52,7 @@ protected:
   virtual                             bool isValid( QString& );
   virtual                             bool execute( ObjectList& );
 
-private slots:
+private Q_SLOTS:
   void                                ClickOnOk();
   bool                                ClickOnApply();
   void                                ActivateThisDialog();

src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h

@@ -59,7 +59,7 @@ private:
   
   DlgRef_2Sel2List*                  GroupPoints;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               SetEditCurrentArgument();

src/OperationGUI/OperationGUI_GetSharedShapesDlg.h

@@ -59,7 +59,7 @@ private:
 
   DlgRef_2Sel1List1Check*            GroupPoints;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();

src/OperationGUI/OperationGUI_MaterialDlg.h

@@ -54,7 +54,7 @@ private:
   
   DlgRef_1List1Spin1Btn*     GroupPoints;
   
-private slots:
+private Q_SLOTS:
   void                       ClickOnOk();
   void                       ActivateThisDialog();
   void                       SelectionIntoArgument();

src/OperationGUI/OperationGUI_PartitionDlg.h

@@ -67,7 +67,7 @@ private:
   DlgRef_2Sel1List2Check*            GroupPoints;
   QCheckBox                         *mySelfInte;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();

src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h

@@ -62,7 +62,7 @@ private:
   DlgRef_2Sel*                       GroupPoints;
   DlgRef_3Spin*                      GroupDimensions;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();