]> SALOME platform Git repositories - modules/geom.git/commitdiff
Salome HOME
Removed qt3 support and replaced qt macros imn/removed_qt3_support
authorimn <imn@opencascade.com>
Wed, 17 Sep 2014 09:32:50 +0000 (13:32 +0400)
committerimn <imn@opencascade.com>
Wed, 17 Sep 2014 09:32:50 +0000 (13:32 +0400)
131 files changed:
src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.h
src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.h
src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.h
src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.cxx
src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.h
src/BasicGUI/BasicGUI_ArcDlg.h
src/BasicGUI/BasicGUI_CircleDlg.h
src/BasicGUI/BasicGUI_CurveDlg.h
src/BasicGUI/BasicGUI_EllipseDlg.h
src/BasicGUI/BasicGUI_LineDlg.h
src/BasicGUI/BasicGUI_MarkerDlg.h
src/BasicGUI/BasicGUI_PlaneDlg.h
src/BasicGUI/BasicGUI_PointDlg.h
src/BasicGUI/BasicGUI_VectorDlg.h
src/BasicGUI/BasicGUI_WorkingPlaneDlg.h
src/BlocksGUI/BlocksGUI_BlockDlg.h
src/BlocksGUI/BlocksGUI_ExplodeDlg.h
src/BlocksGUI/BlocksGUI_PropagateDlg.h
src/BlocksGUI/BlocksGUI_QuadFaceDlg.h
src/BlocksGUI/BlocksGUI_TrsfDlg.h
src/BooleanGUI/BooleanGUI_Dialog.h
src/BuildGUI/BuildGUI_CompoundDlg.h
src/BuildGUI/BuildGUI_EdgeDlg.h
src/BuildGUI/BuildGUI_FaceDlg.h
src/BuildGUI/BuildGUI_ShellDlg.h
src/BuildGUI/BuildGUI_SolidDlg.h
src/BuildGUI/BuildGUI_WireDlg.h
src/CurveCreator/CurveCreator_NewPointDlg.cxx
src/CurveCreator/CurveCreator_NewPointDlg.h
src/CurveCreator/CurveCreator_NewSectionDlg.h
src/CurveCreator/CurveCreator_TreeView.cxx
src/CurveCreator/CurveCreator_TreeView.h
src/CurveCreator/CurveCreator_UndoOptsDlg.h
src/CurveCreator/CurveCreator_Widget.cxx
src/CurveCreator/CurveCreator_Widget.h
src/DependencyTree/DependencyTree_View.h
src/DependencyTree/DependencyTree_ViewModel.h
src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
src/EntityGUI/EntityGUI_3DSketcherDlg.h
src/EntityGUI/EntityGUI_FeatureDetectorDlg.h
src/EntityGUI/EntityGUI_FieldDlg.cxx
src/EntityGUI/EntityGUI_FieldDlg.h
src/EntityGUI/EntityGUI_IsolineDlg.h
src/EntityGUI/EntityGUI_PictureImportDlg.h
src/EntityGUI/EntityGUI_SketcherDlg.h
src/EntityGUI/EntityGUI_SubShapeDlg.h
src/GEOMBase/GEOMBase.cxx
src/GEOMBase/GEOMBase_Skeleton.h
src/GEOMGUI/GEOM_Displayer.cxx
src/GEOMGUI/GeometryGUI.cxx
src/GEOMGUI/GeometryGUI.h
src/GEOMToolsGUI/GEOMToolsGUI.cxx
src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h
src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.h
src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.h
src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx
src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.h
src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h
src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.h
src/GEOMToolsGUI/GEOMToolsGUI_ReduceStudyDlg.h
src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h
src/GenerationGUI/GenerationGUI_FillingDlg.h
src/GenerationGUI/GenerationGUI_PipeDlg.h
src/GenerationGUI/GenerationGUI_PipePathDlg.h
src/GenerationGUI/GenerationGUI_PrismDlg.h
src/GenerationGUI/GenerationGUI_RevolDlg.h
src/GroupGUI/GroupGUI_BooleanDlg.h
src/GroupGUI/GroupGUI_GroupDlg.h
src/ImportExportGUI/ImportExportGUI_ExportXAODlg.h
src/ImportExportGUI/ImportExportGUI_ImportXAODlg.h
src/Material/Material_Model.cxx
src/Material/Material_ResourceMgr.cxx
src/Material/Material_ResourceMgr.h
src/MeasureGUI/MeasureGUI.h
src/MeasureGUI/MeasureGUI_BndBoxDlg.h
src/MeasureGUI/MeasureGUI_CenterMassDlg.h
src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h
src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.h
src/MeasureGUI/MeasureGUI_CheckShapeDlg.h
src/MeasureGUI/MeasureGUI_CreateDimensionDlg.cxx
src/MeasureGUI/MeasureGUI_CreateDimensionDlg.h
src/MeasureGUI/MeasureGUI_DimensionInteractor.cxx
src/MeasureGUI/MeasureGUI_DimensionInteractor.h
src/MeasureGUI/MeasureGUI_DistanceDlg.h
src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.h
src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.h
src/MeasureGUI/MeasureGUI_NormaleDlg.h
src/MeasureGUI/MeasureGUI_Skeleton.h
src/MeasureGUI/MeasureGUI_WhatisDlg.h
src/OperationGUI/OperationGUI_ArchimedeDlg.h
src/OperationGUI/OperationGUI_ChamferDlg.h
src/OperationGUI/OperationGUI_ClippingDlg.h
src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.h
src/OperationGUI/OperationGUI_Fillet1d2dDlg.h
src/OperationGUI/OperationGUI_FilletDlg.h
src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h
src/OperationGUI/OperationGUI_GetSharedShapesDlg.h
src/OperationGUI/OperationGUI_MaterialDlg.h
src/OperationGUI/OperationGUI_PartitionDlg.h
src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h
src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h
src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h
src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h
src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h
src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h
src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h
src/RepairGUI/RepairGUI_ChangeOrientationDlg.h
src/RepairGUI/RepairGUI_CloseContourDlg.h
src/RepairGUI/RepairGUI_DivideEdgeDlg.h
src/RepairGUI/RepairGUI_FreeBoundDlg.h
src/RepairGUI/RepairGUI_FreeFacesDlg.h
src/RepairGUI/RepairGUI_FuseEdgesDlg.h
src/RepairGUI/RepairGUI_GlueDlg.h
src/RepairGUI/RepairGUI_LimitToleranceDlg.h
src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h
src/RepairGUI/RepairGUI_RemoveHolesDlg.h
src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h
src/RepairGUI/RepairGUI_RemoveWebsDlg.h
src/RepairGUI/RepairGUI_SewingDlg.h
src/RepairGUI/RepairGUI_ShapeProcessDlg.h
src/RepairGUI/RepairGUI_SuppressFacesDlg.h
src/RepairGUI/RepairGUI_UnionFacesDlg.h
src/TransformationGUI/TransformationGUI_MirrorDlg.h
src/TransformationGUI/TransformationGUI_MultiRotationDlg.h
src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h
src/TransformationGUI/TransformationGUI_OffsetDlg.h
src/TransformationGUI/TransformationGUI_PositionDlg.h
src/TransformationGUI/TransformationGUI_ProjectionDlg.h
src/TransformationGUI/TransformationGUI_RotationDlg.h
src/TransformationGUI/TransformationGUI_ScaleDlg.h
src/TransformationGUI/TransformationGUI_TranslationDlg.h

