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

List:       kde-commits
Subject:    [kdelibs/frameworks-kcolors] /: Move kdialog to staging/kwidgets/src/dialogs
From:       Giorgos Tsiapaliwkas <terietor () gmail ! com>
Date:       2012-03-11 10:03:39
Message-ID: 20120311100339.D0EC1A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit d45c4141b08326d948e68701f492d146fcc302ee by Giorgos Tsiapaliwkas.
Committed on 11/03/2012 at 11:01.
Pushed by tsiapaliwkas into branch 'frameworks-kcolors'.

Move kdialog to staging/kwidgets/src/dialogs

M  +0    -2    kdeui/CMakeLists.txt
M  +0    -2    kdeui/tests/CMakeLists.txt
M  +2    -0    staging/kwidgets/src/CMakeLists.txt
R  +0    -0    staging/kwidgets/src/dialogs/kdialog.cpp [from: kdeui/dialog=
s/kdialog.cpp - 100% similarity]
R  +0    -0    staging/kwidgets/src/dialogs/kdialog.h [from: kdeui/dialogs/=
kdialog.h - 100% similarity]
R  +0    -0    staging/kwidgets/src/dialogs/kdialog_p.h [from: kdeui/dialog=
s/kdialog_p.h - 100% similarity]
R  +0    -0    staging/kwidgets/src/dialogs/kdialogqueue_p.h [from: kdeui/d=
ialogs/kdialogqueue_p.h - 100% similarity]
M  +4    -0    staging/kwidgets/tests/CMakeLists.txt
R  +0    -0    staging/kwidgets/tests/kdialog_unittest.cpp [from: kdeui/tes=
ts/kdialog_unittest.cpp - 100% similarity]
R  +0    -0    staging/kwidgets/tests/kdialogtest.cpp [from: kdeui/tests/kd=
ialogtest.cpp - 100% similarity]

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

diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index 57341bf..dbac643 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -99,7 +99,6 @@ set(kdeui_LIB_SRCS
  dialogs/kconfigdialog.cpp
  dialogs/kconfigdialogmanager.cpp
  dialogs/kbugreport.cpp
- dialogs/kdialog.cpp
  dialogs/kedittoolbar.cpp
  dialogs/kinputdialog.cpp
  dialogs/klinkdialog.cpp
@@ -488,7 +487,6 @@ install( FILES
  dialogs/kconfigdialog.h
  dialogs/kconfigdialogmanager.h
  dialogs/kdeprintdialog.h
- dialogs/kdialog.h
  dialogs/kedittoolbar.h
  dialogs/kinputdialog.h
  dialogs/kmessagebox.h
diff --git a/kdeui/tests/CMakeLists.txt b/kdeui/tests/CMakeLists.txt
index 14a2193..b93eff7 100644
--- a/kdeui/tests/CMakeLists.txt
+++ b/kdeui/tests/CMakeLists.txt
@@ -40,7 +40,6 @@ KDEUI_UNIT_TESTS(
   klineedit_unittest
   ktextedit_unittest
   kcombobox_unittest
-  kdialog_unittest
   kreplacetest
   kshortcuttest
   kstandardactiontest
@@ -82,7 +81,6 @@ KDEUI_EXECUTABLE_TESTS(
   kdatewidgettest
   kdebugtest_gui
   kdialogbuttonboxtest
-  kdialogtest
   keditlistwidgettest
   kfontdialogtest
   kglobalsettingsclient # helper program for kglobalsettingstest
diff --git a/staging/kwidgets/src/CMakeLists.txt b/staging/kwidgets/src/CMa=
keLists.txt
index 29f22d4..4bba3e7 100644
--- a/staging/kwidgets/src/CMakeLists.txt
+++ b/staging/kwidgets/src/CMakeLists.txt
@@ -9,6 +9,7 @@ include_directories(
 set(kwidgets_LIB_SRCS
  widgets/khbox.cpp
  widgets/kvbox.cpp
+ dialogs/kdialog.cpp
 )
 =

 add_library(kwidgets ${LIBRARY_TYPE} ${kwidgets_LIB_SRCS})
@@ -23,6 +24,7 @@ install( FILES
  ${CMAKE_CURRENT_BINARY_DIR}/kwidgets_export.h
  widgets/khbox.h
  widgets/kvbox.h
+ dialogs/kdialog.h
 =

  DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
 )
diff --git a/kdeui/dialogs/kdialog.cpp b/staging/kwidgets/src/dialogs/kdial=
og.cpp
similarity index 100%
rename from kdeui/dialogs/kdialog.cpp
rename to staging/kwidgets/src/dialogs/kdialog.cpp
diff --git a/kdeui/dialogs/kdialog.h b/staging/kwidgets/src/dialogs/kdialog=
.h
similarity index 100%
rename from kdeui/dialogs/kdialog.h
rename to staging/kwidgets/src/dialogs/kdialog.h
diff --git a/kdeui/dialogs/kdialog_p.h b/staging/kwidgets/src/dialogs/kdial=
og_p.h
similarity index 100%
rename from kdeui/dialogs/kdialog_p.h
rename to staging/kwidgets/src/dialogs/kdialog_p.h
diff --git a/kdeui/dialogs/kdialogqueue_p.h b/staging/kwidgets/src/dialogs/=
kdialogqueue_p.h
similarity index 100%
rename from kdeui/dialogs/kdialogqueue_p.h
rename to staging/kwidgets/src/dialogs/kdialogqueue_p.h
diff --git a/staging/kwidgets/tests/CMakeLists.txt b/staging/kwidgets/tests=
/CMakeLists.txt
index a43c9ad..ff2400c 100644
--- a/staging/kwidgets/tests/CMakeLists.txt
+++ b/staging/kwidgets/tests/CMakeLists.txt
@@ -24,5 +24,9 @@ ENDMACRO(KDEUI_EXECUTABLE_TESTS)
 =

 KDEUI_EXECUTABLE_TESTS(
   khboxtest
+  kdialogtest
 )
 =

+KDEUI_UNIT_TESTS(
+  kdialog_unittest
+)
diff --git a/kdeui/tests/kdialog_unittest.cpp b/staging/kwidgets/tests/kdia=
log_unittest.cpp
similarity index 100%
rename from kdeui/tests/kdialog_unittest.cpp
rename to staging/kwidgets/tests/kdialog_unittest.cpp
diff --git a/kdeui/tests/kdialogtest.cpp b/staging/kwidgets/tests/kdialogte=
st.cpp
similarity index 100%
rename from kdeui/tests/kdialogtest.cpp
rename to staging/kwidgets/tests/kdialogtest.cpp

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