From fc426d91b1aed0b5d7450b62cb733d8dd4e48662 Mon Sep 17 00:00:00 2001 From: san Date: Thu, 15 Apr 2010 13:46:56 +0000 Subject: [PATCH] Issue 0020580: get rid of QtxDoubleSpinBox class and use SalomeApp_DoubleSpinBox instead --- src/DlgRef/DlgRef_1Sel4Spin_QTD.ui | 12 ++++++------ src/DlgRef/DlgRef_1Sel5Spin_QTD.ui | 14 +++++++------- src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.ui | 10 +++++----- src/EntityGUI/EntityGUI_3DSketcherDlg.cxx | 2 +- src/EntityGUI/EntityGUI_SketcherDlg.cxx | 2 +- src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx | 7 ++++--- src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h | 4 ++-- src/OperationGUI/OperationGUI_ChamferDlg.cxx | 2 +- src/OperationGUI/OperationGUI_ClippingDlg.cxx | 2 +- src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx | 2 +- src/RepairGUI/RepairGUI_GlueDlg.cxx | 2 +- src/RepairGUI/RepairGUI_SewingDlg.cxx | 2 +- src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx | 1 - 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/DlgRef/DlgRef_1Sel4Spin_QTD.ui b/src/DlgRef/DlgRef_1Sel4Spin_QTD.ui index 5bb4e299c..43cbcba2b 100644 --- a/src/DlgRef/DlgRef_1Sel4Spin_QTD.ui +++ b/src/DlgRef/DlgRef_1Sel4Spin_QTD.ui @@ -72,7 +72,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -131,7 +131,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -196,9 +196,9 @@ qPixmapFromMimeSource - QtxDoubleSpinBox + SalomeApp_DoubleSpinBox QDoubleSpinBox -
QtxDoubleSpinBox.h
+
SalomeApp_DoubleSpinBox.h
diff --git a/src/DlgRef/DlgRef_1Sel5Spin_QTD.ui b/src/DlgRef/DlgRef_1Sel5Spin_QTD.ui index eb2fd7743..1b945b5a8 100644 --- a/src/DlgRef/DlgRef_1Sel5Spin_QTD.ui +++ b/src/DlgRef/DlgRef_1Sel5Spin_QTD.ui @@ -108,7 +108,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -146,13 +146,13 @@ - + - + - + @@ -213,9 +213,9 @@ qPixmapFromMimeSource - QtxDoubleSpinBox + SalomeApp_DoubleSpinBox QDoubleSpinBox -
QtxDoubleSpinBox.h
+
SalomeApp_DoubleSpinBox.h
diff --git a/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.ui b/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.ui index ac29be9fd..e04d28795 100644 --- a/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.ui +++ b/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.ui @@ -75,13 +75,13 @@
- + - + - + @@ -236,9 +236,9 @@ qPixmapFromMimeSource - QtxDoubleSpinBox + SalomeApp_DoubleSpinBox QDoubleSpinBox -
QtxDoubleSpinBox.h
+
SalomeApp_DoubleSpinBox.h
diff --git a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx index a3171f10a..72c3845a1 100755 --- a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx @@ -25,7 +25,7 @@ #include "EntityGUI_3DSketcherDlg.h" #include "EntityGUI_Widgets.h" -#include +#include #include #include diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx index 000461777..472812cdb 100644 --- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx @@ -25,7 +25,7 @@ // #include "EntityGUI_SketcherDlg.h" #include "EntityGUI_Widgets.h" -#include +#include #include #include diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx index 4277f21f4..ad7352efd 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx @@ -26,7 +26,7 @@ #include "GEOMToolsGUI_DeflectionDlg.h" #include #include -#include +#include #include #include @@ -71,10 +71,11 @@ GEOMToolsGUI_DeflectionDlg::GEOMToolsGUI_DeflectionDlg (QWidget* parent) TextLabel1->setText(tr("GEOM_DEFLECTION")); GroupC1Layout->addWidget(TextLabel1, 0, 0); - SpinBox = new QtxDoubleSpinBox (GroupC1); + SpinBox = new SalomeApp_DoubleSpinBox (GroupC1); // Obtain precision from preferences SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); - int aPrecision = resMgr->integerValue( "Geometry", "parametric_precision", 6 ); + int aPrecision = resMgr->integerValue( "Geometry", "parametric_precision", 6 ); + SpinBox->setAcceptNames( false ); SpinBox->setPrecision( aPrecision ); SpinBox->setDecimals( aPrecision ); SpinBox->setRange( DEFLECTION_MIN, 1.0 ); diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h index e5b3fe9e6..1a78d79e1 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.h @@ -30,7 +30,7 @@ #include -class QtxDoubleSpinBox; +class SalomeApp_DoubleSpinBox; //================================================================================= // class : GEOMToolsGUI_DeflectionDlg @@ -54,7 +54,7 @@ private: void keyPressEvent( QKeyEvent* ); private: - QtxDoubleSpinBox* SpinBox; + SalomeApp_DoubleSpinBox* SpinBox; QString myHelpFileName; }; diff --git a/src/OperationGUI/OperationGUI_ChamferDlg.cxx b/src/OperationGUI/OperationGUI_ChamferDlg.cxx index dd1409e16..9511421cc 100644 --- a/src/OperationGUI/OperationGUI_ChamferDlg.cxx +++ b/src/OperationGUI/OperationGUI_ChamferDlg.cxx @@ -24,7 +24,7 @@ // Author : Damien COQUERET, Open CASCADE S.A.S. // #include "OperationGUI_ChamferDlg.h" -#include +#include #include #include diff --git a/src/OperationGUI/OperationGUI_ClippingDlg.cxx b/src/OperationGUI/OperationGUI_ClippingDlg.cxx index d79a897dd..04ecc78f4 100644 --- a/src/OperationGUI/OperationGUI_ClippingDlg.cxx +++ b/src/OperationGUI/OperationGUI_ClippingDlg.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx index 9829ad24e..8d14e0c57 100644 --- a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx +++ b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/RepairGUI/RepairGUI_GlueDlg.cxx b/src/RepairGUI/RepairGUI_GlueDlg.cxx index 58daf586e..f4e4d1e2d 100644 --- a/src/RepairGUI/RepairGUI_GlueDlg.cxx +++ b/src/RepairGUI/RepairGUI_GlueDlg.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/RepairGUI/RepairGUI_SewingDlg.cxx b/src/RepairGUI/RepairGUI_SewingDlg.cxx index f0e13e85e..8e3c3bb36 100644 --- a/src/RepairGUI/RepairGUI_SewingDlg.cxx +++ b/src/RepairGUI/RepairGUI_SewingDlg.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx index 6073f4cbd..93a84d2fe 100755 --- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx +++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx @@ -29,7 +29,6 @@ #include #include #include -#include #include #include -- 2.39.2