Git commit d7590803b05ae3c8a190c8e340e3895e8fe321cd by Anne-Marie Mahfouf.
Committed on 10/06/2013 at 21:14.
Pushed by annma into branch 'frameworks'.

fix kconfigdialog following knuminput move: add test and register maps

REVIEW: 110418

M  +0    -3    kdeui/dialogs/kconfigdialogmanager.cpp
M  +1    -1    kdeui/tests/CMakeLists.txt
M  +16   -1    kdeui/tests/kconfigdialog_unittest.cpp
M  +4    -0    staging/kde4support/src/kdeui/knuminput.cpp

http://commits.kde.org/kdelibs/d7590803b05ae3c8a190c8e340e3895e8fe321cd

diff --git a/kdeui/dialogs/kconfigdialogmanager.cpp b/kdeui/dialogs/kconfig=
dialogmanager.cpp
index 87c3e48..7e8e73f 100644
--- a/kdeui/dialogs/kconfigdialogmanager.cpp
+++ b/kdeui/dialogs/kconfigdialogmanager.cpp
@@ -143,9 +143,6 @@ void KConfigDialogManager::initMaps()
     s_changedMap()->insert( "KUrlRequester",  SIGNAL(textChanged(QString))=
);
     s_changedMap()->insert( "KUrlComboRequester",  SIGNAL(textChanged(QStr=
ing)));
     s_changedMap()->insert( "KUrlComboBox",  SIGNAL(urlActivated(QUrl)));
-    s_changedMap()->insert( "KIntNumInput", SIGNAL(valueChanged(int)));
-    s_changedMap()->insert( "KIntSpinBox", SIGNAL(valueChanged(int)));
-    s_changedMap()->insert( "KDoubleNumInput", SIGNAL(valueChanged(double)=
));
     s_changedMap()->insert( "KButtonGroup", SIGNAL(changed(int)));
   }
 }
diff --git a/kdeui/tests/CMakeLists.txt b/kdeui/tests/CMakeLists.txt
index 77b0004..4ca816e 100644
--- a/kdeui/tests/CMakeLists.txt
+++ b/kdeui/tests/CMakeLists.txt
@@ -5,7 +5,7 @@ include(ECMMarkAsTest)
 MACRO(KDEUI_UNIT_TESTS)
        FOREACH(_testname ${ARGN})
                kde4_add_unit_test(${_testname} TESTNAME kdeui-${_testname}=
 ${_testname}.cpp)
-               target_link_libraries(${_testname} ${KDE4_KDEUI_LIBS} Qt5::=
Test Qt5::Xml ${KDEWIN_LIBRARIES} ${KCoreAddons_LIBRARIES} ${KWidgetsAddons=
_LIBRARIES})
+               target_link_libraries(${_testname} ${KDE4_KDEUI_LIBS} Qt5::=
Test Qt5::Xml kde4support  ${KDEWIN_LIBRARIES} ${KCoreAddons_LIBRARIES} ${K=
WidgetsAddons_LIBRARIES})
        ENDFOREACH(_testname)
 ENDMACRO(KDEUI_UNIT_TESTS)
 MACRO(KDEUI_EXECUTABLE_TESTS)
diff --git a/kdeui/tests/kconfigdialog_unittest.cpp b/kdeui/tests/kconfigdi=
alog_unittest.cpp
index 4f1a7a7..ed4b9e0 100644
--- a/kdeui/tests/kconfigdialog_unittest.cpp
+++ b/kdeui/tests/kconfigdialog_unittest.cpp
@@ -28,6 +28,7 @@
 #include <kconfigskeleton.h>
 #include <kcombobox.h>
 #include <kcolorcombo.h>
+#include <knuminput.h>
 =

 class ComboBoxPage : public QWidget
 {
@@ -46,11 +47,15 @@ public:
         textCombo->setObjectName("kcfg_Text");
         textCombo->setEditable(true);
         textCombo->addItems(QStringList() << "A" << "B" << "C");
+
+        numInput =3D new KIntNumInput(1, this);
+        numInput->setObjectName("kcfg_IntNumInput");
     }
 =

     KColorCombo *colorCombo;
     KComboBox *enumCombo;
     KComboBox *textCombo;
