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 /libkonq/favicons | |
| 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 'libkonq/favicons')
| -rw-r--r-- | libkonq/favicons/Makefile.am | 2 | ||||
| -rw-r--r-- | libkonq/favicons/favicons.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libkonq/favicons/Makefile.am b/libkonq/favicons/Makefile.am index a53c7faf1..6676fd54f 100644 --- a/libkonq/favicons/Makefile.am +++ b/libkonq/favicons/Makefile.am @@ -12,4 +12,4 @@ services_DATA = favicons.desktop update_DATA = favicons.upd update_SCRIPTS = move_favicons.sh -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp index 1bf9feb83..7bc0bbc22 100644 --- a/libkonq/favicons/favicons.cpp +++ b/libkonq/favicons/favicons.cpp @@ -31,7 +31,7 @@ #include <kimageio.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> -#include <kio/job.h> +#include <tdeio/job.h> #include "favicons.moc" |