diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /kcontrol/energy | |
| parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
| download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/energy')
| -rw-r--r-- | kcontrol/energy/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kcontrol/energy/energy.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/energy/energy.desktop | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/energy/CMakeLists.txt b/kcontrol/energy/CMakeLists.txt index ee9bf8ab0..9e194602a 100644 --- a/kcontrol/energy/CMakeLists.txt +++ b/kcontrol/energy/CMakeLists.txt @@ -60,6 +60,6 @@ install( FILES energy.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidden ) tde_add_kpart( kcm_energy AUTOMOC SOURCES energy.cpp - LINK kio-shared ${XEXT_LIBRARY} + LINK tdeio-shared ${XEXT_LIBRARY} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp index a6fb21887..19c46e235 100644 --- a/kcontrol/energy/energy.cpp +++ b/kcontrol/energy/energy.cpp @@ -27,7 +27,7 @@ #include <tqlayout.h> #include <tqwhatsthis.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcursor.h> #include <kdialog.h> #include <kiconloader.h> diff --git a/kcontrol/energy/energy.desktop b/kcontrol/energy/energy.desktop index 8b0d24373..e3a4d2093 100644 --- a/kcontrol/energy/energy.desktop +++ b/kcontrol/energy/energy.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell energy +Exec=tdecmshell energy Icon=energy_star DocPath=kcontrol/energy/index.html Type=Application |