+    KIntNumInput *numInput;
 };
 =

 class ComboSettings : public KConfigSkeleton
@@ -82,6 +87,9 @@ public:
 =

         stringItem =3D new ItemString( currentGroup(), QLatin1String( "Tex=
t" ), string, QLatin1String( "hh:mm" ) );
         addItem( stringItem, QLatin1String( "Text" ) );
+
+        intValueItem =3D new ItemInt( currentGroup(), QLatin1String( "IntN=
umInput" ), intValue, 42 );
+        addItem( intValueItem, QLatin1String( "IntNumInput" ) );
     }
 =

     ItemColor *colorItem;
@@ -92,6 +100,9 @@ public:
 =

     ItemString *stringItem;
     QString string;
+
+    ItemInt *intValueItem;
+    int intValue;
 };
 =

 class KConfigDialog_UnitTest : public QObject
@@ -108,7 +119,7 @@ private Q_SLOTS:
             QFile::remove(configFile);
     }
 =

-    void combosTest()
+    void test()
     {
         ComboSettings *skeleton =3D new ComboSettings();
         KConfigDialog *dialog =3D new KConfigDialog(0, "settings", skeleto=
n);
@@ -117,16 +128,19 @@ private Q_SLOTS:
         QCOMPARE(page->colorCombo->color(), QColor(Qt::red));
         QCOMPARE(page->enumCombo->currentIndex(), 0);
         QCOMPARE(page->textCombo->currentText(), QString("A"));
+        QCOMPARE(page->numInput->value(), 1);
 =

         dialog->addPage(page, "General");
 =

         QCOMPARE(page->colorCombo->color(), QColor(Qt::white));
         QCOMPARE(page->enumCombo->currentIndex(), 1);
         QCOMPARE(page->textCombo->currentText(), QLatin1String( "hh:mm" ));
+        QCOMPARE(page->numInput->value(), 42);
 =

         page->colorCombo->setColor(Qt::blue);
         page->enumCombo->setCurrentIndex(2);
         page->textCombo->setCurrentIndex(2);
+        page->numInput->setValue(2);
 =

         QDialogButtonBox *buttonBox =3D dialog->findChild<QDialogButtonBox=
*>();
         QVERIFY(buttonBox!=3D0);
@@ -134,6 +148,7 @@ private Q_SLOTS:
         QCOMPARE(skeleton->colorItem->property().value<QColor>(), QColor(Q=
t::blue));
         QCOMPARE(skeleton->enumItem->property().toInt(), 2);
         QCOMPARE(skeleton->stringItem->property().toString(), QLatin1Strin=
g("C"));
+        QCOMPARE(skeleton->intValueItem->property().toInt(), 2);
 =

         delete dialog;
         delete skeleton;
diff --git a/staging/kde4support/src/kdeui/knuminput.cpp b/staging/kde4supp=
ort/src/kdeui/knuminput.cpp
index 8a288a5..85c9e7f 100644
--- a/staging/kde4support/src/kdeui/knuminput.cpp
+++ b/staging/kde4support/src/kdeui/knuminput.cpp
@@ -36,6 +36,7 @@
 #include <QSlider>
 #include <QStyle>
 =

+#include <kconfigdialogmanager.h>
 #include <kdebug.h>
 #include <klocalizedstring.h>
 =

@@ -93,6 +94,9 @@ KNumInput::KNumInput(QWidget* parent)
 {
     setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed));
     setFocusPolicy(Qt::StrongFocus);
+    KConfigDialogManager::changedMap()->insert("KIntNumInput", SIGNAL(valu=
eChanged(int)));
+    KConfigDialogManager::changedMap()->insert("KIntSpinBox", SIGNAL(value=
Changed(int)));
+    KConfigDialogManager::changedMap()->insert("KDoubleSpinBox", SIGNAL(va=
lueChanged(double)));
 }
 =

 #ifndef KDE_NO_DEPRECATED