index 3fef245e902a5b2933d6f8231d462b19403c4c4a..fddac6b9012a5eec851449e4fe5687ac76a0d0ef 100644 (file)
@@ -55,7 +55,7 @@ private:
   DlgRef_3Radio*                     GroupPattern;
   GEOM::pattern                      myPattern;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index aac6532cbc52b9983b559ee288091371108ac3e3..f3e92e8003b8446c3d95b86d8f51e1a83122645c 100644 (file)
@@ -60,7 +60,7 @@ private:
   int                                myOrientation;
   GEOM::pattern                      myPattern;
   
-private slots:
+private Q_SLOTS:
   void                               ConstructorsClicked ( int );
   void                               ClickOnOk();
   bool                               ClickOnApply();
index 8936f4c647e20fd202a5f228c3db3d857f3ef43c..306d1f2ca1ac9e67226142981168cacb3f8b9b19 100644 (file)
@@ -115,7 +115,7 @@ private:
   bool myOkPoint1, myOkPoint2, myOkPoint3;
   ObjectList pipeTShapeGroupObjects;
 
-private slots:
+private Q_SLOTS:
   void ClickOnOk();
   bool ClickOnApply();
   void ActivateThisDialog();
index 151af634847d6ff77adad792919e81e4a0027b68..72028f47b2dfeb1c37d12276c8f55d4bfe1af68e 100644 (file)
@@ -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()) {
index 822d2aa0f8db29d965c866b85953cfa23faf1cac..9d0ec6fcae22c3cfe142b00ca9ebb902171d33a3 100644 (file)
@@ -58,7 +58,7 @@ private:
   SalomeApp_IntSpinBox              *myDegMaxSpin;
   SalomeApp_DoubleSpinBox           *myDMaxSpin;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   
index d3849700c581dd64ae63ab0a097f8b36d1d238ae..9009630e35f401017c7fee235c291767b172b41c 100644 (file)
@@ -63,7 +63,7 @@ private:
   DlgRef_3Sel1Check*                 Group3Pnts2;
   DlgRef_3Sel*                       Group3Pnts3;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   
index 5fc81bbabc377460018d103efe71dc3fbc8964d7..b113365a6a7bbf8e52943eabc9522be700edefd0 100644 (file)
@@ -65,7 +65,7 @@ private:
   DlgRef_3Sel*                       Group3Pnts;
   DlgRef_3Sel*                       GroupCenter2Pnts;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 
index f88a39261a005f0b98cfb71b1cc538336d1fa690..c4fcc2799aa20edcfc606206c8fd1425f6a8afe9 100644 (file)
@@ -77,7 +77,7 @@ private:
   QList<GEOM::GeomObjPtr>            myPoints;
   GEOM::GeomObjPtr                   myVec1, myVec2;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 
index 88e665d26ff85a0a8a8c0d0631102f7852e0f0e4..1c109b3f69887d831dbe5049bd11bca9c2840cb9 100644 (file)
@@ -60,7 +60,7 @@ private:
   
   DlgRef_3Sel2Spin*                  GroupPoints;
   
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   
index 61d59b814ef248b1198d909fcc0684523b945464..910882fb3f96916104272f483addf22892103219 100644 (file)
@@ -64,7 +64,7 @@ private:
   DlgRef_2Sel*                       GroupPoints;
   DlgRef_2Sel*                       GroupFaces;
     
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 
index fad0ff0ad60d2e6cd2d1cdf32fb9d0a23c7dea38..2d43cca41a5442a627878323bab055d39042ac0a 100644 (file)
@@ -69,7 +69,7 @@ private:
   GEOM::GeomObjPtr              myVectorX;
   GEOM::GeomObjPtr              myVectorY;
 
-private slots:
+private Q_SLOTS:
   void                          onOk();
   bool                          onApply();
   void                          onActivate();
index 1a46fd0f4c7f6a27a02383031e05edb3146f251e..746cb813ec18b6e684c3750bb95ab0e916dafc16 100644 (file)
@@ -70,7 +70,7 @@ private:
   DlgRef_2Sel1Spin*                  Group2Vec;
   DlgRef_3Radio1Sel1Spin*            GroupLCS;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   
index ddd413f7b96573070f2161a85d89d8c0c195ec80..872289b450f7b52e2c6c35b4b26b56c66aca68e5 100644 (file)
@@ -104,7 +104,7 @@ private:
 
   TopAbs_ShapeEnum                   myNeedType;
   
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index 7ca69ca8aa979ca483a6cfbd170029f928837e83..173875b41c6280d959681422b4e6211e397b3b07 100644 (file)
@@ -62,7 +62,7 @@ private:
   DlgRef_2Sel*                       GroupPoints;
   DlgRef_3Spin1Check*                GroupDimensions;
     
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 
index c7abd1e1ba44b662db690c8e729a5680bfa3b705..38fa4e346e54d608217fcf83620318b931ec0c04 100644 (file)
@@ -68,7 +68,7 @@ private:
   
   gp_Ax3                myWPlane;
   
-private slots:
+private Q_SLOTS:
   void                  ClickOnOk();
   bool                  ClickOnApply();
   
index 70f69b94553bf95229e65ab4ef1908b630f29f97..9f609995415f5e3e1d81988c264fa915916f1003 100644 (file)
@@ -68,7 +68,7 @@ private:
   DlgRef_2Sel*                       Group2F;
   DlgRef_6Sel*                       Group6F;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index 6fad07986ad1d55fcdf71d3445bef3fbc8467db4..431bf70b240d38acd53722dd5a19b38330485a82 100644 (file)
@@ -74,7 +74,7 @@ private:
 
   DlgRef_1Sel2Spin1View1Check*       myGrp1;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index 772dfd0ddabd615fd72b4bd533a861758f396568..26fd5aeb389bbe8e17a217f4f2c354c87f570736 100644 (file)
@@ -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();
 
index 6da2154c048a810a67829ecf9775ef91dcabc7af..a48e6f293919242d67c05811bbacdf405ea3f7a5 100644 (file)
@@ -85,7 +85,7 @@ private:
   QMap<int, QPushButton*>            mySelBtn;
   QMap<int, QLineEdit*>              mySelName;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index 41ab8a4ad44de3817afcee543a42b498b722b0c5..eaab513794043029f163349af1f6c5c28b7a4700 100644 (file)
@@ -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();
index 99ead05a6915a5751f31e79cf08a42d4a5446331..c5370cf095d634f26ec326d346cf1e02dfd29f97 100644 (file)
@@ -67,7 +67,7 @@ private:
   
   DlgRef_2Sel2Spin3Check*            myGroup;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               SetEditCurrentArgument();
index e4614aaf47689c71b98d689c87e4e1f061fcbfae..580cc123917b3c2356758e6043cf5cd6dd609572 100644 (file)
@@ -60,7 +60,7 @@ private:
   
   DlgRef_1Sel*                       GroupShapes;
     
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index 3b18ff8a63366a457daa547d3bab57dd235945c2..3c62bb62e2e0c880d931f721fbf38f346ceb9337 100644 (file)
@@ -67,7 +67,7 @@ private:
   DlgRef_1Sel2Spin*                  GroupWire;
   DlgRef_2Sel1Spin*                  GroupOnCurve;
 
-private slots:
+private Q_SLOTS:
   void                               ConstructorsClicked (int);
   void                               ClickOnOk();
   bool                               ClickOnApply();
index d0e6670727152f142d9d8866902c2f95404500bc..2dc3b993c092bbd62ab25cbb1698819022c56db8 100644 (file)
@@ -59,7 +59,7 @@ private:
   
   DlgRef_1Sel1Check*                 GroupWire;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index 8c2e18061d2b8754992d45790d0b8dfd33664feb..d460acf3f9740d82306f632d4f21b943b9df117b 100644 (file)
@@ -59,7 +59,7 @@ private:
   
   DlgRef_1Sel*                       GroupShell;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               SetEditCurrentArgument();
index 6be374c6f10b38ad7116d29d375d672a41873757..98eb0f779df5ba5f0d60bfec9ebcad81b80a8efb 100644 (file)
@@ -60,7 +60,7 @@ private:
 
   DlgRef_1Sel1Check*                 GroupSolid;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               SetEditCurrentArgument();
index 8aa929c70f5e71a0714acf069945c7d63b1d1c71..caba1b3a2fc1dabad36bec78469372288953c1c5 100644 (file)
@@ -62,7 +62,7 @@ private:
   DlgRef_1Sel1Spin*                  GroupArgs;
   DlgRef_3Radio*                     GroupType;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index bb15571e86080ecce96c968471f54c295ac6db2f..4a5810e73d30a6ce01e1606c4145adf631249ad6 100755 (executable)
@@ -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
index a86189e545f2d6113a986793ae57e8d2ce483e68..4bbad91179cb733d042e5b540ea178ccc51af87c 100755 (executable)
@@ -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);
index 7f028f20e62a253e2653fd5d6b88e46d90229dbd..ddb00c67d4f921bde222c9c0955493dd477aff92 100755 (executable)
@@ -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:
index 1b7fa95876c69b875947b178527304bfeb778de9..723cebc7d9ad0382cbc9eea274311c8ade202ea6 100755 (executable)
@@ -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 )
index 09929bf356ad7507fd002cc671ea8aa7fdf63c3f..fe5b16c9f1a33fd87435be0e3b095682f9a69b87 100755 (executable)
@@ -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 );
index 86aa87aa3cad3e5107e72ca5fd0b6362766cc15a..4adac51bdb5e3491638d7039a2e8fc770e40f84c 100644 (file)
@@ -54,7 +54,7 @@ private:
 
   void setTabOrder();
 
