[kmobiletools] KDE/kdepim/kmobiletools/kmobiletools

[Marco Gulino]

SVN commit 679458 by gulino:

More moving.


 M  +2 -6      libkmobiletools/CMakeLists.txt  
 D             libkmobiletools/pickphonenumberdialog.cpp  
 D             libkmobiletools/pickphonenumberdialog.h  
 D             libkmobiletools/ui_pickphonenumber.ui  
 M  +2 -1      mainpart/CMakeLists.txt  
 M  +1 -1      mainpart/deviceconfigdialog.cpp  
 M  +1 -1      mainpart/newsmsdlg.cpp  
 A             mainpart/pickphonenumber.ui   libkmobiletools/ui_pickphonenumber.ui#678397
 A             mainpart/pickphonenumberdialog.cpp   libkmobiletools/pickphonenumberdialog.cpp#678397 [License: GPL (v2+)]
 A             mainpart/pickphonenumberdialog.h   libkmobiletools/pickphonenumberdialog.h#678397 [License: GPL (v2+)]


--- trunk/KDE/kdepim/kmobiletools/kmobiletools/libkmobiletools/CMakeLists.txt #679457:679458
@@ -23,10 +23,9 @@
    overlaywidget.cpp 
    job.cpp 
    weaver.cpp 
-   pickphonenumberdialog.cpp 
    enginedata.cpp
-   picksmscenter.cpp 
    qserial.cpp 
+   picksmscenter.cpp
    serialdevice.cpp 
    engine.cpp 
    sms.cpp 
@@ -38,8 +37,6 @@
 
 kde4_automoc(${kmobiletools_LIB_SRCS})
 
-kde4_add_ui_files(kmobiletools_LIB_SRCS ui_pickphonenumber.ui )
-
 kde4_add_kcfg_files(kmobiletools_LIB_SRCS kmobiletools_cfg.kcfgc kmobiletools_devices.kcfgc )
 
 kde4_add_library(kmobiletools SHARED ${kmobiletools_LIB_SRCS})
@@ -57,6 +54,7 @@
 install( FILES  kmobiletoolsengine.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 install(FILES
    kmobiletools_export.h
+   picksmscenter.h
    kmobiletoolshelper.h
    engine.h
    sms.h
@@ -66,9 +64,7 @@
    qserial.h
    job.h
    contactslist.h
-   pickphonenumberdialog.h
    serialdevice.h
-   picksmscenter.h
    enginedata.h
    weaver.h
    ${CMAKE_CURRENT_BINARY_DIR}/kmobiletools_devices.h
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/mainpart/CMakeLists.txt #679457:679458
@@ -11,7 +11,7 @@
    popupaddressee.cpp
       popupnumber.cpp
          popupsms.cpp
-
+   pickphonenumberdialog.cpp
    editaddressee.cpp 
    exportphonebookdlg.cpp 
    importphonebookdlg.cpp 
@@ -34,6 +34,7 @@
    importphonebook.ui 
    mainWidget.ui 
    ui_newsms.ui
+   pickphonenumber.ui
    cfg_filesystem.ui 
    cfg_gammu-engine.ui 
    deviceList.ui 
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/mainpart/deviceconfigdialog.cpp #679457:679458
@@ -47,7 +47,7 @@
 
 #include "ui_genericDeviceOptions.h"
 // #include "deviceIFace_stub.h" @TODO update to dbus if necessary
-#include <libkmobiletools/picksmscenter.h>
+#include <picksmscenter.h>
 
 #include "ui_cfg_filesystem.h"
 #include "kcombobox.h"
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/mainpart/newsmsdlg.cpp #679457:679458
@@ -29,7 +29,7 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <libkmobiletools/kmobiletoolshelper.h>
-#include <libkmobiletools/pickphonenumberdialog.h>
+#include <pickphonenumberdialog.h>
 #include <libkmobiletools/encodingshelper.h>
 #include <libkmobiletools/engineslist.h>
 #include <libkmobiletools/sms.h>