50 files changed, 143 insertions, 53 deletions
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
index edc853c95..edc853c95 100644
--- a/tdecore/hwlibdaemons/CMakeLists.txt
+++ b/tdecore/tdehw/hwlibdaemons/CMakeLists.txt
diff --git a/tdecore/hwlibdaemons/dbus/CMakeLists.txt b/tdecore/tdehw/hwlibdaemons/dbus/CMakeLists.txt
index 4d1f4618a..4d1f4618a 100644
--- a/tdecore/hwlibdaemons/dbus/CMakeLists.txt
+++ b/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
index a649b969f..a649b969f 100644
--- a/tdecore/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.conf
+++ b/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
index 3be2ebeee..3be2ebeee 100644
--- a/tdecore/hwlibdaemons/dbus/org.trinitydesktop.hardwarecontrol.service.cmake
+++ b/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
index f7e707522..f7e707522 100644
--- a/tdecore/hwlibdaemons/dbus/tde_dbus_hardwarecontrol.c
+++ b/tdecore/tdehw/hwlibdaemons/dbus/tde_dbus_hardwarecontrol.c
diff --git a/tdecore/hwlibdata/CMakeLists.txt b/tdecore/tdehw/hwlibdata/CMakeLists.txt
index fe7cee67d..fe7cee67d 100644
--- a/tdecore/hwlibdata/CMakeLists.txt
+++ b/tdecore/tdehw/hwlibdata/CMakeLists.txt
diff --git a/tdecore/hwlibdata/classrules/CMakeLists.txt b/tdecore/tdehw/hwlibdata/classrules/CMakeLists.txt
index 3b9452f43..3b9452f43 100644
--- a/tdecore/hwlibdata/classrules/CMakeLists.txt
+++ b/tdecore/tdehw/hwlibdata/classrules/CMakeLists.txt
diff --git a/tdecore/hwlibdata/classrules/floppydisk-platform.hwclass b/tdecore/tdehw/hwlibdata/classrules/floppydisk-platform.hwclass
index b3ccab66c..b3ccab66c 100644
--- a/tdecore/hwlibdata/classrules/floppydisk-platform.hwclass
+++ b/tdecore/tdehw/hwlibdata/classrules/floppydisk-platform.hwclass
diff --git a/tdecore/hwlibdata/classrules/floppydisk-udev.hwclass b/tdecore/tdehw/hwlibdata/classrules/floppydisk-udev.hwclass
index 6c76d3c85..6c76d3c85 100644
--- a/tdecore/hwlibdata/classrules/floppydisk-udev.hwclass
+++ b/tdecore/tdehw/hwlibdata/classrules/floppydisk-udev.hwclass
diff --git a/tdecore/hwlibdata/pnpdev/CMakeLists.txt b/tdecore/tdehw/hwlibdata/pnpdev/CMakeLists.txt
index 98b117d54..98b117d54 100644
--- a/tdecore/hwlibdata/pnpdev/CMakeLists.txt
+++ b/tdecore/tdehw/hwlibdata/pnpdev/CMakeLists.txt
diff --git a/tdecore/hwlibdata/pnpdev/dpy.ids b/tdecore/tdehw/hwlibdata/pnpdev/dpy.ids
index 605ef28f4..605ef28f4 100644
--- a/tdecore/hwlibdata/pnpdev/dpy.ids
+++ b/tdecore/tdehw/hwlibdata/pnpdev/dpy.ids
diff --git a/tdecore/hwlibdata/pnpdev/pnp.ids b/tdecore/tdehw/hwlibdata/pnpdev/pnp.ids
index bf4a3ce01..bf4a3ce01 100644
--- a/tdecore/hwlibdata/pnpdev/pnp.ids
+++ b/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
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
index 21f238ffa..21f238ffa 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-access-point.xml
+++ b/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
index ef01ab160..ef01ab160 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-active-connection.xml
+++ b/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
index e26caacf4..e26caacf4 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-agent-manager.xml
+++ b/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
index ec50d1104..ec50d1104 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-device-adsl.xml
+++ b/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
index 9d200ef8f..9d200ef8f 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-device-bond.xml
+++ b/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
index cc4a9b544..cc4a9b544 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-device-bt.xml
+++ b/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
index 000caf752..000caf752 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-device-ethernet.xml
+++ b/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
index 097714c69..097714c69 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-device-infiniband.xml
+++ b/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
index 0ca101fd7..0ca101fd7 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-device-modem.xml
+++ b/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
index c30ecfc60..c30ecfc60 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-device-olpc-mesh.xml
+++ b/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
index 54b7bbe48..54b7bbe48 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-device-vlan.xml
+++ b/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
index 531fc8930..531fc8930 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-device-wifi.xml
+++ b/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
index 6e414087f..6e414087f 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-device-wimax.xml
+++ b/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
index 5b2c98b3c..5b2c98b3c 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-device.xml
+++ b/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
index c0821ada9..c0821ada9 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-dhcp4-config.xml
+++ b/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
index 93b0f1c8f..93b0f1c8f 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-dhcp6-config.xml
+++ b/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
index 70d3e1ce4..70d3e1ce4 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-ip4-config.xml
+++ b/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
index 604781857..604781857 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-ip6-config.xml
+++ b/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
index f5fd7abcf..f5fd7abcf 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-manager.xml
+++ b/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
index 9e2dfdb1c..9e2dfdb1c 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-ppp-manager.xml
+++ b/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
index 81a1321b1..81a1321b1 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-secret-agent.xml
+++ b/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
index 9089b009a..9089b009a 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-settings-connection.xml
+++ b/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
index 301cde76d..301cde76d 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-settings.xml
+++ b/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
index 65b917854..65b917854 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-vpn-connection.xml
+++ b/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
index 5fb11622a..5fb11622a 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-vpn-plugin.xml
+++ b/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
index 55ac4abcf..55ac4abcf 100644
--- a/tdecore/networkbackends/network-manager/introspection/nm-wimax-nsp.xml
+++ b/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
index a7295beac..a7295beac 100644
--- a/tdecore/networkbackends/network-manager/network-manager.cpp
+++ b/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
index a9042f1c4..a9042f1c4 100644
--- a/tdecore/networkbackends/network-manager/network-manager.h
+++ b/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
index 925fd4389..925fd4389 100644
--- a/tdecore/networkbackends/network-manager/network-manager_p.h
+++ b/tdecore/tdehw/networkbackends/network-manager/network-manager_p.h
diff --git a/tdecore/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp
index 69e7856cb..69e7856cb 100644
--- a/tdecore/tdehardwaredevices.cpp
+++ b/tdecore/tdehw/tdehardwaredevices.cpp
diff --git a/tdecore/tdehardwaredevices.h b/tdecore/tdehw/tdehardwaredevices.h
index fcf60533d..fcf60533d 100644
--- a/tdecore/tdehardwaredevices.h
+++ b/tdecore/tdehw/tdehardwaredevices.h
diff --git a/tdecore/tdenetworkconnections.cpp b/tdecore/tdehw/tdenetworkconnections.cpp
index 6227b095f..6227b095f 100644
--- a/tdecore/tdenetworkconnections.cpp
+++ b/tdecore/tdehw/tdenetworkconnections.cpp
diff --git a/tdecore/tdenetworkconnections.h b/tdecore/tdehw/tdenetworkconnections.h
index b8425196a..b8425196a 100644
--- a/tdecore/tdenetworkconnections.h
+++ b/tdecore/tdehw/tdenetworkconnections.h