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

List:       kde-commits
Subject:    playground/network/kcall
From:       George Kiagiadakis <gkiagiad () csd ! uoc ! gr>
Date:       2009-07-20 19:15:49
Message-ID: 1248117349.327115.6550.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1000057 by gkiagia:

Move DtmfWidget from libkcallprivate to kcall_handler,
as it is not used anywhere else to justify its presence in a shared library.

 M  +2 -1      kcall_handler/CMakeLists.txt  
 M  +1 -1      kcall_handler/callwindow.ui  
 M  +1 -1      kcall_handler/dtmfhandler.cpp  
 A             kcall_handler/dtmfwidget.cpp   libkcallprivate/dtmfwidget.cpp#1000044 \
[License: LGPL (v2.1+)]  A             kcall_handler/dtmfwidget.h   \
libkcallprivate/dtmfwidget.h#1000044 [License: LGPL (v2.1+)]  A             \
kcall_handler/dtmfwidget.ui   libkcallprivate/dtmfwidget.ui#1000044  M  +0 -2      \
libkcallprivate/CMakeLists.txt    D             libkcallprivate/dtmfwidget.cpp  
 D             libkcallprivate/dtmfwidget.h  
 D             libkcallprivate/dtmfwidget.ui  


--- trunk/playground/network/kcall/kcall_handler/CMakeLists.txt #1000056:1000057
@@ -11,12 +11,13 @@
     channelhandler.cpp
     abstractmediahandler.cpp
     dtmfhandler.cpp
+    dtmfwidget.cpp
     volumewidget.cpp
     farsight/audiobin.cpp
     farsight/farsightmediahandler.cpp
 )
 
-kde4_add_ui_files(kcall_handler_SRCS callwindow.ui)
+kde4_add_ui_files(kcall_handler_SRCS callwindow.ui dtmfwidget.ui)
 kde4_add_kcfg_files(kcall_handler_SRCS kcallhandlersettings.kcfgc)
 kde4_add_executable(kcall_handler ${kcall_handler_SRCS})
 target_link_libraries(kcall_handler ${KDE4_KDEUI_LIBS}
--- trunk/playground/network/kcall/kcall_handler/callwindow.ui #1000056:1000057
@@ -120,7 +120,7 @@
   <customwidget>
    <class>DtmfWidget</class>
    <extends>QWidget</extends>
-   <header>../libkcallprivate/dtmfwidget.h</header>
+   <header>dtmfwidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
--- trunk/playground/network/kcall/kcall_handler/dtmfhandler.cpp #1000056:1000057
@@ -15,7 +15,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "dtmfhandler.h"
-#include "../libkcallprivate/dtmfwidget.h"
+#include "dtmfwidget.h"
 
 struct DtmfHandler::Private
 {
--- trunk/playground/network/kcall/libkcallprivate/CMakeLists.txt #1000056:1000057
@@ -8,10 +8,8 @@
     accountitem.cpp
     contactitem.cpp
     groupmembersmodel.cpp
-    dtmfwidget.cpp
 )
 
-kde4_add_ui_files(libkcallprivate_SRCS dtmfwidget.ui)
 kde4_add_library(kcallprivate SHARED ${libkcallprivate_SRCS})
 target_link_libraries(kcallprivate ${KDE4_KDEUI_LIBS} ${TELEPATHY_QT4_LIBRARIES})
 install(TARGETS kcallprivate ${INSTALL_TARGETS_DEFAULT_ARGS})


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