Git commit 92bd93bb5266f9634f2bf56af456c00801074746 by Anne-Marie Mahfouf.
Committed on 10/06/2013 at 20:35.
Pushed by annma into branch 'frameworks'.

KNumInput -> QSpinBox

M  +9    -3    kdeui/dialogs/kinputdialog.cpp
M  +3    -3    kdeui/dialogs/kinputdialog_p.h
M  +17   -12   kdeui/tests/krulertest.cpp
M  +4    -3    kdeui/tests/krulertest.h
M  +15   -15   staging/kde4support/src/kdeui/kcolordialog.cpp

http://commits.kde.org/kdelibs/92bd93bb5266f9634f2bf56af456c00801074746

diff --git a/kdeui/dialogs/kinputdialog.cpp b/kdeui/dialogs/kinputdialog.cpp
index dfe2493..dfb2072 100644
--- a/kdeui/dialogs/kinputdialog.cpp
+++ b/kdeui/dialogs/kinputdialog.cpp
@@ -26,12 +26,12 @@
 #include <QLayout>
 #include <QPushButton>
 #include <QListWidget>
+#include <QSpinBox>
 =

 #include <kcombobox.h>
 #include <kcompletion.h>
 #include <kguiitem.h>
 #include <klineedit.h>
-#include <knuminput.h>
 #include <kstandardguiitem.h>
 #include <ktextedit.h>
 =

@@ -133,7 +133,13 @@ KInputDialogHelper::KInputDialogHelper( const QString =
&caption, const QString &l
     m_label->setWordWrap(true);
     layout->addWidget(m_label);
 =

-    m_intSpinBox =3D new KIntSpinBox(minValue, maxValue, step, value, this=
, base);
+    m_intSpinBox =3D new QSpinBox(this);
+    m_intSpinBox->setMinimum(minValue);
+    m_intSpinBox->setMaximum(maxValue);
+    m_intSpinBox->setSingleStep(step);
+    m_intSpinBox->setValue(value);
+    m_intSpinBox->setDisplayIntegerBase(base);
+
     layout->addWidget(m_intSpinBox);
 =

     layout->addStretch();
@@ -320,7 +326,7 @@ KLineEdit *KInputDialogHelper::lineEdit() const
     return m_lineEdit;
 }
 =

-KIntSpinBox *KInputDialogHelper::intSpinBox() const
+QSpinBox *KInputDialogHelper::intSpinBox() const
 {
     return m_intSpinBox;
 }
diff --git a/kdeui/dialogs/kinputdialog_p.h b/kdeui/dialogs/kinputdialog_p.h
index dcdff3f..4c9c8ae 100644
--- a/kdeui/dialogs/kinputdialog_p.h
+++ b/kdeui/dialogs/kinputdialog_p.h
@@ -25,9 +25,9 @@ class QValidator;
 class QDialogButtonBox;
 class QDoubleSpinBox;
 class QListWidget;
+class QSpinBox;
 =

 class KComboBox;
-class KIntSpinBox;
 class KLineEdit;
 class KTextEdit;
 =

@@ -61,7 +61,7 @@ class KInputDialogHelper : public QDialog
     ~KInputDialogHelper();
 =

     KLineEdit *lineEdit() const;
-    KIntSpinBox *intSpinBox() const;
+    QSpinBox *intSpinBox() const;
     QDoubleSpinBox *doubleSpinBox() const;
     KComboBox *comboBox() const;
     QListWidget *listBox() const;
@@ -74,7 +74,7 @@ class KInputDialogHelper : public QDialog
   private:
     QLabel *m_label;
     KLineEdit *m_lineEdit;
-    KIntSpinBox *m_intSpinBox;
+    QSpinBox *m_intSpinBox;
     QDoubleSpinBox *m_doubleSpinBox;
     KComboBox *m_comboBox;
     QListWidget *m_listBox;
diff --git a/kdeui/tests/krulertest.cpp b/kdeui/tests/krulertest.cpp
index 9686421..d94d73c 100644
--- a/kdeui/tests/krulertest.cpp
+++ b/kdeui/tests/krulertest.cpp
@@ -8,6 +8,8 @@
 #include <QKeyEvent>
 #include <QGroupBox>
 #include <QButtonGroup>
