diff options
55 files changed, 86 insertions, 86 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 3dfd15e..f303912 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -612,7 +612,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi if test -n "$trinity2ornewer"; then - KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) + KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi if test -n "$trinity3ornewer"; then @@ -1792,7 +1792,7 @@ if test "$kde_qtver" = 1; then kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z "$1"; then @@ -2099,7 +2099,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2109,7 +2109,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/src/calendarhandler.cpp b/src/calendarhandler.cpp index 5f7893c..765da12 100644 --- a/src/calendarhandler.cpp +++ b/src/calendarhandler.cpp @@ -18,7 +18,7 @@ #include <klocale.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #ifdef USE_KCAL #include <libkcal/calendarresources.h> diff --git a/src/cite/openoffice.cpp b/src/cite/openoffice.cpp index 9daabf4..27c8f2c 100644 --- a/src/cite/openoffice.cpp +++ b/src/cite/openoffice.cpp @@ -25,7 +25,7 @@ #include <kdialogbase.h> #include <knuminput.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klineedit.h> #include <kiconloader.h> #include <klocale.h> diff --git a/src/configdialog.cpp b/src/configdialog.cpp index 8d60942..ed5e67d 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -32,7 +32,7 @@ #include <klineedit.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <knuminput.h> #include <kpushbutton.h> @@ -40,7 +40,7 @@ #include <ksortablevaluelist.h> #include <kaccelmanager.h> #include <tdehtmlview.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kinputdialog.h> #include <kfontcombo.h> #include <kcolorcombo.h> diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 2d61d84..15fc0df 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -19,7 +19,7 @@ tellico-1-3-update.pl kde_kcfg_DATA = tellico_config.kcfg -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update update_DATA = tellico-rename.upd tellico.upd update_SCRIPTS = tellico-1-3-update.pl diff --git a/src/core/netaccess.cpp b/src/core/netaccess.cpp index 2187735..82b3fce 100644 --- a/src/core/netaccess.cpp +++ b/src/core/netaccess.cpp @@ -16,10 +16,10 @@ #include "../tellico_debug.h" #include <tdeversion.h> -#include <kio/job.h> -#include <kio/netaccess.h> -#include <kio/scheduler.h> -#include <kio/previewjob.h> +#include <tdeio/job.h> +#include <tdeio/netaccess.h> +#include <tdeio/scheduler.h> +#include <tdeio/previewjob.h> #include <ktempfile.h> #include <tqapplication.h> diff --git a/src/core/tellico_config.cpp b/src/core/tellico_config.cpp index 20c0a4b..07f705c 100644 --- a/src/core/tellico_config.cpp +++ b/src/core/tellico_config.cpp @@ -1,4 +1,4 @@ -// This file is generated by kconfig_compiler from tellico_config.kcfg. +// This file is generated by tdeconfig_compiler from tellico_config.kcfg. // All changes you do to this file will be lost. #include "tellico_config.h" diff --git a/src/core/tellico_config.kcfgc b/src/core/tellico_config.kcfgc index 7cf7c9c..0405c88 100644 --- a/src/core/tellico_config.kcfgc +++ b/src/core/tellico_config.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=tellico_config.kcfg ClassName=Config NameSpace=Tellico diff --git a/src/detailedlistview.cpp b/src/detailedlistview.cpp index 78199c3..0a64ecf 100644 --- a/src/detailedlistview.cpp +++ b/src/detailedlistview.cpp @@ -24,7 +24,7 @@ #include "core/tellico_config.h" #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kaction.h> #include <kiconloader.h> diff --git a/src/exportdialog.cpp b/src/exportdialog.cpp index df9cf87..b40d0a8 100644 --- a/src/exportdialog.cpp +++ b/src/exportdialog.cpp @@ -33,7 +33,7 @@ #include <klocale.h> #include <kdebug.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqlayout.h> #include <tqcheckbox.h> diff --git a/src/fetch/amazonfetcher.cpp b/src/fetch/amazonfetcher.cpp index d21ee27..6705e67 100644 --- a/src/fetch/amazonfetcher.cpp +++ b/src/fetch/amazonfetcher.cpp @@ -28,9 +28,9 @@ #include "../gui/combobox.h" #include <klocale.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klineedit.h> #include <kseparator.h> #include <kcombobox.h> diff --git a/src/fetch/animenfofetcher.cpp b/src/fetch/animenfofetcher.cpp index be639d6..45396f1 100644 --- a/src/fetch/animenfofetcher.cpp +++ b/src/fetch/animenfofetcher.cpp @@ -23,8 +23,8 @@ #include "../tellico_debug.h" #include <klocale.h> -#include <kconfig.h> -#include <kio/job.h> +#include <tdeconfig.h> +#include <tdeio/job.h> #include <tqregexp.h> #include <tqlayout.h> diff --git a/src/fetch/arxivfetcher.cpp b/src/fetch/arxivfetcher.cpp index ffc3e60..e3cd776 100644 --- a/src/fetch/arxivfetcher.cpp +++ b/src/fetch/arxivfetcher.cpp @@ -25,7 +25,7 @@ #include <klocale.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqdom.h> #include <tqlabel.h> diff --git a/src/fetch/arxivfetcher.h b/src/fetch/arxivfetcher.h index 4ee2a80..b7e0fe2 100644 --- a/src/fetch/arxivfetcher.h +++ b/src/fetch/arxivfetcher.h @@ -18,7 +18,7 @@ #include "configwidget.h" #include "../datavectors.h" -#include <kio/job.h> +#include <tdeio/job.h> #include <tqcstring.h> // for TQByteArray #include <tqguardedptr.h> diff --git a/src/fetch/bibsonomyfetcher.h b/src/fetch/bibsonomyfetcher.h index eb85610..e53ea51 100644 --- a/src/fetch/bibsonomyfetcher.h +++ b/src/fetch/bibsonomyfetcher.h @@ -18,7 +18,7 @@ #include "configwidget.h" #include "../datavectors.h" -#include <kio/job.h> +#include <tdeio/job.h> #include <tqcstring.h> // for TQByteArray #include <tqguardedptr.h> diff --git a/src/fetch/citebasefetcher.h b/src/fetch/citebasefetcher.h index 72325dd..9246897 100644 --- a/src/fetch/citebasefetcher.h +++ b/src/fetch/citebasefetcher.h @@ -18,7 +18,7 @@ #include "configwidget.h" #include "../datavectors.h" -#include <kio/job.h> +#include <tdeio/job.h> #include <tqcstring.h> // for TQByteArray #include <tqguardedptr.h> diff --git a/src/fetch/configwidget.cpp b/src/fetch/configwidget.cpp index 983ef9a..8e1e5b7 100644 --- a/src/fetch/configwidget.cpp +++ b/src/fetch/configwidget.cpp @@ -13,7 +13,7 @@ #include "configwidget.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kaccelmanager.h> diff --git a/src/fetch/crossreffetcher.cpp b/src/fetch/crossreffetcher.cpp index 897aca8..27579ab 100644 --- a/src/fetch/crossreffetcher.cpp +++ b/src/fetch/crossreffetcher.cpp @@ -25,7 +25,7 @@ #include <klocale.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klineedit.h> #include <kactivelabel.h> diff --git a/src/fetch/crossreffetcher.h b/src/fetch/crossreffetcher.h index a39d69c..d54964a 100644 --- a/src/fetch/crossreffetcher.h +++ b/src/fetch/crossreffetcher.h @@ -18,7 +18,7 @@ #include "configwidget.h" #include "../datavectors.h" -#include <kio/job.h> +#include <tdeio/job.h> #include <tqcstring.h> // for TQByteArray #include <tqguardedptr.h> diff --git a/src/fetch/discogsfetcher.cpp b/src/fetch/discogsfetcher.cpp index f24e642..df3042d 100644 --- a/src/fetch/discogsfetcher.cpp +++ b/src/fetch/discogsfetcher.cpp @@ -24,8 +24,8 @@ #include <klocale.h> #include <kstandarddirs.h> -#include <kconfig.h> -#include <kio/job.h> +#include <tdeconfig.h> +#include <tdeio/job.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/src/fetch/entrezfetcher.cpp b/src/fetch/entrezfetcher.cpp index 51839ec..6237f7b 100644 --- a/src/fetch/entrezfetcher.cpp +++ b/src/fetch/entrezfetcher.cpp @@ -22,9 +22,9 @@ #include "../tellico_debug.h" #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <tqdom.h> #include <tqlabel.h> diff --git a/src/fetch/execexternalfetcher.cpp b/src/fetch/execexternalfetcher.cpp index 4b45520..4430317 100644 --- a/src/fetch/execexternalfetcher.cpp +++ b/src/fetch/execexternalfetcher.cpp @@ -26,7 +26,7 @@ #include "../newstuff/manager.h" #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kprocess.h> #include <kurlrequester.h> #include <kaccelmanager.h> diff --git a/src/fetch/fetcher.cpp b/src/fetch/fetcher.cpp index 025d494..2a6fc87 100644 --- a/src/fetch/fetcher.cpp +++ b/src/fetch/fetcher.cpp @@ -16,7 +16,7 @@ #include "../entry.h" #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> using Tellico::Fetch::Fetcher; using Tellico::Fetch::SearchResult; diff --git a/src/fetch/fetchmanager.cpp b/src/fetch/fetchmanager.cpp index 5aa61cd..7cec617 100644 --- a/src/fetch/fetchmanager.cpp +++ b/src/fetch/fetchmanager.cpp @@ -47,14 +47,14 @@ #include "discogsfetcher.h" #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kiconloader.h> #include <kmimetype.h> #include <kstandarddirs.h> #include <dcopref.h> #include <ktempfile.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqfileinfo.h> #include <tqdir.h> diff --git a/src/fetch/gcstarpluginfetcher.cpp b/src/fetch/gcstarpluginfetcher.cpp index a026f97..8912ad9 100644 --- a/src/fetch/gcstarpluginfetcher.cpp +++ b/src/fetch/gcstarpluginfetcher.cpp @@ -25,7 +25,7 @@ #include "../latin1literal.h" #include "../tellico_utils.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kprocess.h> #include <kprocio.h> #include <kstandarddirs.h> diff --git a/src/fetch/googlescholarfetcher.cpp b/src/fetch/googlescholarfetcher.cpp index 567983c..ce5081c 100644 --- a/src/fetch/googlescholarfetcher.cpp +++ b/src/fetch/googlescholarfetcher.cpp @@ -21,8 +21,8 @@ #include "../tellico_debug.h" #include <klocale.h> -#include <kconfig.h> -#include <kio/job.h> +#include <tdeconfig.h> +#include <tdeio/job.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/src/fetch/ibsfetcher.cpp b/src/fetch/ibsfetcher.cpp index a6b608d..f2308ef 100644 --- a/src/fetch/ibsfetcher.cpp +++ b/src/fetch/ibsfetcher.cpp @@ -23,8 +23,8 @@ #include "../tellico_debug.h" #include <klocale.h> -#include <kconfig.h> -#include <kio/job.h> +#include <tdeconfig.h> +#include <tdeio/job.h> #include <tqregexp.h> #include <tqlayout.h> diff --git a/src/fetch/imdbfetcher.cpp b/src/fetch/imdbfetcher.cpp index d23881b..2198b50 100644 --- a/src/fetch/imdbfetcher.cpp +++ b/src/fetch/imdbfetcher.cpp @@ -25,7 +25,7 @@ #include <klocale.h> #include <kdialogbase.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klineedit.h> #include <knuminput.h> diff --git a/src/fetch/imdbfetcher.h b/src/fetch/imdbfetcher.h index 75549fe..e0451cf 100644 --- a/src/fetch/imdbfetcher.h +++ b/src/fetch/imdbfetcher.h @@ -19,7 +19,7 @@ #include "../datavectors.h" #include <kurl.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <tqcstring.h> // for TQByteArray #include <tqmap.h> diff --git a/src/fetch/isbndbfetcher.cpp b/src/fetch/isbndbfetcher.cpp index d0c93c1..3ec088a 100644 --- a/src/fetch/isbndbfetcher.cpp +++ b/src/fetch/isbndbfetcher.cpp @@ -23,7 +23,7 @@ #include <klocale.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqdom.h> #include <tqlabel.h> diff --git a/src/fetch/isbndbfetcher.h b/src/fetch/isbndbfetcher.h index 75e3dbf..9d3e5ac 100644 --- a/src/fetch/isbndbfetcher.h +++ b/src/fetch/isbndbfetcher.h @@ -22,7 +22,7 @@ namespace Tellico { #include "configwidget.h" #include "../datavectors.h" -#include <kio/job.h> +#include <tdeio/job.h> #include <tqcstring.h> // for TQByteArray #include <tqguardedptr.h> diff --git a/src/fetch/srufetcher.cpp b/src/fetch/srufetcher.cpp index 505fa74..38bf62a 100644 --- a/src/fetch/srufetcher.cpp +++ b/src/fetch/srufetcher.cpp @@ -28,9 +28,9 @@ #include "../lccnvalidator.h" #include <klocale.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcombobox.h> #include <kaccelmanager.h> #include <knuminput.h> diff --git a/src/fetch/yahoofetcher.cpp b/src/fetch/yahoofetcher.cpp index fe6d407..31602e2 100644 --- a/src/fetch/yahoofetcher.cpp +++ b/src/fetch/yahoofetcher.cpp @@ -24,8 +24,8 @@ #include <klocale.h> #include <kstandarddirs.h> -#include <kconfig.h> -#include <kio/job.h> +#include <tdeconfig.h> +#include <tdeio/job.h> #include <tqdom.h> #include <tqlabel.h> diff --git a/src/fetch/z3950fetcher.cpp b/src/fetch/z3950fetcher.cpp index 3be46fc..0bec0c7 100644 --- a/src/fetch/z3950fetcher.cpp +++ b/src/fetch/z3950fetcher.cpp @@ -41,7 +41,7 @@ #include <kstandarddirs.h> #include <kapplication.h> #include <knuminput.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcombobox.h> #include <kaccelmanager.h> #include <kseparator.h> diff --git a/src/fetchdialog.cpp b/src/fetchdialog.cpp index 7244fcd..441fc2d 100644 --- a/src/fetchdialog.cpp +++ b/src/fetchdialog.cpp @@ -34,9 +34,9 @@ #include <kstatusbar.h> #include <tdehtmlview.h> #include <kprogress.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialogbase.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kiconloader.h> #include <kaccelmanager.h> #include <ktextedit.h> diff --git a/src/filehandler.cpp b/src/filehandler.cpp index 96a1ef9..0d21e67 100644 --- a/src/filehandler.cpp +++ b/src/filehandler.cpp @@ -22,12 +22,12 @@ #include <kurl.h> #include <klocale.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <ktempfile.h> #include <ksavefile.h> #include <kapplication.h> -#include <kfileitem.h> -#include <kio/chmodjob.h> +#include <tdefileitem.h> +#include <tdeio/chmodjob.h> #include <kfilterdev.h> #include <tqdom.h> diff --git a/src/gui/imagewidget.cpp b/src/gui/imagewidget.cpp index ada1ad2..090f3c8 100644 --- a/src/gui/imagewidget.cpp +++ b/src/gui/imagewidget.cpp @@ -18,7 +18,7 @@ #include "../tellico_debug.h" #include "../tellico_utils.h" -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kbuttonbox.h> #include <kurldrag.h> diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 5737256..0b45dd3 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -57,11 +57,11 @@ #include <kapplication.h> #include <kcombobox.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmenubar.h> #include <ktoolbar.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstdaction.h> #include <twin.h> #include <kprogress.h> @@ -74,7 +74,7 @@ #include <krecentdocument.h> #include <kedittoolbar.h> #include <kkeydialog.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <dcopclient.h> #include <kaction.h> diff --git a/src/newstuff/dialog.cpp b/src/newstuff/dialog.cpp index 0d21c69..b627cf0 100644 --- a/src/newstuff/dialog.cpp +++ b/src/newstuff/dialog.cpp @@ -20,11 +20,11 @@ #include <klocale.h> #include <kpushbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kiconloader.h> #include <kstatusbar.h> -#include <kio/job.h> -#include <kio/netaccess.h> +#include <tdeio/job.h> +#include <tdeio/netaccess.h> #include <kaccelmanager.h> #include <knewstuff/entry.h> #include <knewstuff/provider.h> @@ -233,7 +233,7 @@ Dialog::Dialog(NewStuff::DataType type_, TQWidget* parent_) if(prov.isEmpty()) { if(m_type == EntryTemplate) { prov = TQString::fromLatin1("http://periapsis.org/tellico/newstuff/tellicotemplates-providers.php"); - TQString alt = TQString::fromLatin1("http://download.kde.org/khotnewstuff/tellicotemplates-providers.xml"); + TQString alt = TQString::fromLatin1("http://download.kde.org/tdehotnewstuff/tellicotemplates-providers.xml"); loader->setAlternativeProvider(alt); } else { prov = TQString::fromLatin1("http://periapsis.org/tellico/newstuff/tellicoscripts-providers.php"); diff --git a/src/newstuff/manager.cpp b/src/newstuff/manager.cpp index 45eae08..afe6fe0 100644 --- a/src/newstuff/manager.cpp +++ b/src/newstuff/manager.cpp @@ -22,11 +22,11 @@ #include <kurl.h> #include <ktar.h> #include <kglobal.h> -#include <kio/netaccess.h> -#include <kconfig.h> +#include <tdeio/netaccess.h> +#include <tdeconfig.h> #include <ktempfile.h> -#include <kio/job.h> -#include <kfileitem.h> +#include <tdeio/job.h> +#include <tdefileitem.h> #include <tdeversion.h> #include <knewstuff/entry.h> #include <kstandarddirs.h> diff --git a/src/newstuff/providerloader.cpp b/src/newstuff/providerloader.cpp index 0f12a7e..d796a3d 100644 --- a/src/newstuff/providerloader.cpp +++ b/src/newstuff/providerloader.cpp @@ -19,10 +19,10 @@ #include "../tellico_debug.h" #include "../latin1literal.h" -#include <kio/job.h> +#include <tdeio/job.h> #include <knewstuff/provider.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <klocale.h> diff --git a/src/reportdialog.cpp b/src/reportdialog.cpp index 421488d..70fc249 100644 --- a/src/reportdialog.cpp +++ b/src/reportdialog.cpp @@ -33,7 +33,7 @@ #include <kpushbutton.h> #include <kiconloader.h> #include <ksortablevaluelist.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqlayout.h> #include <tqfile.h> diff --git a/src/translators/bibtexexporter.cpp b/src/translators/bibtexexporter.cpp index 2055f39..537c702 100644 --- a/src/translators/bibtexexporter.cpp +++ b/src/translators/bibtexexporter.cpp @@ -25,7 +25,7 @@ #include <klocale.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcombobox.h> #include <tqregexp.h> diff --git a/src/translators/bibteximporter.cpp b/src/translators/bibteximporter.cpp index 898d216..7cb1411 100644 --- a/src/translators/bibteximporter.cpp +++ b/src/translators/bibteximporter.cpp @@ -21,7 +21,7 @@ #include "../tellico_debug.h" #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqptrlist.h> #include <tqregexp.h> diff --git a/src/translators/csvexporter.cpp b/src/translators/csvexporter.cpp index 2755a17..bea9218 100644 --- a/src/translators/csvexporter.cpp +++ b/src/translators/csvexporter.cpp @@ -19,7 +19,7 @@ #include <klocale.h> #include <kdebug.h> #include <klineedit.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqgroupbox.h> #include <tqcheckbox.h> diff --git a/src/translators/csvimporter.cpp b/src/translators/csvimporter.cpp index c4f74d0..a289792 100644 --- a/src/translators/csvimporter.cpp +++ b/src/translators/csvimporter.cpp @@ -33,7 +33,7 @@ extern "C" { #include <kpushbutton.h> #include <kapplication.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <tqgroupbox.h> diff --git a/src/translators/filelistingimporter.cpp b/src/translators/filelistingimporter.cpp index 934d4b0..85039e1 100644 --- a/src/translators/filelistingimporter.cpp +++ b/src/translators/filelistingimporter.cpp @@ -25,8 +25,8 @@ #include <kapplication.h> #include <kmountpoint.h> -#include <kio/job.h> -#include <kio/netaccess.h> +#include <tdeio/job.h> +#include <tdeio/netaccess.h> #include <tqcheckbox.h> #include <tqvgroupbox.h> diff --git a/src/translators/filelistingimporter.h b/src/translators/filelistingimporter.h index bddc059..fd3dc09 100644 --- a/src/translators/filelistingimporter.h +++ b/src/translators/filelistingimporter.h @@ -17,8 +17,8 @@ #include "importer.h" #include "../datavectors.h" -#include <kio/global.h> -#include <kfileitem.h> +#include <tdeio/global.h> +#include <tdefileitem.h> #include <tqguardedptr.h> diff --git a/src/translators/freedbimporter.cpp b/src/translators/freedbimporter.cpp index 805fbff..d3e4035 100644 --- a/src/translators/freedbimporter.cpp +++ b/src/translators/freedbimporter.cpp @@ -36,7 +36,7 @@ #endif #include <kcombobox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kinputdialog.h> diff --git a/src/translators/gcfilmsexporter.cpp b/src/translators/gcfilmsexporter.cpp index 55e3c7c..c8c17f7 100644 --- a/src/translators/gcfilmsexporter.cpp +++ b/src/translators/gcfilmsexporter.cpp @@ -22,7 +22,7 @@ #include "../imagefactory.h" #include <klocale.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> namespace { char GCFILMS_DELIMITER = '|'; diff --git a/src/translators/htmlexporter.cpp b/src/translators/htmlexporter.cpp index 2e006a3..daca5d1 100644 --- a/src/translators/htmlexporter.cpp +++ b/src/translators/htmlexporter.cpp @@ -26,9 +26,9 @@ #include "../tellico_debug.h" #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kapplication.h> #include <klocale.h> diff --git a/src/translators/onixexporter.cpp b/src/translators/onixexporter.cpp index f4861af..a0bb0ef 100644 --- a/src/translators/onixexporter.cpp +++ b/src/translators/onixexporter.cpp @@ -26,7 +26,7 @@ #include <kstandarddirs.h> #include <kapplication.h> #include <kzip.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <tqdom.h> diff --git a/src/translators/pilotdbexporter.cpp b/src/translators/pilotdbexporter.cpp index be86de2..934f8df 100644 --- a/src/translators/pilotdbexporter.cpp +++ b/src/translators/pilotdbexporter.cpp @@ -20,7 +20,7 @@ #include <klocale.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kcharsets.h> diff --git a/src/translators/tellicoxmlexporter.cpp b/src/translators/tellicoxmlexporter.cpp index 7e62bb5..59c6dac 100644 --- a/src/translators/tellicoxmlexporter.cpp +++ b/src/translators/tellicoxmlexporter.cpp @@ -28,7 +28,7 @@ #include "../translators/bibtexhandler.h" // needed for cleaning text #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmdcodec.h> #include <kglobal.h> #include <kcalendarsystem.h> diff --git a/src/translators/tellicozipexporter.cpp b/src/translators/tellicozipexporter.cpp index 629a998..c2da619 100644 --- a/src/translators/tellicozipexporter.cpp +++ b/src/translators/tellicozipexporter.cpp @@ -22,7 +22,7 @@ #include "../progressmanager.h" #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kzip.h> #include <kapplication.h> |