From 0984f0194709db2d85651615b0551054876dbcc5 Mon Sep 17 00:00:00 2001 From: Golubev Alexander Date: Sat, 27 Jul 2013 10:34:20 +0400 Subject: [PATCH] move all tdehw stuff into separate subdir --- tdecore/CMakeLists.txt | 59 ++----------- tdecore/tdehw/CMakeLists.txt | 82 +++++++++++++++++++ .../{ => tdehw}/hwlibdaemons/CMakeLists.txt | 0 .../hwlibdaemons/dbus/CMakeLists.txt | 0 .../org.trinitydesktop.hardwarecontrol.conf | 0 ...initydesktop.hardwarecontrol.service.cmake | 0 .../dbus/tde_dbus_hardwarecontrol.c | 0 tdecore/{ => tdehw}/hwlibdata/CMakeLists.txt | 0 .../hwlibdata/classrules/CMakeLists.txt | 0 .../classrules/floppydisk-platform.hwclass | 0 .../classrules/floppydisk-udev.hwclass | 0 .../hwlibdata/pnpdev/CMakeLists.txt | 0 tdecore/{ => tdehw}/hwlibdata/pnpdev/dpy.ids | 0 tdecore/{ => tdehw}/hwlibdata/pnpdev/pnp.ids | 0 tdecore/tdehw/networkbackends/CMakeLists.txt | 12 +++ .../network-manager/CMakeLists.txt | 36 ++++++++ .../dbus-introspection}/CMakeLists.txt | 7 +- .../dbus-introspection}/nm-access-point.xml | 0 .../nm-active-connection.xml | 0 .../dbus-introspection}/nm-agent-manager.xml | 0 .../dbus-introspection}/nm-device-adsl.xml | 0 .../dbus-introspection}/nm-device-bond.xml | 0 .../dbus-introspection}/nm-device-bt.xml | 0 .../nm-device-ethernet.xml | 0 .../nm-device-infiniband.xml | 0 .../dbus-introspection}/nm-device-modem.xml | 0 .../nm-device-olpc-mesh.xml | 0 .../dbus-introspection}/nm-device-vlan.xml | 0 .../dbus-introspection}/nm-device-wifi.xml | 0 .../dbus-introspection}/nm-device-wimax.xml | 0 .../dbus-introspection}/nm-device.xml | 0 .../dbus-introspection}/nm-dhcp4-config.xml | 0 .../dbus-introspection}/nm-dhcp6-config.xml | 0 .../dbus-introspection}/nm-ip4-config.xml | 0 .../dbus-introspection}/nm-ip6-config.xml | 0 .../dbus-introspection}/nm-manager.xml | 0 .../dbus-introspection}/nm-ppp-manager.xml | 0 .../dbus-introspection}/nm-secret-agent.xml | 0 .../nm-settings-connection.xml | 0 .../dbus-introspection}/nm-settings.xml | 0 .../dbus-introspection}/nm-vpn-connection.xml | 0 .../dbus-introspection}/nm-vpn-plugin.xml | 0 .../dbus-introspection}/nm-wimax-nsp.xml | 0 .../network-manager/network-manager.cpp | 0 .../network-manager/network-manager.h | 0 .../network-manager/network-manager_p.h | 0 tdecore/{ => tdehw}/tdehardwaredevices.cpp | 0 tdecore/{ => tdehw}/tdehardwaredevices.h | 0 tdecore/{ => tdehw}/tdenetworkconnections.cpp | 0 tdecore/{ => tdehw}/tdenetworkconnections.h | 0 50 files changed, 143 insertions(+), 53 deletions(-) create mode 100644 tdecore/tdehw/CMakeLists.txt rename tdecore/{ => tdehw}/hwlibdaemons/CMakeLists.txt (100%) rename tdecore/{ => tdehw}/hwlibdaemons/dbus/CMakeLists.txt (100%) rename tdecore/{ => tdehw}/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.conf (100%) rename tdecore/{ => tdehw}/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.service.cmake (100%) rename tdecore/{ => tdehw}/hwlibdaemons/dbus/tde_dbus_hardwarecontrol.c (100%) rename tdecore/{ => tdehw}/hwlibdata/CMakeLists.txt (100%) rename tdecore/{ => tdehw}/hwlibdata/classrules/CMakeLists.txt (100%) rename tdecore/{ => tdehw}/hwlibdata/classrules/floppydisk-platform.hwclass (100%) rename tdecore/{ => tdehw}/hwlibdata/classrules/floppydisk-udev.hwclass (100%) rename tdecore/{ => tdehw}/hwlibdata/pnpdev/CMakeLists.txt (100%) rename tdecore/{ => tdehw}/hwlibdata/pnpdev/dpy.ids (100%) rename tdecore/{ => tdehw}/hwlibdata/pnpdev/pnp.ids (100%) create mode 100644 tdecore/tdehw/networkbackends/CMakeLists.txt create mode 100644 tdecore/tdehw/networkbackends/network-manager/CMakeLists.txt rename tdecore/{networkbackends/network-manager/dbus => tdehw/networkbackends/network-manager/dbus-introspection}/CMakeLists.txt (89%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-access-point.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-active-connection.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-agent-manager.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-device-adsl.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-device-bond.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-device-bt.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-device-ethernet.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-device-infiniband.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-device-modem.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-device-olpc-mesh.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-device-vlan.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-device-wifi.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-device-wimax.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-device.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-dhcp4-config.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-dhcp6-config.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-ip4-config.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-ip6-config.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-manager.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-ppp-manager.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-secret-agent.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-settings-connection.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-settings.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-vpn-connection.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-vpn-plugin.xml (100%) rename tdecore/{networkbackends/network-manager/introspection => tdehw/networkbackends/network-manager/dbus-introspection}/nm-wimax-nsp.xml (100%) rename tdecore/{ => tdehw}/networkbackends/network-manager/network-manager.cpp (100%) rename tdecore/{ => tdehw}/networkbackends/network-manager/network-manager.h (100%) rename tdecore/{ => tdehw}/networkbackends/network-manager/network-manager_p.h (100%) rename tdecore/{ => tdehw}/tdehardwaredevices.cpp (100%) rename tdecore/{ => tdehw}/tdehardwaredevices.h (100%) rename tdecore/{ => tdehw}/tdenetworkconnections.cpp (100%) rename tdecore/{ => tdehw}/tdenetworkconnections.h (100%) diff --git a/tdecore/CMakeLists.txt b/tdecore/CMakeLists.txt index bff0e51d0..59bccf568 100644 --- a/tdecore/CMakeLists.txt +++ b/tdecore/CMakeLists.txt @@ -12,61 +12,20 @@ add_subdirectory( malloc ) add_subdirectory( network ) add_subdirectory( tdeconfig_compiler ) -add_subdirectory( hwlibdata ) -add_subdirectory( hwlibdaemons ) - -if( NOT DBUS_SYSTEM_BUS ) - set( DBUS_SYSTEM_BUS "unix:path=/var/run/dbus/system_bus_socket" CACHE INTERNAL "" FORCE ) -endif() - -if( WITH_UPOWER ) - add_definitions( -DWITH_UPOWER ) - set ( TDEUPOWER_INCLUDE_DIRECTORIES - ${DBUS_TQT_INCLUDE_DIRS} - ) - set ( TDEUPOWER_LIBRARIES - ${DBUS_TQT_LIBRARIES} - ) -endif( ) - -if( WITH_UDISKS ) - add_definitions( -DWITH_UDISKS ) -endif( ) - -if( WITH_UDISKS2 ) - add_definitions( -DWITH_UDISKS2 ) -endif( ) - -if( WITH_CONSOLEKIT ) - add_definitions( -DWITH_CONSOLEKIT ) -endif( ) +add_subdirectory( tdehw ) if( WITH_LIBART ) add_subdirectory( svgicons ) set( KDESVGICONS kdesvgicons-static ) endif( WITH_LIBART ) -if( WITH_NETWORK_MANAGER_BACKEND ) - add_subdirectory( networkbackends/network-manager/dbus ) - set ( TDENM_INCLUDE_DIRECTORIES - ${DBUS_TQT_INCLUDE_DIRS} - ${NM_UTIL_INCLUDE_DIRS} - "${CMAKE_BINARY_DIR}/tdecore/networkbackends/network-manager/dbus" - ) - set ( TDENM_LIBRARIES - tdenm_dbus-static - ${DBUS_TQT_LIBRARIES} - ) - set ( TDENM_BACKEND_SOURCES networkbackends/network-manager/network-manager.cpp ) -endif( WITH_NETWORK_MANAGER_BACKEND ) - - include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/network + ${CMAKE_CURRENT_SOURCE_DIR}/tdehw ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/libltdl ${CMAKE_SOURCE_DIR}/tdefx @@ -75,8 +34,6 @@ include_directories( ${LIBART_INCLUDE_DIRS} ${LIBIDN_INCLUDE_DIRS} ${GAMIN_INCLUDEDIR} - ${TDENM_INCLUDE_DIRECTORIES} - ${TDEUPOWER_INCLUDE_DIRECTORIES} ) link_directories( @@ -111,8 +68,7 @@ install( FILES kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h kmanagerselection.h kmountpoint.h kuser.h klockfile.h kidna.h ktempdir.h kshell.h fixx11h.h kxerrorhandler.h - tdelibs_export.h kde_file.h ktimezones.h tdehardwaredevices.h - tdenetworkconnections.h + tdelibs_export.h kde_file.h ktimezones.h ${CMAKE_CURRENT_BINARY_DIR}/kdemacros.h DESTINATION ${INCLUDE_INSTALL_DIR} ) @@ -168,16 +124,15 @@ set( ${target}_SRCS ktempdir.cpp kshell.cpp kmountpoint.cpp kcalendarsystemjalali.cpp kprotocolinfo_tdecore.cpp kprotocolinfofactory.cpp kxerrorhandler.cpp kuser.cpp tdeconfigskeleton.cpp tdeconfigdialogmanager.cpp klockfile.cpp - kqiodevicegzip_p.cpp ktimezones.cpp tdehardwaredevices.cpp tdenetworkconnections.cpp - ksimpledirwatch.cpp - ${TDENM_BACKEND_SOURCES} + kqiodevicegzip_p.cpp ktimezones.cpp ksimpledirwatch.cpp ) tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 4.2.0 - EMBED tdecorenetwork-static - LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM udev ${GAMIN_LIBRARIES} ${TDENM_LIBRARIES} ${TDEUPOWER_LIBRARIES} + EMBED tdecorenetwork-static tdehw-static + LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES} + ${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM ${GAMIN_LIBRARIES} DEPENDENCIES dcopidl dcopidl2cpp DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/tdecore/tdehw/CMakeLists.txt b/tdecore/tdehw/CMakeLists.txt new file mode 100644 index 000000000..960158cea --- /dev/null +++ b/tdecore/tdehw/CMakeLists.txt @@ -0,0 +1,82 @@ +################################################# +# +# (C) 2013 Golubev Alexander +# fatzer2 (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_subdirectory( hwlibdata ) +add_subdirectory( hwlibdaemons ) +add_subdirectory( networkbackends ) + +if( NOT DBUS_SYSTEM_BUS ) + set( DBUS_SYSTEM_BUS "unix:path=/var/run/dbus/system_bus_socket" CACHE INTERNAL "" FORCE ) +endif() + +if( WITH_UPOWER OR WITH_UDISKS OR WITH_UDISKS2 OR + WITH_NETWORK_MANAGER_BACKEND OR WITH_CONSOLEKIT ) + list( APPEND TDEHW_CUSTOM_INCLUDE_DIRS ${DBUS_TQT_INCLUDE_DIRS} ) + list( APPEND TDEHW_CUSTOM_LIBRARY_DIRS ${DBUS_TQT_LIBRARY_DIRS} ) + list( APPEND TDEHW_CUSTOM_LIBRARIES ${DBUS_TQT_LIBRARIES} ) +endif( ) + +if( WITH_UPOWER ) + add_definitions( -DWITH_UPOWER ) +endif( ) + +if( WITH_UDISKS ) + add_definitions( -DWITH_UDISKS ) +endif( ) + +if( WITH_UDISKS2 ) + add_definitions( -DWITH_UDISKS2 ) +endif( ) + +if( WITH_CONSOLEKIT ) + add_definitions( -DWITH_CONSOLEKIT ) +endif( ) + +if( WITH_NETWORK_MANAGER_BACKEND ) + list( APPEND TDEHW_CUSTOM_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/networkbackends/network-manager/dbus ) + list( APPEND TDEHW_CUSTOM_LIBRARIES network_manager_backend-static ) +endif( WITH_NETWORK_MANAGER_BACKEND ) + +include_directories( + ${TQT_INCLUDE_DIRS} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/dcop + ${TDEHW_CUSTOM_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDEHW_CUSTOM_LIBRARY_DIRS} +) + +##### headers ################################### + +install( FILES tdehardwaredevices.h tdenetworkconnections.h + DESTINATION ${INCLUDE_INSTALL_DIR} ) + + +##### libtdecore ################################ + +set( target tdehw ) + +set( ${target}_SRCS + tdehardwaredevices.cpp tdenetworkconnections.cpp +) + +tde_add_library( ${target} STATIC_PIC AUTOMOC + SOURCES ${${target}_SRCS} + LINK udev ${TDENM_LIBRARIES} ${TDEUPOWER_LIBRARIES} + ${TDEHW_CUSTOM_LIBRARIES} +) diff --git a/tdecore/hwlibdaemons/CMakeLists.txt b/tdecore/tdehw/hwlibdaemons/CMakeLists.txt similarity index 100% rename from tdecore/hwlibdaemons/CMakeLists.txt rename to tdecore/tdehw/hwlibdaemons/CMakeLists.txt diff --git a/tdecore/hwlibdaemons/dbus/CMakeLists.txt b/tdecore/tdehw/hwlibdaemons/dbus/CMakeLists.txt similarity index 100% rename from tdecore/hwlibdaemons/dbus/CMakeLists.txt rename to tdecore/tdehw/hwlibdaemons/dbus/CMakeLists.txt diff --git a/tdecore/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.conf b/tdecore/tdehw/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.conf similarity index 100% rename from tdecore/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.conf rename to tdecore/tdehw/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.conf diff --git a/tdecore/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.service.cmake b/tdecore/tdehw/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.service.cmake similarity index 100% rename from tdecore/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.service.cmake rename to tdecore/tdehw/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.service.cmake diff --git a/tdecore/hwlibdaemons/dbus/tde_dbus_hardwarecontrol.c b/tdecore/tdehw/hwlibdaemons/dbus/tde_dbus_hardwarecontrol.c similarity index 100% rename from tdecore/hwlibdaemons/dbus/tde_dbus_hardwarecontrol.c rename to tdecore/tdehw/hwlibdaemons/dbus/tde_dbus_hardwarecontrol.c diff --git a/tdecore/hwlibdata/CMakeLists.txt b/tdecore/tdehw/hwlibdata/CMakeLists.txt similarity index 100% rename from tdecore/hwlibdata/CMakeLists.txt rename to tdecore/tdehw/hwlibdata/CMakeLists.txt diff --git a/tdecore/hwlibdata/classrules/CMakeLists.txt b/tdecore/tdehw/hwlibdata/classrules/CMakeLists.txt similarity index 100% rename from tdecore/hwlibdata/classrules/CMakeLists.txt rename to tdecore/tdehw/hwlibdata/classrules/CMakeLists.txt diff --git a/tdecore/hwlibdata/classrules/floppydisk-platform.hwclass b/tdecore/tdehw/hwlibdata/classrules/floppydisk-platform.hwclass similarity index 100% rename from tdecore/hwlibdata/classrules/floppydisk-platform.hwclass rename to tdecore/tdehw/hwlibdata/classrules/floppydisk-platform.hwclass diff --git a/tdecore/hwlibdata/classrules/floppydisk-udev.hwclass b/tdecore/tdehw/hwlibdata/classrules/floppydisk-udev.hwclass similarity index 100% rename from tdecore/hwlibdata/classrules/floppydisk-udev.hwclass rename to tdecore/tdehw/hwlibdata/classrules/floppydisk-udev.hwclass diff --git a/tdecore/hwlibdata/pnpdev/CMakeLists.txt b/tdecore/tdehw/hwlibdata/pnpdev/CMakeLists.txt similarity index 100% rename from tdecore/hwlibdata/pnpdev/CMakeLists.txt rename to tdecore/tdehw/hwlibdata/pnpdev/CMakeLists.txt diff --git a/tdecore/hwlibdata/pnpdev/dpy.ids b/tdecore/tdehw/hwlibdata/pnpdev/dpy.ids similarity index 100% rename from tdecore/hwlibdata/pnpdev/dpy.ids rename to tdecore/tdehw/hwlibdata/pnpdev/dpy.ids diff --git a/tdecore/hwlibdata/pnpdev/pnp.ids b/tdecore/tdehw/hwlibdata/pnpdev/pnp.ids similarity index 100% rename from tdecore/hwlibdata/pnpdev/pnp.ids rename to tdecore/tdehw/hwlibdata/pnpdev/pnp.ids diff --git a/tdecore/tdehw/networkbackends/CMakeLists.txt b/tdecore/tdehw/networkbackends/CMakeLists.txt new file mode 100644 index 000000000..f5b916a95 --- /dev/null +++ b/tdecore/tdehw/networkbackends/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2013 Golubev Alexander +# fatzer2 (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_conditional_add_subdirectory( WITH_NETWORK_MANAGER_BACKEND network-manager ) diff --git a/tdecore/tdehw/networkbackends/network-manager/CMakeLists.txt b/tdecore/tdehw/networkbackends/network-manager/CMakeLists.txt new file mode 100644 index 000000000..f00b5e482 --- /dev/null +++ b/tdecore/tdehw/networkbackends/network-manager/CMakeLists.txt @@ -0,0 +1,36 @@ +################################################# +# +# (C) 2013 Golubev Alexander +# fatzer2 (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_subdirectory( dbus-introspection ) + +include_directories ( + ${TQT_INCLUDE_DIRS} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${DBUS_TQT_INCLUDE_DIRS} + ${NM_UTIL_INCLUDE_DIRS} + ${CMAKE_BINARY_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore + ${CMAKE_SOURCE_DIR}/tdecore/tdehw + ${CMAKE_CURRENT_BINARY_DIR}/dbus-introspection +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${DBUS_TQT_LIBRARY_DIRS} +) + +tde_add_library( network_manager_backend STATIC_PIC AUTOMOC + SOURCES network-manager.cpp + EMBED tdenm_dbus-static + LINK tdenm_dbus-static ${DBUS_TQT_LIBRARIES} +) diff --git a/tdecore/networkbackends/network-manager/dbus/CMakeLists.txt b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt similarity index 89% rename from tdecore/networkbackends/network-manager/dbus/CMakeLists.txt rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt index 6f4e39f6f..144d56569 100644 --- a/tdecore/networkbackends/network-manager/dbus/CMakeLists.txt +++ b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/CMakeLists.txt @@ -18,7 +18,7 @@ include_directories( ##### tdenm_dbus (static) ######################### -set( INTROSPECTIONPATH "${CMAKE_SOURCE_DIR}/tdecore/networkbackends/network-manager/introspection" ) +set( INTROSPECTIONPATH ${CMAKE_CURRENT_SOURCE_DIR} ) # options: # p - generate proxy files @@ -71,6 +71,11 @@ add_custom_command( OUTPUT mocfiles.cpp COMMAND cat ${_moc_files} > mocfiles.cpp DEPENDS ${_moc_files} ) +# tde_automoc( accesspointproxy.h deviceproxy.h networkmanagerproxy.h +# networkmanagerpppproxy.h bluetoothproxy.h olpcmeshproxy.h +# ethernetproxy.h infinibandproxy.h wifiproxy.h wimaxproxy.h +# activeconnectionproxy.h vpnconnectionproxy.h vpnpluginproxy.h +# modemproxy.h networkmanagersettings.h connectionsettings.h ) # build the library diff --git a/tdecore/networkbackends/network-manager/introspection/nm-access-point.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-access-point.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-access-point.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-access-point.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-active-connection.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-active-connection.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-active-connection.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-active-connection.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-agent-manager.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-agent-manager.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-agent-manager.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-agent-manager.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device-adsl.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device-adsl.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-device-adsl.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device-adsl.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device-bond.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device-bond.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-device-bond.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device-bond.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device-bt.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device-bt.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-device-bt.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device-bt.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device-ethernet.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device-ethernet.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-device-ethernet.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device-ethernet.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device-infiniband.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device-infiniband.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-device-infiniband.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device-infiniband.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device-modem.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device-modem.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-device-modem.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device-modem.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device-olpc-mesh.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device-olpc-mesh.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-device-olpc-mesh.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device-olpc-mesh.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device-vlan.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device-vlan.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-device-vlan.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device-vlan.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device-wifi.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device-wifi.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-device-wifi.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device-wifi.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device-wimax.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device-wimax.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-device-wimax.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device-wimax.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-device.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-device.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-device.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-dhcp4-config.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-dhcp4-config.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-dhcp4-config.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-dhcp4-config.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-dhcp6-config.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-dhcp6-config.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-dhcp6-config.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-dhcp6-config.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-ip4-config.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-ip4-config.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-ip4-config.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-ip4-config.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-ip6-config.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-ip6-config.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-ip6-config.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-ip6-config.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-manager.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-manager.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-manager.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-manager.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-ppp-manager.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-ppp-manager.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-ppp-manager.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-ppp-manager.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-secret-agent.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-secret-agent.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-secret-agent.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-secret-agent.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-settings-connection.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-settings-connection.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-settings-connection.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-settings-connection.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-settings.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-settings.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-settings.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-settings.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-vpn-connection.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-vpn-connection.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-vpn-connection.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-vpn-connection.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-vpn-plugin.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-vpn-plugin.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-vpn-plugin.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-vpn-plugin.xml diff --git a/tdecore/networkbackends/network-manager/introspection/nm-wimax-nsp.xml b/tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-wimax-nsp.xml similarity index 100% rename from tdecore/networkbackends/network-manager/introspection/nm-wimax-nsp.xml rename to tdecore/tdehw/networkbackends/network-manager/dbus-introspection/nm-wimax-nsp.xml diff --git a/tdecore/networkbackends/network-manager/network-manager.cpp b/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp similarity index 100% rename from tdecore/networkbackends/network-manager/network-manager.cpp rename to tdecore/tdehw/networkbackends/network-manager/network-manager.cpp diff --git a/tdecore/networkbackends/network-manager/network-manager.h b/tdecore/tdehw/networkbackends/network-manager/network-manager.h similarity index 100% rename from tdecore/networkbackends/network-manager/network-manager.h rename to tdecore/tdehw/networkbackends/network-manager/network-manager.h diff --git a/tdecore/networkbackends/network-manager/network-manager_p.h b/tdecore/tdehw/networkbackends/network-manager/network-manager_p.h similarity index 100% rename from tdecore/networkbackends/network-manager/network-manager_p.h rename to tdecore/tdehw/networkbackends/network-manager/network-manager_p.h diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp similarity index 100% rename from tdecore/tdehardwaredevices.cpp rename to tdecore/tdehw/tdehardwaredevices.cpp diff --git a/tdecore/tdehardwaredevices.h b/tdecore/tdehw/tdehardwaredevices.h similarity index 100% rename from tdecore/tdehardwaredevices.h rename to tdecore/tdehw/tdehardwaredevices.h diff --git a/tdecore/tdenetworkconnections.cpp b/tdecore/tdehw/tdenetworkconnections.cpp similarity index 100% rename from tdecore/tdenetworkconnections.cpp rename to tdecore/tdehw/tdenetworkconnections.cpp diff --git a/tdecore/tdenetworkconnections.h b/tdecore/tdehw/tdenetworkconnections.h similarity index 100% rename from tdecore/tdenetworkconnections.h rename to tdecore/tdehw/tdenetworkconnections.h