-private slots:
+private Q_SLOTS:
 
   void optionChanged(int theId);
 
index 180284fc16f86e95dbf279bf7e91423f22dd6ce3..c1eff9258d056dace8af2d9f4ce69e17d62a1d83 100644 (file)
@@ -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()
index 7f335e8dbbead8007badae375b3473458b09729c..f28c39ac564f4506a904d95eff351fdf59f029c3 100644 (file)
@@ -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);
index 298933729ecbddf6785d3e3b3aa2266f04a617bd..d3eb9ac20f211a0af25a86a638468d9c31023487 100644 (file)
@@ -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 );
index 9bac8cbce8ca0bba3a61c95a3c0e63cc4a91157e..9f269cdbe0527c63ddd20d99c51545fa8c852f66 100644 (file)
@@ -37,7 +37,7 @@ public:
 
   virtual void  contextMenuPopup( QMenu* );
 
-private slots:
+private Q_SLOTS:
 
   void          onShowSelected();
   void          onShowOnlySelected();
index 609b7e8a39e0df80382b3f456d542de996da21e7..10c7d4dcf83e302081f29cf2563d4f6ddf05201f 100755 (executable)
@@ -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();
   }
index a60a8063fbbd40938e5aa9df3bfb71adb985f020..8b78cb66d658afc1f88fb70c2760e20dd85233c6 100755 (executable)
@@ -181,7 +181,7 @@ private:
   bool                               myIsUndoRedo;
   XYZ                                myWorkPoint;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   void                               ClickOnAddPoint();
   bool                               ClickOnApply();
