From: imn Date: Wed, 17 Sep 2014 09:32:50 +0000 (+0400) Subject: Removed qt3 support and replaced qt macros X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fimn%2Fremoved_qt3_support;p=modules%2Fgeom.git Removed qt3 support and replaced qt macros --- diff --git a/src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.h b/src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.h index 3fef245e9..fddac6b90 100644 --- a/src/AdvancedGUI/AdvancedGUI_DividedCylinderDlg.h +++ b/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(); diff --git a/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.h b/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.h index aac6532cb..f3e92e800 100644 --- a/src/AdvancedGUI/AdvancedGUI_DividedDiskDlg.h +++ b/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(); diff --git a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.h b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.h index 8936f4c64..306d1f2ca 100644 --- a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.h +++ b/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(); diff --git a/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.cxx b/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.cxx index 151af6348..72028f47b 100644 --- a/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.cxx +++ b/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 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()) { diff --git a/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.h b/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.h index 822d2aa0f..9d0ec6fca 100644 --- a/src/AdvancedGUI/AdvancedGUI_SmoothingSurfaceDlg.h +++ b/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(); diff --git a/src/BasicGUI/BasicGUI_ArcDlg.h b/src/BasicGUI/BasicGUI_ArcDlg.h index d3849700c..9009630e3 100644 --- a/src/BasicGUI/BasicGUI_ArcDlg.h +++ b/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(); diff --git a/src/BasicGUI/BasicGUI_CircleDlg.h b/src/BasicGUI/BasicGUI_CircleDlg.h index 5fc81bbab..b113365a6 100644 --- a/src/BasicGUI/BasicGUI_CircleDlg.h +++ b/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(); diff --git a/src/BasicGUI/BasicGUI_CurveDlg.h b/src/BasicGUI/BasicGUI_CurveDlg.h index f88a39261..c4fcc2799 100644 --- a/src/BasicGUI/BasicGUI_CurveDlg.h +++ b/src/BasicGUI/BasicGUI_CurveDlg.h @@ -77,7 +77,7 @@ private: QList myPoints; GEOM::GeomObjPtr myVec1, myVec2; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.h b/src/BasicGUI/BasicGUI_EllipseDlg.h index 88e665d26..1c109b3f6 100644 --- a/src/BasicGUI/BasicGUI_EllipseDlg.h +++ b/src/BasicGUI/BasicGUI_EllipseDlg.h @@ -60,7 +60,7 @@ private: DlgRef_3Sel2Spin* GroupPoints; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); diff --git a/src/BasicGUI/BasicGUI_LineDlg.h b/src/BasicGUI/BasicGUI_LineDlg.h index 61d59b814..910882fb3 100644 --- a/src/BasicGUI/BasicGUI_LineDlg.h +++ b/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(); diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.h b/src/BasicGUI/BasicGUI_MarkerDlg.h index fad0ff0ad..2d43cca41 100644 --- a/src/BasicGUI/BasicGUI_MarkerDlg.h +++ b/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(); diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.h b/src/BasicGUI/BasicGUI_PlaneDlg.h index 1a46fd0f4..746cb813e 100644 --- a/src/BasicGUI/BasicGUI_PlaneDlg.h +++ b/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(); diff --git a/src/BasicGUI/BasicGUI_PointDlg.h b/src/BasicGUI/BasicGUI_PointDlg.h index ddd413f7b..872289b45 100644 --- a/src/BasicGUI/BasicGUI_PointDlg.h +++ b/src/BasicGUI/BasicGUI_PointDlg.h @@ -104,7 +104,7 @@ private: TopAbs_ShapeEnum myNeedType; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/BasicGUI/BasicGUI_VectorDlg.h b/src/BasicGUI/BasicGUI_VectorDlg.h index 7ca69ca8a..173875b41 100644 --- a/src/BasicGUI/BasicGUI_VectorDlg.h +++ b/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(); diff --git a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h index c7abd1e1b..38fa4e346 100644 --- a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h +++ b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h @@ -68,7 +68,7 @@ private: gp_Ax3 myWPlane; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); diff --git a/src/BlocksGUI/BlocksGUI_BlockDlg.h b/src/BlocksGUI/BlocksGUI_BlockDlg.h index 70f69b945..9f6099954 100644 --- a/src/BlocksGUI/BlocksGUI_BlockDlg.h +++ b/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(); diff --git a/src/BlocksGUI/BlocksGUI_ExplodeDlg.h b/src/BlocksGUI/BlocksGUI_ExplodeDlg.h index 6fad07986..431bf70b2 100644 --- a/src/BlocksGUI/BlocksGUI_ExplodeDlg.h +++ b/src/BlocksGUI/BlocksGUI_ExplodeDlg.h @@ -74,7 +74,7 @@ private: DlgRef_1Sel2Spin1View1Check* myGrp1; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/BlocksGUI/BlocksGUI_PropagateDlg.h b/src/BlocksGUI/BlocksGUI_PropagateDlg.h index 772dfd0dd..26fd5aeb3 100644 --- a/src/BlocksGUI/BlocksGUI_PropagateDlg.h +++ b/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(); diff --git a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h index 6da2154c0..a48e6f293 100644 --- a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h +++ b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h @@ -85,7 +85,7 @@ private: QMap mySelBtn; QMap mySelName; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/BlocksGUI/BlocksGUI_TrsfDlg.h b/src/BlocksGUI/BlocksGUI_TrsfDlg.h index 41ab8a4ad..eaab51379 100644 --- a/src/BlocksGUI/BlocksGUI_TrsfDlg.h +++ b/src/BlocksGUI/BlocksGUI_TrsfDlg.h @@ -82,7 +82,7 @@ private: QMap mySelName; QMap mySpinBox; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/BooleanGUI/BooleanGUI_Dialog.h b/src/BooleanGUI/BooleanGUI_Dialog.h index 99ead05a6..c5370cf09 100644 --- a/src/BooleanGUI/BooleanGUI_Dialog.h +++ b/src/BooleanGUI/BooleanGUI_Dialog.h @@ -67,7 +67,7 @@ private: DlgRef_2Sel2Spin3Check* myGroup; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void SetEditCurrentArgument(); diff --git a/src/BuildGUI/BuildGUI_CompoundDlg.h b/src/BuildGUI/BuildGUI_CompoundDlg.h index e4614aaf4..580cc1239 100644 --- a/src/BuildGUI/BuildGUI_CompoundDlg.h +++ b/src/BuildGUI/BuildGUI_CompoundDlg.h @@ -60,7 +60,7 @@ private: DlgRef_1Sel* GroupShapes; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/BuildGUI/BuildGUI_EdgeDlg.h b/src/BuildGUI/BuildGUI_EdgeDlg.h index 3b18ff8a6..3c62bb62e 100644 --- a/src/BuildGUI/BuildGUI_EdgeDlg.h +++ b/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(); diff --git a/src/BuildGUI/BuildGUI_FaceDlg.h b/src/BuildGUI/BuildGUI_FaceDlg.h index d0e667072..2dc3b993c 100644 --- a/src/BuildGUI/BuildGUI_FaceDlg.h +++ b/src/BuildGUI/BuildGUI_FaceDlg.h @@ -59,7 +59,7 @@ private: DlgRef_1Sel1Check* GroupWire; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/BuildGUI/BuildGUI_ShellDlg.h b/src/BuildGUI/BuildGUI_ShellDlg.h index 8c2e18061..d460acf3f 100644 --- a/src/BuildGUI/BuildGUI_ShellDlg.h +++ b/src/BuildGUI/BuildGUI_ShellDlg.h @@ -59,7 +59,7 @@ private: DlgRef_1Sel* GroupShell; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void SetEditCurrentArgument(); diff --git a/src/BuildGUI/BuildGUI_SolidDlg.h b/src/BuildGUI/BuildGUI_SolidDlg.h index 6be374c6f..98eb0f779 100644 --- a/src/BuildGUI/BuildGUI_SolidDlg.h +++ b/src/BuildGUI/BuildGUI_SolidDlg.h @@ -60,7 +60,7 @@ private: DlgRef_1Sel1Check* GroupSolid; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void SetEditCurrentArgument(); diff --git a/src/BuildGUI/BuildGUI_WireDlg.h b/src/BuildGUI/BuildGUI_WireDlg.h index 8aa929c70..caba1b3a2 100644 --- a/src/BuildGUI/BuildGUI_WireDlg.h +++ b/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(); diff --git a/src/CurveCreator/CurveCreator_NewPointDlg.cxx b/src/CurveCreator/CurveCreator_NewPointDlg.cxx index bb15571e8..4a5810e73 100755 --- a/src/CurveCreator/CurveCreator_NewPointDlg.cxx +++ b/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 diff --git a/src/CurveCreator/CurveCreator_NewPointDlg.h b/src/CurveCreator/CurveCreator_NewPointDlg.h index a86189e54..4bbad9117 100755 --- a/src/CurveCreator/CurveCreator_NewPointDlg.h +++ b/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); diff --git a/src/CurveCreator/CurveCreator_NewSectionDlg.h b/src/CurveCreator/CurveCreator_NewSectionDlg.h index 7f028f20e..ddb00c67d 100755 --- a/src/CurveCreator/CurveCreator_NewSectionDlg.h +++ b/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: diff --git a/src/CurveCreator/CurveCreator_TreeView.cxx b/src/CurveCreator/CurveCreator_TreeView.cxx index 1b7fa9587..723cebc7d 100755 --- a/src/CurveCreator/CurveCreator_TreeView.cxx +++ b/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 ) diff --git a/src/CurveCreator/CurveCreator_TreeView.h b/src/CurveCreator/CurveCreator_TreeView.h index 09929bf35..fe5b16c9f 100755 --- a/src/CurveCreator/CurveCreator_TreeView.h +++ b/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 ); diff --git a/src/CurveCreator/CurveCreator_UndoOptsDlg.h b/src/CurveCreator/CurveCreator_UndoOptsDlg.h index 86aa87aa3..4adac51bd 100644 --- a/src/CurveCreator/CurveCreator_UndoOptsDlg.h +++ b/src/CurveCreator/CurveCreator_UndoOptsDlg.h @@ -54,7 +54,7 @@ private: void setTabOrder(); -private slots: +private Q_SLOTS: void optionChanged(int theId); diff --git a/src/CurveCreator/CurveCreator_Widget.cxx b/src/CurveCreator/CurveCreator_Widget.cxx index 180284fc1..c1eff9258 100644 --- a/src/CurveCreator/CurveCreator_Widget.cxx +++ b/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() diff --git a/src/CurveCreator/CurveCreator_Widget.h b/src/CurveCreator/CurveCreator_Widget.h index 7f335e8db..f28c39ac5 100644 --- a/src/CurveCreator/CurveCreator_Widget.h +++ b/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); diff --git a/src/DependencyTree/DependencyTree_View.h b/src/DependencyTree/DependencyTree_View.h index 298933729..d3eb9ac20 100644 --- a/src/DependencyTree/DependencyTree_View.h +++ b/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 ); diff --git a/src/DependencyTree/DependencyTree_ViewModel.h b/src/DependencyTree/DependencyTree_ViewModel.h index 9bac8cbce..9f269cdbe 100644 --- a/src/DependencyTree/DependencyTree_ViewModel.h +++ b/src/DependencyTree/DependencyTree_ViewModel.h @@ -37,7 +37,7 @@ public: virtual void contextMenuPopup( QMenu* ); -private slots: +private Q_SLOTS: void onShowSelected(); void onShowOnlySelected(); diff --git a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx index 609b7e8a3..10c7d4dcf 100755 --- a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx @@ -1742,7 +1742,7 @@ bool EntityGUI_3DSketcherDlg::createShapes (GEOM::GEOM_Object_ptr /*theObject*/, TopoDS_Shape& theLastSegment) { QList 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(); } diff --git a/src/EntityGUI/EntityGUI_3DSketcherDlg.h b/src/EntityGUI/EntityGUI_3DSketcherDlg.h index a60a8063f..8b78cb66d 100755 --- a/src/EntityGUI/EntityGUI_3DSketcherDlg.h +++ b/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(); diff --git a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.h b/src/EntityGUI/EntityGUI_FeatureDetectorDlg.h index c49713689..d425dc42e 100644 --- a/src/EntityGUI/EntityGUI_FeatureDetectorDlg.h +++ b/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 ); diff --git a/src/EntityGUI/EntityGUI_FieldDlg.cxx b/src/EntityGUI/EntityGUI_FieldDlg.cxx index cead457e7..8b800c4e0 100644 --- a/src/EntityGUI/EntityGUI_FieldDlg.cxx +++ b/src/EntityGUI/EntityGUI_FieldDlg.cxx @@ -531,7 +531,7 @@ QList EntityGUI_FieldDlg::StepTable::selectedRows() QTableWidgetItem* anItem; QList rows; - foreach( anItem, selItems ) { + Q_FOREACH( anItem, selItems ) { int r = row( anItem ); if ( !rows.contains( r ) ) rows.append( r ); } diff --git a/src/EntityGUI/EntityGUI_FieldDlg.h b/src/EntityGUI/EntityGUI_FieldDlg.h index 0fab30729..885689cf1 100644 --- a/src/EntityGUI/EntityGUI_FieldDlg.h +++ b/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 ); }; diff --git a/src/EntityGUI/EntityGUI_IsolineDlg.h b/src/EntityGUI/EntityGUI_IsolineDlg.h index 30988fd79..d33d811c8 100755 --- a/src/EntityGUI/EntityGUI_IsolineDlg.h +++ b/src/EntityGUI/EntityGUI_IsolineDlg.h @@ -68,7 +68,7 @@ private: GEOM::GeomObjPtr myFace; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); diff --git a/src/EntityGUI/EntityGUI_PictureImportDlg.h b/src/EntityGUI/EntityGUI_PictureImportDlg.h index 6024bd374..c48b682a6 100644 --- a/src/EntityGUI/EntityGUI_PictureImportDlg.h +++ b/src/EntityGUI/EntityGUI_PictureImportDlg.h @@ -59,7 +59,7 @@ private: QPushButton* myPushButton; QLineEdit* myLineEdit; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); // diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.h b/src/EntityGUI/EntityGUI_SketcherDlg.h index 773b4dde8..6a1146404 100644 --- a/src/EntityGUI/EntityGUI_SketcherDlg.h +++ b/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(); diff --git a/src/EntityGUI/EntityGUI_SubShapeDlg.h b/src/EntityGUI/EntityGUI_SubShapeDlg.h index 14275c83e..8f57873ea 100644 --- a/src/EntityGUI/EntityGUI_SubShapeDlg.h +++ b/src/EntityGUI/EntityGUI_SubShapeDlg.h @@ -55,7 +55,7 @@ protected: void closeEvent (QCloseEvent*); -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/GEOMBase/GEOMBase.cxx b/src/GEOMBase/GEOMBase.cxx index 26110fe1e..1bf8dae1f 100644 --- a/src/GEOMBase/GEOMBase.cxx +++ b/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( 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(occViewer); diff --git a/src/GEOMBase/GEOMBase_Skeleton.h b/src/GEOMBase/GEOMBase_Skeleton.h index e4f5f4d94..28056dac0 100644 --- a/src/GEOMBase/GEOMBase_Skeleton.h +++ b/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 ); }; diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index a012c220b..7b6264fff 100644 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/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 ( 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(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 diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index fa594d236..2f4b6b242 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/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; } diff --git a/src/GEOMGUI/GeometryGUI.h b/src/GEOMGUI/GeometryGUI.h index f2f2ad8e5..7fd12c3e3 100644 --- a/src/GEOMGUI/GeometryGUI.h +++ b/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 ); diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx index 0c514cb78..6437bcded 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx +++ b/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 ( vmod ); // must work for OCC and VTK views if ( view ) diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h index 8999ffdce..cd99904ba 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h +++ b/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: diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.h index 2e5ec22d3..2da8dbbc3 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_LineWidthDlg.h +++ b/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: diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.h index c927bc79c..23b1ba697 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.h +++ b/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(); diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx index 2f35c6595..ecb2003d4 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.cxx +++ b/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 ) ); diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.h index ffd65964e..fa18ab3fe 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_MaterialPropertiesDlg.h +++ b/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* ); }; diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h index 94e069644..3491bf343 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h +++ b/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: diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.h index 4f25918d4..e8deacdd5 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.h @@ -65,7 +65,7 @@ protected: void getDrawableList(QTreeWidgetItem* theItem, QList& theList); void getTails(QTreeWidgetItem* theItem, QList& theList); -protected slots: +protected Q_SLOTS: void clickOnOk(); void clickOnApply(); void clickOnSelectAll(); diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_ReduceStudyDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_ReduceStudyDlg.h index ce69292e8..5281da338 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_ReduceStudyDlg.h +++ b/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 ); diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h index f9fad5b08..ccb3ee1db 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h +++ b/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(); diff --git a/src/GenerationGUI/GenerationGUI_FillingDlg.h b/src/GenerationGUI/GenerationGUI_FillingDlg.h index a6a828a04..2d45fcb57 100644 --- a/src/GenerationGUI/GenerationGUI_FillingDlg.h +++ b/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(); diff --git a/src/GenerationGUI/GenerationGUI_PipeDlg.h b/src/GenerationGUI/GenerationGUI_PipeDlg.h index ee15f709f..409340bb4 100644 --- a/src/GenerationGUI/GenerationGUI_PipeDlg.h +++ b/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(); diff --git a/src/GenerationGUI/GenerationGUI_PipePathDlg.h b/src/GenerationGUI/GenerationGUI_PipePathDlg.h index 58b2c8cec..ec11b0a03 100644 --- a/src/GenerationGUI/GenerationGUI_PipePathDlg.h +++ b/src/GenerationGUI/GenerationGUI_PipePathDlg.h @@ -61,7 +61,7 @@ private: DlgRef_3Sel1Check* GroupPoints; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.h b/src/GenerationGUI/GenerationGUI_PrismDlg.h index f8a7f1fde..cfa98d070 100644 --- a/src/GenerationGUI/GenerationGUI_PrismDlg.h +++ b/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(); diff --git a/src/GenerationGUI/GenerationGUI_RevolDlg.h b/src/GenerationGUI/GenerationGUI_RevolDlg.h index 7fe5aa34c..162e14c3f 100644 --- a/src/GenerationGUI/GenerationGUI_RevolDlg.h +++ b/src/GenerationGUI/GenerationGUI_RevolDlg.h @@ -63,7 +63,7 @@ private: DlgRef_2Sel1Spin2Check* GroupPoints; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/GroupGUI/GroupGUI_BooleanDlg.h b/src/GroupGUI/GroupGUI_BooleanDlg.h index 469581775..d00fbdd76 100644 --- a/src/GroupGUI/GroupGUI_BooleanDlg.h +++ b/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(); diff --git a/src/GroupGUI/GroupGUI_GroupDlg.h b/src/GroupGUI/GroupGUI_GroupDlg.h index fe43e2221..47bb77115 100644 --- a/src/GroupGUI/GroupGUI_GroupDlg.h +++ b/src/GroupGUI/GroupGUI_GroupDlg.h @@ -64,7 +64,7 @@ protected: void closeEvent (QCloseEvent*); -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/ImportExportGUI/ImportExportGUI_ExportXAODlg.h b/src/ImportExportGUI/ImportExportGUI_ExportXAODlg.h index 61ceffda1..fe9c1cdf5 100644 --- a/src/ImportExportGUI/ImportExportGUI_ExportXAODlg.h +++ b/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(); diff --git a/src/ImportExportGUI/ImportExportGUI_ImportXAODlg.h b/src/ImportExportGUI/ImportExportGUI_ImportXAODlg.h index d241ace6b..3aa6b8e20 100644 --- a/src/ImportExportGUI/ImportExportGUI_ImportXAODlg.h +++ b/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(); diff --git a/src/Material/Material_Model.cxx b/src/Material/Material_Model.cxx index 3eafd3c38..900769289 100644 --- a/src/Material/Material_Model.cxx +++ b/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; diff --git a/src/Material/Material_ResourceMgr.cxx b/src/Material/Material_ResourceMgr.cxx index 0f3027839..3e8306d41 100644 --- a/src/Material/Material_ResourceMgr.cxx +++ b/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(); } diff --git a/src/Material/Material_ResourceMgr.h b/src/Material/Material_ResourceMgr.h index 8896929ae..2fed56ca3 100644 --- a/src/Material/Material_ResourceMgr.h +++ b/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: diff --git a/src/MeasureGUI/MeasureGUI.h b/src/MeasureGUI/MeasureGUI.h index bbc71bf96..d2fbcef15 100644 --- a/src/MeasureGUI/MeasureGUI.h +++ b/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); }; diff --git a/src/MeasureGUI/MeasureGUI_BndBoxDlg.h b/src/MeasureGUI/MeasureGUI_BndBoxDlg.h index 1386f0c30..0bf9e35a3 100644 --- a/src/MeasureGUI/MeasureGUI_BndBoxDlg.h +++ b/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(); diff --git a/src/MeasureGUI/MeasureGUI_CenterMassDlg.h b/src/MeasureGUI/MeasureGUI_CenterMassDlg.h index f279c6c33..86612479d 100644 --- a/src/MeasureGUI/MeasureGUI_CenterMassDlg.h +++ b/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(); diff --git a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h index e6a93c4f0..747e07b43 100644 --- a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h +++ b/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(); diff --git a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.h b/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.h index e22346439..3baccd3bb 100644 --- a/src/MeasureGUI/MeasureGUI_CheckSelfIntersectionsDlg.h +++ b/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(); diff --git a/src/MeasureGUI/MeasureGUI_CheckShapeDlg.h b/src/MeasureGUI/MeasureGUI_CheckShapeDlg.h index a2ace0ae2..dec3752fd 100644 --- a/src/MeasureGUI/MeasureGUI_CheckShapeDlg.h +++ b/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(); diff --git a/src/MeasureGUI/MeasureGUI_CreateDimensionDlg.cxx b/src/MeasureGUI/MeasureGUI_CreateDimensionDlg.cxx index 13796c0ca..66bd404b1 100644 --- a/src/MeasureGUI/MeasureGUI_CreateDimensionDlg.cxx +++ b/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(); } //================================================================================= diff --git a/src/MeasureGUI/MeasureGUI_CreateDimensionDlg.h b/src/MeasureGUI/MeasureGUI_CreateDimensionDlg.h index 02e7cd9a6..215583642 100644 --- a/src/MeasureGUI/MeasureGUI_CreateDimensionDlg.h +++ b/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& theModes ); @@ -142,7 +142,7 @@ public: public: BaseSelectorPane( QWidget* theParent ); -signals: +Q_SIGNALS: void StartSelection( const QList& 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(); diff --git a/src/MeasureGUI/MeasureGUI_DimensionInteractor.cxx b/src/MeasureGUI/MeasureGUI_DimensionInteractor.cxx index 536774c0b..479f7cae2 100644 --- a/src/MeasureGUI/MeasureGUI_DimensionInteractor.cxx +++ b/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; } diff --git a/src/MeasureGUI/MeasureGUI_DimensionInteractor.h b/src/MeasureGUI/MeasureGUI_DimensionInteractor.h index d2a2f3acd..f1daf98d9 100644 --- a/src/MeasureGUI/MeasureGUI_DimensionInteractor.h +++ b/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* ); diff --git a/src/MeasureGUI/MeasureGUI_DistanceDlg.h b/src/MeasureGUI/MeasureGUI_DistanceDlg.h index 04c9ed820..cfcf217c7 100644 --- a/src/MeasureGUI/MeasureGUI_DistanceDlg.h +++ b/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(); diff --git a/src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.h b/src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.h index 5282c8cd6..fa3abf484 100644 --- a/src/MeasureGUI/MeasureGUI_GetNonBlocksDlg.h +++ b/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(); diff --git a/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.h b/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.h index af5ba2c9f..5b30ccb88 100644 --- a/src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.h +++ b/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(); diff --git a/src/MeasureGUI/MeasureGUI_NormaleDlg.h b/src/MeasureGUI/MeasureGUI_NormaleDlg.h index c7fe1337c..0ec57e162 100644 --- a/src/MeasureGUI/MeasureGUI_NormaleDlg.h +++ b/src/MeasureGUI/MeasureGUI_NormaleDlg.h @@ -56,7 +56,7 @@ private: DlgRef_2Sel* GroupArgs; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); diff --git a/src/MeasureGUI/MeasureGUI_Skeleton.h b/src/MeasureGUI/MeasureGUI_Skeleton.h index a12b40bf3..2871894b0 100644 --- a/src/MeasureGUI/MeasureGUI_Skeleton.h +++ b/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(); diff --git a/src/MeasureGUI/MeasureGUI_WhatisDlg.h b/src/MeasureGUI/MeasureGUI_WhatisDlg.h index 9c5ca6443..e98baeb42 100644 --- a/src/MeasureGUI/MeasureGUI_WhatisDlg.h +++ b/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: diff --git a/src/OperationGUI/OperationGUI_ArchimedeDlg.h b/src/OperationGUI/OperationGUI_ArchimedeDlg.h index 82a7af7bc..049381ef1 100644 --- a/src/OperationGUI/OperationGUI_ArchimedeDlg.h +++ b/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(); diff --git a/src/OperationGUI/OperationGUI_ChamferDlg.h b/src/OperationGUI/OperationGUI_ChamferDlg.h index 5e0712290..0b29f1d92 100644 --- a/src/OperationGUI/OperationGUI_ChamferDlg.h +++ b/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(); diff --git a/src/OperationGUI/OperationGUI_ClippingDlg.h b/src/OperationGUI/OperationGUI_ClippingDlg.h index d0d8067ec..5f7abea1b 100644 --- a/src/OperationGUI/OperationGUI_ClippingDlg.h +++ b/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(); diff --git a/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.h b/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.h index e5d384b26..913dc55ba 100644 --- a/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.h +++ b/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.h @@ -75,7 +75,7 @@ private: DlgRef_2Sel2Spin2Push* myGroup; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/OperationGUI/OperationGUI_Fillet1d2dDlg.h b/src/OperationGUI/OperationGUI_Fillet1d2dDlg.h index f203671d5..2606fa766 100644 --- a/src/OperationGUI/OperationGUI_Fillet1d2dDlg.h +++ b/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(); diff --git a/src/OperationGUI/OperationGUI_FilletDlg.h b/src/OperationGUI/OperationGUI_FilletDlg.h index edaaa40f7..b4116ae12 100644 --- a/src/OperationGUI/OperationGUI_FilletDlg.h +++ b/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(); diff --git a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h index 25dac2b69..20af0c215 100644 --- a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h +++ b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h @@ -59,7 +59,7 @@ private: DlgRef_2Sel2List* GroupPoints; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void SetEditCurrentArgument(); diff --git a/src/OperationGUI/OperationGUI_GetSharedShapesDlg.h b/src/OperationGUI/OperationGUI_GetSharedShapesDlg.h index 37edbcae3..7c90ee54a 100644 --- a/src/OperationGUI/OperationGUI_GetSharedShapesDlg.h +++ b/src/OperationGUI/OperationGUI_GetSharedShapesDlg.h @@ -59,7 +59,7 @@ private: DlgRef_2Sel1List1Check* GroupPoints; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/OperationGUI/OperationGUI_MaterialDlg.h b/src/OperationGUI/OperationGUI_MaterialDlg.h index 562a5f813..dead72449 100644 --- a/src/OperationGUI/OperationGUI_MaterialDlg.h +++ b/src/OperationGUI/OperationGUI_MaterialDlg.h @@ -54,7 +54,7 @@ private: DlgRef_1List1Spin1Btn* GroupPoints; -private slots: +private Q_SLOTS: void ClickOnOk(); void ActivateThisDialog(); void SelectionIntoArgument(); diff --git a/src/OperationGUI/OperationGUI_PartitionDlg.h b/src/OperationGUI/OperationGUI_PartitionDlg.h index 242eb12a4..53f3cff51 100644 --- a/src/OperationGUI/OperationGUI_PartitionDlg.h +++ b/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(); diff --git a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h index 0fd8e4467..d82ba935a 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h +++ b/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(); diff --git a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h index dc094f8b7..7c2d1953b 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h +++ b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h @@ -65,7 +65,7 @@ private: DlgRef_2Sel3Spin* GroupPoints; DlgRef_3Spin* GroupDimensions; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h index 1a5ccc46b..933551ee2 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h +++ b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h @@ -68,7 +68,7 @@ private: DlgRef_2Sel3Spin1Check* GroupPoints; DlgRef_3Spin1CheckCyl* GroupDimensions; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h index b616096df..f2ae1739d 100755 --- a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h +++ b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h @@ -66,7 +66,7 @@ private: DlgRef_1Spin* GroupDimensions; DlgRef_3Radio* GroupOrientation; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); diff --git a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h index bc2c398c0..a94164028 100755 --- a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h +++ b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h @@ -65,7 +65,7 @@ private: DlgRef_3Radio* GroupOrientation; DlgRef_3Radio* GroupType; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); diff --git a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h index 19611ac23..1889ce58a 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h +++ b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h @@ -63,7 +63,7 @@ private: DlgRef_1Sel1Spin* GroupPoints; DlgRef_1Spin* GroupDimensions; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h index ed46a68de..45767250f 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h +++ b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h @@ -64,7 +64,7 @@ private: DlgRef_2Sel2Spin* GroupPoints; DlgRef_2Spin* GroupDimensions; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/RepairGUI/RepairGUI_ChangeOrientationDlg.h b/src/RepairGUI/RepairGUI_ChangeOrientationDlg.h index 235c0b9e0..673bb97cd 100644 --- a/src/RepairGUI/RepairGUI_ChangeOrientationDlg.h +++ b/src/RepairGUI/RepairGUI_ChangeOrientationDlg.h @@ -59,7 +59,7 @@ private: DlgRef_1Sel1Check* GroupPoints; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/RepairGUI/RepairGUI_CloseContourDlg.h b/src/RepairGUI/RepairGUI_CloseContourDlg.h index 22d872a61..8f346a49f 100644 --- a/src/RepairGUI/RepairGUI_CloseContourDlg.h +++ b/src/RepairGUI/RepairGUI_CloseContourDlg.h @@ -64,7 +64,7 @@ private: DlgRef_2SelExt* GroupPoints; QButtonGroup* myIsVertexGr; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); diff --git a/src/RepairGUI/RepairGUI_DivideEdgeDlg.h b/src/RepairGUI/RepairGUI_DivideEdgeDlg.h index 4b1adc3c9..87a123442 100644 --- a/src/RepairGUI/RepairGUI_DivideEdgeDlg.h +++ b/src/RepairGUI/RepairGUI_DivideEdgeDlg.h @@ -66,7 +66,7 @@ private: QButtonGroup* myIsParameterGr; SalomeApp_DoubleSpinBox* myValEdt; -protected slots: +protected Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); diff --git a/src/RepairGUI/RepairGUI_FreeBoundDlg.h b/src/RepairGUI/RepairGUI_FreeBoundDlg.h index deb2812f8..d71e2e791 100644 --- a/src/RepairGUI/RepairGUI_FreeBoundDlg.h +++ b/src/RepairGUI/RepairGUI_FreeBoundDlg.h @@ -69,7 +69,7 @@ private: int myNbOpen; int myCurrObj; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void SelectionIntoArgument(); diff --git a/src/RepairGUI/RepairGUI_FreeFacesDlg.h b/src/RepairGUI/RepairGUI_FreeFacesDlg.h index 160d4bffa..783df1d9c 100644 --- a/src/RepairGUI/RepairGUI_FreeFacesDlg.h +++ b/src/RepairGUI/RepairGUI_FreeFacesDlg.h @@ -62,7 +62,7 @@ private: void activateSelection(); GEOM_Displayer* getDisplayer(); -private slots: +private Q_SLOTS: void onClose(); void onHelp(); void onDeactivate(); diff --git a/src/RepairGUI/RepairGUI_FuseEdgesDlg.h b/src/RepairGUI/RepairGUI_FuseEdgesDlg.h index b7cf9c4d1..1dba3a8cb 100644 --- a/src/RepairGUI/RepairGUI_FuseEdgesDlg.h +++ b/src/RepairGUI/RepairGUI_FuseEdgesDlg.h @@ -45,7 +45,7 @@ protected: virtual bool execute (ObjectList&); virtual void addSubshapesToStudy(); -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/RepairGUI/RepairGUI_GlueDlg.h b/src/RepairGUI/RepairGUI_GlueDlg.h index 4b6ccc3af..8a16c4fdf 100644 --- a/src/RepairGUI/RepairGUI_GlueDlg.h +++ b/src/RepairGUI/RepairGUI_GlueDlg.h @@ -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(); diff --git a/src/RepairGUI/RepairGUI_LimitToleranceDlg.h b/src/RepairGUI/RepairGUI_LimitToleranceDlg.h index 4e2af32de..48afdc900 100644 --- a/src/RepairGUI/RepairGUI_LimitToleranceDlg.h +++ b/src/RepairGUI/RepairGUI_LimitToleranceDlg.h @@ -66,7 +66,7 @@ private: DlgRef_1SelExt* GroupPoints; SalomeApp_DoubleSpinBox* myTolEdt; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); diff --git a/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h b/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h index 9c638015e..35be3357d 100644 --- a/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h +++ b/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h @@ -58,7 +58,7 @@ private: DlgRef_1Sel1Check* GroupPoints; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); diff --git a/src/RepairGUI/RepairGUI_RemoveHolesDlg.h b/src/RepairGUI/RepairGUI_RemoveHolesDlg.h index 79483cb36..ae3a7a75c 100644 --- a/src/RepairGUI/RepairGUI_RemoveHolesDlg.h +++ b/src/RepairGUI/RepairGUI_RemoveHolesDlg.h @@ -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(); diff --git a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h index 9648e8b3b..d850ee030 100644 --- a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h +++ b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h @@ -60,7 +60,7 @@ private: DlgRef_1Sel1Check1Sel* GroupPoints; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); diff --git a/src/RepairGUI/RepairGUI_RemoveWebsDlg.h b/src/RepairGUI/RepairGUI_RemoveWebsDlg.h index 72fd49937..bca46af25 100755 --- a/src/RepairGUI/RepairGUI_RemoveWebsDlg.h +++ b/src/RepairGUI/RepairGUI_RemoveWebsDlg.h @@ -57,7 +57,7 @@ private: DlgRef_1Sel* GroupPoints; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); diff --git a/src/RepairGUI/RepairGUI_SewingDlg.h b/src/RepairGUI/RepairGUI_SewingDlg.h index 264a9b6e7..f1b925860 100644 --- a/src/RepairGUI/RepairGUI_SewingDlg.h +++ b/src/RepairGUI/RepairGUI_SewingDlg.h @@ -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(); diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.h b/src/RepairGUI/RepairGUI_ShapeProcessDlg.h index 4a6480220..6661793e9 100755 --- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.h +++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.h @@ -121,7 +121,7 @@ private: SalomeApp_DoubleSpinBox* mySameParameterTol3D; -private slots: +private Q_SLOTS: void onOk(); bool onApply(); diff --git a/src/RepairGUI/RepairGUI_SuppressFacesDlg.h b/src/RepairGUI/RepairGUI_SuppressFacesDlg.h index d0fdbef5d..df615b5ca 100644 --- a/src/RepairGUI/RepairGUI_SuppressFacesDlg.h +++ b/src/RepairGUI/RepairGUI_SuppressFacesDlg.h @@ -61,7 +61,7 @@ private: DlgRef_2Sel* GroupArgs; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); diff --git a/src/RepairGUI/RepairGUI_UnionFacesDlg.h b/src/RepairGUI/RepairGUI_UnionFacesDlg.h index 3290ae3b9..73a470cfb 100755 --- a/src/RepairGUI/RepairGUI_UnionFacesDlg.h +++ b/src/RepairGUI/RepairGUI_UnionFacesDlg.h @@ -58,7 +58,7 @@ private: DlgRef_1Sel* GroupPoints; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); diff --git a/src/TransformationGUI/TransformationGUI_MirrorDlg.h b/src/TransformationGUI/TransformationGUI_MirrorDlg.h index e75b583bb..9bad6cda7 100644 --- a/src/TransformationGUI/TransformationGUI_MirrorDlg.h +++ b/src/TransformationGUI/TransformationGUI_MirrorDlg.h @@ -66,7 +66,7 @@ private: DlgRef_2Sel1Spin2Check* GroupPoints; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h index 904c718bf..a770b083b 100644 --- a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h +++ b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h @@ -115,7 +115,7 @@ private: TransformationGUI_2Sel4Spin1Check* GroupArgs; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h index ed7446bef..dfe251b4a 100644 --- a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h +++ b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h @@ -72,7 +72,7 @@ private: DlgRef_2Sel2Spin1Check* GroupPoints; DlgRef_3Sel4Spin2Check* GroupDimensions; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/TransformationGUI/TransformationGUI_OffsetDlg.h b/src/TransformationGUI/TransformationGUI_OffsetDlg.h index 259a641e9..04a6f6818 100644 --- a/src/TransformationGUI/TransformationGUI_OffsetDlg.h +++ b/src/TransformationGUI/TransformationGUI_OffsetDlg.h @@ -62,7 +62,7 @@ private: DlgRef_1Sel1Spin1Check* GroupPoints; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/TransformationGUI/TransformationGUI_PositionDlg.h b/src/TransformationGUI/TransformationGUI_PositionDlg.h index 67d4b3a76..805244c26 100644 --- a/src/TransformationGUI/TransformationGUI_PositionDlg.h +++ b/src/TransformationGUI/TransformationGUI_PositionDlg.h @@ -68,7 +68,7 @@ private: DlgRef_4Sel1Spin3Check* Group1; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/TransformationGUI/TransformationGUI_ProjectionDlg.h b/src/TransformationGUI/TransformationGUI_ProjectionDlg.h index b20e110c8..d72e74321 100644 --- a/src/TransformationGUI/TransformationGUI_ProjectionDlg.h +++ b/src/TransformationGUI/TransformationGUI_ProjectionDlg.h @@ -60,7 +60,7 @@ private: DlgRef_2Sel* myGroup; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void SetEditCurrentArgument(); diff --git a/src/TransformationGUI/TransformationGUI_RotationDlg.h b/src/TransformationGUI/TransformationGUI_RotationDlg.h index 7811bbf2a..5fe1fed70 100644 --- a/src/TransformationGUI/TransformationGUI_RotationDlg.h +++ b/src/TransformationGUI/TransformationGUI_RotationDlg.h @@ -68,7 +68,7 @@ private: DlgRef_4Sel1Spin2Check* GroupPoints; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/TransformationGUI/TransformationGUI_ScaleDlg.h b/src/TransformationGUI/TransformationGUI_ScaleDlg.h index e69c9e3f1..89d3c3ca5 100644 --- a/src/TransformationGUI/TransformationGUI_ScaleDlg.h +++ b/src/TransformationGUI/TransformationGUI_ScaleDlg.h @@ -84,7 +84,7 @@ private: SalomeApp_DoubleSpinBox* SpinBox_FZ; QCheckBox* CheckBoxCopy; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); diff --git a/src/TransformationGUI/TransformationGUI_TranslationDlg.h b/src/TransformationGUI/TransformationGUI_TranslationDlg.h index c0a0a1223..6241b2b7d 100644 --- a/src/TransformationGUI/TransformationGUI_TranslationDlg.h +++ b/src/TransformationGUI/TransformationGUI_TranslationDlg.h @@ -68,7 +68,7 @@ private: DlgRef_3Sel3Spin2Check* GroupPoints; -private slots: +private Q_SLOTS: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog();