diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:55:17 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:55:17 -0600 |
commit | 45e371f7ffece317ed9466f032cb0fe9520461f1 (patch) | |
tree | 2f292babc95fbea695a578de46bed15fb2b61fc8 /conduits | |
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')
22 files changed, 23 insertions, 23 deletions
diff --git a/conduits/abbrowserconduit/abbrowser-conduit.cc b/conduits/abbrowserconduit/abbrowser-conduit.cc index 9e677d0..93e15ac 100644 --- a/conduits/abbrowserconduit/abbrowser-conduit.cc +++ b/conduits/abbrowserconduit/abbrowser-conduit.cc @@ -40,7 +40,7 @@ #include <kabc/stdaddressbook.h> #include <kabc/resourcefile.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <ksavefile.h> #include <pilotSerialDatabase.h> 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> diff --git a/conduits/knotes/knotes-action.cc b/conduits/knotes/knotes-action.cc index 29a2e32..00880c6 100644 --- a/conduits/knotes/knotes-action.cc +++ b/conduits/knotes/knotes-action.cc @@ -39,7 +39,7 @@ #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> //#include <dcopclient.h> #include <time.h> // required by pilot-link includes diff --git a/conduits/knotes/knotes-setup.cc b/conduits/knotes/knotes-setup.cc index 1127011..93c4f71 100644 --- a/conduits/knotes/knotes-setup.cc +++ b/conduits/knotes/knotes-setup.cc @@ -34,7 +34,7 @@ #include <tqtimer.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "setup_base.h" diff --git a/conduits/malconduit/mal-conduit.cc b/conduits/malconduit/mal-conduit.cc index 5aa5883..cddf09f 100644 --- a/conduits/malconduit/mal-conduit.cc +++ b/conduits/malconduit/mal-conduit.cc @@ -35,7 +35,7 @@ #include "options.h" #include <tqregexp.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include "mal-factory.h" diff --git a/conduits/malconduit/mal-setup.cc b/conduits/malconduit/mal-setup.cc index 61441f0..57f07c4 100644 --- a/conduits/malconduit/mal-setup.cc +++ b/conduits/malconduit/mal-setup.cc @@ -43,7 +43,7 @@ #include <kpassdlg.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "mal-setup_dialog.h" diff --git a/conduits/memofileconduit/memofile-conduit.cc b/conduits/memofileconduit/memofile-conduit.cc index 1334b10..ec373fd 100644 --- a/conduits/memofileconduit/memofile-conduit.cc +++ b/conduits/memofileconduit/memofile-conduit.cc @@ -45,7 +45,7 @@ #include <tqdir.h> #include <tqtextcodec.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include "pilotRecord.h" diff --git a/conduits/memofileconduit/memofile-factory.cc b/conduits/memofileconduit/memofile-factory.cc index c20da01..30789f8 100644 --- a/conduits/memofileconduit/memofile-factory.cc +++ b/conduits/memofileconduit/memofile-factory.cc @@ -32,7 +32,7 @@ #include <tqlineedit.h> #include <tqcheckbox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kinstance.h> #include <kaboutdata.h> #include <kurlrequester.h> diff --git a/conduits/notepadconduit/notepad-factory.cc b/conduits/notepadconduit/notepad-factory.cc index b68eff2..36ae5f9 100644 --- a/conduits/notepadconduit/notepad-factory.cc +++ b/conduits/notepadconduit/notepad-factory.cc @@ -28,7 +28,7 @@ #include "options.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kinstance.h> #include <kaboutdata.h> #include <kurlrequester.h> diff --git a/conduits/null/null-conduit.cc b/conduits/null/null-conduit.cc index c8e0b3a..c0d50fc 100644 --- a/conduits/null/null-conduit.cc +++ b/conduits/null/null-conduit.cc @@ -40,7 +40,7 @@ // #include <time.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include "pilotSerialDatabase.h" diff --git a/conduits/null/null-factory.cc b/conduits/null/null-factory.cc index aeed7c9..30f6f00 100644 --- a/conduits/null/null-factory.cc +++ b/conduits/null/null-factory.cc @@ -32,7 +32,7 @@ #include <tqlineedit.h> #include <tqcheckbox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kinstance.h> #include <kaboutdata.h> diff --git a/conduits/popmail/popmail-conduit.cc b/conduits/popmail/popmail-conduit.cc index 1fbaf71..057a07c 100644 --- a/conduits/popmail/popmail-conduit.cc +++ b/conduits/popmail/popmail-conduit.cc @@ -67,7 +67,7 @@ unsigned long version_conduit_popmail = Pilot::PLUGIN_API; #include <kapplication.h> #include <kmessagebox.h> #include <ksock.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <ksimpleconfig.h> #include <dcopclient.h> #include <ktempfile.h> diff --git a/conduits/popmail/setupDialog.cc b/conduits/popmail/setupDialog.cc index ea8b113..eb7a89c 100644 --- a/conduits/popmail/setupDialog.cc +++ b/conduits/popmail/setupDialog.cc @@ -37,7 +37,7 @@ #include <sys/stat.h> #include <stdlib.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <klineedit.h> #include <kaboutdata.h> @@ -46,7 +46,7 @@ #include <tqdir.h> #include <tqcombobox.h> -#include "kfiledialog.h" +#include "tdefiledialog.h" #include <kurlrequester.h> diff --git a/conduits/recordconduit/factory.cc b/conduits/recordconduit/factory.cc index bf23de7..22b14c8 100644 --- a/conduits/recordconduit/factory.cc +++ b/conduits/recordconduit/factory.cc @@ -32,7 +32,7 @@ #include <tqlineedit.h> #include <tqcheckbox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kinstance.h> #include <kaboutdata.h> diff --git a/conduits/sysinfoconduit/sysinfo-conduit.cc b/conduits/sysinfoconduit/sysinfo-conduit.cc index 5ed758f..08c0f14 100644 --- a/conduits/sysinfoconduit/sysinfo-conduit.cc +++ b/conduits/sysinfoconduit/sysinfo-conduit.cc @@ -33,7 +33,7 @@ #include <tqdir.h> #include <tqfileinfo.h> #include <tqregexp.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <pilotSysInfo.h> diff --git a/conduits/timeconduit/time-conduit.cc b/conduits/timeconduit/time-conduit.cc index 76798db..6020ffe 100644 --- a/conduits/timeconduit/time-conduit.cc +++ b/conduits/timeconduit/time-conduit.cc @@ -31,7 +31,7 @@ #include <pilotSysInfo.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include "time-factory.h" diff --git a/conduits/vcalconduit/cleanupstate.cc b/conduits/vcalconduit/cleanupstate.cc index 200a9df..bac22ce 100644 --- a/conduits/vcalconduit/cleanupstate.cc +++ b/conduits/vcalconduit/cleanupstate.cc @@ -28,7 +28,7 @@ #include <options.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqfile.h> #include "pilotDatabase.h" diff --git a/conduits/vcalconduit/vcal-conduitbase.cc b/conduits/vcalconduit/vcal-conduitbase.cc index a6cc86f..a21aabb 100644 --- a/conduits/vcalconduit/vcal-conduitbase.cc +++ b/conduits/vcalconduit/vcal-conduitbase.cc @@ -37,7 +37,7 @@ #include <tqfile.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include "libkcal/calendar.h" #include "libkcal/calendarlocal.h" |