diff options
author | Timothy Pearson <[email protected]> | 2013-01-26 13:09:51 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-26 13:09:51 -0600 |
commit | 7da308033163d9ad679b1e49cbdc0602e30f649a (patch) | |
tree | c8c711993cf75475cc793701183487ea18fde007 | |
parent | 16d72fea3d73c5476f04d5005d9b0bc2c767a9e1 (diff) | |
download | tdenetworkmanager-7da308033163d9ad679b1e49cbdc0602e30f649a.tar.gz tdenetworkmanager-7da308033163d9ad679b1e49cbdc0602e30f649a.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
-rw-r--r-- | tdenetworkmanager/src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tdenetworkmanager/src/tdenetman-pluginmanager.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tdenetworkmanager/src/CMakeLists.txt b/tdenetworkmanager/src/CMakeLists.txt index d45b57d..1503819 100644 --- a/tdenetworkmanager/src/CMakeLists.txt +++ b/tdenetworkmanager/src/CMakeLists.txt @@ -65,5 +65,5 @@ tde_add_tdeinit_executable( tdenetworkmanager AUTOMOC tdenetman-vpnauthenticationdialog.cpp vpn_tray_component.cpp EMBED tdenetwork-connection-configwidgets-static #tdenetwork-connection-settings-static - LINK tdecore-shared tdeui-shared kutils-shared ${DBUS_TQT_LIBRARIES} + LINK tdecore-shared tdeui-shared tdeutils-shared ${DBUS_TQT_LIBRARIES} ) diff --git a/tdenetworkmanager/src/tdenetman-pluginmanager.cpp b/tdenetworkmanager/src/tdenetman-pluginmanager.cpp index 0dad6ad..51ab1b5 100644 --- a/tdenetworkmanager/src/tdenetman-pluginmanager.cpp +++ b/tdenetworkmanager/src/tdenetman-pluginmanager.cpp @@ -23,7 +23,7 @@ **************************************************************************/ #include <kplugininfo.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kdebug.h> #include <klocale.h> |