diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:17:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:17:21 -0600 |
| commit | dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 (patch) | |
| tree | c297348a55df66c571de4525646e0b9762427353 /kioslave/http/kcookiejar | |
| parent | b7658a0d5eca24a9d37c6e04f88298ef02389db0 (diff) | |
| download | tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.tar.gz tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/http/kcookiejar')
| -rw-r--r-- | kioslave/http/kcookiejar/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kioslave/http/kcookiejar/Makefile.am | 2 | ||||
| -rw-r--r-- | kioslave/http/kcookiejar/kcookiejar.cpp | 2 | ||||
| -rw-r--r-- | kioslave/http/kcookiejar/tests/Makefile.am | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/kioslave/http/kcookiejar/CMakeLists.txt b/kioslave/http/kcookiejar/CMakeLists.txt index eef5e9654..289daa4f0 100644 --- a/kioslave/http/kcookiejar/CMakeLists.txt +++ b/kioslave/http/kcookiejar/CMakeLists.txt @@ -29,7 +29,7 @@ link_directories( install( FILES kcookiejar.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) install( FILES kcookiescfg.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) -install( FILES domain_info DESTINATION ${DATA_INSTALL_DIR}/khtml ) +install( FILES domain_info DESTINATION ${DATA_INSTALL_DIR}/tdehtml ) ##### kcookiejar ################################ diff --git a/kioslave/http/kcookiejar/Makefile.am b/kioslave/http/kcookiejar/Makefile.am index 3cfb540fb..431502c12 100644 --- a/kioslave/http/kcookiejar/Makefile.am +++ b/kioslave/http/kcookiejar/Makefile.am @@ -27,5 +27,5 @@ update_DATA = kcookiescfg.upd updatedir = $(kde_datadir)/kconf_update cookie_DATA = domain_info -cookiedir = $(kde_datadir)/khtml +cookiedir = $(kde_datadir)/tdehtml diff --git a/kioslave/http/kcookiejar/kcookiejar.cpp b/kioslave/http/kcookiejar/kcookiejar.cpp index f115a6da6..12d92a8df 100644 --- a/kioslave/http/kcookiejar/kcookiejar.cpp +++ b/kioslave/http/kcookiejar/kcookiejar.cpp @@ -257,7 +257,7 @@ KCookieJar::KCookieJar() m_configChanged = false; m_cookiesChanged = false; - TDEConfig cfg("khtml/domain_info", true, false, "data"); + TDEConfig cfg("tdehtml/domain_info", true, false, "data"); TQStringList countries = cfg.readListEntry("twoLevelTLD"); for(TQStringList::ConstIterator it = countries.begin(); it != countries.end(); ++it) diff --git a/kioslave/http/kcookiejar/tests/Makefile.am b/kioslave/http/kcookiejar/tests/Makefile.am index 44a453feb..4059cdcd1 100644 --- a/kioslave/http/kcookiejar/tests/Makefile.am +++ b/kioslave/http/kcookiejar/tests/Makefile.am @@ -9,7 +9,7 @@ check_PROGRAMS = kcookiejartest kcookiejartest_SOURCES = kcookiejartest.cpp kcookiejartest_LDADD = $(LIB_KIO) -kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcookiejartest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor check-local: kcookiejartest ./kcookiejartest $(srcdir)/cookie.test |