summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:09:48 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:09:48 -0600
commit2f2d4424f4ba183492d59c47103def5ef0f64aec (patch)
tree9c0232ea13a0bd73c77c9c571950157cb9270d0a
parentcbd491b7e6596570b3d9d3f96a622d056ca0440f (diff)
downloadknetworkmanager8-2f2d4424f4ba183492d59c47103def5ef0f64aec.tar.gz
knetworkmanager8-2f2d4424f4ba183492d59c47103def5ef0f64aec.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
-rw-r--r--knetworkmanager-0.8/src/CMakeLists.txt2
-rw-r--r--knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/knetworkmanager-0.8/src/CMakeLists.txt b/knetworkmanager-0.8/src/CMakeLists.txt
index ba1e362..98a8106 100644
--- a/knetworkmanager-0.8/src/CMakeLists.txt
+++ b/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}
)
diff --git a/knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp b/knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp
index 7654ccd..5a6ab4a 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp
+++ b/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>