From kde-commits Mon Jun 10 19:19:56 2013 From: Anne-Marie Mahfouf Date: Mon, 10 Jun 2013 19:19:56 +0000 To: kde-commits Subject: [kdelibs/frameworks] /: Move KNumInput to KDE4Support and move test Message-Id: <20130610191956.6BF07A6067 () git ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=137089201121543 Git commit e447f2aa5b2dfedd46d728df8838d833d9b51e90 by Anne-Marie Mahfouf. Committed on 10/06/2013 at 21:02. Pushed by annma into branch 'frameworks'. Move KNumInput to KDE4Support and move test M +0 -2 kdeui/CMakeLists.txt M +0 -1 kdeui/tests/CMakeLists.txt M +0 -11 kdewidgets/kde.widgets M +2 -0 kdewidgets/kdedeprecated.qrc M +11 -0 kdewidgets/kdedeprecated.widgets M +0 -2 kdewidgets/kdewidgets.qrc M +2 -0 staging/kde4support/src/CMakeLists.txt R +0 -0 staging/kde4support/src/kdeui/knuminput.cpp [from: kdeui/wid= gets/knuminput.cpp - 100% similarity] R +10 -10 staging/kde4support/src/kdeui/knuminput.h [from: kdeui/widge= ts/knuminput.h - 097% similarity] M +1 -0 staging/kde4support/tests/CMakeLists.txt R +0 -0 staging/kde4support/tests/knuminputtest.cpp [from: kdeui/tes= ts/knuminputtest.cpp - 100% similarity] R +0 -0 staging/kde4support/tests/knuminputtest.h [from: kdeui/tests= /knuminputtest.h - 100% similarity] http://commits.kde.org/kdelibs/e447f2aa5b2dfedd46d728df8838d833d9b51e90 diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt index d9f9b1c..cb30283 100644 --- a/kdeui/CMakeLists.txt +++ b/kdeui/CMakeLists.txt @@ -153,7 +153,6 @@ set(kdeui_LIB_SRCS widgets/klineedit.cpp widgets/kmessagewidget.cpp widgets/kmultitabbar.cpp - widgets/knuminput.cpp widgets/krichtextedit.cpp widgets/krichtextwidget.cpp widgets/kshortcutwidget.cpp @@ -413,7 +412,6 @@ install( FILES widgets/klineedit.h widgets/kmessagewidget.h widgets/kmultitabbar.h - widgets/knuminput.h widgets/krichtextedit.h widgets/krichtextwidget.h widgets/kstringvalidator.h diff --git a/kdeui/tests/CMakeLists.txt b/kdeui/tests/CMakeLists.txt index 7ffc47a..77b0004 100644 --- a/kdeui/tests/CMakeLists.txt +++ b/kdeui/tests/CMakeLists.txt @@ -52,7 +52,6 @@ KDEUI_EXECUTABLE_TESTS( kmodifierkeyinfotest knewpassworddialogtest knotificationrestrictionstest - knuminputtest kpagedialogtest kpagewidgettest kpassivepopuptest diff --git a/kdewidgets/kde.widgets b/kdewidgets/kde.widgets index 877be5c..261ac1f 100644 --- a/kdewidgets/kde.widgets +++ b/kdewidgets/kde.widgets @@ -139,17 +139,6 @@ ToolTip=3DA widget that provides a image preview of a = URL Group=3DDisplay (KDE) ConstructorArgs=3D(parent) = -[KIntNumInput] -ToolTip=3DInteger Input Widget (KDE) -WhatsThis=3DAn input widget for integer numbers, consisting of a spinbox a= nd a slider. -IncludeFile=3Dknuminput.h -Group=3DInput (KDE) - -[KIntSpinBox] -IncludeFile=3Dknuminput.h -ToolTip=3DEnhanced Spinbox for Integer Values (KDE) -Group=3DInput (KDE) - [KKeySequenceWidget] ToolTip=3DQKeySequence picker widget. (KDE) WhatsThis=3DA widget to pick a QKeySequence. diff --git a/kdewidgets/kdedeprecated.qrc b/kdewidgets/kdedeprecated.qrc index 699df9e..f65f9ff 100644 --- a/kdewidgets/kdedeprecated.qrc +++ b/kdewidgets/kdedeprecated.qrc @@ -2,6 +2,8 @@ pics/keditlistbox.png pics/kdialog.png +pics/kintnuminput.png +pics/kintspinbox.png pics/kpushbutton.png pics/krestrictedline.png pics/ktextbrowser.png diff --git a/kdewidgets/kdedeprecated.widgets b/kdewidgets/kdedeprecated.wi= dgets index c560777..92185a7 100644 --- a/kdewidgets/kdedeprecated.widgets +++ b/kdewidgets/kdedeprecated.widgets @@ -44,6 +44,17 @@ IncludeFile=3Dkcolorvalueselector.h ToolTip=3DColor Value Selector (KDE) Group=3DInput (KDE) = +[KIntNumInput] +ToolTip=3DInteger Input Widget (KDE) +WhatsThis=3DAn input widget for integer numbers, consisting of a spinbox a= nd a slider. +IncludeFile=3Dknuminput.h +Group=3DInput (KDE) + +[KIntSpinBox] +IncludeFile=3Dknuminput.h +ToolTip=3DEnhanced Spinbox for Integer Values (KDE) +Group=3DInput (KDE) + [KPushButton] ToolTip=3DImproved QPushButton (KDE) WhatsThis=3DAn improved QPushButton to follow KDE settings diff --git a/kdewidgets/kdewidgets.qrc b/kdewidgets/kdewidgets.qrc index 06873eb..5251bd6 100644 --- a/kdewidgets/kdewidgets.qrc +++ b/kdewidgets/kdewidgets.qrc @@ -20,8 +20,6 @@ pics/khistorycombo.png pics/khsselector.png pics/kiconbutton.png -pics/kintnuminput.png -pics/kintspinbox.png pics/kkeybutton.png pics/kled.png pics/klineedit.png diff --git a/staging/kde4support/src/CMakeLists.txt b/staging/kde4support/s= rc/CMakeLists.txt index 1f6edde..f89e845 100644 --- a/staging/kde4support/src/CMakeLists.txt +++ b/staging/kde4support/src/CMakeLists.txt @@ -74,6 +74,7 @@ set(libkde4support_SRCS kdeui/klistwidget.cpp kdeui/ktextbrowser.cpp kdeui/keditlistbox.cpp + kdeui/knuminput.cpp = kio/metainfojob.cpp = @@ -182,6 +183,7 @@ install(FILES kdeui/klistwidget.h kdeui/ktextbrowser.h kdeui/keditlistbox.h + kdeui/knuminput.h ${CMAKE_CURRENT_BINARY_DIR}/kde4support_export.h ${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel diff --git a/kdeui/widgets/knuminput.cpp b/staging/kde4support/src/kdeui/kn= uminput.cpp similarity index 100% rename from kdeui/widgets/knuminput.cpp rename to staging/kde4support/src/kdeui/knuminput.cpp diff --git a/kdeui/widgets/knuminput.h b/staging/kde4support/src/kdeui/knum= input.h similarity index 97% rename from kdeui/widgets/knuminput.h rename to staging/kde4support/src/kdeui/knuminput.h index 06d1ebd..5137c3c 100644 --- a/kdeui/widgets/knuminput.h +++ b/staging/kde4support/src/kdeui/knuminput.h @@ -22,7 +22,7 @@ #ifndef K_NUMINPUT_H #define K_NUMINPUT_H = -#include +#include = #include #include @@ -40,7 +40,7 @@ class KLocalizedString; * for a different variable type * */ -class KDEUI_EXPORT KNumInput : public QWidget +class KDE4SUPPORT_EXPORT KNumInput : public QWidget { Q_OBJECT Q_PROPERTY( QString label READ label WRITE setLabel ) @@ -59,7 +59,7 @@ public: * \deprecated - use the version without the below parameter instead */ #ifndef KDE_NO_DEPRECATED - KDEUI_DEPRECATED KNumInput(QWidget *parent, KNumInput* below); + KDE4SUPPORT_DEPRECATED KNumInput(QWidget *parent, KNumInput* below); #endif = /** @@ -169,7 +169,7 @@ private: * \image html kintnuminput.png "KDE Int Number Input Spinbox" */ = -class KDEUI_EXPORT KIntNumInput : public KNumInput +class KDE4SUPPORT_EXPORT KIntNumInput : public KNumInput { Q_OBJECT Q_PROPERTY( int value READ value WRITE setValue NOTIFY valueChanged US= ER true ) @@ -221,7 +221,7 @@ public: * \deprecated use the version without the below parameter instead. */ #ifndef KDE_NO_DEPRECATED - KDEUI_DEPRECATED KIntNumInput(KNumInput* below, int value, QWidget *pa= rent, int base =3D 10); + KDE4SUPPORT_DEPRECATED KIntNumInput(KNumInput* below, int value, QWidg= et *parent, int base =3D 10); #endif = /** @@ -276,7 +276,7 @@ public: * @deprecated Use the other setRange function and setSliderEnabled in= stead */ #ifndef KDE_NO_DEPRECATED - KDEUI_DEPRECATED void setRange(int min, int max, int singleStep, bool = slider); + KDE4SUPPORT_DEPRECATED void setRange(int min, int max, int singleStep,= bool slider); #endif = /** @@ -447,7 +447,7 @@ class KDoubleLine; * @see KIntNumInput */ = -class KDEUI_EXPORT KDoubleNumInput : public KNumInput +class KDE4SUPPORT_EXPORT KDoubleNumInput : public KNumInput { Q_OBJECT Q_PROPERTY( double value READ value WRITE setValue NOTIFY valueChanged= USER true ) @@ -511,7 +511,7 @@ public: * \deprecated use the version without below instead */ #ifndef KDE_NO_DEPRECATED - KDEUI_DEPRECATED KDoubleNumInput(KNumInput* below, + KDE4SUPPORT_DEPRECATED KDoubleNumInput(KNumInput* below, double lower, double upper, double value, QWidget *parent=3D0,double= singleStep=3D0.02, int precision=3D2); #endif @@ -592,7 +592,7 @@ public: void setDecimals(int decimals); = #ifndef KDE_NO_DEPRECATED - KDEUI_DEPRECATED void setPrecision(int precision) { setDecimals(precis= ion); } + KDE4SUPPORT_DEPRECATED void setPrecision(int precision) { setDecimals(= precision); } #endif = /** @@ -714,7 +714,7 @@ private: * * \image html kintspinbox.png "KDE Integer Input Spinboxes with hexadecim= al and binary input" */ -class KDEUI_EXPORT KIntSpinBox : public QSpinBox +class KDE4SUPPORT_EXPORT KIntSpinBox : public QSpinBox { Q_OBJECT Q_PROPERTY( int base READ base WRITE setBase ) diff --git a/staging/kde4support/tests/CMakeLists.txt b/staging/kde4support= /tests/CMakeLists.txt index 6f3632b..f8bd71e 100644 --- a/staging/kde4support/tests/CMakeLists.txt +++ b/staging/kde4support/tests/CMakeLists.txt @@ -25,5 +25,6 @@ kde4support_examples( kfontdialogtest ktextbrowsertest keditlistboxtest + knuminputtest ) = diff --git a/kdeui/tests/knuminputtest.cpp b/staging/kde4support/tests/knum= inputtest.cpp similarity index 100% rename from kdeui/tests/knuminputtest.cpp rename to staging/kde4support/tests/knuminputtest.cpp diff --git a/kdeui/tests/knuminputtest.h b/staging/kde4support/tests/knumin= puttest.h similarity index 100% rename from kdeui/tests/knuminputtest.h rename to staging/kde4support/tests/knuminputtest.h