diff options
24 files changed, 27 insertions, 27 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 891bebd..aae8844 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -602,7 +602,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 @@ -1788,7 +1788,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 @@ -2094,7 +2094,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") @@ -2104,7 +2104,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/amarotdescript/Makefile.am b/src/amarokscript/Makefile.am index b8049a7..b8049a7 100755 --- a/src/amarotdescript/Makefile.am +++ b/src/amarokscript/Makefile.am diff --git a/src/amarotdescript/README b/src/amarokscript/README index 1186231..1186231 100644 --- a/src/amarotdescript/README +++ b/src/amarokscript/README diff --git a/src/amarotdescript/soundKonverter.rb b/src/amarokscript/soundKonverter.rb index 144c0c8..144c0c8 100755 --- a/src/amarotdescript/soundKonverter.rb +++ b/src/amarokscript/soundKonverter.rb diff --git a/src/cdopener.cpp b/src/cdopener.cpp index 7b4c959..56f8919 100755 --- a/src/cdopener.cpp +++ b/src/cdopener.cpp @@ -14,7 +14,7 @@ #include <kcombobox.h> #include <knuminput.h> #include <ktextedit.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <tqlayout.h> diff --git a/src/config.cpp b/src/config.cpp index 4ec463b..ac169aa 100755 --- a/src/config.cpp +++ b/src/config.cpp @@ -14,8 +14,8 @@ #include <kstandarddirs.h> #include <kmimetype.h> #include <kapplication.h> -#include <kconfig.h> -#include <kio/netaccess.h> +#include <tdeconfig.h> +#include <tdeio/netaccess.h> // NOTE currently only the possibilities of a file format are respected, // the possibilities of the current encoder are ignored diff --git a/src/configdialog.cpp b/src/configdialog.cpp index f53844f..0d539dd 100755 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -20,7 +20,7 @@ #include <tqlayout.h> */ -//#include <kconfig.h> +//#include <tdeconfig.h> #include <kiconloader.h> #include <klocale.h> #include <kpushbutton.h> diff --git a/src/configenvironmentpage.cpp b/src/configenvironmentpage.cpp index 3c4b776..d67e2ad 100755 --- a/src/configenvironmentpage.cpp +++ b/src/configenvironmentpage.cpp @@ -9,7 +9,7 @@ #include <klistbox.h> //#include <keditlistbox.h> //#include <kurlrequester.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kstandarddirs.h> #include <tqlayout.h> diff --git a/src/configgeneralpage.cpp b/src/configgeneralpage.cpp index b389f81..64bfd5b 100755 --- a/src/configgeneralpage.cpp +++ b/src/configgeneralpage.cpp @@ -9,7 +9,7 @@ #include <kiconloader.h> #include <klineedit.h> #include <kpushbutton.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/src/configpluginspage.cpp b/src/configpluginspage.cpp index f848def..7781677 100755 --- a/src/configpluginspage.cpp +++ b/src/configpluginspage.cpp @@ -18,11 +18,11 @@ #include <klocale.h> #include <kpushbutton.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kstandarddirs.h> #include <kmessagebox.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klistbox.h> //#include <kurl.h> diff --git a/src/configpluginspage.h b/src/configpluginspage.h index cff82e4..70f77c9 100755 --- a/src/configpluginspage.h +++ b/src/configpluginspage.h @@ -4,7 +4,7 @@ #include <configpagebase.h> -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> class Config; class KPushButton; diff --git a/src/convert.cpp b/src/convert.cpp index 9e9ef3a..070b9b3 100755 --- a/src/convert.cpp +++ b/src/convert.cpp @@ -18,7 +18,7 @@ #include <kglobal.h> //#include <kdebug.h> #include <ktempfile.h> -#include <kio/job.h> +#include <tdeio/job.h> //#include <kprocess.h> #include <kstandarddirs.h> diff --git a/src/convert.h b/src/convert.h index 94a0f64..cd4fc5e 100755 --- a/src/convert.h +++ b/src/convert.h @@ -3,7 +3,7 @@ #ifndef CONVERT_H #define CONVERT_H -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> #include <tqobject.h> #include <tqvaluelist.h> diff --git a/src/dirdialog.cpp b/src/dirdialog.cpp index b76d148..6e68a6b 100755 --- a/src/dirdialog.cpp +++ b/src/dirdialog.cpp @@ -13,7 +13,7 @@ #include <kpushbutton.h> // #include <kurlrequester.h> #include <klistbox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> DirDialog::DirDialog( Config* config, Mode mode, TQWidget *parent, const char *name, bool modal, WFlags f ) : KDialog( parent, name, modal, f ) diff --git a/src/metadata/tplugins.cpp b/src/metadata/tplugins.cpp index 10d7107..81c3b6c 100755 --- a/src/metadata/tplugins.cpp +++ b/src/metadata/tplugins.cpp @@ -38,7 +38,7 @@ #include "trueaudio/taglib_trueaudiofiletyperesolver.h" #include "trueaudio/ttafile.h" -#include "wavpack/taglib_wavpackfiletyperesolver.h" +#include "wavpack/taglib_wavpactdefiletyperesolver.h" #include "wavpack/wvfile.h" #include "speex/taglib_speexfiletyperesolver.h" #include "speex/speexfile.h" diff --git a/src/metadata/wavpack/Makefile.am b/src/metadata/wavpack/Makefile.am index 93a98c6..64f60b6 100644 --- a/src/metadata/wavpack/Makefile.am +++ b/src/metadata/wavpack/Makefile.am @@ -8,9 +8,9 @@ noinst_LTLIBRARIES = libtagwavpack.la libtagwavpack_la_SOURCES = \ wvfile.cpp \ wvproperties.cpp \ - taglib_wavpackfiletyperesolver.cpp + taglib_wavpactdefiletyperesolver.cpp noinst_HEADERS = wvfile.h \ wvproperties.h \ - taglib_wavpackfiletyperesolver.h + taglib_wavpactdefiletyperesolver.h diff --git a/src/metadata/wavpack/taglib_wavpackfiletyperesolver.cpp b/src/metadata/wavpack/taglib_wavpactdefiletyperesolver.cpp index fe289a2..feadd8b 100644 --- a/src/metadata/wavpack/taglib_wavpackfiletyperesolver.cpp +++ b/src/metadata/wavpack/taglib_wavpactdefiletyperesolver.cpp @@ -19,7 +19,7 @@ * MA 02110-1301 USA * ***************************************************************************/ -#include "taglib_wavpackfiletyperesolver.h" +#include "taglib_wavpactdefiletyperesolver.h" #include "wvfile.h" #include <string.h> diff --git a/src/metadata/wavpack/taglib_wavpackfiletyperesolver.h b/src/metadata/wavpack/taglib_wavpactdefiletyperesolver.h index b9d4500..b9d4500 100644 --- a/src/metadata/wavpack/taglib_wavpackfiletyperesolver.h +++ b/src/metadata/wavpack/taglib_wavpactdefiletyperesolver.h diff --git a/src/options.cpp b/src/options.cpp index 59e10e0..fe1e3ab 100755 --- a/src/options.cpp +++ b/src/options.cpp @@ -13,7 +13,7 @@ #include <ktabwidget.h> #include <kpushbutton.h> #include <kiconloader.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kstandarddirs.h> // FIXME prevent converting wav files to wav diff --git a/src/options.h b/src/options.h index ddb5661..deb6cd2 100755 --- a/src/options.h +++ b/src/options.h @@ -7,7 +7,7 @@ #include "conversionoptions.h" -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> class OptionsSimple; class OptionsDetailed; diff --git a/src/outputdirectory.cpp b/src/outputdirectory.cpp index 3119849..55a2ecf 100755 --- a/src/outputdirectory.cpp +++ b/src/outputdirectory.cpp @@ -17,7 +17,7 @@ #include <klocale.h> #include <kiconloader.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <ktoolbarbutton.h> #include <kcombobox.h> #include <klineedit.h> diff --git a/src/paranoia.cpp b/src/paranoia.cpp index 6031e84..66db95c 100755 --- a/src/paranoia.cpp +++ b/src/paranoia.cpp @@ -35,7 +35,7 @@ #include <ktrader.h> #include <kpushbutton.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tdeparts/componentfactory.h> diff --git a/src/replaygainscanner.cpp b/src/replaygainscanner.cpp index 0e34b88..da7bc4e 100755 --- a/src/replaygainscanner.cpp +++ b/src/replaygainscanner.cpp @@ -13,7 +13,7 @@ #include <klocale.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kpushbutton.h> #include <kprogress.h> diff --git a/src/soundkonverter.cpp b/src/soundkonverter.cpp index 155e746..c48645b 100755 --- a/src/soundkonverter.cpp +++ b/src/soundkonverter.cpp @@ -22,7 +22,7 @@ #include <kapplication.h> #include <klocale.h> #include <kiconloader.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kinputdialog.h> #include <kpushbutton.h> #include <kpopupmenu.h> @@ -32,7 +32,7 @@ #include <kedittoolbar.h> #include <kmessagebox.h> #include <kstddirs.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kprocess.h> #include <ksystemtray.h> |