index c497136890ed2d89861cf313bb3e4eed60b9ce59..d425dc42ec88c2babf5f2361511beec5a5350193 100644 (file)
@@ -73,7 +73,7 @@ private:
   ShapeRec_Parameters*               parametersChanged();
 
   
-private slots:
+private Q_SLOTS:
   void                               SelectionIntoArgument();
   void                               ConstructorsClicked( int );
 //   void                               onViewClicked( int );
index cead457e76b79efebb585288b16cc1a59c98ec79..8b800c4e0dc4b97d0de6e94de9c3948699c49145 100644 (file)
@@ -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 );
   }
index 0fab307296cc54c1659c0dd3af9f19d72cdae559..885689cf1ef863957c4bd98c30dc187307ea91cb 100644 (file)
@@ -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 );
 };
index 30988fd794b097614054ea66dca116c08b6975f4..d33d811c873675c7b0cd9b814bbf0ec7cc4ec08f 100755 (executable)
@@ -68,7 +68,7 @@ private:
   GEOM::GeomObjPtr                   myFace;
 
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 
index 6024bd374b12c65f573ff6c231528a3168326ebb..c48b682a6c242c0e17cf81f2ea424450031f3850 100644 (file)
@@ -59,7 +59,7 @@ private:
   QPushButton*                       myPushButton;
   QLineEdit*                         myLineEdit;
   
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 // 
index 773b4dde810ef52f641e3663c9ed36f2ce46619e..6a11464045876df6bc73c6713dcfa75161e276cf 100644 (file)
@@ -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();
index 14275c83effe1077fb3f5d6c13132c9628cd154c..8f57873ea41f3b711e37e3749488aa6defb5d43e 100644 (file)
@@ -55,7 +55,7 @@ protected:
 
   void                                closeEvent (QCloseEvent*);
 
-private slots:
+private Q_SLOTS:
   void                                ClickOnOk();
   bool                                ClickOnApply();
   void                                ActivateThisDialog();
index 26110fe1ee06ab40f537375529a37c1e53f2fa5f..1bf8dae1f9a0fb9206cd8cfc6ebeb8f68d0282ad 100644 (file)
@@ -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);
index e4f5f4d94645c7126193c77f031e063d828d8221..28056dac07431e7bfa5d3396df07561f5b94127b 100644 (file)
@@ -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 );
 };
 
index a012c220b7b1684696323245c100912c615adae8..7b6264fffe2d6ec7a0ee732fb4c5f59212ebc7fc 100644 (file)
@@ -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
index fa594d2366cf5c2811e61cd6b5146dadf237c74a..2f4b6b242b4935c1f0a717f90fa48150122641b1 100644 (file)
@@ -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;
     }
index f2f2ad8e5661fd7d67e5c372f34b4f0f406c1796..7fd12c3e31967022a766b4fc0820a94df3109d09 100644 (file)
@@ -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 );
index 0c514cb7864da2afbdf64c4d635cae9cdd7afde0..6437bcded9620bc1ba45793e17237a6d724d50d6 100644 (file)
@@ -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 )
index 8999ffdce83019c17f2edf81b9e9b486fd7a059a..cd99904ba1e35b8c97e8867d4846d636afbdc355 100644 (file)
@@ -45,7 +45,7 @@ public:
   double    getTheDC() const;
   void      setTheDC( const double );
 
-private slots:
+private Q_SLOTS:
   void      ClickOnHelp();
 
 private:
index 2e5ec22d39ac255599f3eb2b32feb975bb17e3c3..2da8dbbc3a26e75bf32d78ad04613f24fe36e2e8 100644 (file)
@@ -45,7 +45,7 @@ public:
   int       getTheLW() const;
   void      setTheLW( const int );
 
-private slots:
+private Q_SLOTS:
   void      ClickOnHelp();
 
 private:
index c927bc79c9ce616680a89caf3492062061ae2702..23b1ba69709d6a0af8b3e9966af2cde51f63a9e8 100644 (file)
@@ -59,7 +59,7 @@ private:
   void                             addTexture( int, bool = false ) const;
   SalomeApp_Study*                 getStudy() const;
 
-private slots:
+private Q_SLOTS:
   void                             browse();
   void                             help();
 
index 2f35c6595c17c77ad7c0dbdd2f861c91e2709bb4..ecb2003d4ada5dc0609bf857b3b4c9f18f3e67b8 100644 (file)
@@ -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 ) );
index ffd65964eaded5d1baeb5a88b6db362f4f48cf6f..fa18ab3fe59e2f883b35670ba69917339011ecde 100644 (file)
@@ -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* );
 };
 
index 94e06964413a950e53ac73b93006616d55c0da39..3491bf343597a9e67b3534cb9ba6a1a825dea841 100644 (file)
@@ -51,7 +51,7 @@ public:
   void      setU( const int );
   void      setV( const int );
   
-private slots:
+private Q_SLOTS:
   void      ClickOnHelp();
 
 private:
index 4f25918d4434cf3167b479be51035e2935f46678..e8deacdd5c32d0f8a99d5fb8de15d5c207c471ca 100644 (file)
@@ -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();
index ce69292e8d275c75dc7633e22bc83e0240deae5f..5281da338c37732905a3ae5d0cf5985cefc5d459 100644 (file)
@@ -65,7 +65,7 @@ public:
   GEOMToolsGUI_ReduceStudyDlg( QWidget* );
   ~GEOMToolsGUI_ReduceStudyDlg();
 
