Rename a number of libraries and executables to avoid conflicts with KDE4

knetworkmanager-0.8/src/CMakeLists.txt

@@ -89,5 +89,5 @@ tde_add_tdeinit_executable( knetworkmanager AUTOMOC
     knetworkmanager-pluginmanager.cpp knetworkmanager-vpnservice.cpp knetworkmanager-vpnmanager.cpp
     knetworkmanager-vpnauthenticationdialog.cpp devicetraycomponent.cpp traycomponent.cpp
     vpn_tray_component.cpp secret_storage_plugin.cpp
-  LINK knm_dbus-static tdeui-shared kutils-shared ${DBUS_TQT_LIBRARIES}
+  LINK knm_dbus-static tdeui-shared tdeutils-shared ${DBUS_TQT_LIBRARIES}
 )

knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp

@@ -23,7 +23,7 @@
  **************************************************************************/
 
 #include <kplugininfo.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kdebug.h>
 #include <klocale.h>