[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdelibs/frameworks] /: Move KNumInput to KDE4Support and move test
From: Anne-Marie Mahfouf <annma () kde ! org>
Date: 2013-06-10 19:19:56
Message-ID: 20130610191956.6BF07A6067 () git ! kde ! org
[Download RAW message or body]
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/widgets/knuminput.cpp - 100% similarity] R +10 -10 \
staging/kde4support/src/kdeui/knuminput.h [from: kdeui/widgets/knuminput.h - 097% \
similarity] M +1 -0 staging/kde4support/tests/CMakeLists.txt
R +0 -0 staging/kde4support/tests/knuminputtest.cpp [from: \
kdeui/tests/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=A widget that provides a image preview of a URL
Group=Display (KDE)
ConstructorArgs=(parent)
-[KIntNumInput]
-ToolTip=Integer Input Widget (KDE)
-WhatsThis=An input widget for integer numbers, consisting of a spinbox and a slider.
-IncludeFile=knuminput.h
-Group=Input (KDE)
-
-[KIntSpinBox]
-IncludeFile=knuminput.h
-ToolTip=Enhanced Spinbox for Integer Values (KDE)
-Group=Input (KDE)
-
[KKeySequenceWidget]
ToolTip=QKeySequence picker widget. (KDE)
WhatsThis=A 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 @@
<qresource>
<file>pics/keditlistbox.png</file>
<file>pics/kdialog.png</file>
+<file>pics/kintnuminput.png</file>
+<file>pics/kintspinbox.png</file>
<file>pics/kpushbutton.png</file>
<file>pics/krestrictedline.png</file>
<file>pics/ktextbrowser.png</file>
diff --git a/kdewidgets/kdedeprecated.widgets b/kdewidgets/kdedeprecated.widgets
index c560777..92185a7 100644
--- a/kdewidgets/kdedeprecated.widgets
+++ b/kdewidgets/kdedeprecated.widgets
@@ -44,6 +44,17 @@ IncludeFile=kcolorvalueselector.h
ToolTip=Color Value Selector (KDE)
Group=Input (KDE)
+[KIntNumInput]
+ToolTip=Integer Input Widget (KDE)
+WhatsThis=An input widget for integer numbers, consisting of a spinbox and a slider.
+IncludeFile=knuminput.h
+Group=Input (KDE)
+
+[KIntSpinBox]
+IncludeFile=knuminput.h
+ToolTip=Enhanced Spinbox for Integer Values (KDE)
+Group=Input (KDE)
+
[KPushButton]
ToolTip=Improved QPushButton (KDE)
WhatsThis=An 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 @@
<file>pics/khistorycombo.png</file>
<file>pics/khsselector.png</file>
<file>pics/kiconbutton.png</file>
-<file>pics/kintnuminput.png</file>
-<file>pics/kintspinbox.png</file>
<file>pics/kkeybutton.png</file>
<file>pics/kled.png</file>
<file>pics/klineedit.png</file>
diff --git a/staging/kde4support/src/CMakeLists.txt \
b/staging/kde4support/src/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/knuminput.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/knuminput.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 <kdeui_export.h>
+#include <kde4support_export.h>
#include <QWidget>
#include <QSpinBox>
@@ -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 USER 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 *parent, int \
base = 10); + KDE4SUPPORT_DEPRECATED KIntNumInput(KNumInput* below, int value, \
QWidget *parent, int base = 10); #endif
/**
@@ -276,7 +276,7 @@ public:
* @deprecated Use the other setRange function and setSliderEnabled instead
*/
#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=0,double \
singleStep=0.02, int precision=2);
#endif
@@ -592,7 +592,7 @@ public:
void setDecimals(int decimals);
#ifndef KDE_NO_DEPRECATED
- KDEUI_DEPRECATED void setPrecision(int precision) { setDecimals(precision); }
+ KDE4SUPPORT_DEPRECATED void setPrecision(int precision) { \
setDecimals(precision); } #endif
/**
@@ -714,7 +714,7 @@ private:
*
* \image html kintspinbox.png "KDE Integer Input Spinboxes with hexadecimal 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/knuminputtest.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/knuminputtest.h
similarity index 100%
rename from kdeui/tests/knuminputtest.h
rename to staging/kde4support/tests/knuminputtest.h
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic