[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/frameworks] /: Move KEditListBox to KDE4Support
From:       Anne-Marie Mahfouf <annma () kde ! org>
Date:       2013-05-23 9:35:30
Message-ID: 20130523093530.C5197A6071 () git ! kde ! org
[Download RAW message or body]

Git commit 7b45746bee4e54aee72a4d273c8b5379f172bd8a by Anne-Marie Mahfouf.
Committed on 23/05/2013 at 11:33.
Pushed by annma into branch 'frameworks'.

Move KEditListBox to KDE4Support

M  +0    -13   kdeui/CMakeLists.txt
M  +0    -6    kdeui/tests/CMakeLists.txt
M  +2    -0    staging/kde4support/src/CMakeLists.txt
R  +0    -1    staging/kde4support/src/kdeui/keditlistbox.cpp [from: \
kdeui/widgets/keditlistbox.cpp - 099% similarity] R  +6    -6    \
staging/kde4support/src/kdeui/keditlistbox.h [from: kdeui/widgets/keditlistbox.h - \
095% similarity] M  +1    -0    staging/kde4support/tests/CMakeLists.txt
R  +0    -0    staging/kde4support/tests/keditlistboxtest.cpp [from: \
kdeui/tests/keditlistboxtest.cpp - 100% similarity]

http://commits.kde.org/kdelibs/7b45746bee4e54aee72a4d273c8b5379f172bd8a

diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index f962438..40dc764 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -199,13 +199,6 @@ set(kdeui_LIB_SRCS
  xmlgui/ktoolbar.cpp
 )
 
-if(NOT KDE_NO_DEPRECATED)
-set(kdeui_LIB_SRCS
- ${kdeui_LIB_SRCS}
- widgets/keditlistbox.cpp
-)
-endif(NOT KDE_NO_DEPRECATED)
-
 option(MAC_USE_OSXKEYCHAIN "On OS X, use the keychain as backend for kwallet, \
instead of kwalletd.")  
 if (APPLE AND MAC_USE_OSXKEYCHAIN)
@@ -496,12 +489,6 @@ install( FILES
  xmlgui/ktoolbar.h
  DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel )
 
-if(NOT KDE_NO_DEPRECATED)
-install(FILES
- widgets/keditlistbox.h
- DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel )
-endif(NOT KDE_NO_DEPRECATED)
-
 install(PROGRAMS preparetips DESTINATION ${BIN_INSTALL_DIR} )
 
 if (APPLE)
diff --git a/kdeui/tests/CMakeLists.txt b/kdeui/tests/CMakeLists.txt
index 7d74d1a..fb447f6 100644
--- a/kdeui/tests/CMakeLists.txt
+++ b/kdeui/tests/CMakeLists.txt
@@ -79,12 +79,6 @@ KDEUI_EXECUTABLE_TESTS(
   kpixmapsequenceoverlaypaintertest
 )
 