-private slots:
+private Q_SLOTS:
   void                          onItemClicked(QTreeWidgetItem*, int );
   void                          onHeaderClicked( int );
 
index f9fad5b0841cbf3157889b6f52f1c04b57dc4533..ccb3ee1db3173f53db54c6549b2235eb2bc98f83 100644 (file)
@@ -56,7 +56,7 @@ private:
   QLabel*   myValueLab;
   QString   myHelpFileName;
 
-private slots: 
+private Q_SLOTS:
   void      ClickOnOk();
   void      ClickOnClose();
   void      ClickOnHelp();
index a6a828a0431a65d79599a76e503010876d04f2b2..2d45fcb57150a29fc392a88fc0f445d20d248c4b 100644 (file)
@@ -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();
index ee15f709f47f3abdc8345692ebcba16db2826599..409340bb43c9164ca5fcf783848d9b27574dd1cf 100644 (file)
@@ -66,7 +66,7 @@ private:
   DlgRef_3Sel1Check*                 GroupPoints;
   DlgRef_3Sel2Check3Spin*            GroupMakePoints;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index 58b2c8cec8aa7bba5351873b38f9832c15de8c8c..ec11b0a03b6e526f747df6048df3341745719a56 100644 (file)
@@ -61,7 +61,7 @@ private:
 
   DlgRef_3Sel1Check*                 GroupPoints;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index f8a7f1fde8724c516877f997d70d58a4b78fffd6..cfa98d070e2151fe56a0f1541633129ef7ddc69b 100644 (file)
@@ -69,7 +69,7 @@ private:
   DlgRef_1Sel3Spin2Check1Spin*       GroupDXDYDZ;
   DlgRef_1Check1Spin1Check*          GroupThickening;
   
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index 7fe5aa34c00735c0e457ad572e09356cda09405f..162e14c3ff5e445f3e24356bca742fbf9b0cc4c3 100644 (file)
@@ -63,7 +63,7 @@ private:
   
   DlgRef_2Sel1Spin2Check*            GroupPoints;
     
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index 469581775dba4f99e06526e54bd67019ce178405..d00fbdd7655ed70cc5f88d3a8dcd90b670317fda 100644 (file)
@@ -58,7 +58,7 @@ private:
   void                               Init();
   void                               enterEvent (QEvent*);
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               SetEditCurrentArgument();
index fe43e22213ebbee9a33bb497ed58da0216ec7d16..47bb77115735d43d122106fdc05aef0ea77189f5 100644 (file)
@@ -64,7 +64,7 @@ protected:
 
   void                                closeEvent (QCloseEvent*);
 
-private slots:
+private Q_SLOTS:
   void                                ClickOnOk();
   bool                                ClickOnApply();
   void                                ActivateThisDialog();
index 61ceffda1c51833ef2be9c32fbe2f3a6d2e6ac85..fe9c1cdf53a7a5e3b150ffcd955e0b65fc5bb8c5 100644 (file)
@@ -64,7 +64,7 @@ private:
     QPushButton* btnShapeSelect;
     QPushButton* btnFileSelect;
 
-private slots:
+private Q_SLOTS:
     void ClickOnOk();
     bool ClickOnApply();
     void ActivateThisDialog();
index d241ace6b39af8b99200de5dae3d63ec3c8386a0..3aa6b8e20476fd80fd2c2a0c8df5cab86e412510 100644 (file)
@@ -57,7 +57,7 @@ private:
     QPushButton* btnFileSelect;
     GEOM::GEOM_Object_var m_mainShape;
 
-private slots:
+private Q_SLOTS:
     void ClickOnOk();
     bool ClickOnApply();
     void ActivateThisDialog();
index 3eafd3c38eabbab1bc8853a6b379f5a28c6f90cd..9007692893a0bc733fed7ff45c5e64178fbf85de 100644 (file)
@@ -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;
index 0f302783961bfe1e942fe8f7254be0734e0bcbba..3e8306d41d2f377f8614a230fb5fa698ac32dd97 100644 (file)
@@ -217,5 +217,5 @@ void Material_ResourceMgr::saved()
 void Material_ResourceMgr::update()
 {
   Updater( this ).wait();
-  emit changed();
+  Q_EMIT changed();
 }
index 8896929ae91b37f22841782c7d6b5028aa370c1b..2fed56ca380063e802b72db6df4964314fb7fa08 100644 (file)
@@ -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:
index bbc71bf96bf065db96cbc58ef293a08e9270e3ca..d2fbcef150dd40acfdb105dff6d1492cb29fc309 100644 (file)
@@ -54,7 +54,7 @@ public:
   void ChangeDimensionsVisibility( const bool theIsVisible );
 private:
   QDialog* myManageDimensionDlg;
-private slots:
+private Q_SLOTS:
   void onFinished(int);
 };
 
index 1386f0c30a239f2d4a18cf23fda6b1ed66d922e7..0bf9e35a3df4f1fd00535c2862b8327e58c5d8bb 100644 (file)
@@ -62,7 +62,7 @@ private:
   GEOM::GEOM_Object_var              myObj;
   MeasureGUI_1Sel6LineEdit*          myGrp;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               SelectionIntoArgument();
index f279c6c3364e42a56a399d1a4904b99fb53c22bf..86612479dbeb61193d3a83817736c8cc0b530022 100644 (file)
@@ -49,7 +49,7 @@ protected:
   virtual bool                        isValid( QString& );
   virtual bool                        execute( ObjectList& );
 
-private slots:
+private Q_SLOTS:
   void                                ClickOnOk();
   bool                                ClickOnApply();
   void                                ActivateThisDialog();
index e6a93c4f07e124f6144c766b43e4f5ff705687e9..747e07b437c544e06547cd655e5c1c2907fd7eb9 100644 (file)
@@ -51,7 +51,7 @@ protected:
   virtual bool                        execute( ObjectList& );
   virtual void                        processObject();
 
-private slots:
+private Q_SLOTS:
   void                                ClickOnOk();
   bool                                ClickOnApply();
   void                                ActivateThisDialog();
index e22346439ebb437bfb700d460ba1ac84fb34428f..3baccd3bbff6cee1f01db44bd1c1d0adbf316d7e 100644 (file)
@@ -47,7 +47,7 @@ protected:
   // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
   virtual void                        processObject();
 
-private slots:
+private Q_SLOTS:
   void                                onErrorsListSelectionChanged();
   void                                onSubShapesListSelectionChanged();
 
index a2ace0ae2a97417422642b7b3e65a5b45e2e9aad..dec3752fd685214dc77497a505a96c9634324e21 100644 (file)
@@ -52,7 +52,7 @@ protected:
   virtual bool                        isValid( QString& );
   virtual bool extractPrefix() const;
 
-private slots:
+private Q_SLOTS:
   void                                SelectionIntoArgument();
   void                                ClickOnOk();
   bool                                ClickOnApply();
index 13796c0ca4c172260b0f93f32a41162666a5e3bb..66bd404b12e936f332ee8fe7f8b65df3a8f71b47 100644 (file)
@@ -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();
 }
 
 //=================================================================================
index 02e7cd9a65135a98ea9114f3ff3cb40e6947d22a..21558364239d95b830bec248decbb5a4765574c7 100644 (file)
@@ -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();
 
index 536774c0bf268311e66f3ec29f32011583583bc3..479f7cae28220ba3c168d5a1c2ca58637c4d5f8e 100644 (file)
@@ -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;
       }
index d2a2f3acdd87e4897d03e70151e1069664c24ec3..f1daf98d90ab50d3a4fe39a3d8ab4170489b4bc8 100644 (file)
@@ -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* );
 
index 04c9ed8209f27e324edd70c271352126a3cbe8fc..cfcf217c71caffbcd6b619ad05b73c76a5cc691d 100644 (file)
@@ -116,7 +116,7 @@ private:
   MeasureGUI_DistanceGroup*           myGrp;
   GEOM::ListOfDouble_var              myDbls;
 
-private slots:
+private Q_SLOTS:
   void                                ClickOnOk();
   bool                                ClickOnApply();
   void                                ActivateThisDialog();
index 5282c8cd6e888180839292c79f47c75c4d619a96..fa3abf484c05322b2843ddd40cfac6d4652ac784 100644 (file)
@@ -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();
index af5ba2c9fda82d7577ba4bc1746956540d392fee..5b30ccb8883d8889b6c50eeeb16eb47a2cedceb8 100644 (file)
@@ -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();
index c7fe1337c94234991167ee875b6dff58561b5e3b..0ec57e1627ad4e78a638a7fa2299130071a39b9d 100644 (file)
@@ -56,7 +56,7 @@ private:
 
   DlgRef_2Sel*                       GroupArgs;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 
index a12b40bf322b36b938bb0008ec39c33998c3ea9d..2871894b082b39fc2a6e95874305eacf2d5bf185 100644 (file)
@@ -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();
index 9c5ca644329cd0510b94c7f0307e572c2b06414c..e98baeb42e73330e0958cd23e65c5ad3e244bc85 100644 (file)
@@ -49,7 +49,7 @@ protected:
   // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
   virtual void                        processObject();
   
-protected slots:
+protected Q_SLOTS:
   virtual void                        ClickOnProperties();
 
 private:
index 82a7af7bcb6646f808fefa3d064843d1c12e92fa..049381ef1e73f47c62670472dc989ab24a72984b 100644 (file)
@@ -58,7 +58,7 @@ private:
   DlgRef_1Sel3Spin*                   GroupPoints;
   double                              myStep;
 
-private slots:
+private Q_SLOTS:
   void                                ClickOnOk();
   bool                                ClickOnApply();
   void                                ActivateThisDialog();
index 5e0712290cd2275b59643baba1db932efdd40fc9..0b29f1d92deddcb2e639ba8744316f15bcd7aeb0 100644 (file)
@@ -67,7 +67,7 @@ protected:
   virtual                             bool isValid( QString& );
   virtual                             bool execute( ObjectList& );    
 
-private slots:
+private Q_SLOTS:
   void                                ClickOnOk();
   bool                                ClickOnApply();
   void                                ActivateThisDialog();
index d0d8067ec0af9873f2dfaa79ffb6b3339db9184c..5f7abea1bfeaa0593e38e48ff4a4c1431c1d33df 100644 (file)
@@ -65,7 +65,7 @@ private:
   QPushButton*      resetButton;
   QComboBox*        TypeCB;
 
-private slots:
+private Q_SLOTS:
   void              ClickOnOk();
   bool              ClickOnApply();
   void              onActivate();
index e5d384b269a96fbbd1e039b9da4406cea4a2c91f..913dc55ba5c5ce670151258e89c644ec8d254fa4 100644 (file)
@@ -75,7 +75,7 @@ private:
   
   DlgRef_2Sel2Spin2Push*      myGroup;
   
-private slots:
+private Q_SLOTS:
   void                        ClickOnOk();
   bool                        ClickOnApply();
   void                        ActivateThisDialog();
index f203671d51d32e24891c0a3c11dca27bbe4727fd..2606fa7661c52943a383df0a393e1df228a69c0e 100644 (file)
@@ -48,7 +48,7 @@ protected:
   virtual                             bool isValid( QString& );
   virtual                             bool execute( ObjectList& );
 
-private slots:
+private Q_SLOTS:
   void                                ClickOnOk();
   bool                                ClickOnApply();
   void                                ActivateThisDialog();
index edaaa40f7a0ab76b949d8ac6825b8662b0261398..b4116ae12e44ae0b9d2ac81f5e3b28652fe6f9ed 100644 (file)
@@ -52,7 +52,7 @@ protected:
   virtual                             bool isValid( QString& );
   virtual                             bool execute( ObjectList& );
 
