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/colors | |
| 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/colors')
| -rw-r--r-- | kcontrol/colors/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kcontrol/colors/colors.desktop | 2 | ||||
| -rw-r--r-- | kcontrol/colors/colorscm.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/colors/widgetcanvas.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/colors/CMakeLists.txt b/kcontrol/colors/CMakeLists.txt index de87133b7..e5cab510f 100644 --- a/kcontrol/colors/CMakeLists.txt +++ b/kcontrol/colors/CMakeLists.txt @@ -29,6 +29,6 @@ install( FILES colors.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_colors AUTOMOC SOURCES colorscm.cpp widgetcanvas.cpp - LINK krdb-static kio-shared + LINK krdb-static tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/colors/colors.desktop b/kcontrol/colors/colors.desktop index 4553d5824..e2fb3ca19 100644 --- a/kcontrol/colors/colors.desktop +++ b/kcontrol/colors/colors.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell colors +Exec=tdecmshell colors Icon=colorscm Type=Application DocPath=kcontrol/colors/index.html diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index 32fa1125f..baf56c5c3 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -24,11 +24,11 @@ #include <kcolorbutton.h> #include <kcursor.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kgenericfactory.h> #include <kglobalsettings.h> #include <kinputdialog.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kipc.h> #include <kmessagebox.h> #include <kprocess.h> diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp index a0e59323d..684e9d6d3 100644 --- a/kcontrol/colors/widgetcanvas.cpp +++ b/kcontrol/colors/widgetcanvas.cpp @@ -16,7 +16,7 @@ #include <kcolordrag.h> #include <kpixmapeffect.h> #include <kglobalsettings.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kpixmap.h> |