diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 00:55:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 00:55:17 -0600 |
| commit | 45e371f7ffece317ed9466f032cb0fe9520461f1 (patch) | |
| tree | 2f292babc95fbea695a578de46bed15fb2b61fc8 /conduits/docconduit | |
| parent | 5e4f00a9911f1b6360a49f869fe10620325beaba (diff) | |
| download | kpilot-45e371f7ffece317ed9466f032cb0fe9520461f1.tar.gz kpilot-45e371f7ffece317ed9466f032cb0fe9520461f1.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'conduits/docconduit')
| -rw-r--r-- | conduits/docconduit/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | conduits/docconduit/Makefile.am | 2 | ||||
| -rw-r--r-- | conduits/docconduit/doc-conduit.cc | 2 | ||||
| -rw-r--r-- | conduits/docconduit/doc-setup.cc | 2 | ||||
| -rw-r--r-- | conduits/docconduit/kpalmdoc_dlg.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/conduits/docconduit/CMakeLists.txt b/conduits/docconduit/CMakeLists.txt index be3119b..8793b28 100644 --- a/conduits/docconduit/CMakeLists.txt +++ b/conduits/docconduit/CMakeLists.txt @@ -81,7 +81,7 @@ install( install( FILES kpalmdoc.upd - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kconf_update + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/tdeconf_update ) add_subdirectory(Icons) diff --git a/conduits/docconduit/Makefile.am b/conduits/docconduit/Makefile.am index b0d56b0..40b1a11 100644 --- a/conduits/docconduit/Makefile.am +++ b/conduits/docconduit/Makefile.am @@ -36,5 +36,5 @@ servicetypedir = $(kde_servicetypesdir) kde_kcfg_DATA = docconduit.kcfg kpalmdoc.kcfg update_DATA = kpalmdoc.upd -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update diff --git a/conduits/docconduit/doc-conduit.cc b/conduits/docconduit/doc-conduit.cc index 31a075b..294b31a 100644 --- a/conduits/docconduit/doc-conduit.cc +++ b/conduits/docconduit/doc-conduit.cc @@ -39,7 +39,7 @@ #include <tqtimer.h> #include <tqdir.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmdcodec.h> #include <pilotLocalDatabase.h> diff --git a/conduits/docconduit/doc-setup.cc b/conduits/docconduit/doc-setup.cc index 4269c9e..d0951c5 100644 --- a/conduits/docconduit/doc-setup.cc +++ b/conduits/docconduit/doc-setup.cc @@ -33,7 +33,7 @@ #include <tqbuttongroup.h> #include <tqcombobox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurlrequester.h> #include <kcharsets.h> diff --git a/conduits/docconduit/kpalmdoc_dlg.cc b/conduits/docconduit/kpalmdoc_dlg.cc index 02cfed1..f4a480c 100644 --- a/conduits/docconduit/kpalmdoc_dlg.cc +++ b/conduits/docconduit/kpalmdoc_dlg.cc @@ -39,7 +39,7 @@ #include <tqcombobox.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaboutapplication.h> #include <kapplication.h> #include <kurlrequester.h> |