diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:32 -0600 |
| commit | 793cf2dff35dffe3ec4c7b24252947dde758a1b2 (patch) | |
| tree | 7d9972d99ed281a36418ae9f5fc128e3c951532c | |
| parent | 04f764aaf273340e1d5811d4216dd8127cacc5db (diff) | |
| download | tdemultimedia-793cf2dff35dffe3ec4c7b24252947dde758a1b2.tar.gz tdemultimedia-793cf2dff35dffe3ec4c7b24252947dde758a1b2.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
239 files changed, 515 insertions, 515 deletions
diff --git a/Makefile.am.in b/Makefile.am.in index d77fa940..aaccab85 100644 --- a/Makefile.am.in +++ b/Makefile.am.in @@ -6,7 +6,7 @@ DISTCLEANFILES = inst-apps COMPILE_AFTER_arts = noatun krec akode_artsplugin COMPILE_AFTER_mpeglib = mpeglib_artsplug -COMPILE_AFTER_libkcddb = kaudiocreator kioslave kscd +COMPILE_AFTER_libkcddb = kaudiocreator tdeioslave kscd COMPILE_AFTER_akode = juk MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 SUBDIRS @@ -25,7 +25,7 @@ infrastructure of above applications: * arts: a versatily multimedia system the consists of various little building blocks that you (or an application) can combine in almost arbitrary ways to create sound and video processing pipes -* kfile-plugins: provide meta information about sound files +* tdefile-plugins: provide meta information about sound files * mpeglib: a library for MPEG 1 (layer I, II and III) encoded files * mpeglib_artsplug: wrapped mpeglib to make it aRts-aware * mpg123_artsplugin: a trimmed down mpg123 made aRts-compatible diff --git a/arts/builder/execdlg.cpp b/arts/builder/execdlg.cpp index 2aa4f608..9e4819e2 100644 --- a/arts/builder/execdlg.cpp +++ b/arts/builder/execdlg.cpp @@ -27,7 +27,7 @@ #include <tqlineedit.h> #include <kbuttonbox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kseparator.h> #include <klocale.h> #include <kapplication.h> diff --git a/arts/builder/main.cpp b/arts/builder/main.cpp index c83a5091..87783267 100644 --- a/arts/builder/main.cpp +++ b/arts/builder/main.cpp @@ -48,7 +48,7 @@ #include <klocale.h> #include <kinputdialog.h> #include <kstdaccel.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <ksavefile.h> #include <kmessagebox.h> #include <kaboutdata.h> diff --git a/arts/builder/main.h b/arts/builder/main.h index f5a09457..5098ff60 100644 --- a/arts/builder/main.h +++ b/arts/builder/main.h @@ -26,7 +26,7 @@ #include <kdockwidget.h> #include <kapplication.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <ksimpleconfig.h> #include <list> diff --git a/arts/tools/artscontrolapplet.cpp b/arts/tools/artscontrolapplet.cpp index dc495322..41b55c71 100644 --- a/arts/tools/artscontrolapplet.cpp +++ b/arts/tools/artscontrolapplet.cpp @@ -17,7 +17,7 @@ #include <kglobal.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kmessagebox.h> #include <kdebug.h> diff --git a/arts/tools/artscontrolapplet.h b/arts/tools/artscontrolapplet.h index 06090c80..515e4fb4 100644 --- a/arts/tools/artscontrolapplet.h +++ b/arts/tools/artscontrolapplet.h @@ -24,7 +24,7 @@ #include <kpanelapplet.h> #include <tqstring.h> -#include <kconfig.h> +#include <tdeconfig.h> class ArtsControlAppletPrivate; diff --git a/configure.in.in b/configure.in.in index b07980d1..bfaadb2e 100644 --- a/configure.in.in +++ b/configure.in.in @@ -116,7 +116,7 @@ AC_DEFUN([KDE_CHECK_OGGVORBIS], [have_vorbis_value=2], [have_vorbis_value=1]) if test "x$have_oggvorbis" = xyes; then - # for akode/plugins/xiph_decoder/ kioslave/audiocd/plugins/ and krec/ogg_export/ + # for akode/plugins/xiph_decoder/ tdeioslave/audiocd/plugins/ and krec/ogg_export/ VORBIS_LIBS="-lvorbis -logg" VORBISFILE_LIBS="-lvorbisfile" VORBISENC_LIBS="-lvorbisenc" @@ -124,7 +124,7 @@ AC_DEFUN([KDE_CHECK_OGGVORBIS], # for akode/plugins/xiph_decoder/ AC_DEFINE_UNQUOTED(HAVE_OGG_VORBIS, 1, [Define if you have ogg/vorbis installed]) - # for kioslave/audiocd/plugins/ and krec/ogg_export/ + # for tdeioslave/audiocd/plugins/ and krec/ogg_export/ AC_DEFINE_UNQUOTED(HAVE_VORBIS, $have_vorbis_value, [Define if you ogg/vorbis installed]) # for mpeglib/ @@ -301,7 +301,7 @@ AC_DEFUN([KDE_CHECK_CDPARANOIA], fi if test "x$have_cdparanoia" = xyes; then - # for kioslave/audiocd/ + # for tdeioslave/audiocd/ CDPARANOIA_LIBS="-lcdda_paranoia -lcdda_interface -lm" # for mpeglib/ @@ -310,7 +310,7 @@ AC_DEFUN([KDE_CHECK_CDPARANOIA], fi if test "x$have_cdparanoia_only_static" = xyes; then - # for kioslave/audiocd/ + # for tdeioslave/audiocd/ AC_DEFINE_UNQUOTED(CDPARANOIA_STATIC, 1, [Define if you only have a static cdparanoia]) fi @@ -328,7 +328,7 @@ AC_DEFUN([KDE_CHECK_LAME], [:], [have_lame=no], [-lm]) if test "x$have_lame" = xyes; then - # for krec/mp3_export/ (kioslave/audiocd/ uses the lame binary at runtime) + # for krec/mp3_export/ (tdeioslave/audiocd/ uses the lame binary at runtime) LAME_LIBS="-lmp3lame -lm" fi @@ -488,8 +488,8 @@ if test "x$with_cdparanoia" != xno; then fi fi -# for kioslave/audiocd/ -AM_CONDITIONAL(include_kioslave_audiocd, test "x$have_cdparanoia" = xyes) +# for tdeioslave/audiocd/ +AM_CONDITIONAL(include_tdeioslave_audiocd, test "x$have_cdparanoia" = xyes) AM_CONDITIONAL(include_kcm_audiocd, test "x$have_cdparanoia" = xyes) if test "x$have_cdparanoia" != xyes; then # kaudiocreator depends on kio_audiocd diff --git a/doc/krec/index.docbook b/doc/krec/index.docbook index 1b79e433..86ed8f3c 100644 --- a/doc/krec/index.docbook +++ b/doc/krec/index.docbook @@ -233,7 +233,7 @@ before you can be sure... Second important thing is that &arts; has to run in full-duplex mode. That means that &arts; is reading from the soundcard and writing to it at the same time. You have to start &kcontrol; and edit the soundsystem settings (or press Alt+F2 -and enter <command>kcmshell arts</command>). On the second tab-page you have to +and enter <command>tdecmshell arts</command>). On the second tab-page you have to make sure the checkbox for full-duplex is selected, clicking <guibutton>Apply</guibutton> restarts &arts; which means that you have to restart &krec; too. diff --git a/doc/kioslave/Makefile.am b/doc/tdeioslave/Makefile.am index 085981d9..085981d9 100644 --- a/doc/kioslave/Makefile.am +++ b/doc/tdeioslave/Makefile.am diff --git a/doc/kioslave/audiocd.docbook b/doc/tdeioslave/audiocd.docbook index 982e1f23..982e1f23 100644 --- a/doc/kioslave/audiocd.docbook +++ b/doc/tdeioslave/audiocd.docbook diff --git a/juk/artsplayer.cpp b/juk/artsplayer.cpp index 4022b0f1..d6905f0e 100644 --- a/juk/artsplayer.cpp +++ b/juk/artsplayer.cpp @@ -21,7 +21,7 @@ #if HAVE_ARTS #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <tqdir.h> diff --git a/juk/cache.cpp b/juk/cache.cpp index 0183c560..bb7c2956 100644 --- a/juk/cache.cpp +++ b/juk/cache.cpp @@ -15,7 +15,7 @@ #include <kstandarddirs.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kactionclasses.h> #include <kdebug.h> diff --git a/juk/collectionlist.cpp b/juk/collectionlist.cpp index 13b6d6b4..7b22542e 100644 --- a/juk/collectionlist.cpp +++ b/juk/collectionlist.cpp @@ -19,7 +19,7 @@ #include <kdebug.h> #include <kpopupmenu.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaction.h> #include <kurl.h> diff --git a/juk/collectionlist.h b/juk/collectionlist.h index 5df08023..c15dccc3 100644 --- a/juk/collectionlist.h +++ b/juk/collectionlist.h @@ -18,7 +18,7 @@ #include <kapplication.h> #include <kdirwatch.h> -#include <kfileitem.h> +#include <tdefileitem.h> #include <tqdict.h> #include <tqclipboard.h> diff --git a/juk/deletedialog.cpp b/juk/deletedialog.cpp index 67958116..5bb3c4d3 100644 --- a/juk/deletedialog.cpp +++ b/juk/deletedialog.cpp @@ -18,7 +18,7 @@ #include <kstdguiitem.h> #include <klocale.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqstringlist.h> #include <tqcheckbox.h> diff --git a/juk/directorylist.cpp b/juk/directorylist.cpp index 43df3dda..c368a6c3 100644 --- a/juk/directorylist.cpp +++ b/juk/directorylist.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <klistview.h> #include <kpushbutton.h> diff --git a/juk/filerenamer.cpp b/juk/filerenamer.cpp index e21a484d..e9c997aa 100644 --- a/juk/filerenamer.cpp +++ b/juk/filerenamer.cpp @@ -23,9 +23,9 @@ #include <kiconloader.h> #include <knuminput.h> #include <kstandarddirs.h> -#include <kio/netaccess.h> -#include <kconfigbase.h> -#include <kconfig.h> +#include <tdeio/netaccess.h> +#include <tdeconfigbase.h> +#include <tdeconfig.h> #include <kglobal.h> #include <klineedit.h> #include <klocale.h> diff --git a/juk/gstreamerplayer.cpp b/juk/gstreamerplayer.cpp index a45678a3..4b893815 100644 --- a/juk/gstreamerplayer.cpp +++ b/juk/gstreamerplayer.cpp @@ -17,7 +17,7 @@ #if HAVE_GSTREAMER #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kdebug.h> diff --git a/juk/keydialog.cpp b/juk/keydialog.cpp index 6b3d278a..ea73277f 100644 --- a/juk/keydialog.cpp +++ b/juk/keydialog.cpp @@ -15,7 +15,7 @@ #include "keydialog.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <tqradiobutton.h> diff --git a/juk/main.cpp b/juk/main.cpp index 6fbb0930..3db558df 100644 --- a/juk/main.cpp +++ b/juk/main.cpp @@ -19,8 +19,8 @@ #include <kcmdlineargs.h> #include <kaboutdata.h> #include <dcopclient.h> -#include <kconfigbase.h> -#include <kconfig.h> +#include <tdeconfigbase.h> +#include <tdeconfig.h> #include "juk.h" diff --git a/juk/mediafiles.cpp b/juk/mediafiles.cpp index d105d1cd..94382b23 100644 --- a/juk/mediafiles.cpp +++ b/juk/mediafiles.cpp @@ -13,10 +13,10 @@ * * ***************************************************************************/ -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdebug.h> #include <klocale.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include "mediafiles.h" diff --git a/juk/nowplaying.cpp b/juk/nowplaying.cpp index 1125cdd6..03f679ae 100644 --- a/juk/nowplaying.cpp +++ b/juk/nowplaying.cpp @@ -17,7 +17,7 @@ #include <klocale.h> #include <kdebug.h> #include <kurldrag.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqimage.h> #include <tqlayout.h> diff --git a/juk/playlist.cpp b/juk/playlist.cpp index a60d0c05..1f33b4be 100644 --- a/juk/playlist.cpp +++ b/juk/playlist.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <kurldrag.h> #include <kiconloader.h> @@ -23,11 +23,11 @@ #include <klocale.h> #include <kdebug.h> #include <kinputdialog.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobalsettings.h> #include <kurl.h> -#include <kio/netaccess.h> -#include <kio/job.h> +#include <tdeio/netaccess.h> +#include <tdeio/job.h> #include <dcopclient.h> #include <tqheader.h> diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp index 11c8a27a..bff1e7c9 100644 --- a/juk/playlistcollection.cpp +++ b/juk/playlistcollection.cpp @@ -39,7 +39,7 @@ #include <kapplication.h> #include <kinputdialog.h> #include <kmessagebox.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqwidgetstack.h> #include <tqhbox.h> diff --git a/juk/playlistsplitter.h b/juk/playlistsplitter.h index c33621d3..8e9f0e0f 100644 --- a/juk/playlistsplitter.h +++ b/juk/playlistsplitter.h @@ -16,7 +16,7 @@ #ifndef PLAYLISTSPLITTER_H #define PLAYLISTSPLITTER_H -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <tqwidgetstack.h> diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp index 0b4d041b..efff323d 100644 --- a/juk/tageditor.cpp +++ b/juk/tageditor.cpp @@ -25,7 +25,7 @@ #include <knuminput.h> #include <keditcl.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/juk/tagguesser.cpp b/juk/tagguesser.cpp index 57714842..ae165c6e 100644 --- a/juk/tagguesser.cpp +++ b/juk/tagguesser.cpp @@ -9,7 +9,7 @@ #include "tagguesser.h" #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <kmacroexpander.h> diff --git a/juk/tagrenameroptions.cpp b/juk/tagrenameroptions.cpp index b9b40fbb..50c3083b 100644 --- a/juk/tagrenameroptions.cpp +++ b/juk/tagrenameroptions.cpp @@ -16,8 +16,8 @@ #include <kdebug.h> #include <kglobal.h> #include <klocale.h> -#include <kconfig.h> -#include <kconfigbase.h> +#include <tdeconfig.h> +#include <tdeconfigbase.h> #include "tagrenameroptions.h" diff --git a/juk/tracksequencemanager.cpp b/juk/tracksequencemanager.cpp index 828c61d5..4f7ae64f 100644 --- a/juk/tracksequencemanager.cpp +++ b/juk/tracksequencemanager.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kaction.h> #include <kpopupmenu.h> diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp index 303d53ab..5a2de5b2 100644 --- a/juk/webimagefetcherdialog.cpp +++ b/juk/webimagefetcherdialog.cpp @@ -15,7 +15,7 @@ ***************************************************************************/ #include <kapplication.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/juk/webimagefetcherdialog.h b/juk/webimagefetcherdialog.h index a3b60378..4af0cf41 100644 --- a/juk/webimagefetcherdialog.h +++ b/juk/webimagefetcherdialog.h @@ -18,7 +18,7 @@ #define WEBIMAGEFETCHERDIALOG_H #include <kiconview.h> -#include <kio/job.h> +#include <tdeio/job.h> #include "webimagefetcher.h" diff --git a/kaboodle/Makefile.am b/kaboodle/Makefile.am index 1f39c8f4..88177b35 100644 --- a/kaboodle/Makefile.am +++ b/kaboodle/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(kde_includes)/kio -I$(kde_includes)/arts $(all_includes) +INCLUDES = -I$(kde_includes)/tdeio -I$(kde_includes)/arts $(all_includes) SUBDIRS = pics actions diff --git a/kaboodle/conf.cpp b/kaboodle/conf.cpp index 3bab0768..2c66f5a8 100644 --- a/kaboodle/conf.cpp +++ b/kaboodle/conf.cpp @@ -23,7 +23,7 @@ // used in advertising or otherwise to promote the sale, use or other dealings // in this Software without prior written authorization from the author(s). -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <tqcheckbox.h> #include <tqvbox.h> diff --git a/kaboodle/engine.cpp b/kaboodle/engine.cpp index 5909dbcd..0b3c42f4 100644 --- a/kaboodle/engine.cpp +++ b/kaboodle/engine.cpp @@ -26,7 +26,7 @@ extern "C" #include <sys/wait.h> } -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kaboodle/kaboodleapp.cpp b/kaboodle/kaboodleapp.cpp index 6aced727..e153c725 100644 --- a/kaboodle/kaboodleapp.cpp +++ b/kaboodle/kaboodleapp.cpp @@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ #include <kcmdlineargs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "kaboodleapp.h" #include "userinterface.h" diff --git a/kaboodle/userinterface.cpp b/kaboodle/userinterface.cpp index 5deaad05..ffc04c48 100644 --- a/kaboodle/userinterface.cpp +++ b/kaboodle/userinterface.cpp @@ -23,9 +23,9 @@ // in this Software without prior written authorization from the author(s). #include <arts/kplayobjectfactory.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialog.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobal.h> #include <kiconloader.h> #include <klocale.h> diff --git a/kaboodle/view.cpp b/kaboodle/view.cpp index bde6e9f4..509fb7b0 100644 --- a/kaboodle/view.cpp +++ b/kaboodle/view.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kapplication.h> #include <kcmdlineargs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> #include <kiconloader.h> diff --git a/kaudiocreator/Makefile.am b/kaudiocreator/Makefile.am index ba0f65ad..1f926de6 100644 --- a/kaudiocreator/Makefile.am +++ b/kaudiocreator/Makefile.am @@ -35,7 +35,7 @@ appdatadir = $(kde_datadir)/kaudiocreator servicedata_DATA = audiocd_extract.desktop servicedatadir = $(kde_datadir)/konqueror/servicemenus -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update update_DATA = kaudiocreator-meta.upd kaudiocreator-libkcddb.upd update_SCRIPTS = upgrade-kaudiocreator-metadata.sh diff --git a/kaudiocreator/encoder_prefs.kcfgc b/kaudiocreator/encoder_prefs.kcfgc index 075a4321..c34a8641 100644 --- a/kaudiocreator/encoder_prefs.kcfgc +++ b/kaudiocreator/encoder_prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kaudiocreator_encoders.kcfg #IncludeFiles=defines.h ClassName=EncoderPrefs diff --git a/kaudiocreator/encoderconfigimp.cpp b/kaudiocreator/encoderconfigimp.cpp index cc4d1ad5..b02ca614 100644 --- a/kaudiocreator/encoderconfigimp.cpp +++ b/kaudiocreator/encoderconfigimp.cpp @@ -24,10 +24,10 @@ #include <tqpushbutton.h> #include <tqlineedit.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kmessagebox.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> /** * Constructor. diff --git a/kaudiocreator/jobqueimp.cpp b/kaudiocreator/jobqueimp.cpp index 81c0431d..1083f738 100644 --- a/kaudiocreator/jobqueimp.cpp +++ b/kaudiocreator/jobqueimp.cpp @@ -24,7 +24,7 @@ #include <tqpushbutton.h> #include <tqlabel.h> #include <tqpainter.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/kaudiocreator/kaudiocreator.h b/kaudiocreator/kaudiocreator.h index 0ba8f6aa..5624c563 100644 --- a/kaudiocreator/kaudiocreator.h +++ b/kaudiocreator/kaudiocreator.h @@ -22,7 +22,7 @@ #define KAUDIOCREATOR_H #include <kmainwindow.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> class KJanusWidget; class TracksImp; diff --git a/kaudiocreator/prefs.kcfgc b/kaudiocreator/prefs.kcfgc index dc784e77..1b3d28ff 100644 --- a/kaudiocreator/prefs.kcfgc +++ b/kaudiocreator/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kaudiocreator.kcfg #IncludeFiles=defines.h ClassName=Prefs diff --git a/kaudiocreator/ripper.cpp b/kaudiocreator/ripper.cpp index e2366fd7..2060278f 100644 --- a/kaudiocreator/ripper.cpp +++ b/kaudiocreator/ripper.cpp @@ -27,7 +27,7 @@ #include <kmessagebox.h> #include <knotifyclient.h> #include <kstandarddirs.h> -#include <kio/scheduler.h> +#include <tdeio/scheduler.h> /** * Constructor, load settings. diff --git a/kaudiocreator/ripper.h b/kaudiocreator/ripper.h index 3804b8ad..1d79c0e8 100644 --- a/kaudiocreator/ripper.h +++ b/kaudiocreator/ripper.h @@ -22,7 +22,7 @@ #define RIPPER_H #include "job.h" -#include <kio/jobclasses.h> +#include <tdeio/jobclasses.h> #include <tqmap.h> #include <tqptrlist.h> diff --git a/kaudiocreator/tracksimp.cpp b/kaudiocreator/tracksimp.cpp index c9296547..73656e07 100644 --- a/kaudiocreator/tracksimp.cpp +++ b/kaudiocreator/tracksimp.cpp @@ -23,7 +23,7 @@ #include <fixx11h.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcombobox.h> #include <kdebug.h> #include <kinputdialog.h> diff --git a/kfile-plugins/au/Makefile.am b/kfile-plugins/au/Makefile.am deleted file mode 100644 index f9a1649b..00000000 --- a/kfile-plugins/au/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Makefile.am for au file meta info plugin - -# set the include path for X, qt and KDE -INCLUDES = $(all_includes) - -# these are the headers for your project -noinst_HEADERS = kfile_au.h - -kde_module_LTLIBRARIES = kfile_au.la - -kfile_au_la_SOURCES = kfile_au.cpp -kfile_au_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) -kfile_au_la_LIBADD = $(LIB_KIO) - -# let automoc handle all of the meta source files (moc) -METASOURCES = AUTO - -messages: - $(XGETTEXT) kfile_au.cpp -o $(podir)/kfile_au.pot - -services_DATA = kfile_au.desktop -servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/avi/Makefile.am b/kfile-plugins/avi/Makefile.am deleted file mode 100644 index 43590f82..00000000 --- a/kfile-plugins/avi/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Makefile.am for avi file meta info plugin - -# set the include path for X, qt and KDE -INCLUDES = $(all_includes) - -# these are the headers for your project -noinst_HEADERS = kfile_avi.h - -kde_module_LTLIBRARIES = kfile_avi.la - -kfile_avi_la_SOURCES = kfile_avi.cpp -kfile_avi_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) -kfile_avi_la_LIBADD = $(LIB_KIO) - -# let automoc handle all of the meta source files (moc) -METASOURCES = AUTO - -messages: rc.cpp - $(XGETTEXT) kfile_avi.cpp -o $(podir)/kfile_avi.pot - -services_DATA = kfile_avi.desktop -servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/flac/Makefile.am b/kfile-plugins/flac/Makefile.am deleted file mode 100644 index 34a0ffb3..00000000 --- a/kfile-plugins/flac/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Makefile.am for FLAC file meta info plugin - -# set the include path for X, qt, KDE and TagLib -INCLUDES = $(all_includes) $(taglib_includes) - -# these are the headers for your project -noinst_HEADERS = kfile_flac.h - -kde_module_LTLIBRARIES = kfile_flac.la - -kfile_flac_la_SOURCES = kfile_flac.cpp -kfile_flac_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN) -kfile_flac_la_LIBADD = $(LIB_KIO) - -# let automoc handle all of the meta source files (moc) -METASOURCES = AUTO - -messages: rc.cpp - $(XGETTEXT) kfile_flac.cpp -o $(podir)/kfile_flac.pot - -services_DATA = kfile_flac.desktop -servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/m3u/Makefile.am b/kfile-plugins/m3u/Makefile.am deleted file mode 100644 index 11b59685..00000000 --- a/kfile-plugins/m3u/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Makefile.am for m3u file meta info plugin - -# set the include path for X, qt and KDE -INCLUDES = $(all_includes) - -# these are the headers for your project -noinst_HEADERS = kfile_m3u.h - -kde_module_LTLIBRARIES = kfile_m3u.la - -kfile_m3u_la_SOURCES = kfile_m3u.cpp -kfile_m3u_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) -kfile_m3u_la_LIBADD = $(LIB_KSYCOCA) - -# let automoc handle all of the meta source files (moc) -METASOURCES = AUTO - -messages: rc.cpp - $(XGETTEXT) kfile_m3u.cpp -o $(podir)/kfile_m3u.pot - -services_DATA = kfile_m3u.desktop -servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/mp3/Makefile.am b/kfile-plugins/mp3/Makefile.am deleted file mode 100644 index 0c238b67..00000000 --- a/kfile-plugins/mp3/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Makefile.am for mp3 file meta info plugin - -# set the include path for X, qt and KDE -INCLUDES = $(all_includes) $(taglib_includes) - -# these are the headers for your project -noinst_HEADERS = kfile_mp3.h - -kde_module_LTLIBRARIES = kfile_mp3.la - -kfile_mp3_la_SOURCES = kfile_mp3.cpp -kfile_mp3_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN) -kfile_mp3_la_LIBADD = $(LIB_KIO) - -# let automoc handle all of the meta source files (moc) -METASOURCES = AUTO - -messages: rc.cpp - $(XGETTEXT) kfile_mp3.cpp -o $(podir)/kfile_mp3.pot - -services_DATA = kfile_mp3.desktop -servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/mpc/Makefile.am b/kfile-plugins/mpc/Makefile.am deleted file mode 100644 index 11a639e7..00000000 --- a/kfile-plugins/mpc/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Makefile.am for MPC file meta info plugin - -# set the include path for X, qt, KDE and TagLib -INCLUDES = $(all_includes) $(taglib_includes) - -# these are the headers for your project -noinst_HEADERS = kfile_mpc.h - -kde_module_LTLIBRARIES = kfile_mpc.la - -kfile_mpc_la_SOURCES = kfile_mpc.cpp -kfile_mpc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN) -kfile_mpc_la_LIBADD = $(LIB_KIO) - -# let automoc handle all of the meta source files (moc) -METASOURCES = AUTO - -messages: rc.cpp - $(XGETTEXT) kfile_mpc.cpp -o $(podir)/kfile_mpc.pot - -services_DATA = kfile_mpc.desktop -servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/mpeg/Makefile.am b/kfile-plugins/mpeg/Makefile.am deleted file mode 100644 index 00b40647..00000000 --- a/kfile-plugins/mpeg/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Makefile.am for mpeg file meta info plugin - -# set the include path for X, qt and KDE -INCLUDES = $(all_includes) - -# these are the headers for your project -noinst_HEADERS = kfile_mpeg.h - -kde_module_LTLIBRARIES = kfile_mpeg.la - -kfile_mpeg_la_SOURCES = kfile_mpeg.cpp -kfile_mpeg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) -kfile_mpeg_la_LIBADD = $(LIB_KIO) - -# let automoc handle all of the meta source files (moc) -METASOURCES = AUTO - -messages: rc.cpp - $(XGETTEXT) kfile_mpeg.cpp -o $(podir)/kfile_mpeg.pot - -services_DATA = kfile_mpeg.desktop -servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/ogg/Makefile.am b/kfile-plugins/ogg/Makefile.am deleted file mode 100644 index b53709a8..00000000 --- a/kfile-plugins/ogg/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Makefile.am for ogg/vorbis file meta info plugin - -# set the include path for X, qt and KDE -INCLUDES = $(all_includes) - -# these are the headers for your project -noinst_HEADERS = kfile_ogg.h - -kde_module_LTLIBRARIES = kfile_ogg.la - -kfile_ogg_la_SOURCES = kfile_ogg.cpp vcedit.c -kfile_ogg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) -kfile_ogg_la_LIBADD = $(LIB_KIO) -logg -lvorbis -lvorbisfile - -# let automoc handle all of the meta source files (moc) -METASOURCES = AUTO - -messages: rc.cpp - $(XGETTEXT) kfile_ogg.cpp -o $(podir)/kfile_ogg.pot - -services_DATA = kfile_ogg.desktop -servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/sid/Makefile.am b/kfile-plugins/sid/Makefile.am deleted file mode 100644 index 8f7d59be..00000000 --- a/kfile-plugins/sid/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Makefile.am for sid file meta info plugin - -# set the include path for X, qt and KDE -INCLUDES = $(all_includes) $(taglib_includes) - -# these are the headers for your project -noinst_HEADERS = kfile_sid.h - -kde_module_LTLIBRARIES = kfile_sid.la - -kfile_sid_la_SOURCES = kfile_sid.cpp -kfile_sid_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) -kfile_sid_la_LIBADD = $(LIB_KIO) - -# let automoc handle all of the meta source files (moc) -METASOURCES = AUTO - -messages: rc.cpp - $(XGETTEXT) kfile_sid.cpp -o $(podir)/kfile_sid.pot - -services_DATA = kfile_sid.desktop -servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/theora/Makefile.am b/kfile-plugins/theora/Makefile.am deleted file mode 100644 index a2495cec..00000000 --- a/kfile-plugins/theora/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Makefile.am for ogg/vorbis file meta info plugin - -# set the include path for X, qt and KDE -INCLUDES = $(all_includes) - -# these are the headers for your project -noinst_HEADERS = kfile_theora.h - -kde_module_LTLIBRARIES = kfile_theora.la - -kfile_theora_la_SOURCES = kfile_theora.cpp -kfile_theora_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) -kfile_theora_la_LIBADD = $(LIB_KIO) -logg -lvorbis -ltheora - -# let automoc handle all of the meta source files (moc) -METASOURCES = AUTO - -messages: rc.cpp - $(XGETTEXT) kfile_theora.cpp -o $(podir)/kfile_theora.pot - -services_DATA = kfile_theora.desktop -servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/wav/Makefile.am b/kfile-plugins/wav/Makefile.am deleted file mode 100644 index 5254d014..00000000 --- a/kfile-plugins/wav/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## Makefile.am for wav file meta info plugin - -# set the include path for X, qt and KDE -INCLUDES = $(all_includes) - -# these are the headers for your project -noinst_HEADERS = kfile_wav.h - -kde_module_LTLIBRARIES = kfile_wav.la - -kfile_wav_la_SOURCES = kfile_wav.cpp -kfile_wav_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) -kfile_wav_la_LIBADD = $(LIB_KIO) - -# let automoc handle all of the meta source files (moc) -METASOURCES = AUTO - -messages: rc.cpp - $(XGETTEXT) kfile_wav.cpp -o $(podir)/kfile_wav.pot - -services_DATA = kfile_wav.desktop -servicesdir = $(kde_servicesdir) diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp index a9fb11d0..f583c352 100644 --- a/kmix/kmix.cpp +++ b/kmix/kmix.cpp @@ -35,7 +35,7 @@ #include <kmenubar.h> #include <klineeditdlg.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaction.h> #include <kapplication.h> #include <kstdaction.h> diff --git a/kmix/kmixapplet.cpp b/kmix/kmixapplet.cpp index 0af64588..c93f8ae9 100644 --- a/kmix/kmixapplet.cpp +++ b/kmix/kmixapplet.cpp @@ -41,7 +41,7 @@ #include <kapplication.h> #include <kbugreport.h> #include <kcolorbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <kglobalaccel.h> diff --git a/kmix/kmixctrl.cpp b/kmix/kmixctrl.cpp index 334dea71..ee7b8728 100644 --- a/kmix/kmixctrl.cpp +++ b/kmix/kmixctrl.cpp @@ -25,7 +25,7 @@ #include <klocale.h> #include <kglobal.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <tqptrlist.h> diff --git a/kmix/kmixerwidget.cpp b/kmix/kmixerwidget.cpp index 4d4ae7ee..fec74d5b 100644 --- a/kmix/kmixerwidget.cpp +++ b/kmix/kmixerwidget.cpp @@ -28,7 +28,7 @@ #include <tqapplication.h> // for TQApplication::revsreseLayout() // KDE -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <klocale.h> diff --git a/kmix/mdwenum.cpp b/kmix/mdwenum.cpp index e5504534..d4381b04 100644 --- a/kmix/mdwenum.cpp +++ b/kmix/mdwenum.cpp @@ -26,7 +26,7 @@ #include <tqtooltip.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcombobox.h> #include <kaction.h> #include <kpopupmenu.h> diff --git a/kmix/mdwslider.cpp b/kmix/mdwslider.cpp index f2ff1b1f..7664811d 100644 --- a/kmix/mdwslider.cpp +++ b/kmix/mdwslider.cpp @@ -22,7 +22,7 @@ #include <klocale.h> #include <kled.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaction.h> #include <kpopupmenu.h> #include <kglobalaccel.h> diff --git a/kmix/mdwswitch.cpp b/kmix/mdwswitch.cpp index 6fe1aeb4..5c931048 100644 --- a/kmix/mdwswitch.cpp +++ b/kmix/mdwswitch.cpp @@ -27,7 +27,7 @@ #include <tqtooltip.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaction.h> #include <kpopupmenu.h> #include <kglobalaccel.h> diff --git a/kmix/mixdevice.h b/kmix/mixdevice.h index 33ef0d1b..cc048a62 100644 --- a/kmix/mixdevice.h +++ b/kmix/mixdevice.h @@ -3,7 +3,7 @@ #include "volume.h" #include <tqstring.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqobject.h> #include <tqptrlist.h> diff --git a/kmix/mixdevicewidget.cpp b/kmix/mixdevicewidget.cpp index 9096c2c0..19b20514 100644 --- a/kmix/mixdevicewidget.cpp +++ b/kmix/mixdevicewidget.cpp @@ -22,7 +22,7 @@ #include <klocale.h> #include <kled.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaction.h> #include <kpopupmenu.h> #include <kglobalaccel.h> diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp index 99fd84b0..fc5a06f6 100644 --- a/kmix/mixer.cpp +++ b/kmix/mixer.cpp @@ -23,7 +23,7 @@ #include <tqtimer.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kdebug.h> #include <dcopobject.h> diff --git a/kmix/mixset.cpp b/kmix/mixset.cpp index 8f4ba438..18e7fe7c 100644 --- a/kmix/mixset.cpp +++ b/kmix/mixset.cpp @@ -23,7 +23,7 @@ #include <tqstring.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "mixdevice.h" #include "mixset.h" diff --git a/krec/krecconfig_files.cpp b/krec/krecconfig_files.cpp index 469b269f..36f7d3b3 100644 --- a/krec/krecconfig_files.cpp +++ b/krec/krecconfig_files.cpp @@ -25,7 +25,7 @@ #include <tqhbox.h> #include <tqlabel.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> typedef KGenericFactory<KRecConfigFiles, TQWidget> KRecConfigFilesFactory; diff --git a/krec/krecconfig_fileswidget.cpp b/krec/krecconfig_fileswidget.cpp index 206eda1b..96340ed3 100644 --- a/krec/krecconfig_fileswidget.cpp +++ b/krec/krecconfig_fileswidget.cpp @@ -22,7 +22,7 @@ #include <tqcheckbox.h> #include <tqlineedit.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <tqlabel.h> diff --git a/krec/krecconfigure.cpp b/krec/krecconfigure.cpp index 633409f5..5db92218 100644 --- a/krec/krecconfigure.cpp +++ b/krec/krecconfigure.cpp @@ -26,7 +26,7 @@ #include <tqhbox.h> #include <tqlabel.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kmessagebox.h> #include <kpushbutton.h> diff --git a/krec/krecfile.cpp b/krec/krecfile.cpp index 27975cdf..bee2f733 100644 --- a/krec/krecfile.cpp +++ b/krec/krecfile.cpp @@ -23,7 +23,7 @@ #include <ktempdir.h> #include <ktempfile.h> #include <ktar.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <klocale.h> #include <ksimpleconfig.h> #include <tqdir.h> diff --git a/krec/krecglobal.cpp b/krec/krecglobal.cpp index 984048d2..a1c9c44c 100644 --- a/krec/krecglobal.cpp +++ b/krec/krecglobal.cpp @@ -16,7 +16,7 @@ #include "krecexport_template.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <tqwidget.h> #include <kapplication.h> #include <kstatusbar.h> @@ -51,7 +51,7 @@ KRecGlobal* KRecGlobal::the() { void KRecGlobal::setMainWidget( TQWidget* n ) { _qwidget = n; } TQWidget* KRecGlobal::mainWidget() { return _qwidget; } -TDEConfig* KRecGlobal::kconfig() { return kapp->config(); } +TDEConfig* KRecGlobal::tdeconfig() { return kapp->config(); } void KRecGlobal::setStatusBar( KStatusBar *bar ) { _statusbar = bar; } void KRecGlobal::message( const TQString &text ) { if ( _statusbar ) _statusbar->message( text, 2000 ); } diff --git a/krec/krecglobal.h b/krec/krecglobal.h index 06615d8d..e0733022 100644 --- a/krec/krecglobal.h +++ b/krec/krecglobal.h @@ -51,7 +51,7 @@ public: TQWidget* mainWidget(); /// @return kapp->config() - static TDEConfig* kconfig(); + static TDEConfig* tdeconfig(); /// Sets the Statusbar. void setStatusBar( KStatusBar* ); diff --git a/krec/krecnewproperties.cpp b/krec/krecnewproperties.cpp index a5cdc07b..fc713a1a 100644 --- a/krec/krecnewproperties.cpp +++ b/krec/krecnewproperties.cpp @@ -17,7 +17,7 @@ #include "krecglobal.h" #include "krecconfig_fileswidget.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <tqbuttongroup.h> #include <tqvbuttongroup.h> #include <tqradiobutton.h> @@ -39,7 +39,7 @@ KRecNewProperties::KRecNewProperties( TQWidget* p, const char* n ) , _samplerate( 44100 ), _channels( 2 ), _bits( 16 ) { kdDebug( 60005 ) << k_funcinfo << endl; - TDEConfig *config = KRecGlobal::kconfig(); + TDEConfig *config = KRecGlobal::tdeconfig(); config->setGroup( "FileDefaults" ); _samplerate = config->readNumEntry( "SamplingRate", 44100 ); _channels = config->readNumEntry( "Channels", 2 ); @@ -91,8 +91,8 @@ void KRecNewProperties::channelschanged( int channels ) { _channels = channels; void KRecNewProperties::bitschanged( int bits ) { _bits = bits; } void KRecNewProperties::usedefaultschanged( bool n ) { _usedefaults = n; - KRecGlobal::kconfig()->setGroup( "FileDefaults" ); - KRecGlobal::kconfig()->writeEntry( "UseDefaults", _usedefaults ); + KRecGlobal::tdeconfig()->setGroup( "FileDefaults" ); + KRecGlobal::tdeconfig()->writeEntry( "UseDefaults", _usedefaults ); } void KRecNewProperties::done( int r ) { diff --git a/krec/krecord.cpp b/krec/krecord.cpp index 538957c5..164a38df 100644 --- a/krec/krecord.cpp +++ b/krec/krecord.cpp @@ -25,13 +25,13 @@ #include <arts/kaudioplaystream.h> #include <arts/kaudiorecordstream.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <klocale.h> #include <kdebug.h> #include <kapplication.h> #include <kaction.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqlayout.h> #include <tqtimer.h> #include <ksettings/dialog.h> @@ -359,7 +359,7 @@ KRecord::~KRecord(){ d->volumecontrol = Arts::StereoVolumeControl::null(); if( d->b_comp ) d->comp = Arts::StereoEffect::null(); - KRecGlobal::kconfig()->sync(); + KRecGlobal::tdeconfig()->sync(); delete d; kdDebug( 60005 ) << k_funcinfo << "done. Bye!" << endl; } diff --git a/krec/mp3_export/krecexport_mp3.cpp b/krec/mp3_export/krecexport_mp3.cpp index 7ec27e52..312a91e0 100644 --- a/krec/mp3_export/krecexport_mp3.cpp +++ b/krec/mp3_export/krecexport_mp3.cpp @@ -25,7 +25,7 @@ #include <time.h> #include <tqdatetime.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> // Error code definitions from lame.h @@ -155,7 +155,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; } else return false; } -// Derived from tdemultimedia/kioslave/audiocd/audiocd.cpp. +// Derived from tdemultimedia/tdeioslave/audiocd/audiocd.cpp. // We use the encoding settings from kcmaudiocd. void KRecExport_MP3::setLameParameters() { TDEConfig *config; diff --git a/krec/ogg_export/krecexport_ogg.cpp b/krec/ogg_export/krecexport_ogg.cpp index e7e9c4dc..f8bc9799 100644 --- a/krec/ogg_export/krecexport_ogg.cpp +++ b/krec/ogg_export/krecexport_ogg.cpp @@ -24,7 +24,7 @@ #include <ktempfile.h> #include <tqfile.h> #include <tqtimer.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <stdlib.h> #include <time.h> #include <tqdatetime.h> @@ -191,7 +191,7 @@ kdDebug( 60005 ) << k_funcinfo << endl; } -// Derived from tdemultimedia/kioslave/audiocd/audiocd.cpp. +// Derived from tdemultimedia/tdeioslave/audiocd/audiocd.cpp. // We use the encoding settings from kcmaudiocd. void KRecExport_OGG::setOggParameters() { kdDebug( 60005 ) << k_funcinfo << endl; diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp index a0cc59c6..7781601f 100644 --- a/kscd/kscd.cpp +++ b/kscd/kscd.cpp @@ -39,7 +39,7 @@ #include <dcopref.h> #include <kcharsets.h> #include <kcmdlineargs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> #include <kemailsettings.h> @@ -61,7 +61,7 @@ #include <kuniqueapplication.h> #include <kglobalsettings.h> #include <tdecmoduleloader.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include "docking.h" #include "kscd.h" diff --git a/kscd/kscd.h b/kscd/kscd.h index 01c6e163..fc1ab6ef 100644 --- a/kscd/kscd.h +++ b/kscd/kscd.h @@ -53,7 +53,7 @@ class KCompactDisc; #include "prefs.h" #include "configWidget.h" #include <kapplication.h> -#include <kconfigdialog.h> +#include <tdeconfigdialog.h> #include <kprocess.h> #include <krandomsequence.h> #include <dcopobject.h> diff --git a/kscd/prefs.kcfgc b/kscd/prefs.kcfgc index 89d94319..7cc1efb9 100644 --- a/kscd/prefs.kcfgc +++ b/kscd/prefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=kscd.kcfg ClassName=Prefs Singleton=true diff --git a/libkcddb/asynchttplookup.cpp b/libkcddb/asynchttplookup.cpp index e46df657..5bcf1f76 100644 --- a/libkcddb/asynchttplookup.cpp +++ b/libkcddb/asynchttplookup.cpp @@ -22,7 +22,7 @@ #include <tqapplication.h> #include <kdebug.h> -#include <kio/job.h> +#include <tdeio/job.h> #include "asynchttplookup.h" diff --git a/libkcddb/asynchttpsubmit.cpp b/libkcddb/asynchttpsubmit.cpp index 6caf2bf4..246e5804 100644 --- a/libkcddb/asynchttpsubmit.cpp +++ b/libkcddb/asynchttpsubmit.cpp @@ -18,7 +18,7 @@ */ #include "asynchttpsubmit.h" -#include <kio/job.h> +#include <tdeio/job.h> #include <kdebug.h> namespace KCDDB diff --git a/libkcddb/asyncsmtpsubmit.h b/libkcddb/asyncsmtpsubmit.h index aebf53a9..17351497 100644 --- a/libkcddb/asyncsmtpsubmit.h +++ b/libkcddb/asyncsmtpsubmit.h @@ -20,7 +20,7 @@ */ #include "smtpsubmit.h" -#include <kio/job.h> +#include <tdeio/job.h> namespace KCDDB { diff --git a/libkcddb/httplookup.cpp b/libkcddb/httplookup.cpp index 461a9334..af785854 100644 --- a/libkcddb/httplookup.cpp +++ b/libkcddb/httplookup.cpp @@ -19,7 +19,7 @@ Boston, MA 02110-1301, USA. */ -#include <kio/job.h> +#include <tdeio/job.h> #include <kdebug.h> #include "httplookup.h" diff --git a/libkcddb/httpsubmit.cpp b/libkcddb/httpsubmit.cpp index d42d5a3d..5acde285 100644 --- a/libkcddb/httpsubmit.cpp +++ b/libkcddb/httpsubmit.cpp @@ -19,7 +19,7 @@ */ #include "httpsubmit.h" #include <kdebug.h> -#include <kio/job.h> +#include <tdeio/job.h> namespace KCDDB { diff --git a/libkcddb/kcmcddb/Makefile.am b/libkcddb/kcmcddb/Makefile.am index 8233116d..3a93445f 100644 --- a/libkcddb/kcmcddb/Makefile.am +++ b/libkcddb/kcmcddb/Makefile.am @@ -19,5 +19,5 @@ xdg_apps_DATA = libkcddb.desktop messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcmcddb.pot -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update update_DATA = kcmcddb-emailsettings.upd diff --git a/libkcddb/kcmcddb/cddbconfigwidget.cpp b/libkcddb/kcmcddb/cddbconfigwidget.cpp index 442efd12..a693d22f 100644 --- a/libkcddb/kcmcddb/cddbconfigwidget.cpp +++ b/libkcddb/kcmcddb/cddbconfigwidget.cpp @@ -27,7 +27,7 @@ #include <tqcombobox.h> #include <tqspinbox.h> #include <tqlineedit.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kapplication.h> #include <klocale.h> #include <kinputdialog.h> diff --git a/libkcddb/kcmcddb/kcmcddb.cpp b/libkcddb/kcmcddb/kcmcddb.cpp index 75dd8501..8ce6a6dd 100644 --- a/libkcddb/kcmcddb/kcmcddb.cpp +++ b/libkcddb/kcmcddb/kcmcddb.cpp @@ -28,12 +28,12 @@ #include <tqlabel.h> #include <tqbuttongroup.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kglobal.h> #include <kgenericfactory.h> #include <kmessagebox.h> -#include <kconfigdialogmanager.h> +#include <tdeconfigdialogmanager.h> #include "cddbconfigwidget.h" diff --git a/libkcddb/kcmcddb/libkcddb.desktop b/libkcddb/kcmcddb/libkcddb.desktop index a2c2a5da..fb0163ad 100644 --- a/libkcddb/kcmcddb/libkcddb.desktop +++ b/libkcddb/kcmcddb/libkcddb.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell libkcddb +Exec=tdecmshell libkcddb Icon=cdaudio_unmount Type=Application X-TDE-ModuleType=Library diff --git a/libkcddb/sites.cpp b/libkcddb/sites.cpp index a031c949..56cc5eb6 100644 --- a/libkcddb/sites.cpp +++ b/libkcddb/sites.cpp @@ -19,7 +19,7 @@ #include "sites.h" #include <kurl.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqfile.h> #include <kdebug.h> #include <tqregexp.h> diff --git a/libkcddb/smtpsubmit.cpp b/libkcddb/smtpsubmit.cpp index ed4e7357..2341f256 100644 --- a/libkcddb/smtpsubmit.cpp +++ b/libkcddb/smtpsubmit.cpp @@ -19,7 +19,7 @@ #include "smtpsubmit.h" #include <kdebug.h> -#include <kio/job.h> +#include <tdeio/job.h> namespace KCDDB { diff --git a/libkcddb/synchttplookup.cpp b/libkcddb/synchttplookup.cpp index c50618e1..42c45aba 100644 --- a/libkcddb/synchttplookup.cpp +++ b/libkcddb/synchttplookup.cpp @@ -22,8 +22,8 @@ #include <tqapplication.h> #include <kdebug.h> -#include <kio/job.h> -#include <kio/netaccess.h> +#include <tdeio/job.h> +#include <tdeio/netaccess.h> #include "synchttplookup.h" diff --git a/libkcddb/synchttpsubmit.cpp b/libkcddb/synchttpsubmit.cpp index 7920fce2..271367da 100644 --- a/libkcddb/synchttpsubmit.cpp +++ b/libkcddb/synchttpsubmit.cpp @@ -18,8 +18,8 @@ */ #include "synchttpsubmit.h" -#include <kio/netaccess.h> -#include <kio/job.h> +#include <tdeio/netaccess.h> +#include <tdeio/job.h> namespace KCDDB { diff --git a/libkcddb/syncsmtpsubmit.cpp b/libkcddb/syncsmtpsubmit.cpp index 002c3304..f875e2ef 100644 --- a/libkcddb/syncsmtpsubmit.cpp +++ b/libkcddb/syncsmtpsubmit.cpp @@ -19,8 +19,8 @@ #include "syncsmtpsubmit.h" #include "cdinfo.h" -#include <kio/netaccess.h> -#include <kio/job.h> +#include <tdeio/netaccess.h> +#include <tdeio/job.h> namespace KCDDB { diff --git a/noatun/Makefile.am b/noatun/Makefile.am index 91b80b87..032bdf3d 100644 --- a/noatun/Makefile.am +++ b/noatun/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(kde_includes)/kio -I$(top_srcdir)/noatun/library -I$(kde_includes)/arts $(all_includes) +INCLUDES = -I$(kde_includes)/tdeio -I$(top_srcdir)/noatun/library -I$(kde_includes)/arts $(all_includes) SUBDIRS = pics library app . modules @@ -9,11 +9,11 @@ xdg_apps_DATA = noatun.desktop presetsdir = $(kde_datadir)/noatun/eq.preset presets_DATA = preset.dance preset.jazz preset.metal preset.trance preset.zero -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update update_DATA = noatun.upd -kconfdir = $(libdir)/kconf_update_bin -kconf_PROGRAMS = noatun20update +tdeconfdir = $(libdir)/tdeconf_update_bin +tdeconf_PROGRAMS = noatun20update noatun20update_SOURCES = noatun20update.cpp noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp index 0e1ae639..29478e7b 100644 --- a/noatun/library/app.cpp +++ b/noatun/library/app.cpp @@ -20,9 +20,9 @@ #include <dispatcher.h> #include <kaboutdata.h> #include <kcmdlineargs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobal.h> #include <klibloader.h> #include <klocale.h> diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp index 27f4fa99..9c3d3232 100644 --- a/noatun/library/cmodule.cpp +++ b/noatun/library/cmodule.cpp @@ -15,7 +15,7 @@ #include <tqlabel.h> #include <tqdragobject.h> #include <kurlrequester.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdialog.h> #include <klineedit.h> diff --git a/noatun/library/downloader.cpp b/noatun/library/downloader.cpp index e1e210cb..75653940 100644 --- a/noatun/library/downloader.cpp +++ b/noatun/library/downloader.cpp @@ -3,7 +3,7 @@ #include <assert.h> #include <tqfile.h> #include <tqtimer.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <klocale.h> DownloadItem::DownloadItem() diff --git a/noatun/library/engine.cpp b/noatun/library/engine.cpp index 86c10381..e7296191 100644 --- a/noatun/library/engine.cpp +++ b/noatun/library/engine.cpp @@ -12,7 +12,7 @@ #include <kmessagebox.h> #include <klocale.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <tqfile.h> #include <tqdir.h> diff --git a/noatun/library/equalizer.cpp b/noatun/library/equalizer.cpp index ae86d00f..1c50370c 100644 --- a/noatun/library/equalizer.cpp +++ b/noatun/library/equalizer.cpp @@ -9,11 +9,11 @@ #include <noatunarts.h> #include <ktempfile.h> #include <tqdom.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kstandarddirs.h> #include <tqtextstream.h> #include <math.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include "ksaver.h" diff --git a/noatun/library/ksaver.cpp b/noatun/library/ksaver.cpp index f787c585..72b6218e 100644 --- a/noatun/library/ksaver.cpp +++ b/noatun/library/ksaver.cpp @@ -29,7 +29,7 @@ #include <klocale.h> #include <ktempfile.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include "ksaver.h" diff --git a/noatun/library/noatuntags/tags.cpp b/noatun/library/noatuntags/tags.cpp index add75782..9125ff45 100644 --- a/noatun/library/noatuntags/tags.cpp +++ b/noatun/library/noatuntags/tags.cpp @@ -3,7 +3,7 @@ #include <klocale.h> #include <tqslider.h> #include <tqspinbox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqlayout.h> #include <tqhbox.h> #include <tqlabel.h> diff --git a/noatun/library/playlist.cpp b/noatun/library/playlist.cpp index 1bc031d9..8f81c3e8 100644 --- a/noatun/library/playlist.cpp +++ b/noatun/library/playlist.cpp @@ -5,7 +5,7 @@ #include <noatun/pluginloader.h> #include <kcmdlineargs.h> -#include <kfile.h> +#include <tdefile.h> #include <kmimetype.h> #include <tqregexp.h> #include <assert.h> diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp index 49c6084b..a187b235 100644 --- a/noatun/library/playlistsaver.cpp +++ b/noatun/library/playlistsaver.cpp @@ -1,6 +1,6 @@ #include <noatun/playlistsaver.h> #include <tqdom.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <tqfile.h> #include <tqtextstream.h> #include <noatun/app.h> diff --git a/noatun/library/vequalizer.cpp b/noatun/library/vequalizer.cpp index 08895643..7b88848a 100644 --- a/noatun/library/vequalizer.cpp +++ b/noatun/library/vequalizer.cpp @@ -51,9 +51,9 @@ #include <soundserver.h> #include <ktempfile.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <tqdom.h> diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp index 42eaf19c..f1f64a22 100644 --- a/noatun/modules/excellent/userinterface.cpp +++ b/noatun/modules/excellent/userinterface.cpp @@ -37,8 +37,8 @@ #include "userinterface.h" #include <kbuttonbox.h> -#include <kconfig.h> -#include <kfiledialog.h> +#include <tdeconfig.h> +#include <tdefiledialog.h> #include <kglobal.h> #include <kiconloader.h> #include <klocale.h> diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h index 9e710547..304092fb 100644 --- a/noatun/modules/htmlexport/htmlexport.h +++ b/noatun/modules/htmlexport/htmlexport.h @@ -15,11 +15,11 @@ #include <klocale.h> #include <kpopupmenu.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <ktempfile.h> #include <kcolorbutton.h> -#include <kio/netaccess.h> -#include <kconfig.h> +#include <tdeio/netaccess.h> +#include <tdeconfig.h> #include <kurlrequester.h> //#include <kdebug.h> diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp index 77753cf4..36d6a8fb 100644 --- a/noatun/modules/infrared/irprefs.cpp +++ b/noatun/modules/infrared/irprefs.cpp @@ -6,7 +6,7 @@ #include <kdialog.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klistview.h> #include <kcombobox.h> #include <knuminput.h> diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp index a53ed72f..249a74e4 100644 --- a/noatun/modules/kaiman/pref.cpp +++ b/noatun/modules/kaiman/pref.cpp @@ -25,7 +25,7 @@ #include <kglobal.h> #include <kdebug.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "pref.h" #include "userinterface.h" diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp index 462f5718..56eb389e 100644 --- a/noatun/modules/kaiman/userinterface.cpp +++ b/noatun/modules/kaiman/userinterface.cpp @@ -38,17 +38,17 @@ #include <tqdragobject.h> #include <tqtimer.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdebug.h> #include <kapplication.h> #include <twin.h> #include <kglobal.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kpopupmenu.h> #include <kstandarddirs.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kurldrag.h> #include <sys/types.h> diff --git a/noatun/modules/kjofol-skin/Makefile.am b/noatun/modules/kjofol-skin/Makefile.am index 17ff1162..f3e9504a 100644 --- a/noatun/modules/kjofol-skin/Makefile.am +++ b/noatun/modules/kjofol-skin/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/noatun/library \ -I$(top_builddir)/arts/modules/effects \ -I$(top_builddir)/arts/modules/mixers \ -I$(top_builddir)/arts/gui/common \ - -I$(kde_includes)/kio \ + -I$(kde_includes)/tdeio \ -I$(kde_includes)/arts \ $(all_includes) diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp index 795dedfb..7cdfc0e2 100644 --- a/noatun/modules/kjofol-skin/kjbutton.cpp +++ b/noatun/modules/kjofol-skin/kjbutton.cpp @@ -22,7 +22,7 @@ #include <kpixmap.h> #include <kpixmapeffect.h> #include <kurl.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <khelpmenu.h> #include <kpopupmenu.h> diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp index 4401ee01..ee8ca247 100644 --- a/noatun/modules/kjofol-skin/kjloader.cpp +++ b/noatun/modules/kjofol-skin/kjloader.cpp @@ -54,7 +54,7 @@ #include <kaction.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <khelpmenu.h> #include <kstdaction.h> #include <kpopupmenu.h> diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp index b6d8e6eb..d93cc5dc 100644 --- a/noatun/modules/kjofol-skin/kjprefs.cpp +++ b/noatun/modules/kjofol-skin/kjprefs.cpp @@ -29,10 +29,10 @@ #include <tqregexp.h> #include <knuminput.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <klocale.h> #include <kmessagebox.h> #include <kmimemagic.h> diff --git a/noatun/modules/kjofol-skin/kjprefs.h b/noatun/modules/kjofol-skin/kjprefs.h index 0bb4540d..e5181963 100644 --- a/noatun/modules/kjofol-skin/kjprefs.h +++ b/noatun/modules/kjofol-skin/kjprefs.h @@ -9,7 +9,7 @@ #include <tqwidget.h> #include <noatun/pref.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kurlrequester.h> class TQVBoxLayout; diff --git a/noatun/modules/kjofol-skin/kjvis.cpp b/noatun/modules/kjofol-skin/kjvis.cpp index 7ae04d44..527fb673 100644 --- a/noatun/modules/kjofol-skin/kjvis.cpp +++ b/noatun/modules/kjofol-skin/kjvis.cpp @@ -19,7 +19,7 @@ //kde includes #include <kdebug.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kpixmapeffect.h> #include <kpixmap.h> diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp index 62c959ac..e3faf8b1 100644 --- a/noatun/modules/marquis/marquis.cpp +++ b/noatun/modules/marquis/marquis.cpp @@ -27,7 +27,7 @@ #include <config.h> #endif -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kmessagebox.h> #include <klocale.h> diff --git a/noatun/modules/metatag/edit.cpp b/noatun/modules/metatag/edit.cpp index 6e37347c..6f16a4b3 100644 --- a/noatun/modules/metatag/edit.cpp +++ b/noatun/modules/metatag/edit.cpp @@ -17,7 +17,7 @@ #include <kdialogbase.h> #include <kdebug.h> #include <kseparator.h> -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> #include <tqvalidator.h> #include "metatag.h" diff --git a/noatun/modules/metatag/metatag.cpp b/noatun/modules/metatag/metatag.cpp index 1ec54cbf..5ffa1e6a 100644 --- a/noatun/modules/metatag/metatag.cpp +++ b/noatun/modules/metatag/metatag.cpp @@ -16,11 +16,11 @@ #include <kaction.h> #include <kglobal.h> #include <klineedit.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaction.h> #include <kiconloader.h> #include <kpopupmenu.h> -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> extern "C" { diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp index d3c6de0f..9173867e 100644 --- a/noatun/modules/noatunui/userinterface.cpp +++ b/noatun/modules/noatunui/userinterface.cpp @@ -25,8 +25,8 @@ #include <klocale.h> #include <kiconloader.h> #include <kurldrag.h> -#include <kfiledialog.h> -#include <kconfig.h> +#include <tdefiledialog.h> +#include <tdeconfig.h> MilkChocolate::MilkChocolate() : TQWidget(0,"NoatunUI"), UserInterface() { diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp index d76f3b54..4cda6fe0 100644 --- a/noatun/modules/simple/userinterface.cpp +++ b/noatun/modules/simple/userinterface.cpp @@ -17,7 +17,7 @@ #include <noatun/player.h> #include <noatun/stdaction.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kglobalsettings.h> #include <kiconloader.h> diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp index 50245140..cce64897 100644 --- a/noatun/modules/splitplaylist/view.cpp +++ b/noatun/modules/splitplaylist/view.cpp @@ -20,10 +20,10 @@ #include <kaction.h> #include <kdebug.h> -#include <kfiledialog.h> -#include <kfileitem.h> -#include <kio/job.h> -#include <kio/netaccess.h> +#include <tdefiledialog.h> +#include <tdefileitem.h> +#include <tdeio/job.h> +#include <tdeio/netaccess.h> #include <klocale.h> #include <kmenubar.h> #include <ksimpleconfig.h> diff --git a/noatun/modules/splitplaylist/view.h b/noatun/modules/splitplaylist/view.h index 48a30df5..48a0be67 100644 --- a/noatun/modules/splitplaylist/view.h +++ b/noatun/modules/splitplaylist/view.h @@ -7,7 +7,7 @@ #include <kmainwindow.h> #include <tqrect.h> #include <tqdict.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <noatun/downloader.h> class Finder; diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp index 0788ceb3..27976429 100644 --- a/noatun/modules/systray/systray.cpp +++ b/noatun/modules/systray/systray.cpp @@ -39,7 +39,7 @@ #include <noatun/stdaction.h> #include <kaction.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqfile.h> #include <kglobal.h> #include <kiconloader.h> @@ -56,7 +56,7 @@ #include <tqimage.h> #include <kurl.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kdebug.h> #include <kstandarddirs.h> diff --git a/noatun/modules/systray/yhconfig.kcfgc b/noatun/modules/systray/yhconfig.kcfgc index 5b4f99e4..8b35e4f7 100644 --- a/noatun/modules/systray/yhconfig.kcfgc +++ b/noatun/modules/systray/yhconfig.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=yhconfig.kcfg ClassName=YHConfig Singleton=true diff --git a/noatun/modules/voiceprint/prefs.cpp b/noatun/modules/voiceprint/prefs.cpp index 882c05a4..e80de081 100644 --- a/noatun/modules/voiceprint/prefs.cpp +++ b/noatun/modules/voiceprint/prefs.cpp @@ -6,7 +6,7 @@ #include <tqlabel.h> #include <tqlayout.h> #include <kcolorbutton.h> -#include <kconfig.h> +#include <tdeconfig.h> Prefs::Prefs(TQObject* parent) : CModule(i18n("Voiceprint"), i18n("Options for the Voiceprint Visualization"), "xapp", parent) diff --git a/noatun/modules/winskin/fileInfo.cpp b/noatun/modules/winskin/fileInfo.cpp index 6e721cd9..5cd2779f 100644 --- a/noatun/modules/winskin/fileInfo.cpp +++ b/noatun/modules/winskin/fileInfo.cpp @@ -2,7 +2,7 @@ #include <noatun/playlist.h> #include <tqstring.h> -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> #include "fileInfo.h" diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp index d0447397..0d2978ee 100644 --- a/noatun/modules/winskin/guiSpectrumAnalyser.cpp +++ b/noatun/modules/winskin/guiSpectrumAnalyser.cpp @@ -15,7 +15,7 @@ #include <tqcolor.h> #include <tqpopupmenu.h> #include <tqpainter.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "waColor.h" #include "waSkinModel.h" diff --git a/noatun/modules/winskin/waDigit.cpp b/noatun/modules/winskin/waDigit.cpp index d18d9ead..75a89b7e 100644 --- a/noatun/modules/winskin/waDigit.cpp +++ b/noatun/modules/winskin/waDigit.cpp @@ -15,7 +15,7 @@ #include "waDigit.h" #include "waSkinModel.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> WaDigit::WaDigit() : WaWidget(_WA_MAPPING_DIGITS) diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp index 80375a90..b17c308d 100644 --- a/noatun/modules/winskin/waInfo.cpp +++ b/noatun/modules/winskin/waInfo.cpp @@ -17,7 +17,7 @@ #include <stdlib.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include "waInfo.h" diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp index 4512d067..06b9c010 100644 --- a/noatun/modules/winskin/waSkin.cpp +++ b/noatun/modules/winskin/waSkin.cpp @@ -11,7 +11,7 @@ */ -#include <kconfig.h> +#include <tdeconfig.h> #include <tqstringlist.h> #include <kglobal.h> #include <klocale.h> diff --git a/noatun/modules/winskin/waSkinManager.cpp b/noatun/modules/winskin/waSkinManager.cpp index f7d9b777..8230feba 100644 --- a/noatun/modules/winskin/waSkinManager.cpp +++ b/noatun/modules/winskin/waSkinManager.cpp @@ -5,9 +5,9 @@ #include <tqdir.h> #include <kdebug.h> #include <kmimetype.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kurl.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kzip.h> #include "waSkinManager.h" diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp index 7d2c866d..667cf81f 100644 --- a/noatun/modules/winskin/winSkinConfig.cpp +++ b/noatun/modules/winskin/winSkinConfig.cpp @@ -6,12 +6,12 @@ #include <tqlabel.h> #include <tqpixmap.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqslider.h> #include <tqframe.h> #include <tqstringlist.h> -#include <kfile.h> -#include <kfiledialog.h> +#include <tdefile.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <kstandarddirs.h> #include <kurlrequester.h> diff --git a/kfile-plugins/Makefile.am b/tdefile-plugins/Makefile.am index fc127f02..fc127f02 100644 --- a/kfile-plugins/Makefile.am +++ b/tdefile-plugins/Makefile.am diff --git a/kfile-plugins/RETURNED_ITEMS b/tdefile-plugins/RETURNED_ITEMS index ffe878d3..ffe878d3 100644 --- a/kfile-plugins/RETURNED_ITEMS +++ b/tdefile-plugins/RETURNED_ITEMS diff --git a/tdefile-plugins/au/Makefile.am b/tdefile-plugins/au/Makefile.am new file mode 100644 index 00000000..054c6181 --- /dev/null +++ b/tdefile-plugins/au/Makefile.am @@ -0,0 +1,22 @@ +## Makefile.am for au file meta info plugin + +# set the include path for X, qt and KDE +INCLUDES = $(all_includes) + +# these are the headers for your project +noinst_HEADERS = tdefile_au.h + +kde_module_LTLIBRARIES = tdefile_au.la + +tdefile_au_la_SOURCES = tdefile_au.cpp +tdefile_au_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) +tdefile_au_la_LIBADD = $(LIB_KIO) + +# let automoc handle all of the meta source files (moc) +METASOURCES = AUTO + +messages: + $(XGETTEXT) tdefile_au.cpp -o $(podir)/tdefile_au.pot + +services_DATA = tdefile_au.desktop +servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/au/kfile_au.cpp b/tdefile-plugins/au/tdefile_au.cpp index 8a2108a9..0b0b86f6 100644 --- a/kfile-plugins/au/kfile_au.cpp +++ b/tdefile-plugins/au/tdefile_au.cpp @@ -18,7 +18,7 @@ */ #include <config.h> -#include "kfile_au.h" +#include "tdefile_au.h" #include <kprocess.h> #include <klocale.h> @@ -41,7 +41,7 @@ typedef unsigned short uint16_t; typedef KGenericFactory<KAuPlugin> AuFactory; -K_EXPORT_COMPONENT_FACTORY(kfile_au, AuFactory( "kfile_au" )) +K_EXPORT_COMPONENT_FACTORY(tdefile_au, AuFactory( "tdefile_au" )) KAuPlugin::KAuPlugin(TQObject *parent, const char *name, const TQStringList &args) @@ -169,4 +169,4 @@ bool KAuPlugin::readInfo( KFileMetaInfo& info, uint what) return true; } -#include "kfile_au.moc" +#include "tdefile_au.moc" diff --git a/kfile-plugins/au/kfile_au.desktop b/tdefile-plugins/au/tdefile_au.desktop index eee2964d..b3057140 100644 --- a/kfile-plugins/au/kfile_au.desktop +++ b/tdefile-plugins/au/tdefile_au.desktop @@ -61,7 +61,7 @@ Name[zh_HK]=AU 資訊 Name[zh_TW]=AU 資訊 Name[zu]=Ulwazi lwe-AU ServiceTypes=KFilePlugin -X-TDE-Library=kfile_au +X-TDE-Library=tdefile_au MimeType=audio/basic PreferredGrous=Technical PreferredItems=Length,Sample Rate,Channels,Encoding diff --git a/kfile-plugins/au/kfile_au.h b/tdefile-plugins/au/tdefile_au.h index ca38161e..7ac18c9c 100644 --- a/kfile-plugins/au/kfile_au.h +++ b/tdefile-plugins/au/tdefile_au.h @@ -20,7 +20,7 @@ #ifndef __KFILE_AU_H__ #define __KFILE_AU_H__ -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> class TQStringList; diff --git a/tdefile-plugins/avi/Makefile.am b/tdefile-plugins/avi/Makefile.am new file mode 100644 index 00000000..2ecbf411 --- /dev/null +++ b/tdefile-plugins/avi/Makefile.am @@ -0,0 +1,22 @@ +## Makefile.am for avi file meta info plugin + +# set the include path for X, qt and KDE +INCLUDES = $(all_includes) + +# these are the headers for your project +noinst_HEADERS = tdefile_avi.h + +kde_module_LTLIBRARIES = tdefile_avi.la + +tdefile_avi_la_SOURCES = tdefile_avi.cpp +tdefile_avi_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) +tdefile_avi_la_LIBADD = $(LIB_KIO) + +# let automoc handle all of the meta source files (moc) +METASOURCES = AUTO + +messages: rc.cpp + $(XGETTEXT) tdefile_avi.cpp -o $(podir)/tdefile_avi.pot + +services_DATA = tdefile_avi.desktop +servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/avi/kfile_avi.cpp b/tdefile-plugins/avi/tdefile_avi.cpp index 131ae027..b1c832bd 100644 --- a/kfile-plugins/avi/kfile_avi.cpp +++ b/tdefile-plugins/avi/tdefile_avi.cpp @@ -19,7 +19,7 @@ #include <config.h> -#include "kfile_avi.h" +#include "tdefile_avi.h" #include <kprocess.h> #include <klocale.h> @@ -43,7 +43,7 @@ typedef unsigned long long uint64_t; typedef KGenericFactory<KAviPlugin> AviFactory; -K_EXPORT_COMPONENT_FACTORY(kfile_avi, AviFactory( "kfile_avi" )) +K_EXPORT_COMPONENT_FACTORY(tdefile_avi, AviFactory( "tdefile_avi" )) KAviPlugin::KAviPlugin(TQObject *parent, const char *name, const TQStringList &args) @@ -537,4 +537,4 @@ bool KAviPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) return true; } -#include "kfile_avi.moc" +#include "tdefile_avi.moc" diff --git a/kfile-plugins/avi/kfile_avi.desktop b/tdefile-plugins/avi/tdefile_avi.desktop index 9a3866e4..3dea0d93 100644 --- a/kfile-plugins/avi/kfile_avi.desktop +++ b/tdefile-plugins/avi/tdefile_avi.desktop @@ -62,7 +62,7 @@ Name[zh_HK]=AVI 資訊 Name[zh_TW]=AVI 資訊 Name[zu]=Ulwazi lwe-AVI ServiceTypes=KFilePlugin -X-TDE-Library=kfile_avi +X-TDE-Library=tdefile_avi MimeType=video/x-msvideo PreferredGrous=Technical PreferredItems=Length,Resolution,Frame rate,Video codec,Audio codec diff --git a/kfile-plugins/avi/kfile_avi.h b/tdefile-plugins/avi/tdefile_avi.h index a19e44b6..b73f324b 100644 --- a/kfile-plugins/avi/kfile_avi.h +++ b/tdefile-plugins/avi/tdefile_avi.h @@ -20,7 +20,7 @@ #ifndef __KFILE_AVI_H__ #define __KFILE_AVI_H__ -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> #include <tqfile.h> #if !defined(__osf__) diff --git a/tdefile-plugins/flac/Makefile.am b/tdefile-plugins/flac/Makefile.am new file mode 100644 index 00000000..ddae9580 --- /dev/null +++ b/tdefile-plugins/flac/Makefile.am @@ -0,0 +1,22 @@ +## Makefile.am for FLAC file meta info plugin + +# set the include path for X, qt, KDE and TagLib +INCLUDES = $(all_includes) $(taglib_includes) + +# these are the headers for your project +noinst_HEADERS = tdefile_flac.h + +kde_module_LTLIBRARIES = tdefile_flac.la + +tdefile_flac_la_SOURCES = tdefile_flac.cpp +tdefile_flac_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN) +tdefile_flac_la_LIBADD = $(LIB_KIO) + +# let automoc handle all of the meta source files (moc) +METASOURCES = AUTO + +messages: rc.cpp + $(XGETTEXT) tdefile_flac.cpp -o $(podir)/tdefile_flac.pot + +services_DATA = tdefile_flac.desktop +servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/flac/configure.in.in b/tdefile-plugins/flac/configure.in.in index eeaeebf5..eeaeebf5 100644 --- a/kfile-plugins/flac/configure.in.in +++ b/tdefile-plugins/flac/configure.in.in diff --git a/kfile-plugins/flac/kfile_flac.cpp b/tdefile-plugins/flac/tdefile_flac.cpp index c621f74c..b7030998 100644 --- a/kfile-plugins/flac/kfile_flac.cpp +++ b/tdefile-plugins/flac/tdefile_flac.cpp @@ -1,9 +1,9 @@ /* This file is part of the KDE project * Copyright (C) 2003-2004 Allan Sandfeld Jensen <kde@carewolf.com> * - * Originally based upon the kfile_ogg plugin: + * Originally based upon the tdefile_ogg plugin: * Copyright (C) 2001, 2002 Rolf Magnus <ramagnus@kde.org> - * Interfacing to TagLib is copied from kfile_mp3 plugin: + * Interfacing to TagLib is copied from tdefile_mp3 plugin: * Copyright (C) 2003 Scott Wheeler <wheeler@kde.org> * * This program is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ * Boston, MA 02110-1301, USA. */ -#include "kfile_flac.h" +#include "tdefile_flac.h" #include <tqcstring.h> #include <tqfile.h> @@ -54,7 +54,7 @@ #include <unistd.h> #include <ctype.h> -K_EXPORT_COMPONENT_FACTORY(kfile_flac, KGenericFactory<KFlacPlugin>("kfile_flac")) +K_EXPORT_COMPONENT_FACTORY(tdefile_flac, KGenericFactory<KFlacPlugin>("tdefile_flac")) KFlacPlugin::KFlacPlugin( TQObject *parent, const char *name, const TQStringList &args ) @@ -279,4 +279,4 @@ TQValidator* KFlacPlugin::createValidator( const TQString&, return new TQRegExpValidator(TQRegExp(".*"), parent, name); } -#include "kfile_flac.moc" +#include "tdefile_flac.moc" diff --git a/kfile-plugins/flac/kfile_flac.desktop b/tdefile-plugins/flac/tdefile_flac.desktop index f4c65815..88e494c4 100644 --- a/kfile-plugins/flac/kfile_flac.desktop +++ b/tdefile-plugins/flac/tdefile_flac.desktop @@ -56,7 +56,7 @@ Name[zh_CN]=FLAC 信息 Name[zh_HK]=FLAC 資訊 Name[zh_TW]=FLAC 資訊 ServiceTypes=KFilePlugin -X-TDE-Library=kfile_flac +X-TDE-Library=tdefile_flac MimeType=audio/x-flac;audio/x-oggflac PreferredGroups=Comment,Technical PreferredItems=Title,Artist,Album,Tracknumber,Genre,Bitrate,Length,Channels, Date,Description,Organization,Location,Copyright diff --git a/kfile-plugins/flac/kfile_flac.h b/tdefile-plugins/flac/tdefile_flac.h index 08f283ae..f4f3c96f 100644 --- a/kfile-plugins/flac/kfile_flac.h +++ b/tdefile-plugins/flac/tdefile_flac.h @@ -1,9 +1,9 @@ /* This file is part of the KDE project * Copyright (C) 2003 Allan Sandfeld Jensen <kde@carewolf.com> * - * Originally based upon the kfile_ogg plugin: + * Originally based upon the tdefile_ogg plugin: * Copyright (C) 2001, 2002 Rolf Magnus <ramagnus@kde.org> - * Interfacing to TagLib is copied from kfile_mp3 plugin: + * Interfacing to TagLib is copied from tdefile_mp3 plugin: * Copyright (C) 2003 Scott Wheeler <wheeler@kde.org> * * This program is free software; you can redistribute it and/or @@ -24,7 +24,7 @@ #ifndef __KFILE_FLAC_H__ #define __KFILE_FLAC_H__ -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> class TQString; class TQStringList; diff --git a/tdefile-plugins/m3u/Makefile.am b/tdefile-plugins/m3u/Makefile.am new file mode 100644 index 00000000..11259cad --- /dev/null +++ b/tdefile-plugins/m3u/Makefile.am @@ -0,0 +1,22 @@ +## Makefile.am for m3u file meta info plugin + +# set the include path for X, qt and KDE +INCLUDES = $(all_includes) + +# these are the headers for your project +noinst_HEADERS = tdefile_m3u.h + +kde_module_LTLIBRARIES = tdefile_m3u.la + +tdefile_m3u_la_SOURCES = tdefile_m3u.cpp +tdefile_m3u_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) +tdefile_m3u_la_LIBADD = $(LIB_KSYCOCA) + +# let automoc handle all of the meta source files (moc) +METASOURCES = AUTO + +messages: rc.cpp + $(XGETTEXT) tdefile_m3u.cpp -o $(podir)/tdefile_m3u.pot + +services_DATA = tdefile_m3u.desktop +servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/m3u/kfile_m3u.cpp b/tdefile-plugins/m3u/tdefile_m3u.cpp index 5fff1a08..a25234e8 100644 --- a/kfile-plugins/m3u/kfile_m3u.cpp +++ b/tdefile-plugins/m3u/tdefile_m3u.cpp @@ -18,7 +18,7 @@ * $Id$ */ -#include "kfile_m3u.h" +#include "tdefile_m3u.h" #include <kdebug.h> #include <kurl.h> @@ -35,7 +35,7 @@ typedef KGenericFactory<KM3uPlugin> M3uFactory; -K_EXPORT_COMPONENT_FACTORY( kfile_m3u, M3uFactory( "kfile_m3u" ) ) +K_EXPORT_COMPONENT_FACTORY( tdefile_m3u, M3uFactory( "tdefile_m3u" ) ) KM3uPlugin::KM3uPlugin( TQObject *parent, const char *name, const TQStringList &preferredItems ) @@ -84,4 +84,4 @@ bool KM3uPlugin::readInfo( KFileMetaInfo& info, uint ) return true; } -#include "kfile_m3u.moc" +#include "tdefile_m3u.moc" diff --git a/kfile-plugins/m3u/kfile_m3u.desktop b/tdefile-plugins/m3u/tdefile_m3u.desktop index b9478b85..388a6e71 100644 --- a/kfile-plugins/m3u/kfile_m3u.desktop +++ b/tdefile-plugins/m3u/tdefile_m3u.desktop @@ -65,7 +65,7 @@ Name[zh_HK]=M3U 播放清單資訊 Name[zh_TW]=M3U 播放清單資訊 Name[zu]=Ulwazi Lohlu lokudlala lwe-M3U ServiceTypes=KFilePlugin -X-TDE-Library=kfile_m3u +X-TDE-Library=tdefile_m3u MimeType=audio/x-mpegurl PreferredGroups=Tracks PreferredItems= diff --git a/kfile-plugins/m3u/kfile_m3u.h b/tdefile-plugins/m3u/tdefile_m3u.h index b8534ef3..afc46847 100644 --- a/kfile-plugins/m3u/kfile_m3u.h +++ b/tdefile-plugins/m3u/tdefile_m3u.h @@ -21,7 +21,7 @@ #ifndef __KMIME_M3U_H__ #define __KMIME_M3U_H__ -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> #include <kurl.h> class TQStringList; diff --git a/tdefile-plugins/mp3/Makefile.am b/tdefile-plugins/mp3/Makefile.am new file mode 100644 index 00000000..97fbe73d --- /dev/null +++ b/tdefile-plugins/mp3/Makefile.am @@ -0,0 +1,22 @@ +## Makefile.am for mp3 file meta info plugin + +# set the include path for X, qt and KDE +INCLUDES = $(all_includes) $(taglib_includes) + +# these are the headers for your project +noinst_HEADERS = tdefile_mp3.h + +kde_module_LTLIBRARIES = tdefile_mp3.la + +tdefile_mp3_la_SOURCES = tdefile_mp3.cpp +tdefile_mp3_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN) +tdefile_mp3_la_LIBADD = $(LIB_KIO) + +# let automoc handle all of the meta source files (moc) +METASOURCES = AUTO + +messages: rc.cpp + $(XGETTEXT) tdefile_mp3.cpp -o $(podir)/tdefile_mp3.pot + +services_DATA = tdefile_mp3.desktop +servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/mp3/configure.in.in b/tdefile-plugins/mp3/configure.in.in index d04bc223..d04bc223 100644 --- a/kfile-plugins/mp3/configure.in.in +++ b/tdefile-plugins/mp3/configure.in.in diff --git a/kfile-plugins/mp3/kfile_mp3.cpp b/tdefile-plugins/mp3/tdefile_mp3.cpp index f686147c..ccabd079 100644 --- a/kfile-plugins/mp3/kfile_mp3.cpp +++ b/tdefile-plugins/mp3/tdefile_mp3.cpp @@ -20,7 +20,7 @@ #include "config.h" -#include "kfile_mp3.h" +#include "tdefile_mp3.h" #include <kprocess.h> #include <klocale.h> @@ -42,7 +42,7 @@ typedef KGenericFactory<KMp3Plugin> Mp3Factory; -K_EXPORT_COMPONENT_FACTORY(kfile_mp3, Mp3Factory( "kfile_mp3" )) +K_EXPORT_COMPONENT_FACTORY(tdefile_mp3, Mp3Factory( "tdefile_mp3" )) KMp3Plugin::KMp3Plugin(TQObject *parent, const char *name, const TQStringList &args) : KFilePlugin(parent, name, args) @@ -304,4 +304,4 @@ TQValidator *KMp3Plugin::createValidator(const TQString & /* mimetype */, return 0; } -#include "kfile_mp3.moc" +#include "tdefile_mp3.moc" diff --git a/kfile-plugins/mp3/kfile_mp3.desktop b/tdefile-plugins/mp3/tdefile_mp3.desktop index bec8dcff..2f83b875 100644 --- a/kfile-plugins/mp3/kfile_mp3.desktop +++ b/tdefile-plugins/mp3/tdefile_mp3.desktop @@ -64,7 +64,7 @@ Name[zh_HK]=MP3 資訊 Name[zh_TW]=MP3 資訊 Name[zu]=Ulwazi lwe-MP3 ServiceTypes=KFilePlugin -X-TDE-Library=kfile_mp3 +X-TDE-Library=tdefile_mp3 MimeType=audio/x-mp3 PreferredGroups=id3,Technical PreferredItems=Title,Artist,Album,Tracknumber,Genre,Bitrate,Length,Date,Comment,Sample Rate,Channels,Version,Layer,Copyright,Original,CRC diff --git a/kfile-plugins/mp3/kfile_mp3.h b/tdefile-plugins/mp3/tdefile_mp3.h index e913db2a..209c81a6 100644 --- a/kfile-plugins/mp3/kfile_mp3.h +++ b/tdefile-plugins/mp3/tdefile_mp3.h @@ -19,7 +19,7 @@ #ifndef __KFILE_MP3_H__ #define __KFILE_MP3_H__ -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> class TQStringList; diff --git a/tdefile-plugins/mpc/Makefile.am b/tdefile-plugins/mpc/Makefile.am new file mode 100644 index 00000000..6c1cc840 --- /dev/null +++ b/tdefile-plugins/mpc/Makefile.am @@ -0,0 +1,22 @@ +## Makefile.am for MPC file meta info plugin + +# set the include path for X, qt, KDE and TagLib +INCLUDES = $(all_includes) $(taglib_includes) + +# these are the headers for your project +noinst_HEADERS = tdefile_mpc.h + +kde_module_LTLIBRARIES = tdefile_mpc.la + +tdefile_mpc_la_SOURCES = tdefile_mpc.cpp +tdefile_mpc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN) +tdefile_mpc_la_LIBADD = $(LIB_KIO) + +# let automoc handle all of the meta source files (moc) +METASOURCES = AUTO + +messages: rc.cpp + $(XGETTEXT) tdefile_mpc.cpp -o $(podir)/tdefile_mpc.pot + +services_DATA = tdefile_mpc.desktop +servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/mpc/configure.in.in b/tdefile-plugins/mpc/configure.in.in index 6590e6c5..6590e6c5 100644 --- a/kfile-plugins/mpc/configure.in.in +++ b/tdefile-plugins/mpc/configure.in.in diff --git a/kfile-plugins/mpc/kfile_mpc.cpp b/tdefile-plugins/mpc/tdefile_mpc.cpp index 830feb54..bc4828fd 100644 --- a/kfile-plugins/mpc/kfile_mpc.cpp +++ b/tdefile-plugins/mpc/tdefile_mpc.cpp @@ -1,9 +1,9 @@ /* This file is part of the KDE project * Copyright (C) 2003-2004 Allan Sandfeld Jensen <kde@carewolf.com> * - * Originally based upon the kfile_ogg plugin: + * Originally based upon the tdefile_ogg plugin: * Copyright (C) 2001, 2002 Rolf Magnus <ramagnus@kde.org> - * Interfacing to TagLib is copied from kfile_mp3 plugin: + * Interfacing to TagLib is copied from tdefile_mp3 plugin: * Copyright (C) 2003 Scott Wheeler <wheeler@kde.org> * * This program is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ * Boston, MA 02110-1301, USA. */ -#include "kfile_mpc.h" +#include "tdefile_mpc.h" #include <tqcstring.h> #include <tqfile.h> @@ -46,7 +46,7 @@ #include <unistd.h> #include <ctype.h> -K_EXPORT_COMPONENT_FACTORY(kfile_mpc, KGenericFactory<KMpcPlugin>("kfile_mpc")) +K_EXPORT_COMPONENT_FACTORY(tdefile_mpc, KGenericFactory<KMpcPlugin>("tdefile_mpc")) KMpcPlugin::KMpcPlugin( TQObject *parent, const char *name, const TQStringList &args ) @@ -250,4 +250,4 @@ TQValidator* KMpcPlugin::createValidator( const TQString&, return new TQRegExpValidator(TQRegExp(".*"), parent, name); } -#include "kfile_mpc.moc" +#include "tdefile_mpc.moc" diff --git a/kfile-plugins/mpc/kfile_mpc.desktop b/tdefile-plugins/mpc/tdefile_mpc.desktop index f2dceec0..d850fb60 100644 --- a/kfile-plugins/mpc/kfile_mpc.desktop +++ b/tdefile-plugins/mpc/tdefile_mpc.desktop @@ -50,7 +50,7 @@ Name[zh_CN]=Musepack 信息 Name[zh_HK]=Musepack 資訊 Name[zh_TW]=Musepack 資訊 ServiceTypes=KFilePlugin -X-TDE-Library=kfile_mpc +X-TDE-Library=tdefile_mpc MimeType=audio/x-musepack PreferredGroups=Comment,Technical PreferredItems=Title,Artist,Album,Tracknumber,Genre,Bitrate,Length,Channels, Date,Description,Organization,Location,Copyright diff --git a/kfile-plugins/mpc/kfile_mpc.h b/tdefile-plugins/mpc/tdefile_mpc.h index c37fa953..8b3345ed 100644 --- a/kfile-plugins/mpc/kfile_mpc.h +++ b/tdefile-plugins/mpc/tdefile_mpc.h @@ -1,9 +1,9 @@ /* This file is part of the KDE project * Copyright (C) 2004 Allan Sandfeld Jensen <kde@carewolf.com> * - * Originally based upon the kfile_ogg plugin: + * Originally based upon the tdefile_ogg plugin: * Copyright (C) 2001, 2002 Rolf Magnus <ramagnus@kde.org> - * Interfacing to TagLib is copied from kfile_mp3 plugin: + * Interfacing to TagLib is copied from tdefile_mp3 plugin: * Copyright (C) 2003 Scott Wheeler <wheeler@kde.org> * * This program is free software; you can redistribute it and/or @@ -24,7 +24,7 @@ #ifndef __KFILE_MPC_H__ #define __KFILE_MPC_H__ -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> class TQString; class TQStringList; diff --git a/tdefile-plugins/mpeg/Makefile.am b/tdefile-plugins/mpeg/Makefile.am new file mode 100644 index 00000000..63fd9460 --- /dev/null +++ b/tdefile-plugins/mpeg/Makefile.am @@ -0,0 +1,22 @@ +## Makefile.am for mpeg file meta info plugin + +# set the include path for X, qt and KDE +INCLUDES = $(all_includes) + +# these are the headers for your project +noinst_HEADERS = tdefile_mpeg.h + +kde_module_LTLIBRARIES = tdefile_mpeg.la + +tdefile_mpeg_la_SOURCES = tdefile_mpeg.cpp +tdefile_mpeg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) +tdefile_mpeg_la_LIBADD = $(LIB_KIO) + +# let automoc handle all of the meta source files (moc) +METASOURCES = AUTO + +messages: rc.cpp + $(XGETTEXT) tdefile_mpeg.cpp -o $(podir)/tdefile_mpeg.pot + +services_DATA = tdefile_mpeg.desktop +servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/mpeg/kfile_mpeg.cpp b/tdefile-plugins/mpeg/tdefile_mpeg.cpp index 4d51f64d..fd015422 100644 --- a/kfile-plugins/mpeg/kfile_mpeg.cpp +++ b/tdefile-plugins/mpeg/tdefile_mpeg.cpp @@ -22,7 +22,7 @@ // and studying MPEG dumps. #include <config.h> -#include "kfile_mpeg.h" +#include "tdefile_mpeg.h" #include <kprocess.h> #include <klocale.h> @@ -44,7 +44,7 @@ typedef unsigned int uint32_t; typedef KGenericFactory<KMpegPlugin> MpegFactory; -K_EXPORT_COMPONENT_FACTORY(kfile_mpeg, MpegFactory( "kfile_mpeg" )) +K_EXPORT_COMPONENT_FACTORY(tdefile_mpeg, MpegFactory( "tdefile_mpeg" )) KMpegPlugin::KMpegPlugin(TQObject *parent, const char *name, const TQStringList &args) @@ -579,4 +579,4 @@ bool KMpegPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) return true; } -#include "kfile_mpeg.moc" +#include "tdefile_mpeg.moc" diff --git a/kfile-plugins/mpeg/kfile_mpeg.desktop b/tdefile-plugins/mpeg/tdefile_mpeg.desktop index 024f448d..20dfe243 100644 --- a/kfile-plugins/mpeg/kfile_mpeg.desktop +++ b/tdefile-plugins/mpeg/tdefile_mpeg.desktop @@ -49,7 +49,7 @@ Name[zh_CN]=MPEG 信息 Name[zh_HK]=MPEG 資訊 Name[zh_TW]=MPEG 資訊 ServiceTypes=KFilePlugin -X-TDE-Library=kfile_mpeg +X-TDE-Library=tdefile_mpeg MimeType=video/mpeg PreferredGrous=Technical PreferredItems=Length,Resolution,Frame rate,Video codec,Audio codec diff --git a/kfile-plugins/mpeg/kfile_mpeg.h b/tdefile-plugins/mpeg/tdefile_mpeg.h index c81114bf..13035837 100644 --- a/kfile-plugins/mpeg/kfile_mpeg.h +++ b/tdefile-plugins/mpeg/tdefile_mpeg.h @@ -20,7 +20,7 @@ #ifndef __KFILE_MPEG_H__ #define __KFILE_MPEG_H__ -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> #include <tqfile.h> class TQStringList; diff --git a/tdefile-plugins/ogg/Makefile.am b/tdefile-plugins/ogg/Makefile.am new file mode 100644 index 00000000..a6590beb --- /dev/null +++ b/tdefile-plugins/ogg/Makefile.am @@ -0,0 +1,22 @@ +## Makefile.am for ogg/vorbis file meta info plugin + +# set the include path for X, qt and KDE +INCLUDES = $(all_includes) + +# these are the headers for your project +noinst_HEADERS = tdefile_ogg.h + +kde_module_LTLIBRARIES = tdefile_ogg.la + +tdefile_ogg_la_SOURCES = tdefile_ogg.cpp vcedit.c +tdefile_ogg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) +tdefile_ogg_la_LIBADD = $(LIB_KIO) -logg -lvorbis -lvorbisfile + +# let automoc handle all of the meta source files (moc) +METASOURCES = AUTO + +messages: rc.cpp + $(XGETTEXT) tdefile_ogg.cpp -o $(podir)/tdefile_ogg.pot + +services_DATA = tdefile_ogg.desktop +servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/ogg/configure.in.in b/tdefile-plugins/ogg/configure.in.in index 35218d34..35218d34 100644 --- a/kfile-plugins/ogg/configure.in.in +++ b/tdefile-plugins/ogg/configure.in.in diff --git a/kfile-plugins/ogg/kfile_ogg.cpp b/tdefile-plugins/ogg/tdefile_ogg.cpp index 30f96096..b141acb1 100644 --- a/kfile-plugins/ogg/kfile_ogg.cpp +++ b/tdefile-plugins/ogg/tdefile_ogg.cpp @@ -18,7 +18,7 @@ * $Id$ */ -#include "kfile_ogg.h" +#include "tdefile_ogg.h" #include "vcedit.h" #include <tqcstring.h> @@ -59,7 +59,7 @@ static const char* const knownTranslations[] = { // I18N_NOOP("Isrc") // dunno what an Isrc number is, the link is broken }; -K_EXPORT_COMPONENT_FACTORY(kfile_ogg, KGenericFactory<KOggPlugin>("kfile_ogg")) +K_EXPORT_COMPONENT_FACTORY(tdefile_ogg, KGenericFactory<KOggPlugin>("tdefile_ogg")) KOggPlugin::KOggPlugin( TQObject *parent, const char *name, const TQStringList &args ) @@ -354,4 +354,4 @@ TQValidator* KOggPlugin::createValidator( const TQString&, return new TQRegExpValidator(TQRegExp(".*"), parent, name); } -#include "kfile_ogg.moc" +#include "tdefile_ogg.moc" diff --git a/kfile-plugins/ogg/kfile_ogg.desktop b/tdefile-plugins/ogg/tdefile_ogg.desktop index bf0da7bc..9cc7fe6e 100644 --- a/kfile-plugins/ogg/kfile_ogg.desktop +++ b/tdefile-plugins/ogg/tdefile_ogg.desktop @@ -62,7 +62,7 @@ Name[zh_HK]=OGG 資訊 Name[zh_TW]=OGG 資訊 Name[zu]=Ulwazi lwe OGG ServiceTypes=KFilePlugin -X-TDE-Library=kfile_ogg +X-TDE-Library=tdefile_ogg MimeType=audio/vorbis PreferredGroups=Comment,Technical PreferredItems=Title,Artist,Album,Tracknumber,Genre,Bitrate,Length,Date,Description,Organization,Channels,UpperBitrate,LowerBitrate,NominalBitrate,Location,Copyright,Version diff --git a/kfile-plugins/ogg/kfile_ogg.h b/tdefile-plugins/ogg/tdefile_ogg.h index eb5411ea..0737dff7 100644 --- a/kfile-plugins/ogg/kfile_ogg.h +++ b/tdefile-plugins/ogg/tdefile_ogg.h @@ -21,7 +21,7 @@ #ifndef __KFILE_OGG_H__ #define __KFILE_OGG_H__ -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> class TQString; class TQStringList; diff --git a/kfile-plugins/ogg/vcedit.c b/tdefile-plugins/ogg/vcedit.c index 76e31f6c..76e31f6c 100644 --- a/kfile-plugins/ogg/vcedit.c +++ b/tdefile-plugins/ogg/vcedit.c diff --git a/kfile-plugins/ogg/vcedit.h b/tdefile-plugins/ogg/vcedit.h index 6be136ba..6be136ba 100644 --- a/kfile-plugins/ogg/vcedit.h +++ b/tdefile-plugins/ogg/vcedit.h diff --git a/tdefile-plugins/sid/Makefile.am b/tdefile-plugins/sid/Makefile.am new file mode 100644 index 00000000..56bfa54f --- /dev/null +++ b/tdefile-plugins/sid/Makefile.am @@ -0,0 +1,22 @@ +## Makefile.am for sid file meta info plugin + +# set the include path for X, qt and KDE +INCLUDES = $(all_includes) $(taglib_includes) + +# these are the headers for your project +noinst_HEADERS = tdefile_sid.h + +kde_module_LTLIBRARIES = tdefile_sid.la + +tdefile_sid_la_SOURCES = tdefile_sid.cpp +tdefile_sid_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) +tdefile_sid_la_LIBADD = $(LIB_KIO) + +# let automoc handle all of the meta source files (moc) +METASOURCES = AUTO + +messages: rc.cpp + $(XGETTEXT) tdefile_sid.cpp -o $(podir)/tdefile_sid.pot + +services_DATA = tdefile_sid.desktop +servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/sid/kfile_sid.cpp b/tdefile-plugins/sid/tdefile_sid.cpp index 33b35500..543d5b87 100644 --- a/kfile-plugins/sid/kfile_sid.cpp +++ b/tdefile-plugins/sid/tdefile_sid.cpp @@ -16,7 +16,7 @@ * Boston, MA 02110-1301, USA. */ -#include "kfile_sid.h" +#include "tdefile_sid.h" #include <klocale.h> #include <kgenericfactory.h> @@ -34,7 +34,7 @@ typedef KGenericFactory<KSidPlugin> SidFactory; -K_EXPORT_COMPONENT_FACTORY(kfile_sid, SidFactory("kfile_sid")) +K_EXPORT_COMPONENT_FACTORY(tdefile_sid, SidFactory("tdefile_sid")) KSidPlugin::KSidPlugin(TQObject *parent, const char *name, const TQStringList &args) @@ -224,4 +224,4 @@ KSidPlugin::createValidator(const TQString& /*mimetype*/, const TQString& group, -#include "kfile_sid.moc" +#include "tdefile_sid.moc" diff --git a/kfile-plugins/sid/kfile_sid.desktop b/tdefile-plugins/sid/tdefile_sid.desktop index 22b2ded8..117f2905 100644 --- a/kfile-plugins/sid/kfile_sid.desktop +++ b/tdefile-plugins/sid/tdefile_sid.desktop @@ -54,7 +54,7 @@ Name[zh_CN]=SID 信息 Name[zh_HK]=SID 資訊 Name[zh_TW]=SID 資訊 ServiceTypes=KFilePlugin -X-TDE-Library=kfile_sid +X-TDE-Library=tdefile_sid MimeType=audio/prs.sid PreferredGroups=General,Technical PreferredItems=Title,Artist,Copyright,Number of Songs,Start Song,Version diff --git a/kfile-plugins/sid/kfile_sid.h b/tdefile-plugins/sid/tdefile_sid.h index a69e2460..ba9931f7 100644 --- a/kfile-plugins/sid/kfile_sid.h +++ b/tdefile-plugins/sid/tdefile_sid.h @@ -21,7 +21,7 @@ #ifndef KFILE_SID_H #define KFILE_SID_H -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> class TQStringList; diff --git a/tdefile-plugins/theora/Makefile.am b/tdefile-plugins/theora/Makefile.am new file mode 100644 index 00000000..c44a102d --- /dev/null +++ b/tdefile-plugins/theora/Makefile.am @@ -0,0 +1,22 @@ +## Makefile.am for ogg/vorbis file meta info plugin + +# set the include path for X, qt and KDE +INCLUDES = $(all_includes) + +# these are the headers for your project +noinst_HEADERS = tdefile_theora.h + +kde_module_LTLIBRARIES = tdefile_theora.la + +tdefile_theora_la_SOURCES = tdefile_theora.cpp +tdefile_theora_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) +tdefile_theora_la_LIBADD = $(LIB_KIO) -logg -lvorbis -ltheora + +# let automoc handle all of the meta source files (moc) +METASOURCES = AUTO + +messages: rc.cpp + $(XGETTEXT) tdefile_theora.cpp -o $(podir)/tdefile_theora.pot + +services_DATA = tdefile_theora.desktop +servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/theora/configure.in.bot b/tdefile-plugins/theora/configure.in.bot index 926a39e9..926a39e9 100644 --- a/kfile-plugins/theora/configure.in.bot +++ b/tdefile-plugins/theora/configure.in.bot diff --git a/kfile-plugins/theora/configure.in.in b/tdefile-plugins/theora/configure.in.in index b9d8836d..b9d8836d 100644 --- a/kfile-plugins/theora/configure.in.in +++ b/tdefile-plugins/theora/configure.in.in diff --git a/kfile-plugins/theora/kfile_theora.cpp b/tdefile-plugins/theora/tdefile_theora.cpp index aac38978..20e4e337 100644 --- a/kfile-plugins/theora/kfile_theora.cpp +++ b/tdefile-plugins/theora/tdefile_theora.cpp @@ -20,7 +20,7 @@ #include <tqfile.h> #include <config.h> -#include "kfile_theora.h" +#include "tdefile_theora.h" #include <kdebug.h> #include <klocale.h> @@ -54,7 +54,7 @@ static int buffer_data(FILE *in,ogg_sync_state *oy) typedef KGenericFactory<theoraPlugin> theoraFactory; -K_EXPORT_COMPONENT_FACTORY(kfile_theora, theoraFactory( "kfile_theora" )) +K_EXPORT_COMPONENT_FACTORY(tdefile_theora, theoraFactory( "tdefile_theora" )) theoraPlugin::theoraPlugin(TQObject *parent, const char *name, const TQStringList &args) @@ -318,5 +318,5 @@ bool theoraPlugin::readInfo( KFileMetaInfo& info, uint what) return true; } -#include "kfile_theora.moc" +#include "tdefile_theora.moc" diff --git a/kfile-plugins/theora/kfile_theora.desktop b/tdefile-plugins/theora/tdefile_theora.desktop index 215f3801..e3adfa26 100644 --- a/kfile-plugins/theora/kfile_theora.desktop +++ b/tdefile-plugins/theora/tdefile_theora.desktop @@ -51,7 +51,7 @@ Name[zh_CN]=theora 信息 Name[zh_HK]=theora 資訊 Name[zh_TW]=theora 資訊 ServiceTypes=KFilePlugin -X-TDE-Library=kfile_theora +X-TDE-Library=tdefile_theora # change MimeType here! (example: inode/directory) MimeType=video/x-theora # change PreferredGroups here! (example: FolderInfo) diff --git a/kfile-plugins/theora/kfile_theora.h b/tdefile-plugins/theora/tdefile_theora.h index 815f92d9..88e465c2 100644 --- a/kfile-plugins/theora/kfile_theora.h +++ b/tdefile-plugins/theora/tdefile_theora.h @@ -22,9 +22,9 @@ #define __KFILE_THEORA_H__ /** - * Note: For further information look into <$TDEDIR/include/kfilemetainfo.h> + * Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h> */ -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> class TQStringList; diff --git a/tdefile-plugins/wav/Makefile.am b/tdefile-plugins/wav/Makefile.am new file mode 100644 index 00000000..f755f395 --- /dev/null +++ b/tdefile-plugins/wav/Makefile.am @@ -0,0 +1,22 @@ +## Makefile.am for wav file meta info plugin + +# set the include path for X, qt and KDE +INCLUDES = $(all_includes) + +# these are the headers for your project +noinst_HEADERS = tdefile_wav.h + +kde_module_LTLIBRARIES = tdefile_wav.la + +tdefile_wav_la_SOURCES = tdefile_wav.cpp +tdefile_wav_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -module $(KDE_PLUGIN) +tdefile_wav_la_LIBADD = $(LIB_KIO) + +# let automoc handle all of the meta source files (moc) +METASOURCES = AUTO + +messages: rc.cpp + $(XGETTEXT) tdefile_wav.cpp -o $(podir)/tdefile_wav.pot + +services_DATA = tdefile_wav.desktop +servicesdir = $(kde_servicesdir) diff --git a/kfile-plugins/wav/kfile_wav.cpp b/tdefile-plugins/wav/tdefile_wav.cpp index 50841d95..1c1f61ad 100644 --- a/kfile-plugins/wav/kfile_wav.cpp +++ b/tdefile-plugins/wav/tdefile_wav.cpp @@ -18,7 +18,7 @@ */ #include <config.h> -#include "kfile_wav.h" +#include "tdefile_wav.h" #include <kprocess.h> #include <klocale.h> @@ -41,7 +41,7 @@ typedef unsigned int uint32_t; typedef KGenericFactory<KWavPlugin> WavFactory; -K_EXPORT_COMPONENT_FACTORY(kfile_wav, WavFactory( "kfile_wav" )) +K_EXPORT_COMPONENT_FACTORY(tdefile_wav, WavFactory( "tdefile_wav" )) KWavPlugin::KWavPlugin(TQObject *parent, const char *name, const TQStringList &args) @@ -170,4 +170,4 @@ bool KWavPlugin::readInfo( KFileMetaInfo& info, uint /*what*/) return true; } -#include "kfile_wav.moc" +#include "tdefile_wav.moc" diff --git a/kfile-plugins/wav/kfile_wav.desktop b/tdefile-plugins/wav/tdefile_wav.desktop index be468e1c..613a3772 100644 --- a/kfile-plugins/wav/kfile_wav.desktop +++ b/tdefile-plugins/wav/tdefile_wav.desktop @@ -61,7 +61,7 @@ Name[zh_HK]=WAV 資訊 Name[zh_TW]=WAV 資訊 Name[zu]=Ulwazi lwe WAV ServiceTypes=KFilePlugin -X-TDE-Library=kfile_wav +X-TDE-Library=tdefile_wav MimeType=audio/x-wav PreferredGrous=Technical PreferredItems=Length,Sample Rate,Sample Size,Channels diff --git a/kfile-plugins/wav/kfile_wav.h b/tdefile-plugins/wav/tdefile_wav.h index 7e14fc7f..c3a5b2ba 100644 --- a/kfile-plugins/wav/kfile_wav.h +++ b/tdefile-plugins/wav/tdefile_wav.h @@ -20,7 +20,7 @@ #ifndef __KFILE_WAV_H__ #define __KFILE_WAV_H__ -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> class TQStringList; diff --git a/kioslave/Makefile.am b/tdeioslave/Makefile.am index 4586dcda..606a0a59 100644 --- a/kioslave/Makefile.am +++ b/tdeioslave/Makefile.am @@ -1,4 +1,4 @@ -if include_kioslave_audiocd +if include_tdeioslave_audiocd AUDIOCD_SUBDIR=audiocd endif diff --git a/kioslave/audiocd/HACKING b/tdeioslave/audiocd/HACKING index dde6efc1..dde6efc1 100644 --- a/kioslave/audiocd/HACKING +++ b/tdeioslave/audiocd/HACKING diff --git a/kioslave/audiocd/Makefile.am b/tdeioslave/audiocd/Makefile.am index 736828e1..8e190d4e 100644 --- a/kioslave/audiocd/Makefile.am +++ b/tdeioslave/audiocd/Makefile.am @@ -24,9 +24,9 @@ protocoldir = $(kde_servicesdir) protocol_DATA = audiocd.protocol messages: - $(XGETTEXT) *.cpp -o $(podir)/kio_audiocd.pot + $(XGETTEXT) *.cpp -o $(podir)/tdeio_audiocd.pot -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update update_DATA = audiocd.upd update_SCRIPTS = upgrade-metadata.sh diff --git a/kioslave/audiocd/audiocd.cpp b/tdeioslave/audiocd/audiocd.cpp index 7898be5a..7898be5a 100644 --- a/kioslave/audiocd/audiocd.cpp +++ b/tdeioslave/audiocd/audiocd.cpp diff --git a/kioslave/audiocd/audiocd.h b/tdeioslave/audiocd/audiocd.h index a96000fb..75b9bfd2 100644 --- a/kioslave/audiocd/audiocd.h +++ b/tdeioslave/audiocd/audiocd.h @@ -25,7 +25,7 @@ #ifndef AUDIO_CD_H #define AUDIO_CD_H -#include <kio/slavebase.h> +#include <tdeio/slavebase.h> class AudioCDEncoder; diff --git a/kioslave/audiocd/audiocd.protocol b/tdeioslave/audiocd/audiocd.protocol index 7a3f497f..eb462539 100644 --- a/kioslave/audiocd/audiocd.protocol +++ b/tdeioslave/audiocd/audiocd.protocol @@ -11,6 +11,6 @@ deleting=false linking=false moving=false Icon=cdaudio_unmount -DocPath=kioslave/audiocd.html +DocPath=tdeioslave/audiocd.html Class=:local ShowPreviews=false diff --git a/kioslave/audiocd/audiocd.upd b/tdeioslave/audiocd/audiocd.upd index f4818e5f..f4818e5f 100644 --- a/kioslave/audiocd/audiocd.upd +++ b/tdeioslave/audiocd/audiocd.upd diff --git a/kioslave/audiocd/configure.in.bot b/tdeioslave/audiocd/configure.in.bot index e69de29b..e69de29b 100644 --- a/kioslave/audiocd/configure.in.bot +++ b/tdeioslave/audiocd/configure.in.bot diff --git a/kioslave/audiocd/configure.in.in b/tdeioslave/audiocd/configure.in.in index 99bacf59..99bacf59 100644 --- a/kioslave/audiocd/configure.in.in +++ b/tdeioslave/audiocd/configure.in.in diff --git a/kioslave/audiocd/kcmaudiocd/Makefile.am b/tdeioslave/audiocd/kcmaudiocd/Makefile.am index 73d6be2d..73d6be2d 100644 --- a/kioslave/audiocd/kcmaudiocd/Makefile.am +++ b/tdeioslave/audiocd/kcmaudiocd/Makefile.am diff --git a/kioslave/audiocd/kcmaudiocd/audiocd.desktop b/tdeioslave/audiocd/kcmaudiocd/audiocd.desktop index 7b3ada34..88bfedde 100644 --- a/kioslave/audiocd/kcmaudiocd/audiocd.desktop +++ b/tdeioslave/audiocd/kcmaudiocd/audiocd.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell audiocd +Exec=tdecmshell audiocd Icon=cdaudio_unmount Type=Application diff --git a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui b/tdeioslave/audiocd/kcmaudiocd/audiocdconfig.ui index a3b98507..a3b98507 100644 --- a/kioslave/audiocd/kcmaudiocd/audiocdconfig.ui +++ b/tdeioslave/audiocd/kcmaudiocd/audiocdconfig.ui diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp index adff68f3..f3190d43 100644 --- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp +++ b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kconfig.h> +#include <tdeconfig.h> #include <klineedit.h> #include <klocale.h> @@ -32,7 +32,7 @@ #include <audiocdencoder.h> #include "kcmaudiocd.moc" -#include <kconfigdialogmanager.h> +#include <tdeconfigdialogmanager.h> KAudiocdModule::KAudiocdModule(TQWidget *parent, const char *name) : AudiocdConfig(parent, name), configChanged(false) diff --git a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h index c9ec1bc7..c9ec1bc7 100644 --- a/kioslave/audiocd/kcmaudiocd/kcmaudiocd.h +++ b/tdeioslave/audiocd/kcmaudiocd/kcmaudiocd.h diff --git a/kioslave/audiocd/plugins/Makefile.am b/tdeioslave/audiocd/plugins/Makefile.am index 4dca0d30..fcee4e68 100644 --- a/kioslave/audiocd/plugins/Makefile.am +++ b/tdeioslave/audiocd/plugins/Makefile.am @@ -17,5 +17,5 @@ libaudiocdplugins_la_SOURCES = audiocdencoder.cpp include_HEADERS = audiocdencoder.h messages: - $(XGETTEXT) *.cpp -o $(podir)/kio_audiocd.pot + $(XGETTEXT) *.cpp -o $(podir)/tdeio_audiocd.pot diff --git a/kioslave/audiocd/plugins/audiocdencoder.cpp b/tdeioslave/audiocd/plugins/audiocdencoder.cpp index 26c108b8..26c108b8 100644 --- a/kioslave/audiocd/plugins/audiocdencoder.cpp +++ b/tdeioslave/audiocd/plugins/audiocdencoder.cpp diff --git a/kioslave/audiocd/plugins/audiocdencoder.h b/tdeioslave/audiocd/plugins/audiocdencoder.h index d582d548..56fe7aa5 100644 --- a/kioslave/audiocd/plugins/audiocdencoder.h +++ b/tdeioslave/audiocd/plugins/audiocdencoder.h @@ -20,7 +20,7 @@ #define AUDIOCD_ENCODER_H #include <sys/types.h> -#include <kio/slavebase.h> +#include <tdeio/slavebase.h> #include <cdinfo.h> class TDEConfigSkeleton; diff --git a/kioslave/audiocd/plugins/flac/Makefile.am b/tdeioslave/audiocd/plugins/flac/Makefile.am index 4e693c53..4e693c53 100644 --- a/kioslave/audiocd/plugins/flac/Makefile.am +++ b/tdeioslave/audiocd/plugins/flac/Makefile.am diff --git a/kioslave/audiocd/plugins/flac/encoderflac.cpp b/tdeioslave/audiocd/plugins/flac/encoderflac.cpp index 4c1329cd..ed1c5dde 100644 --- a/kioslave/audiocd/plugins/flac/encoderflac.cpp +++ b/tdeioslave/audiocd/plugins/flac/encoderflac.cpp @@ -26,7 +26,7 @@ #include <FLAC/metadata.h> #include <FLAC/stream_encoder.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #if !defined FLAC_API_VERSION_CURRENT || FLAC_API_VERSION_CURRENT < 8 diff --git a/kioslave/audiocd/plugins/flac/encoderflac.h b/tdeioslave/audiocd/plugins/flac/encoderflac.h index e563e061..e563e061 100644 --- a/kioslave/audiocd/plugins/flac/encoderflac.h +++ b/tdeioslave/audiocd/plugins/flac/encoderflac.h diff --git a/kioslave/audiocd/plugins/lame/Makefile.am b/tdeioslave/audiocd/plugins/lame/Makefile.am index 49ddddd9..49ddddd9 100644 --- a/kioslave/audiocd/plugins/lame/Makefile.am +++ b/tdeioslave/audiocd/plugins/lame/Makefile.am diff --git a/kioslave/audiocd/plugins/lame/audiocd_lame_encoder.kcfg b/tdeioslave/audiocd/plugins/lame/audiocd_lame_encoder.kcfg index c752fd81..c752fd81 100644 --- a/kioslave/audiocd/plugins/lame/audiocd_lame_encoder.kcfg +++ b/tdeioslave/audiocd/plugins/lame/audiocd_lame_encoder.kcfg diff --git a/kioslave/audiocd/plugins/lame/audiocd_lame_encoder.kcfgc b/tdeioslave/audiocd/plugins/lame/audiocd_lame_encoder.kcfgc index b96ee704..b62f454d 100644 --- a/kioslave/audiocd/plugins/lame/audiocd_lame_encoder.kcfgc +++ b/tdeioslave/audiocd/plugins/lame/audiocd_lame_encoder.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=audiocd_lame_encoder.kcfg ClassName=Settings Singleton=true diff --git a/kioslave/audiocd/plugins/lame/collectingprocess.cpp b/tdeioslave/audiocd/plugins/lame/collectingprocess.cpp index 4eaf5304..4eaf5304 100644 --- a/kioslave/audiocd/plugins/lame/collectingprocess.cpp +++ b/tdeioslave/audiocd/plugins/lame/collectingprocess.cpp diff --git a/kioslave/audiocd/plugins/lame/collectingprocess.h b/tdeioslave/audiocd/plugins/lame/collectingprocess.h index df5c180d..df5c180d 100644 --- a/kioslave/audiocd/plugins/lame/collectingprocess.h +++ b/tdeioslave/audiocd/plugins/lame/collectingprocess.h diff --git a/kioslave/audiocd/plugins/lame/encoderlame.cpp b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp index 8984bb33..8984bb33 100644 --- a/kioslave/audiocd/plugins/lame/encoderlame.cpp +++ b/tdeioslave/audiocd/plugins/lame/encoderlame.cpp diff --git a/kioslave/audiocd/plugins/lame/encoderlame.h b/tdeioslave/audiocd/plugins/lame/encoderlame.h index 09c323c3..09c323c3 100644 --- a/kioslave/audiocd/plugins/lame/encoderlame.h +++ b/tdeioslave/audiocd/plugins/lame/encoderlame.h diff --git a/kioslave/audiocd/plugins/lame/encoderlameconfig.ui b/tdeioslave/audiocd/plugins/lame/encoderlameconfig.ui index f8149741..f8149741 100644 --- a/kioslave/audiocd/plugins/lame/encoderlameconfig.ui +++ b/tdeioslave/audiocd/plugins/lame/encoderlameconfig.ui diff --git a/kioslave/audiocd/plugins/vorbis/Makefile.am b/tdeioslave/audiocd/plugins/vorbis/Makefile.am index e83240ff..e83240ff 100644 --- a/kioslave/audiocd/plugins/vorbis/Makefile.am +++ b/tdeioslave/audiocd/plugins/vorbis/Makefile.am diff --git a/kioslave/audiocd/plugins/vorbis/audiocd_vorbis_encoder.kcfg b/tdeioslave/audiocd/plugins/vorbis/audiocd_vorbis_encoder.kcfg index 53465f6c..53465f6c 100644 --- a/kioslave/audiocd/plugins/vorbis/audiocd_vorbis_encoder.kcfg +++ b/tdeioslave/audiocd/plugins/vorbis/audiocd_vorbis_encoder.kcfg diff --git a/kioslave/audiocd/plugins/vorbis/audiocd_vorbis_encoder.kcfgc b/tdeioslave/audiocd/plugins/vorbis/audiocd_vorbis_encoder.kcfgc index e213ccbd..da857139 100644 --- a/kioslave/audiocd/plugins/vorbis/audiocd_vorbis_encoder.kcfgc +++ b/tdeioslave/audiocd/plugins/vorbis/audiocd_vorbis_encoder.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=audiocd_vorbis_encoder.kcfg ClassName=Settings Singleton=true diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp b/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp index c5340434..048a46e0 100644 --- a/kioslave/audiocd/plugins/vorbis/encodervorbis.cpp +++ b/tdeioslave/audiocd/plugins/vorbis/encodervorbis.cpp @@ -31,7 +31,7 @@ #include <vorbis/vorbisenc.h> #include <time.h> #include <stdlib.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <knuminput.h> #include <tqgroupbox.h> diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbis.h b/tdeioslave/audiocd/plugins/vorbis/encodervorbis.h index ea6a0ac3..ea6a0ac3 100644 --- a/kioslave/audiocd/plugins/vorbis/encodervorbis.h +++ b/tdeioslave/audiocd/plugins/vorbis/encodervorbis.h diff --git a/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui b/tdeioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui index e442ade2..e442ade2 100644 --- a/kioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui +++ b/tdeioslave/audiocd/plugins/vorbis/encodervorbisconfig.ui diff --git a/kioslave/audiocd/plugins/wav/Makefile.am b/tdeioslave/audiocd/plugins/wav/Makefile.am index 82e6ab28..82e6ab28 100644 --- a/kioslave/audiocd/plugins/wav/Makefile.am +++ b/tdeioslave/audiocd/plugins/wav/Makefile.am diff --git a/kioslave/audiocd/plugins/wav/encodercda.cpp b/tdeioslave/audiocd/plugins/wav/encodercda.cpp index ef8522d9..ef8522d9 100644 --- a/kioslave/audiocd/plugins/wav/encodercda.cpp +++ b/tdeioslave/audiocd/plugins/wav/encodercda.cpp diff --git a/kioslave/audiocd/plugins/wav/encodercda.h b/tdeioslave/audiocd/plugins/wav/encodercda.h index bb1297c7..bb1297c7 100644 --- a/kioslave/audiocd/plugins/wav/encodercda.h +++ b/tdeioslave/audiocd/plugins/wav/encodercda.h diff --git a/kioslave/audiocd/plugins/wav/encoderwav.cpp b/tdeioslave/audiocd/plugins/wav/encoderwav.cpp index 84a8586b..84a8586b 100644 --- a/kioslave/audiocd/plugins/wav/encoderwav.cpp +++ b/tdeioslave/audiocd/plugins/wav/encoderwav.cpp diff --git a/kioslave/audiocd/plugins/wav/encoderwav.h b/tdeioslave/audiocd/plugins/wav/encoderwav.h index 154236f2..154236f2 100644 --- a/kioslave/audiocd/plugins/wav/encoderwav.h +++ b/tdeioslave/audiocd/plugins/wav/encoderwav.h diff --git a/kioslave/audiocd/upgrade-metadata.sh b/tdeioslave/audiocd/upgrade-metadata.sh index 000323b1..000323b1 100755 --- a/kioslave/audiocd/upgrade-metadata.sh +++ b/tdeioslave/audiocd/upgrade-metadata.sh diff --git a/tdemid/channel.cpp b/tdemid/channel.cpp index 97fc5133..c97ea5c9 100644 --- a/tdemid/channel.cpp +++ b/tdemid/channel.cpp @@ -30,7 +30,7 @@ #include <kglobal.h> #include <kinstance.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kstandarddirs.h> #include "tdemidbutton.h" diff --git a/tdemid/channelview.cpp b/tdemid/channelview.cpp index bf1ebf55..d97fdee9 100644 --- a/tdemid/channelview.cpp +++ b/tdemid/channelview.cpp @@ -28,7 +28,7 @@ #include "channelview.h" #include "channel3d.h" #include "channel4d.h" -#include <kconfig.h> +#include <tdeconfig.h> ChannelView::ChannelView(void) : KMainWindow(0, "ChannelView") diff --git a/tdemid/collectdlg.cpp b/tdemid/collectdlg.cpp index 20ac8def..0e4a84fe 100644 --- a/tdemid/collectdlg.cpp +++ b/tdemid/collectdlg.cpp @@ -26,7 +26,7 @@ #include <tqlabel.h> #include <kapplication.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <klocale.h> #include <kinputdialog.h> #include <kmessagebox.h> diff --git a/tdemid/kdisptext.cpp b/tdemid/kdisptext.cpp index edaede4a..3152a277 100644 --- a/tdemid/kdisptext.cpp +++ b/tdemid/kdisptext.cpp @@ -28,7 +28,7 @@ #include <tqrect.h> #include <tqtextcodec.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <kglobalsettings.h> #include <kinstance.h> diff --git a/tdemid/main.cpp b/tdemid/main.cpp index a35647e0..77a09e73 100644 --- a/tdemid/main.cpp +++ b/tdemid/main.cpp @@ -30,7 +30,7 @@ #include <kapplication.h> #include <klocale.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kcmdlineargs.h> #include <kaboutdata.h> diff --git a/tdemid/midicfgdlg.cpp b/tdemid/midicfgdlg.cpp index 46577c28..3724abcf 100644 --- a/tdemid/midicfgdlg.cpp +++ b/tdemid/midicfgdlg.cpp @@ -27,7 +27,7 @@ #include <tqlayout.h> #include <kapplication.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <klocale.h> #include <libtdemid/deviceman.h> diff --git a/tdemid/tdemidclient.cpp b/tdemid/tdemidclient.cpp index ba85e438..07edf700 100644 --- a/tdemid/tdemidclient.cpp +++ b/tdemid/tdemidclient.cpp @@ -39,7 +39,7 @@ #include <kapplication.h> #include <kcharsets.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include <klocale.h> #include <kmessagebox.h> @@ -79,11 +79,11 @@ tdemidClient::tdemidClient(TQWidget *parent, KActionCollection *ac, const char * noteArray=0L; shuttingdown=false; - TDEConfig *kconf=TDEGlobal::instance()->config(); + TDEConfig *tdeconf=TDEGlobal::instance()->config(); - kconf->setGroup("KMid"); + tdeconf->setGroup("KMid"); TQString tmp2 = locateLocal("appdata", "collections"); - collectionsfile=kconf->readPathEntry("CollectionsFile",tmp2); + collectionsfile=tdeconf->readPathEntry("CollectionsFile",tmp2); slman=new SLManager(); slman->loadConfig(TQFile::encodeName(collectionsfile)); currentsl=NULL; @@ -174,16 +174,16 @@ tdemidClient::tdemidClient(TQWidget *parent, KActionCollection *ac, const char * } - kconf->setGroup("KMid"); - int mididev=kconf->readNumEntry("MidiPortNumber",-1); + tdeconf->setGroup("KMid"); + int mididev=tdeconf->readNumEntry("MidiPortNumber",-1); midi = new DeviceManager(mididev); midi->initManager(); m_kMid.midi=midi; player= new MidiPlayer(midi,m_kMid.pctl); - kconf->setGroup("Midimapper"); - TQCString qs=TQFile::encodeName(kconf->readPathEntry("Loadfile","gm.map")); + tdeconf->setGroup("Midimapper"); + TQCString qs=TQFile::encodeName(tdeconf->readPathEntry("Loadfile","gm.map")); #ifdef KMidDEBUG printf("Read Config file: %s\n",qs.data()); @@ -191,8 +191,8 @@ tdemidClient::tdemidClient(TQWidget *parent, KActionCollection *ac, const char * setMidiMapFilename(qs.data()); initializing_songs=1; - kconf->setGroup("KMid"); - setActiveCollection(kconf->readNumEntry("ActiveCollection",0)); + tdeconf->setGroup("KMid"); + setActiveCollection(tdeconf->readNumEntry("ActiveCollection",0)); initializing_songs=0; TQVBoxLayout *lv=new TQVBoxLayout( this ); @@ -1208,10 +1208,10 @@ void tdemidClient::setSLManager(SLManager *slm) void tdemidClient::setActiveCollection(int i) { activecollection=i; - TDEConfig *kconf=TDEGlobal::instance()->config(); + TDEConfig *tdeconf=TDEGlobal::instance()->config(); - kconf->setGroup("KMid"); - kconf->writeEntry("ActiveCollection",activecollection); + tdeconf->setGroup("KMid"); + tdeconf->writeEntry("ActiveCollection",activecollection); currentsl=slman->getCollection(activecollection); generateCPL(); initializing_songs=1; diff --git a/tdemid/tdemidclient.h b/tdemid/tdemidclient.h index 526b0656..5a6ee79b 100644 --- a/tdemid/tdemidclient.h +++ b/tdemid/tdemidclient.h @@ -38,7 +38,7 @@ #include "version.h" #include "tdemidIface.h" -#include <kio/job.h> +#include <tdeio/job.h> class DeviceManager; diff --git a/tdemid/tdemidframe.cpp b/tdemid/tdemidframe.cpp index cbadbc73..edcfbfe0 100644 --- a/tdemid/tdemidframe.cpp +++ b/tdemid/tdemidframe.cpp @@ -33,9 +33,9 @@ #include <kaccel.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kcmdlineargs.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kfontdialog.h> #include <kglobal.h> #include <kiconloader.h> diff --git a/xine_artsplugin/tools/thumbnail/videocreator.h b/xine_artsplugin/tools/thumbnail/videocreator.h index 2f2236bc..439b9cf4 100644 --- a/xine_artsplugin/tools/thumbnail/videocreator.h +++ b/xine_artsplugin/tools/thumbnail/videocreator.h @@ -20,7 +20,7 @@ #ifndef _VIDEOCREATOR_H_ #define _VIDEOCREATOR_H_ "$Id$" -#include <kio/thumbcreator.h> +#include <tdeio/thumbcreator.h> class VideoCreator : public TQObject, public ThumbCreator { |