+#include <QSpinBox>
+#include <QDoubleSpinBox>
 =

 /*
 void
@@ -139,27 +141,27 @@ KRulerTest::KRulerTest()
   lineEdit =3D new QGroupBox("Value of begin/end", bigwidget);
   lineEdit->setFixedSize(140, 80);
   lineEdit->move(330,4+160);
-  beginMark =3D new KIntNumInput(0, lineEdit);
+  beginMark =3D new QSpinBox(lineEdit);
+  beginMark->setValue(0);
   beginMark->setRange(-1000, 1000);
-  beginMark->setSliderEnabled(false);
   beginMark->move(5, 15);
   beginMark->setFixedSize(beginMark->sizeHint());
   connect(beginMark, SIGNAL(valueChanged(int)),
 	  hruler, SLOT(slotNewOffset(int)) );
   connect(beginMark, SIGNAL(valueChanged(int)),
 	  vruler, SLOT(slotNewOffset(int)) );
-  endMark =3D new KIntNumInput(0, lineEdit);
+  endMark =3D new QSpinBox(lineEdit);
+  endMark->setValue(0);
   endMark->setRange(-1000, 1000);
-  endMark->setSliderEnabled(false);
   endMark->move(5, 35);
   endMark->setFixedSize(endMark->sizeHint());
   connect(endMark, SIGNAL(valueChanged(int)),
 	  hruler, SLOT(slotEndOffset(int)) );
   connect(endMark, SIGNAL(valueChanged(int)),
 	  vruler, SLOT(slotEndOffset(int)) );
-  lengthInput =3D new KIntNumInput(0, lineEdit);
+  lengthInput =3D new QSpinBox(lineEdit);
+  lengthInput->setValue(0);
   lengthInput->setRange(-1000, 1000);
-  lengthInput->setSliderEnabled(false);
   lengthInput->move(5, 55);
   lengthInput->setFixedSize(lengthInput->sizeHint());
   connect(lengthInput, SIGNAL(valueChanged(int)),
@@ -171,25 +173,28 @@ KRulerTest::KRulerTest()
   vertrot =3D new QGroupBox("Value of rotate translate for Vert.", bigwidg=
et);
   vertrot->setFixedSize(140, 80);
   vertrot->move(330,4+160+80+4);
-  transX =3D new KDoubleNumInput(vertrot);
+  transX =3D new QDoubleSpinBox(vertrot);
   transX->setValue(0.0);
-  transX->setRange(-1000, 1000, 1, false);
+  transX->setRange(-1000, 1000);
+  transX->setSingleStep(1);
   transX->move(5, 15);
   transX->setFixedSize(transX->sizeHint());
   //transX->setLabel("transx", AlignLeft);
   connect(transX, SIGNAL(valueChanged(double)),
 	  SLOT(slotSetXTrans(double)) );
-  transY =3D new KDoubleNumInput(vertrot);
+  transY =3D new QDoubleSpinBox(vertrot);
   transY->setValue(-12.0);
-  transY->setRange(-1000, 1000, 1, false);
+  transY->setRange(-1000, 1000);
+  transY->setSingleStep(1);
   transY->move(5, 35);
   transY->setFixedSize(transY->sizeHint());
   //transY->setLabel("transy", AlignLeft);
   connect(transY, SIGNAL(valueChanged(double)),
 	  SLOT(slotSetYTrans(double)) );
-  rotV =3D new KDoubleNumInput(vertrot);
+  rotV =3D new QDoubleSpinBox(vertrot);
   rotV->setValue(90.0);
-  rotV->setRange(-1000, 1000, 1, false);
+  rotV->setRange(-1000, 1000);
+  rotV->setSingleStep(1);
   rotV->move(5, 55);
   rotV->setFixedSize(rotV->sizeHint());
   //rotV->setLabel("rot", AlignLeft);
diff --git a/kdeui/tests/krulertest.h b/kdeui/tests/krulertest.h
index fc677c6..ddc47ad 100644
--- a/kdeui/tests/krulertest.h
+++ b/kdeui/tests/krulertest.h
@@ -8,7 +8,6 @@
 #include <QFrame>
 =

 #include <kmainwindow.h>
-#include <knuminput.h>
 =

 class KRuler;
 class QWidget;
@@ -16,6 +15,8 @@ class QGridLayout;
 class QCheckBox;
 class QGroupBox;
 class QLabel;
+class QSpinBox;
+class QDoubleSpinBox;
 =

 class MouseWidget : public QFrame
 {
@@ -77,8 +78,8 @@ private:
   QLabel *mouse_message;
   QGroupBox *showMarks, *lineEdit, *vertrot;
   QCheckBox *showTM, *showLM, *showMM, *showBM, *showEM, *showPT, *fixLen;
-  KIntNumInput *beginMark, *endMark, *lengthInput;
-  KDoubleNumInput *transX, *transY, *rotV;
+  QSpinBox *beginMark, *endMark, *lengthInput;
+  QDoubleSpinBox *transX, *transY, *rotV;
   QGroupBox *metricstyle;
   QRadioButton *pixelmetric, *inchmetric, *mmmetric, *cmmetric, *mmetric;
 =

diff --git a/staging/kde4support/src/kdeui/kcolordialog.cpp b/staging/kde4s=
upport/src/kdeui/kcolordialog.cpp
index 041c06a..338c0d2 100644
--- a/staging/kde4support/src/kdeui/kcolordialog.cpp
+++ b/staging/kde4support/src/kdeui/kcolordialog.cpp
@@ -58,13 +58,13 @@
 #include <QtCore/QTimer>
 #include <QListWidget>
 #include <QApplication>
+#include <QSpinBox>
 =

 #include <kcombobox.h>
 #include <kconfig.h>
 #include <klineedit.h>
 #include <klocalizedstring.h>
 #include <kmessagebox.h>
-#include <knuminput.h>
 #include <kseparator.h>
 #include <qstandardpaths.h>
 #include <kcolorcollection.h>
@@ -964,14 +964,14 @@ public:
     bool bAlphaEnabled;
     QLabel *colorName;
     KLineEdit *htmlName;
-    KIntSpinBox *hedit;
-    KIntSpinBox *sedit;
-    KIntSpinBox *vedit;
-    KIntSpinBox *redit;
-    KIntSpinBox *gedit;
-    KIntSpinBox *bedit;
+    QSpinBox *hedit;
+    QSpinBox *sedit;
+    QSpinBox *vedit;
+    QSpinBox *redit;
+    QSpinBox *gedit;
+    QSpinBox *bedit;
     QWidget *alphaLabel;
-    KIntSpinBox *aedit;
+    QSpinBox *aedit;
 =

     KColorPatch *patch;
     KColorPatch *comparePatch;
@@ -1077,7 +1077,7 @@ KColorDialog::KColorDialog(QWidget *parent, bool moda=
l)
     l_lbot->addWidget(modeButton, 0, 0);
     d->modeGroup->addButton(modeButton, ChooserHue);
 =

-    d->hedit =3D new KIntSpinBox(page);
+    d->hedit =3D new QSpinBox(page);
     d->hedit->setMaximum(359);
     d->hedit->setSuffix(i18nc("The angular degree unit (for hue)", "\302\2=
60")); //  U+00B0 DEGREE SIGN
     l_lbot->addWidget(d->hedit, 0, 1);
@@ -1088,7 +1088,7 @@ KColorDialog::KColorDialog(QWidget *parent, bool moda=
l)
     l_lbot->addWidget(modeButton, 1, 0);
     d->modeGroup->addButton(modeButton, ChooserSaturation);
 =

-    d->sedit =3D new KIntSpinBox(page);
+    d->sedit =3D new QSpinBox(page);
     d->sedit->setMaximum(255);
     l_lbot->addWidget(d->sedit, 1, 1);
     connect(d->sedit, SIGNAL(valueChanged(int)),
@@ -1098,7 +1098,7 @@ KColorDialog::KColorDialog(QWidget *parent, bool moda=
l)
     l_lbot->addWidget(modeButton, 2, 0);
     d->modeGroup->addButton(modeButton, ChooserValue);
 =

-    d->vedit =3D new KIntSpinBox(page);
+    d->vedit =3D new QSpinBox(page);
     d->vedit->setMaximum(255);
     l_lbot->addWidget(d->vedit, 2, 1);
     connect(d->vedit, SIGNAL(valueChanged(int)),
@@ -1112,7 +1112,7 @@ KColorDialog::KColorDialog(QWidget *parent, bool moda=
l)
     l_lbot->addWidget(modeButton, 0, 3);
     d->modeGroup->addButton(modeButton, ChooserRed);
 =

-    d->redit =3D new KIntSpinBox(page);
+    d->redit =3D new QSpinBox(page);
     d->redit->setMaximum(255);
     l_lbot->addWidget(d->redit, 0, 4);
     connect(d->redit, SIGNAL(valueChanged(int)),
@@ -1122,7 +1122,7 @@ KColorDialog::KColorDialog(QWidget *parent, bool moda=
l)
     l_lbot->addWidget(modeButton, 1, 3);
     d->modeGroup->addButton(modeButton, ChooserGreen);
 =

-    d->gedit =3D new KIntSpinBox(page);
+    d->gedit =3D new QSpinBox(page);
     d->gedit->setMaximum(255);
     l_lbot->addWidget(d->gedit, 1, 4);
     connect(d->gedit, SIGNAL(valueChanged(int)),
@@ -1132,7 +1132,7 @@ KColorDialog::KColorDialog(QWidget *parent, bool moda=
l)
     l_lbot->addWidget(modeButton, 2, 3);
     d->modeGroup->addButton(modeButton, ChooserBlue);
 =

-    d->bedit =3D new KIntSpinBox(page);
+    d->bedit =3D new QSpinBox(page);
     d->bedit->setMaximum(255);
     l_lbot->addWidget(d->bedit, 2, 4);
     connect(d->bedit, SIGNAL(valueChanged(int)),
@@ -1157,7 +1157,7 @@ KColorDialog::KColorDialog(QWidget *parent, bool moda=
l)
     spacer->setFixedWidth(indent);
     l_lbot->addWidget(d->alphaLabel, 3, 3);
 =

-    d->aedit =3D new KIntSpinBox(page);
+    d->aedit =3D new QSpinBox(page);
     d->aedit->setMaximum(255);
     label->setBuddy(d->aedit);
     l_lbot->addWidget(d->aedit, 3, 4);