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

List:       kde-commits
Subject:    [kdelibs/frameworks] /: Move KTimeComboBox to KDE4Attic
From:       Anne-Marie Mahfouf <annma () kde ! org>
Date:       2013-05-23 10:43:55
Message-ID: 20130523104355.2A210A605B () git ! kde ! org
[Download RAW message or body]

Git commit c27ab7d01d88f6a414a9d531c4369d40e053824d by Anne-Marie Mahfouf.
Committed on 23/05/2013 at 12:41.
Pushed by annma into branch 'frameworks'.

Move KTimeComboBox to KDE4Attic

Test has been moved to staging/kde4attic/autotests
REVIEW:110477

M  +0    -2    kdeui/CMakeLists.txt
M  +0    -1    kdeui/tests/CMakeLists.txt
M  +1    -0    staging/kde4attic/autotests/CMakeLists.txt
R  +0    -0    staging/kde4attic/autotests/ktimecomboboxtest.cpp [from: \
kdeui/tests/ktimecomboboxtest.cpp - 100% similarity] R  +0    -0    \
staging/kde4attic/autotests/ktimecomboboxtest.h [from: \
kdeui/tests/ktimecomboboxtest.h - 100% similarity] M  +2    -0    \
staging/kde4attic/src/CMakeLists.txt R  +0    -0    \
staging/kde4attic/src/ktimecombobox.cpp [from: kdeui/widgets/ktimecombobox.cpp - 100% \
similarity] R  +2    -2    staging/kde4attic/src/ktimecombobox.h [from: \
kdeui/widgets/ktimecombobox.h - 099% similarity]

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

diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index 40dc764..dcbcb4f 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -183,7 +183,6 @@ set(kdeui_LIB_SRCS
  widgets/kshortcutwidget.cpp
  widgets/kstringvalidator.cpp
  widgets/ktextedit.cpp
- widgets/ktimecombobox.cpp
  widgets/kdeuiwidgetsproxystyle.cpp
  widgets/nestedlisthelper.cpp
  xmlgui/kxmlguibuilder.cpp
@@ -479,7 +478,6 @@ install( FILES
  widgets/krichtextwidget.h
  widgets/kstringvalidator.h
  widgets/ktextedit.h
- widgets/ktimecombobox.h
  widgets/kshortcutwidget.h
  xmlgui/kxmlguiwindow.h
  xmlgui/kxmlguiclient.h
diff --git a/kdeui/tests/CMakeLists.txt b/kdeui/tests/CMakeLists.txt
index fb447f6..c9401cb 100644
--- a/kdeui/tests/CMakeLists.txt
+++ b/kdeui/tests/CMakeLists.txt
@@ -29,7 +29,6 @@ KDEUI_UNIT_TESTS(
   ktoolbar_unittest
   krichtextedittest
   klistwidgetsearchlinetest
-  ktimecomboboxtest
   kconfigdialog_unittest
   kcolorbuttontest
 )
diff --git a/staging/kde4attic/autotests/CMakeLists.txt \
b/staging/kde4attic/autotests/CMakeLists.txt index 18578da..11c3983 100644
--- a/staging/kde4attic/autotests/CMakeLists.txt
+++ b/staging/kde4attic/autotests/CMakeLists.txt
@@ -15,4 +15,5 @@ endmacro()
 kde4attic_tests(
   kdatecomboboxtest
   ktimezonewidget_unittest
+  ktimecomboboxtest
 )
diff --git a/kdeui/tests/ktimecomboboxtest.cpp \
b/staging/kde4attic/autotests/ktimecomboboxtest.cpp similarity index 100%
rename from kdeui/tests/ktimecomboboxtest.cpp
rename to staging/kde4attic/autotests/ktimecomboboxtest.cpp
diff --git a/kdeui/tests/ktimecomboboxtest.h \
b/staging/kde4attic/autotests/ktimecomboboxtest.h similarity index 100%
rename from kdeui/tests/ktimecomboboxtest.h
rename to staging/kde4attic/autotests/ktimecomboboxtest.h
diff --git a/staging/kde4attic/src/CMakeLists.txt \
b/staging/kde4attic/src/CMakeLists.txt index 229e95a..7a82d62 100644
--- a/staging/kde4attic/src/CMakeLists.txt
+++ b/staging/kde4attic/src/CMakeLists.txt
@@ -5,6 +5,7 @@ set(kde4attic_SRCS
   kdatecombobox.cpp
   kdatetimeedit.cpp
   kdatetimewidget.cpp
+  ktimecombobox.cpp
   ktimezonewidget.cpp
 )
 
@@ -30,6 +31,7 @@ install(FILES
   kdatecombobox.h
   kdatetimeedit.h
   kdatetimewidget.h
+  ktimecombobox.h
   ktimezonewidget.h
   ${CMAKE_CURRENT_BINARY_DIR}/kde4attic_export.h
   DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
diff --git a/kdeui/widgets/ktimecombobox.cpp \
b/staging/kde4attic/src/ktimecombobox.cpp similarity index 100%
rename from kdeui/widgets/ktimecombobox.cpp
rename to staging/kde4attic/src/ktimecombobox.cpp
diff --git a/kdeui/widgets/ktimecombobox.h b/staging/kde4attic/src/ktimecombobox.h
similarity index 99%
rename from kdeui/widgets/ktimecombobox.h
rename to staging/kde4attic/src/ktimecombobox.h
index 21094b2..6b2378d 100644
--- a/kdeui/widgets/ktimecombobox.h
+++ b/staging/kde4attic/src/ktimecombobox.h
@@ -20,7 +20,7 @@
 #ifndef KTIMECOMBOBOX_H
 #define KTIMECOMBOBOX_H
 
-#include <kdeui_export.h>
+#include <kde4attic_export.h>
 
 #include <QWidget>
 
@@ -29,7 +29,7 @@
 
 class KTimeComboBoxPrivate;
 
-class KDEUI_EXPORT KTimeComboBox : public KComboBox
+class KDE4ATTIC_EXPORT KTimeComboBox : public KComboBox
 {
     Q_OBJECT
 


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