-if (NOT KDE_NO_DEPRECATED)
-KDEUI_EXECUTABLE_TESTS(
-  keditlistboxtest
-)
-endif (NOT KDE_NO_DEPRECATED)
-
 if (X11_FOUND)
 find_package(Qt5X11Extras 5.2.0 REQUIRED NO_MODULE)
 KDEUI_EXECUTABLE_TESTS(
diff --git a/staging/kde4support/src/CMakeLists.txt \
b/staging/kde4support/src/CMakeLists.txt index 4b1e186..9a56de3 100644
--- a/staging/kde4support/src/CMakeLists.txt
+++ b/staging/kde4support/src/CMakeLists.txt
@@ -77,6 +77,7 @@ set(libkde4support_SRCS
     kdeui/krestrictedline.cpp
     kdeui/klistwidget.cpp
     kdeui/ktextbrowser.cpp
+    kdeui/keditlistbox.cpp
 
     kio/metainfojob.cpp
 
@@ -182,6 +183,7 @@ install(FILES
     kdeui/krestrictedline.h
     kdeui/klistwidget.h
     kdeui/ktextbrowser.h
+    kdeui/keditlistbox.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/keditlistbox.cpp \
b/staging/kde4support/src/kdeui/keditlistbox.cpp similarity index 99%
rename from kdeui/widgets/keditlistbox.cpp
rename to staging/kde4support/src/kdeui/keditlistbox.cpp
index 23a9052..53d3092 100644
--- a/kdeui/widgets/keditlistbox.cpp
+++ b/staging/kde4support/src/kdeui/keditlistbox.cpp
@@ -682,4 +682,3 @@ bool KEditListBox::eventFilter( QObject* o, QEvent* e )
 
     return false;
 }
-
diff --git a/kdeui/widgets/keditlistbox.h \
b/staging/kde4support/src/kdeui/keditlistbox.h similarity index 95%
rename from kdeui/widgets/keditlistbox.h
rename to staging/kde4support/src/kdeui/keditlistbox.h
index 539f506..a38ad1a 100644
--- a/kdeui/widgets/keditlistbox.h
+++ b/staging/kde4support/src/kdeui/keditlistbox.h
@@ -20,7 +20,7 @@
 #ifndef KEDITLISTBOX_H
 #define KEDITLISTBOX_H
 
-#include <kdeui_export.h>
+#include <kde4support_export.h>
 
 #include <QGroupBox>
 #include <QStringListModel>
@@ -35,9 +35,9 @@ class KEditListBoxPrivate;
 /**
  * @brief An editable listbox
  *
- * @deprecated in favor of KEditListWidget embedded in a QGroupBox.
+ * @deprecated since 5.0 in favor of KEditListWidget embedded in a QGroupBox.
  */
-class KDEUI_EXPORT KEditListBox : public QGroupBox
+class KDE4SUPPORT_EXPORT KEditListBox : public QGroupBox
 {
    Q_OBJECT
 
@@ -51,7 +51,7 @@ public:
     /**
      * Custom editor class
      **/
-    class KDEUI_EXPORT CustomEditor
+    class KDE4SUPPORT_DEPRECATED CustomEditor
     {
     public:
         CustomEditor();
@@ -116,7 +116,7 @@ public:
        * it will be checked if you press the Add-button. It is not
        * possible to enter items twice into the listbox.
        */
-      explicit KDEUI_DEPRECATED KEditListBox(QWidget *parent, const char *name,
+      explicit KDE4SUPPORT_DEPRECATED KEditListBox(QWidget *parent, const char \
                *name,
                             bool checkAtEntering = false, Buttons buttons = All );
       /**
        * Create an editable listbox.
@@ -126,7 +126,7 @@ public:
        * The same as the other constructor, additionally it takes
        * @p title, which will be the title of the frame around the listbox.
        */
-      explicit KDEUI_DEPRECATED KEditListBox(const QString& title, QWidget *parent,
+      explicit KDE4SUPPORT_DEPRECATED KEditListBox(const QString& title, QWidget \
                *parent,
                             const char *name, bool checkAtEntering = false,
                             Buttons buttons = All );
 
diff --git a/staging/kde4support/tests/CMakeLists.txt \
b/staging/kde4support/tests/CMakeLists.txt index 4115688..6f3632b 100644
--- a/staging/kde4support/tests/CMakeLists.txt
+++ b/staging/kde4support/tests/CMakeLists.txt
@@ -24,5 +24,6 @@ kde4support_examples(
   ktabwidgettest
   kfontdialogtest
   ktextbrowsertest
+  keditlistboxtest
 )
 
diff --git a/kdeui/tests/keditlistboxtest.cpp \
b/staging/kde4support/tests/keditlistboxtest.cpp similarity index 100%
rename from kdeui/tests/keditlistboxtest.cpp
rename to staging/kde4support/tests/keditlistboxtest.cpp


[prev in list] [next in list] [prev in thread] [next in thread]