diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:18:13 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:18:13 -0600 |
| commit | 2fb700f92bb787fab0845a63a541cd5640daa449 (patch) | |
| tree | c6f769db55585dd47a9fd415a40ee8b86926f683 /parts/documentation/protocols/chm | |
| parent | fd1d1e1064eb09ddbbd67d3597c39856f5c0bc76 (diff) | |
| download | tdevelop-2fb700f92bb787fab0845a63a541cd5640daa449.tar.gz tdevelop-2fb700f92bb787fab0845a63a541cd5640daa449.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'parts/documentation/protocols/chm')
| -rw-r--r-- | parts/documentation/protocols/chm/Makefile.am | 2 | ||||
| -rw-r--r-- | parts/documentation/protocols/chm/kchmpart.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/parts/documentation/protocols/chm/Makefile.am b/parts/documentation/protocols/chm/Makefile.am index eba29efd..d68f20bd 100644 --- a/parts/documentation/protocols/chm/Makefile.am +++ b/parts/documentation/protocols/chm/Makefile.am @@ -9,7 +9,7 @@ kio_chm_la_LIBADD = $(LIB_KIO) kio_chm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) libkchmpart_la_SOURCES = kchmpart.cpp -libkchmpart_la_LIBADD = -lkhtml $(LIB_KPARTS) $(top_builddir)/lib/widgets/libkdevwidgets.la +libkchmpart_la_LIBADD = -ltdehtml $(LIB_KPARTS) $(top_builddir)/lib/widgets/libkdevwidgets.la libkchmpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) noinst_HEADERS = chm.h chmfile.h decompress.h kchmpart.h diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h index 1ec2eaf8..f8779d75 100644 --- a/parts/documentation/protocols/chm/kchmpart.h +++ b/parts/documentation/protocols/chm/kchmpart.h @@ -17,10 +17,10 @@ #ifndef __kchmpart_h__ #define __kchmpart_h__ -#include <kparts/factory.h> -#include <kparts/part.h> -#include <kparts/browserextension.h> -#include <khtml_part.h> +#include <tdeparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/browserextension.h> +#include <tdehtml_part.h> #include <kio/job.h> #include <kio/jobclasses.h> #include <kdevhtmlpart.h> |