-private slots:
+private Q_SLOTS:
   void                                ClickOnOk();
   bool                                ClickOnApply();
   void                                ActivateThisDialog();
index 25dac2b6903e2cdbed084f23babf1a127f117f10..20af0c2156e7e67e94786f917636b7f80ac5af31 100644 (file)
@@ -59,7 +59,7 @@ private:
   
   DlgRef_2Sel2List*                  GroupPoints;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               SetEditCurrentArgument();
index 37edbcae38996b793c0d6e832882b2fa3c5422bf..7c90ee54aa935646e7c26c48644a3c7716ba37dd 100644 (file)
@@ -59,7 +59,7 @@ private:
 
   DlgRef_2Sel1List1Check*            GroupPoints;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index 562a5f813842397abf83879493ffd24e99663a04..dead72449ae1d08939b9e531ed66d7c5fdb4b81a 100644 (file)
@@ -54,7 +54,7 @@ private:
   
   DlgRef_1List1Spin1Btn*     GroupPoints;
   
-private slots:
+private Q_SLOTS:
   void                       ClickOnOk();
   void                       ActivateThisDialog();
   void                       SelectionIntoArgument();
index 242eb12a49ed00247fcd12cbf3e091520b7c7cbf..53f3cff5113557ee10aba8a1b9277c92130ec495 100644 (file)
@@ -67,7 +67,7 @@ private:
   DlgRef_2Sel1List2Check*            GroupPoints;
   QCheckBox                         *mySelfInte;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index 0fd8e4467f5e0f0aa5256e43e15cb24a7ebe022f..d82ba935a060a07ff17c83c299789c5389ab1ec8 100644 (file)
@@ -62,7 +62,7 @@ private:
   DlgRef_2Sel*                       GroupPoints;
   DlgRef_3Spin*                      GroupDimensions;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index dc094f8b7b09d15bc04d1281bb4cf2cdc6afd23a..7c2d1953b7f10024ac30b4353e99e5869bc014f7 100644 (file)
@@ -65,7 +65,7 @@ private:
   DlgRef_2Sel3Spin*                  GroupPoints;
   DlgRef_3Spin*                      GroupDimensions;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index 1a5ccc46bd27a8e95025b9d0b2008be7e4231ef2..933551ee23ddc781bed8bdb30b4f45fbfb18f5f6 100644 (file)
@@ -68,7 +68,7 @@ private:
   DlgRef_2Sel3Spin1Check*            GroupPoints;
   DlgRef_3Spin1CheckCyl*             GroupDimensions;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index b616096df92f7fce5c0d39d6cb6f14973a319bec..f2ae1739ddde3df46078075252c23b9c066a331d 100755 (executable)
@@ -66,7 +66,7 @@ private:
   DlgRef_1Spin*                      GroupDimensions;
   DlgRef_3Radio*                     GroupOrientation;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 
index bc2c398c0f07cbc7c693cb657ba7d4fd9f6ce0c3..a9416402836ccdfce36a41a62ffb54a057573a9b 100755 (executable)
@@ -65,7 +65,7 @@ private:
   DlgRef_3Radio*                     GroupOrientation;
   DlgRef_3Radio*                     GroupType;
     
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 
index 19611ac23073b328cbb94cebfac0e95f802bbc59..1889ce58adb0a386c2abde9625bd2c895610e31f 100644 (file)
@@ -63,7 +63,7 @@ private:
   DlgRef_1Sel1Spin*                  GroupPoints;
   DlgRef_1Spin*                      GroupDimensions;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index ed46a68dede9e2d23b00917f7cf2850fe2eeb02d..45767250f882727a5b4c7fa5534f47246f2cba63 100644 (file)
@@ -64,7 +64,7 @@ private:
   DlgRef_2Sel2Spin*                  GroupPoints;
   DlgRef_2Spin*                      GroupDimensions;
   
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index 235c0b9e0ba3afd29a5a45488b44dfb5053eb190..673bb97cd72b681245d2327fc99328babc7663b4 100644 (file)
@@ -59,7 +59,7 @@ private:
   
   DlgRef_1Sel1Check*                 GroupPoints;
   
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index 22d872a611d27e4093c07936e21649304e33247a..8f346a49f4e28df40d01fe0f035b5153f73018c5 100644 (file)
@@ -64,7 +64,7 @@ private:
   DlgRef_2SelExt*                    GroupPoints;
   QButtonGroup*                      myIsVertexGr;
   
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   
index 4b1adc3c9df6b8dce7365bb9dca123820d684241..87a123442d45ccc460c4a963e1787448d8a51bc4 100644 (file)
@@ -66,7 +66,7 @@ private:
   QButtonGroup*                      myIsParameterGr;
   SalomeApp_DoubleSpinBox*           myValEdt;
 
-protected slots:
+protected Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 
index deb2812f8e002d8225afab9236b6f9d32cb772fa..d71e2e791a992a19d136281e9651a102454c1f90 100644 (file)
@@ -69,7 +69,7 @@ private:
   int                                   myNbOpen;
   int                                   myCurrObj;
 
-private slots:
+private Q_SLOTS:
   void                                  ClickOnOk();
   bool                                  ClickOnApply();
   void                                  SelectionIntoArgument();
index 160d4bffad692333004e942c3f0049fd25a4d364..783df1d9caa1fdd9ae245ec8f17c96f5fa5310b7 100644 (file)
@@ -62,7 +62,7 @@ private:
   void                               activateSelection();
   GEOM_Displayer*                    getDisplayer();
 
-private slots:
+private Q_SLOTS:
   void                               onClose();
   void                               onHelp(); 
   void                               onDeactivate();
index b7cf9c4d1aff97e8cb2394755a918775beda81f8..1dba3a8cbfaed5d445af5f4ea8297bfd96438a71 100644 (file)
@@ -45,7 +45,7 @@ protected:
   virtual bool                       execute (ObjectList&);
   virtual void                       addSubshapesToStudy();
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index 4b6ccc3afa59d1fbfacc6c3f89918f65c4e9b9a6..8a16c4fdf79de9fbbaa027a5882d21c170cdd71d 100644 (file)
@@ -88,10 +88,10 @@ private:
 
   TopAbs_ShapeEnum                   myGlueMode;
 
