SMH: 3.0.0 preparation - merged and adopted version (POLYWORK+HEAD)

[modules/visu.git] / src / VISUGUI / VisuGUI_ScalarBarDlg.h

diff --git a/src/VISUGUI/VisuGUI_ScalarBarDlg.h b/src/VISUGUI/VisuGUI_ScalarBarDlg.h
index 21bcd89779424419c4b2feee16faac71b32c6f56..6e23c9131490734f7396570bd9f7a4a117bad0ba 100644 (file)
--- a/src/VISUGUI/VisuGUI_ScalarBarDlg.h
+++ b/src/VISUGUI/VisuGUI_ScalarBarDlg.h
@@ -29,9 +29,6 @@
 #ifndef VISUGUI_SCALARBARDLG_H
 #define VISUGUI_SCALARBARDLG_H
 
-#include "QAD_SpinBoxDbl.h"
-
-#include <qdialog.h>
 #include <qbuttongroup.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
@@ -44,12 +41,29 @@
 #include <qvbox.h>
 #include <qtoolbutton.h>
 
-#include "VISU_ScalarMap_i.hh"
+#include "QtxDblSpinBox.h"
+
+class QButtonGroup;
+class QGroupBox;
+class QLabel;
+class QRadioButton;
+class QCheckBox;
+class QPushButton;
+class QSpinBox;
+class QLineEdit;
+class QComboBox;
+class QVBox;
+class QToolButton;
 
+class QtxDblSpinBox;
+
+#include <qdialog.h>
+
+#include "VISU_ScalarMap_i.hh"
 
 class VisuGUI_TextPrefDlg: public QDialog 
 {
-    Q_OBJECT
+  Q_OBJECT;
 
 public:
     VisuGUI_TextPrefDlg(QWidget* parent);
@@ -114,7 +128,7 @@ private slots:
 
 class VisuGUI_ScalarBarPane : public QVBox
 {
-    Q_OBJECT
+  Q_OBJECT;
 
 public:
     VisuGUI_ScalarBarPane(QWidget* parent, bool SetPref);
@@ -155,11 +169,11 @@ protected:
     QRadioButton*   RBhori;
     QRadioButton*   RBvert;
 
-    QAD_SpinBoxDbl* XSpin;
-    QAD_SpinBoxDbl* YSpin;
+    QtxDblSpinBox* XSpin;
+    QtxDblSpinBox* YSpin;
 
-    QAD_SpinBoxDbl* WidthSpin;
-    QAD_SpinBoxDbl* HeightSpin;
+    QtxDblSpinBox* WidthSpin;
+    QtxDblSpinBox* HeightSpin;
 
     QSpinBox*       ColorSpin;
     QSpinBox*       LabelSpin;
@@ -188,10 +202,10 @@ private slots:
 
 class VisuGUI_ScalarBarDlg : public QDialog
 { 
-    Q_OBJECT
+  Q_OBJECT;
 
 public:
-    VisuGUI_ScalarBarDlg( bool SetPref = FALSE );
+    VisuGUI_ScalarBarDlg( QWidget* parent = 0, bool SetPref = FALSE );
     ~VisuGUI_ScalarBarDlg() {};
 
     bool isToSave() {return myScalarPane->isToSave();}