-protected slots:
+protected Q_SLOTS:
   virtual void                       ClickOnCancel();
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 
index 4e2af32debd5756a3264bbc25f9b12bf7d7bc227..48afdc90061d934781678dd9dcbcb0644d4f5c01 100644 (file)
@@ -66,7 +66,7 @@ private:
   DlgRef_1SelExt*                    GroupPoints;
   SalomeApp_DoubleSpinBox*           myTolEdt;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 
index 9c638015edcbdfe83a9deef98ca7b19bf02e7175..35be3357d70ca9bd9c6b219733a2b5f312b9e67b 100644 (file)
@@ -58,7 +58,7 @@ private:
 
   DlgRef_1Sel1Check*                       GroupPoints;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 
index 79483cb365da097c9c98f19dc5c853bef75d0d01..ae3a7a75cbfdc0612ea61ec8934974e9496b2fe1 100644 (file)
@@ -65,7 +65,7 @@ private:
   int                                myClosed; // Number of free closed boundaries detected. Calculated in execute(), used in onDetect().
   int                                myOpen;   // Number of free open   boundaries detected. Calculated in execute(), used in onDetect().
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 
index 9648e8b3bdf3ee4e46efd8291831bea20ea1531d..d850ee03012bf6d9bc95ade1abe5fc089708227c 100644 (file)
@@ -60,7 +60,7 @@ private:
   
   DlgRef_1Sel1Check1Sel*             GroupPoints;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   
index 72fd4993706673f9a669f42f2bce72af5258e627..bca46af2599095350f1298b0a6573366c5e7393e 100755 (executable)
@@ -57,7 +57,7 @@ private:
 
   DlgRef_1Sel*                       GroupPoints;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 
index 264a9b6e7e0f4ba42def1d72bb3c9c9d4c0d5070..f1b92586070f34082bd981c42a0584343a73a337 100644 (file)
@@ -68,7 +68,7 @@ private:
   int                                myClosed; // Number of free closed boundaries detected. Calculated in execute(), used in onDetect().
   int                                myOpen;   // Number of free open   boundaries detected. Calculated in execute(), used in onDetect().
   
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   
index 4a6480220edf7b37b06093d9be699eeeb8d963b7..6661793e9fb1b19dfa53cb60518d0a9aca6207f7 100755 (executable)
@@ -121,7 +121,7 @@ private:
   
   SalomeApp_DoubleSpinBox*           mySameParameterTol3D;
   
-private slots:
+private Q_SLOTS:
   void                               onOk();
   bool                               onApply();
 
index d0fdbef5dced561cecb7e32db1ffca3b323d52a5..df615b5ca636f6114571cd93dfa6ec4396072d41 100644 (file)
@@ -61,7 +61,7 @@ private:
 
   DlgRef_2Sel*                       GroupArgs;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 
index 3290ae3b97cd85889670d7bb20c1693368452561..73a470cfb7f99d06b8f36d191845982e026dd388 100755 (executable)
@@ -58,7 +58,7 @@ private:
 
   DlgRef_1Sel*                       GroupPoints;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
 
index e75b583bb58db7e53e8a38dd94f85f202d84e211..9bad6cda724823c8f560de375a6dcf8edabae3ca 100644 (file)
@@ -66,7 +66,7 @@ private:
   
   DlgRef_2Sel1Spin2Check*            GroupPoints;
     
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index 904c718bffb1c2a6621e0e0c5ec63267c5f75e6d..a770b083bedc93be7a277f2859bf6b5c8b75cc36 100644 (file)
@@ -115,7 +115,7 @@ private:
 
   TransformationGUI_2Sel4Spin1Check* GroupArgs;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index ed7446beff7e2d9dd5cd5d8d87334944967fed83..dfe251b4a99af060ad1374077740841ecfb545a3 100644 (file)
@@ -72,7 +72,7 @@ private:
   DlgRef_2Sel2Spin1Check*            GroupPoints;
   DlgRef_3Sel4Spin2Check*            GroupDimensions;
   
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index 259a641e94dc588a54854cd4bfbba87e66607ab2..04a6f6818e8db46a0c06c748a16d49d7c2c14dec 100644 (file)
@@ -62,7 +62,7 @@ private:
     
   DlgRef_1Sel1Spin1Check*            GroupPoints;
     
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index 67d4b3a760a937bbb14a32aefb85ff6601a06a13..805244c265b1535cba339bca321970e818a0f141 100644 (file)
@@ -68,7 +68,7 @@ private:
 
   DlgRef_4Sel1Spin3Check*            Group1;
     
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index b20e110c8d961ea64d5a78fa68ce5a50d3558e76..d72e74321b9ebdeb98b8e8dd030bf1a36a95c14e 100644 (file)
@@ -60,7 +60,7 @@ private:
   
   DlgRef_2Sel*                       myGroup;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               SetEditCurrentArgument();
index 7811bbf2a2a630214a6d8b40b30d06c5f73bb861..5fe1fed70c82685b0774dc5bddf43efbaf26ccf2 100644 (file)
@@ -68,7 +68,7 @@ private:
     
   DlgRef_4Sel1Spin2Check*            GroupPoints;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index e69c9e3f16bf2988f56c8cbe51e3fadf8fc0ebcb..89d3c3ca543e25a00a45cd509189604340b0898e 100644 (file)
@@ -84,7 +84,7 @@ private:
   SalomeApp_DoubleSpinBox*           SpinBox_FZ;
   QCheckBox*                         CheckBoxCopy;
 
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
index c0a0a12233b9acfd19f2ce7526283b4cfcf5456a..6241b2b7d01826d6297493ee1a4567775db63a3f 100644 (file)
@@ -68,7 +68,7 @@ private:
   
   DlgRef_3Sel3Spin2Check*            GroupPoints;
     
-private slots:
+private Q_SLOTS:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();