From 1859432c9417b0ad9a86fd15c28307680e0d3ea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 20:02:39 +0200 Subject: Additional k => tde renaming and fixes --- CMakeLists.txt | 2 +- arts/builder/Makefile.am | 2 +- arts/gui/kde/Makefile.am | 6 +-- arts/gui/kde/tdepopupbox_impl.h | 4 +- arts/gui/kde/tdepopupbox_private.h | 4 +- arts/tools/Makefile.am | 2 +- juk/Makefile.am | 6 +-- juk/covericonview.h | 2 +- juk/mediafiles.h | 2 +- juk/webimagefetcherdialog.cpp | 2 +- kaboodle/Makefile.am | 10 ++--- kaudiocreator/Makefile.am | 6 +-- kaudiocreator/ripper.cpp | 2 +- kmix/CMakeLists.txt | 4 +- kmix/Makefile.am | 4 +- krec/Makefile.am | 18 ++++----- kscd/Makefile.am | 4 +- kscd/kscdmagic/Makefile.am | 2 +- libkcddb/Makefile.am | 2 +- noatun/Makefile.am | 2 +- noatun/library/playlistsaver.cpp | 2 +- noatun/modules/kjofol-skin/Makefile.am | 2 +- noatun/modules/kjofol-skin/kjprefs.h | 4 +- noatun/modules/metatag/Makefile.am | 2 +- noatun/modules/splitplaylist/Makefile.am | 2 +- tdefile-plugins/au/Makefile.am | 4 +- tdefile-plugins/avi/Makefile.am | 4 +- tdefile-plugins/flac/Makefile.am | 4 +- tdefile-plugins/m3u/Makefile.am | 4 +- tdefile-plugins/m3u/tdefile_m3u.h | 4 +- tdefile-plugins/mp3/Makefile.am | 4 +- tdefile-plugins/mpc/Makefile.am | 4 +- tdefile-plugins/mpeg/Makefile.am | 4 +- tdefile-plugins/ogg/Makefile.am | 4 +- tdefile-plugins/sid/Makefile.am | 4 +- tdefile-plugins/theora/Makefile.am | 4 +- tdefile-plugins/wav/Makefile.am | 4 +- tdeioslave/audiocd/Makefile.am | 2 +- tdeioslave/audiocd/audiocd.h | 2 +- tdeioslave/audiocd/plugins/flac/Makefile.am | 2 +- tdeioslave/audiocd/plugins/lame/Makefile.am | 2 +- tdeioslave/audiocd/plugins/vorbis/Makefile.am | 2 +- tdeioslave/audiocd/plugins/wav/Makefile.am | 2 +- tdemid/Makefile.am | 4 +- tdemid/tdemidIface.h | 4 +- tdemid/tdemid_part.h | 4 +- tdemid/tdemidclient.cpp | 54 +++++++++++++-------------- tdemid/tdemidclient.h | 6 +-- tdemid/tdemidframe.h | 6 +-- tdemid/version.h | 2 +- 50 files changed, 119 insertions(+), 119 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cf1cbcb3..4784bf88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,7 +72,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" ) ##### activate dependencies ##################### -##### kdemultimedia directories ######################## +##### tdemultimedia directories ######################## tde_conditional_add_subdirectory( BUILD_KMIX kmix ) diff --git a/arts/builder/Makefile.am b/arts/builder/Makefile.am index b16ccc39..f65fd426 100644 --- a/arts/builder/Makefile.am +++ b/arts/builder/Makefile.am @@ -21,7 +21,7 @@ noinst_HEADERS = qttableview.h METASOURCES = AUTO -artsbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl +artsbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. diff --git a/arts/gui/kde/Makefile.am b/arts/gui/kde/Makefile.am index c61e1db3..33b8f582 100644 --- a/arts/gui/kde/Makefile.am +++ b/arts/gui/kde/Makefile.am @@ -15,7 +15,7 @@ libartsgui_kde_la_SOURCES = kwidget_impl.cpp kbutton_impl.cpp \ klevelmeter_normalbars.cpp klevelmeter_firebars.cpp \ ktickmarks_impl.cpp kvolumefader_impl.cpp klabel_impl.cpp -libartsgui_kde_la_LIBADD = $(LIB_KIO) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_QT) -ltdefx \ +libartsgui_kde_la_LIBADD = $(LIB_TDEIO) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_QT) -ltdefx \ $(top_builddir)/arts/gui/common/libartsgui_idl.la libartsgui_kde_la_LDFLAGS = $(all_libraries) -no-undefined libartsgui_kde_la_COMPILE_FIRST = ../common/artsgui.h @@ -23,12 +23,12 @@ libartsgui_kde_la_COMPILE_FIRST = ../common/artsgui.h artstestgui_SOURCES = artstestgui.cpp artstestgui_LDADD = -lqtmcop -ltdecore -lartsflow \ $(top_builddir)/arts/gui/common/libartsgui_idl.la -artstestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +artstestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor dbtest_SOURCES = dbtest.cpp dbtest_LDADD = -lqtmcop -ltdecore -lartsflow \ $(top_builddir)/arts/gui/kde/libartsgui_kde.la -dbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +dbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libartsgui_kde_la_METASOURCES = AUTO diff --git a/arts/gui/kde/tdepopupbox_impl.h b/arts/gui/kde/tdepopupbox_impl.h index 0cd44a4e..8ca718f1 100644 --- a/arts/gui/kde/tdepopupbox_impl.h +++ b/arts/gui/kde/tdepopupbox_impl.h @@ -19,8 +19,8 @@ */ -#ifndef KPOPUPBOX_IMPL_H -#define KPOPUPBOX_IMPL_H +#ifndef TDEPOPUPBOX_IMPL_H +#define TDEPOPUPBOX_IMPL_H #include #include diff --git a/arts/gui/kde/tdepopupbox_private.h b/arts/gui/kde/tdepopupbox_private.h index 9e22ae15..d4efee65 100644 --- a/arts/gui/kde/tdepopupbox_private.h +++ b/arts/gui/kde/tdepopupbox_private.h @@ -19,8 +19,8 @@ */ -#ifndef KPOPUPBOX_PRIVATE_H -#define KPOPUPBOX_PRIVATE_H +#ifndef TDEPOPUPBOX_PRIVATE_H +#define TDEPOPUPBOX_PRIVATE_H class HandleDrag; diff --git a/arts/tools/Makefile.am b/arts/tools/Makefile.am index 7d21a23a..49b9055d 100644 --- a/arts/tools/Makefile.am +++ b/arts/tools/Makefile.am @@ -59,7 +59,7 @@ bin_PROGRAMS = artscontrol artscontrol_SOURCES = main.cpp levelmeters.cpp artscontrol_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lartsflow -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) artscontrol_LDADD = libartscontrolsupport.la \ - $(LIB_TDEUI) $(LIB_KSYCOCA) $(LIB_TDEFILE) \ + $(LIB_TDEUI) $(LIB_TDESYCOCA) $(LIB_TDEFILE) \ -lqtmcop -lartsflow -lartsflow_idl -lsoundserver_idl -lartskde -lmcop -lartsflow_idl -L../gui/common -lartsgui_idl -L../gui/kde -lartsgui_kde -L../midi -lartsmidi -lartsmidi_idl -L../modules/effects -lartsmoduleseffects -L../modules/synth -lartsmodulessynth -L../modules/common -lartsmodulescommon $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) xdg_apps_DATA = artscontrol.desktop diff --git a/juk/Makefile.am b/juk/Makefile.am index 5618e68a..678e34fd 100644 --- a/juk/Makefile.am +++ b/juk/Makefile.am @@ -84,13 +84,13 @@ mblibs = -ltunepimp endif ################################################## -juk_LDADD = -lm $(LDADD_GST) $(mblibs) $(LIB_KIO) $(taglib_libs) $(akode_libs) $(LIB_TDEHTML) $(LIB_ARTS) -juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl $(akode_libs) +juk_LDADD = -lm $(LDADD_GST) $(mblibs) $(LIB_TDEIO) $(taglib_libs) $(akode_libs) $(LIB_TDEHTML) $(LIB_ARTS) +juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl $(akode_libs) KDE_CXXFLAGS = $(USE_EXCEPTIONS) tagguessertest_LDADD = $(LIB_TDECORE) -tagguessertest_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl +tagguessertest_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl SUBDIRS = pics diff --git a/juk/covericonview.h b/juk/covericonview.h index cab60b58..4fab390b 100644 --- a/juk/covericonview.h +++ b/juk/covericonview.h @@ -22,7 +22,7 @@ // The WebImageFetcher dialog also has a class named CoverIconViewItem and I // don't like the idea of naming it "CoverIVI" or something, so just namespace -// it out. I would merge them except for webimagefetcher's dependence on KIO +// it out. I would merge them except for webimagefetcher's dependence on TDEIO // and such. namespace CoverUtility { diff --git a/juk/mediafiles.h b/juk/mediafiles.h index 342739e7..0b5c87a1 100644 --- a/juk/mediafiles.h +++ b/juk/mediafiles.h @@ -80,7 +80,7 @@ namespace MediaFiles * from the result (so result.size() may be < urlList.size()). * * @param urlList list of file names or URLs to convert. - * @param w KIO may need the widget to handle user interaction. + * @param w TDEIO may need the widget to handle user interaction. * @return list of all local files in urlList, converted to absolute paths. */ TQStringList convertURLsToLocal(const TQStringList &urlList, TQWidget *w = 0); diff --git a/juk/webimagefetcherdialog.cpp b/juk/webimagefetcherdialog.cpp index 17fe44e3..5fd110d8 100644 --- a/juk/webimagefetcherdialog.cpp +++ b/juk/webimagefetcherdialog.cpp @@ -207,7 +207,7 @@ CoverIconViewItem::~CoverIconViewItem() if(m_job) { m_job->kill(); - // Drain results issued by KIO before being deleted, + // Drain results issued by TDEIO before being deleted, // and before deleting the job. kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); diff --git a/kaboodle/Makefile.am b/kaboodle/Makefile.am index 88177b35..7ebea042 100644 --- a/kaboodle/Makefile.am +++ b/kaboodle/Makefile.am @@ -12,11 +12,11 @@ libkaboodle_noinst_la_SOURCES = conf.cpp \ view.cpp \ kaboodle_factory.cpp -libs = $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde -ltdemediaplayer +libs = $(LIB_TDEPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde -ltdemediaplayer libkaboodlepart_la_SOURCES = dummy.cpp -libkaboodlepart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -libkaboodlepart_la_LIBADD = libkaboodle_noinst.la $(libs) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl +libkaboodlepart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl +libkaboodlepart_la_LIBADD = libkaboodle_noinst.la $(libs) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl kaboodle_SOURCES = main.cpp \ kaboodleapp.cpp \ @@ -27,8 +27,8 @@ dummy.cpp: CLEANFILES = dummy.cpp -kaboodle_LDADD = libkaboodle_noinst.la $(libs) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl +kaboodle_LDADD = libkaboodle_noinst.la $(libs) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl +kaboodle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl bin_PROGRAMS = kaboodle diff --git a/kaudiocreator/Makefile.am b/kaudiocreator/Makefile.am index 1f926de6..7248558b 100644 --- a/kaudiocreator/Makefile.am +++ b/kaudiocreator/Makefile.am @@ -12,15 +12,15 @@ kaudiocreator_SOURCES = main.cpp kaudiocreator.cpp encoder.cpp \ EXTRA_DIST = encoder.h kaudiocreator.h kaudiocreator.desktop encoderconfigimp.h \ obqueimp.h ripper.h tracksimp.h encodefileimp.h -kaudiocreator_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltdeutils $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kaudiocreator_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltdeutils $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/kaudiocreator.pot -kaudiocreator_LDADD = $(LIB_KIO) $(top_builddir)/libkcddb/libkcddb.la \ - $(top_builddir)/kscd/libkcompactdisc.la $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kaudiocreator_LDADD = $(LIB_TDEIO) $(top_builddir)/libkcddb/libkcddb.la \ + $(top_builddir)/kscd/libkcompactdisc.la $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor KDE_ICON = AUTO diff --git a/kaudiocreator/ripper.cpp b/kaudiocreator/ripper.cpp index 89db60f1..657d21b2 100644 --- a/kaudiocreator/ripper.cpp +++ b/kaudiocreator/ripper.cpp @@ -191,7 +191,7 @@ void Ripper::tendToNewJobs(){ } /** - * Copies the data from the KIO Job. Uses this data to fill in the + * Copies the data from the TDEIO Job. Uses this data to fill in the * information dialog. * @param copyjob the IO job to copy from */ diff --git a/kmix/CMakeLists.txt b/kmix/CMakeLists.txt index 237c95d4..08006206 100644 --- a/kmix/CMakeLists.txt +++ b/kmix/CMakeLists.txt @@ -48,7 +48,7 @@ tde_add_kpart( kmix_panelapplet AUTOMOC ) -##### kmix (kdeinit) ############################ +##### kmix (tdeinit) ############################ tde_add_tdeinit_executable( kmix AUTOMOC SOURCES @@ -65,7 +65,7 @@ tde_add_tdeinit_executable( kmix AUTOMOC ) -##### kmixctrl (kdeinit) ######################## +##### kmixctrl (tdeinit) ######################## tde_add_tdeinit_executable( kmixctrl AUTOMOC SOURCES diff --git a/kmix/Makefile.am b/kmix/Makefile.am index 737deec8..c7ec461c 100644 --- a/kmix/Makefile.am +++ b/kmix/Makefile.am @@ -25,7 +25,7 @@ kmix_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \ volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel \ kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp -kmix_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_QT) $(LIB_TDECORE) -lDCOP +kmix_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) $(LIB_QT) $(LIB_TDECORE) -lDCOP kmix_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -avoid-version kmixctrl_la_SOURCES = kmixctrl.cpp mixer.cpp mixset.cpp mixdevice.cpp volume.cpp mixerIface.skel \ @@ -42,7 +42,7 @@ kmix_panelapplet_la_SOURCES = kmixapplet.cpp \ kmixtoolbox.cpp mixertoolbox.cpp dialogselectmaster.cpp kmix_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kmix_panelapplet_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) +kmix_panelapplet_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEUTILS) $(LIBALIB) $(LIBOSSAUDIO) $(LIBASOUND) xdg_apps_DATA = kmix.desktop diff --git a/krec/Makefile.am b/krec/Makefile.am index 87c36f78..f45884c9 100644 --- a/krec/Makefile.am +++ b/krec/Makefile.am @@ -42,34 +42,34 @@ krec_la_SOURCES = \ main.cpp \ krecord.cpp -krec_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects +krec_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects krec_la_LIBADD = \ lib_krec_common.la \ $(top_builddir)/arts/gui/kde/libartsgui_kde.la \ $(top_builddir)/arts/tools/libartscontrolsupport.la \ - -lartskde $(LIBDL) $(LIB_KIO) $(LIB_TDEUI) $(LIB_KUTILS) + -lartskde $(LIBDL) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDEUTILS) kcm_krec_la_SOURCES = krecconfigure.cpp -kcm_krec_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects +kcm_krec_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects -kcm_krec_la_LIBADD = lib_krec_common.la $(LIB_KUTILS) +kcm_krec_la_LIBADD = lib_krec_common.la $(LIB_TDEUTILS) kcm_krec_files_la_SOURCES = krecconfig_files.cpp -kcm_krec_files_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects +kcm_krec_files_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects -kcm_krec_files_la_LIBADD = lib_krec_common.la $(LIB_KUTILS) +kcm_krec_files_la_LIBADD = lib_krec_common.la $(LIB_TDEUTILS) lib_krec_common_la_SOURCES = \ krecglobal.cpp \ krecexport_template.cpp \ krecconfig_fileswidget.cpp -lib_krec_common_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects +lib_krec_common_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects -lib_krec_common_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) +lib_krec_common_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEIO) libkrecexport_wave_la_SOURCES = krecexport_wave.cpp -libkrecexport_wave_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects +libkrecexport_wave_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl -L../arts/modules/effects -lartsmoduleseffects libkrecexport_wave_la_LIBADD = lib_krec_common.la diff --git a/kscd/Makefile.am b/kscd/Makefile.am index 952aae9a..3e37fb52 100644 --- a/kscd/Makefile.am +++ b/kscd/Makefile.am @@ -23,9 +23,9 @@ libkcompactdisc_la_LDFLAGS = $(all_libraries) -lpthread kde_kcfg_DATA = kscd.kcfg -kscd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kscd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kscd_LDADD = $(LIBCDROM) $(LIBCDAUDIO) \ - $(LIBFPE) $(LIB_KIO) -ltdeutils $(top_builddir)/libkcddb/libkcddb.la \ + $(LIBFPE) $(LIB_TDEIO) -ltdeutils $(top_builddir)/libkcddb/libkcddb.la \ libkcompactdisc.la -lpthread profiledata_DATA = kscd.profile.xml diff --git a/kscd/kscdmagic/Makefile.am b/kscd/kscdmagic/Makefile.am index cf24f2bf..49e27709 100644 --- a/kscd/kscdmagic/Makefile.am +++ b/kscd/kscdmagic/Makefile.am @@ -26,7 +26,7 @@ bin_PROGRAMS = kscdmagic kscdmagic_SOURCES = core.cpp main.cpp sound.cpp xlibwrap.cpp xlib.c # the library search path. -kscdmagic_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kscdmagic_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. diff --git a/libkcddb/Makefile.am b/libkcddb/Makefile.am index a599befb..6b04f678 100644 --- a/libkcddb/Makefile.am +++ b/libkcddb/Makefile.am @@ -14,7 +14,7 @@ libkcddb_la_SOURCES = \ cdinfoencodingwidget.cpp cdinfoencodingwidgetbase.ui libkcddb_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -libkcddb_la_LIBADD = $(LIB_TDECORE) $(LIB_KIO) $(LIB_QT) $(LIB_TDEUI) +libkcddb_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_QT) $(LIB_TDEUI) METASOURCES = AUTO diff --git a/noatun/Makefile.am b/noatun/Makefile.am index 032bdf3d..5a3075ce 100644 --- a/noatun/Makefile.am +++ b/noatun/Makefile.am @@ -16,7 +16,7 @@ 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 +noatun20update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor noatun20update_LDADD = $(LIB_QT) messages: diff --git a/noatun/library/playlistsaver.cpp b/noatun/library/playlistsaver.cpp index 6a49f43f..13b7ecfe 100644 --- a/noatun/library/playlistsaver.cpp +++ b/noatun/library/playlistsaver.cpp @@ -482,7 +482,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/) if(!TDEIO::NetAccess::download(file, localFile, 0L)) return false; - // if it's a PLS, transfer control, again (KIO bug?) + // if it's a PLS, transfer control, again (TDEIO bug?) #if 0 { KSimpleConfig list(local, true); diff --git a/noatun/modules/kjofol-skin/Makefile.am b/noatun/modules/kjofol-skin/Makefile.am index ad139ffb..3cd595e1 100644 --- a/noatun/modules/kjofol-skin/Makefile.am +++ b/noatun/modules/kjofol-skin/Makefile.am @@ -24,7 +24,7 @@ noatun_kjofol_la_SOURCES = kjloader.cpp kjwidget.cpp kjbutton.cpp kjseeker.cpp \ noatun_kjofol_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined noatun_kjofol_la_LIBADD = $(LIB_TDEFILE) $(top_builddir)/noatun/library/libnoatun.la \ - $(LIB_KIO) -lm \ + $(LIB_TDEIO) -lm \ $(top_builddir)/arts/modules/libartsmodules.la noinst_HEADERS = kjloader.h kjwidget.h kjbutton.h kjseeker.h \ diff --git a/noatun/modules/kjofol-skin/kjprefs.h b/noatun/modules/kjofol-skin/kjprefs.h index e5181963..0226cfdd 100644 --- a/noatun/modules/kjofol-skin/kjprefs.h +++ b/noatun/modules/kjofol-skin/kjprefs.h @@ -70,8 +70,8 @@ public slots: // Show a preview of "skin" in mPixmap void showPreview(const TQString &skin); - // gets called after a KIO-action has finished - // KIO is used for installing/removing skins + // gets called after a TDEIO-action has finished + // TDEIO is used for installing/removing skins void slotResult(TDEIO::Job *job); signals: diff --git a/noatun/modules/metatag/Makefile.am b/noatun/modules/metatag/Makefile.am index 330e9f34..017118de 100644 --- a/noatun/modules/metatag/Makefile.am +++ b/noatun/modules/metatag/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = noatun_metatag.la noatun_metatag_la_SOURCES = metatag.cpp edit.cpp noatun_metatag_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_metatag_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_metatag_la_LIBADD = $(LIB_TDEIO) $(top_builddir)/noatun/library/libnoatun.la \ $(top_builddir)/noatun/library/noatuntags/libnoatuntags.la noatun_metatag_la_METASOURCES = AUTO diff --git a/noatun/modules/splitplaylist/Makefile.am b/noatun/modules/splitplaylist/Makefile.am index 4ea511ac..cd90950f 100644 --- a/noatun/modules/splitplaylist/Makefile.am +++ b/noatun/modules/splitplaylist/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = noatun_splitplaylist.la noatun_splitplaylist_la_SOURCES = splitplaylist.cpp playlist.cpp view.cpp find.cpp noatun_splitplaylist_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_splitplaylist_la_LIBADD = $(LIB_KIO) $(top_builddir)/noatun/library/libnoatun.la +noatun_splitplaylist_la_LIBADD = $(LIB_TDEIO) $(top_builddir)/noatun/library/libnoatun.la noatun_splitplaylist_la_METASOURCES = AUTO diff --git a/tdefile-plugins/au/Makefile.am b/tdefile-plugins/au/Makefile.am index 054c6181..da2be248 100644 --- a/tdefile-plugins/au/Makefile.am +++ b/tdefile-plugins/au/Makefile.am @@ -9,8 +9,8 @@ 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) +tdefile_au_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN) +tdefile_au_la_LIBADD = $(LIB_TDEIO) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdefile-plugins/avi/Makefile.am b/tdefile-plugins/avi/Makefile.am index 2ecbf411..b001c37c 100644 --- a/tdefile-plugins/avi/Makefile.am +++ b/tdefile-plugins/avi/Makefile.am @@ -9,8 +9,8 @@ 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) +tdefile_avi_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN) +tdefile_avi_la_LIBADD = $(LIB_TDEIO) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdefile-plugins/flac/Makefile.am b/tdefile-plugins/flac/Makefile.am index ddae9580..5438d8d4 100644 --- a/tdefile-plugins/flac/Makefile.am +++ b/tdefile-plugins/flac/Makefile.am @@ -9,8 +9,8 @@ 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) +tdefile_flac_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN) +tdefile_flac_la_LIBADD = $(LIB_TDEIO) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdefile-plugins/m3u/Makefile.am b/tdefile-plugins/m3u/Makefile.am index 11259cad..8564a522 100644 --- a/tdefile-plugins/m3u/Makefile.am +++ b/tdefile-plugins/m3u/Makefile.am @@ -9,8 +9,8 @@ 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) +tdefile_m3u_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN) +tdefile_m3u_la_LIBADD = $(LIB_TDESYCOCA) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdefile-plugins/m3u/tdefile_m3u.h b/tdefile-plugins/m3u/tdefile_m3u.h index afc46847..08a6c506 100644 --- a/tdefile-plugins/m3u/tdefile_m3u.h +++ b/tdefile-plugins/m3u/tdefile_m3u.h @@ -18,8 +18,8 @@ * $Id$ */ -#ifndef __KMIME_M3U_H__ -#define __KMIME_M3U_H__ +#ifndef __TDEFILE_M3U_H__ +#define __TDEFILE_M3U_H__ #include #include diff --git a/tdefile-plugins/mp3/Makefile.am b/tdefile-plugins/mp3/Makefile.am index 97fbe73d..44caf980 100644 --- a/tdefile-plugins/mp3/Makefile.am +++ b/tdefile-plugins/mp3/Makefile.am @@ -9,8 +9,8 @@ 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) +tdefile_mp3_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN) +tdefile_mp3_la_LIBADD = $(LIB_TDEIO) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdefile-plugins/mpc/Makefile.am b/tdefile-plugins/mpc/Makefile.am index 6c1cc840..92bc72be 100644 --- a/tdefile-plugins/mpc/Makefile.am +++ b/tdefile-plugins/mpc/Makefile.am @@ -9,8 +9,8 @@ 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) +tdefile_mpc_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(taglib_libs) -module $(KDE_PLUGIN) +tdefile_mpc_la_LIBADD = $(LIB_TDEIO) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdefile-plugins/mpeg/Makefile.am b/tdefile-plugins/mpeg/Makefile.am index 63fd9460..86809749 100644 --- a/tdefile-plugins/mpeg/Makefile.am +++ b/tdefile-plugins/mpeg/Makefile.am @@ -9,8 +9,8 @@ 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) +tdefile_mpeg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN) +tdefile_mpeg_la_LIBADD = $(LIB_TDEIO) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdefile-plugins/ogg/Makefile.am b/tdefile-plugins/ogg/Makefile.am index a6590beb..d70431a7 100644 --- a/tdefile-plugins/ogg/Makefile.am +++ b/tdefile-plugins/ogg/Makefile.am @@ -9,8 +9,8 @@ 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 +tdefile_ogg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN) +tdefile_ogg_la_LIBADD = $(LIB_TDEIO) -logg -lvorbis -lvorbisfile # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdefile-plugins/sid/Makefile.am b/tdefile-plugins/sid/Makefile.am index 56bfa54f..df104819 100644 --- a/tdefile-plugins/sid/Makefile.am +++ b/tdefile-plugins/sid/Makefile.am @@ -9,8 +9,8 @@ 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) +tdefile_sid_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN) +tdefile_sid_la_LIBADD = $(LIB_TDEIO) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdefile-plugins/theora/Makefile.am b/tdefile-plugins/theora/Makefile.am index c44a102d..aa33481a 100644 --- a/tdefile-plugins/theora/Makefile.am +++ b/tdefile-plugins/theora/Makefile.am @@ -9,8 +9,8 @@ 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 +tdefile_theora_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN) +tdefile_theora_la_LIBADD = $(LIB_TDEIO) -logg -lvorbis -ltheora # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdefile-plugins/wav/Makefile.am b/tdefile-plugins/wav/Makefile.am index f755f395..b194ba6b 100644 --- a/tdefile-plugins/wav/Makefile.am +++ b/tdefile-plugins/wav/Makefile.am @@ -9,8 +9,8 @@ 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) +tdefile_wav_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN) +tdefile_wav_la_LIBADD = $(LIB_TDEIO) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdeioslave/audiocd/Makefile.am b/tdeioslave/audiocd/Makefile.am index 980cd6c9..765dbcab 100644 --- a/tdeioslave/audiocd/Makefile.am +++ b/tdeioslave/audiocd/Makefile.am @@ -16,7 +16,7 @@ tdeio_audiocd_la_SOURCES = audiocd.cpp tdeio_audiocd_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -tdeio_audiocd_la_LIBADD = ./plugins/libaudiocdplugins.la $(LIB_KIO) $(CDPARANOIA_LIBS) $(top_builddir)/libkcddb/libkcddb.la $(top_builddir)/kscd/libkcompactdisc.la +tdeio_audiocd_la_LIBADD = ./plugins/libaudiocdplugins.la $(LIB_TDEIO) $(CDPARANOIA_LIBS) $(top_builddir)/libkcddb/libkcddb.la $(top_builddir)/kscd/libkcompactdisc.la noinst_HEADERS = audiocd.h diff --git a/tdeioslave/audiocd/audiocd.h b/tdeioslave/audiocd/audiocd.h index be805376..9f5d7f34 100644 --- a/tdeioslave/audiocd/audiocd.h +++ b/tdeioslave/audiocd/audiocd.h @@ -90,7 +90,7 @@ class AudioCDProtocol : public TDEIO::SlaveBase uint discid(struct cdrom_drive *); /** - * Add an entry in the KIO directory, using the title you give, + * Add an entry in the TDEIO directory, using the title you give, * it will set the extension itself depending on the fileType. * You must also give the trackNumber for the size of the file * to be calculated. diff --git a/tdeioslave/audiocd/plugins/flac/Makefile.am b/tdeioslave/audiocd/plugins/flac/Makefile.am index 4e693c53..6c261a4e 100644 --- a/tdeioslave/audiocd/plugins/flac/Makefile.am +++ b/tdeioslave/audiocd/plugins/flac/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libaudiocd_encoder_flac.la libaudiocd_encoder_flac_la_SOURCES = encoderflac.cpp -libaudiocd_encoder_flac_la_LIBADD = $(LIBFLAC) $(LIB_KIO) ../libaudiocdplugins.la +libaudiocd_encoder_flac_la_LIBADD = $(LIBFLAC) $(LIB_TDEIO) ../libaudiocdplugins.la libaudiocd_encoder_flac_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) diff --git a/tdeioslave/audiocd/plugins/lame/Makefile.am b/tdeioslave/audiocd/plugins/lame/Makefile.am index 49ddddd9..2b7de511 100644 --- a/tdeioslave/audiocd/plugins/lame/Makefile.am +++ b/tdeioslave/audiocd/plugins/lame/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = libaudiocd_encoder_lame.la libaudiocd_encoder_lame_la_SOURCES = audiocd_lame_encoder.kcfgc encoderlame.cpp encoderlameconfig.ui collectingprocess.cpp -libaudiocd_encoder_lame_la_LIBADD = $(LIB_KIO) ../libaudiocdplugins.la +libaudiocd_encoder_lame_la_LIBADD = $(LIB_TDEIO) ../libaudiocdplugins.la libaudiocd_encoder_lame_la_LDFLAGS = -avoid-version -module -no-undefined $(taglib_libs) $(all_libraries) diff --git a/tdeioslave/audiocd/plugins/vorbis/Makefile.am b/tdeioslave/audiocd/plugins/vorbis/Makefile.am index e83240ff..a866fd44 100644 --- a/tdeioslave/audiocd/plugins/vorbis/Makefile.am +++ b/tdeioslave/audiocd/plugins/vorbis/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = libaudiocd_encoder_vorbis.la libaudiocd_encoder_vorbis_la_SOURCES = audiocd_vorbis_encoder.kcfgc encodervorbis.cpp encodervorbisconfig.ui -libaudiocd_encoder_vorbis_la_LIBADD = $(VORBIS_LIBS) $(VORBISFILE_LIBS) $(VORBISENC_LIBS) $(LIB_KIO) ../libaudiocdplugins.la +libaudiocd_encoder_vorbis_la_LIBADD = $(VORBIS_LIBS) $(VORBISFILE_LIBS) $(VORBISENC_LIBS) $(LIB_TDEIO) ../libaudiocdplugins.la libaudiocd_encoder_vorbis_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) diff --git a/tdeioslave/audiocd/plugins/wav/Makefile.am b/tdeioslave/audiocd/plugins/wav/Makefile.am index 82e6ab28..b1aa1733 100644 --- a/tdeioslave/audiocd/plugins/wav/Makefile.am +++ b/tdeioslave/audiocd/plugins/wav/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = libaudiocd_encoder_wav.la libaudiocd_encoder_wav_la_SOURCES = encoderwav.cpp encodercda.cpp -libaudiocd_encoder_wav_la_LIBADD = $(LIB_KIO) ../libaudiocdplugins.la $(CDPARANOIA_LIBS) +libaudiocd_encoder_wav_la_LIBADD = $(LIB_TDEIO) ../libaudiocdplugins.la $(CDPARANOIA_LIBS) libaudiocd_encoder_wav_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) diff --git a/tdemid/Makefile.am b/tdemid/Makefile.am index 5984d23e..fe5b2b3a 100644 --- a/tdemid/Makefile.am +++ b/tdemid/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libtdemidpart.la lib_LTLIBRARIES = libtdemidlib.la libtdemidlib_la_LDFLAGS = $(all_libraries) -libtdemidlib_la_LIBADD = $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_KIO) -ltdemid $(LIB_QT) $(LIB_TDEUI) -lDCOP $(LIB_TDECORE) +libtdemidlib_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TDEIO) -ltdemid $(LIB_QT) $(LIB_TDEUI) -lDCOP $(LIB_TDECORE) libtdemidpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module libtdemidpart_la_LIBADD = libtdemidlib.la @@ -28,7 +28,7 @@ noinst_HEADERS = tdemidframe.h tdemidclient.h kdisptext.h \ channelcfgdlg.h instrname.h rhythmview.h \ songlist.h slman.h tdemid_part.h -tdemid_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +tdemid_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor tdemid_SOURCES = main.cpp tdemid_LDADD = libtdemidlib.la diff --git a/tdemid/tdemidIface.h b/tdemid/tdemidIface.h index 8bba2575..f9ad207f 100644 --- a/tdemid/tdemidIface.h +++ b/tdemid/tdemidIface.h @@ -1,5 +1,5 @@ -#ifndef _KMIDIFACE_H_ -#define _KMIDIFACE_H_ +#ifndef _TDEMIDIFACE_H_ +#define _TDEMIDIFACE_H_ #include diff --git a/tdemid/tdemid_part.h b/tdemid/tdemid_part.h index e2f07af1..d15a341e 100644 --- a/tdemid/tdemid_part.h +++ b/tdemid/tdemid_part.h @@ -1,5 +1,5 @@ -#ifndef __KMIDPART_H__ -#define __KMIDPART_H__ +#ifndef __TDEMIDPART_H__ +#define __TDEMIDPART_H__ #include #include diff --git a/tdemid/tdemidclient.cpp b/tdemid/tdemidclient.cpp index fa59e749..b05411bc 100644 --- a/tdemid/tdemidclient.cpp +++ b/tdemid/tdemidclient.cpp @@ -185,7 +185,7 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char tdeconf->setGroup("Midimapper"); TQCString qs=TQFile::encodeName(tdeconf->readPathEntry("Loadfile","gm.map")); -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("Read Config file: %s\n",qs.data()); #endif setMidiMapFilename(qs.data()); @@ -321,7 +321,7 @@ int tdemidClient::openFile(const char *filename) if (midifile_opened) delete midifile_opened; midifile_opened=new char[strlen(filename)+1]; strcpy(midifile_opened,filename); -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("TOTAL TIME: %g milliseconds\n",player->information()->millisecsTotal); #endif // noteArray=player->parseNotes(); @@ -530,7 +530,7 @@ void tdemidClient::slotPlay() m_kMid.pctl->error=0; m_kMid.pctl->SPEVplayed=0; m_kMid.pctl->SPEVprocessed=0; -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG passcount=0; #endif noteArray->iteratorBegin(); @@ -538,11 +538,11 @@ void tdemidClient::slotPlay() TQApplication::flushX(); if ((m_kMid.pid=fork())==0) { -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("PlayerProcessID: %d\n",getpid()); #endif player->play(0,(void (*)(void))tdemidOutput); -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("End of child process\n"); #endif _exit(0); @@ -551,7 +551,7 @@ void tdemidClient::slotPlay() spev=player->specialEvents(); -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("writing SPEV\n"); player->debugSpecialEvents(); printf("writing SPEV(END)\n"); @@ -569,7 +569,7 @@ void tdemidClient::slotPlay() timer4timebar->start(1000); -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("PlayerProcess: %d . ParentProcessID: %d\n",m_kMid.pid,getpid()); printf("******************************-\n"); #endif @@ -620,7 +620,7 @@ void tdemidClient::slotSeek(int i) if (m_kMid.pid!=0) { kill(m_kMid.pid,SIGTERM); -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("Waiting for Process %d to be killed\n",m_kMid.pid); #endif waitpid(m_kMid.pid, NULL, 0); @@ -630,7 +630,7 @@ void tdemidClient::slotSeek(int i) allNotesOff(); -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("change Time: %d\n",i); #endif @@ -648,13 +648,13 @@ void tdemidClient::slotSeek(int i) TQApplication::flushX(); if ((m_kMid.pid=fork())==0) { -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("Player_ProcessID: %d\n",getpid()); #endif player->play(0,(void (*)(void))tdemidOutput); -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("End of child process\n"); #endif _exit(0); @@ -687,7 +687,7 @@ void tdemidClient::slotSeek(int i) void tdemidClient::moveEventPointersTo(ulong ms) { -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("Move To: %lu\n",ms); #endif spev=player->specialEvents(); @@ -812,7 +812,7 @@ void tdemidClient::slotNextSong() int r; while ((r=1+(int) ((double)(currentsl->NumberOfSongs())*rand()/(RAND_MAX+1.0)))==currentsl->getActiveSongID()) ; - #ifdef KMidDEBUG + #ifdef TDEMidDEBUG printf("random number:%d\n",r); #endif currentsl->setActiveSong(r); @@ -838,7 +838,7 @@ void tdemidClient::slotNextSong() void tdemidClient::slotPause() { if (m_kMid.pctl->playing==0) return; -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("song Pause\n"); #endif if (m_kMid.pctl->paused==0) @@ -869,11 +869,11 @@ void tdemidClient::slotPause() TQApplication::flushX(); if ((m_kMid.pid=fork())==0) { -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("PlayerProcessID: %d\n",getpid()); #endif player->play(0,(void (*)(void))tdemidOutput); -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("End of child process\n"); #endif _exit(0); @@ -938,13 +938,13 @@ void tdemidClient::slotStop() if (m_kMid.pctl->playing==0) return; if (m_kMid.pctl->paused) return; -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("song Stop\n"); #endif if (m_kMid.pid!=0) { kill(m_kMid.pid,SIGTERM); -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("Killing\n"); #endif waitpid(m_kMid.pid, NULL, 0); @@ -1015,7 +1015,7 @@ void tdemidClient::tdemidOutput(void) char *text=new char[ev->length+1]; strncpy(text,(char *)ev->data,ev->length); text[ev->length]=0; -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("%s , played at: %ld\n",text,currentmillisec-beginmillisec); #endif } @@ -1040,7 +1040,7 @@ void tdemidClient::processSpecialEvent() } */ -//#ifdef KMidDEBUG +//#ifdef TDEMidDEBUG // printf(":::: %ld",passcount++); // printf("%d %s %ld",spev->type,spev->text,spev->absmilliseconds); //#endif @@ -1071,7 +1071,7 @@ void tdemidClient::processSpecialEvent() else if (spev->type==3) { tempoLCD->display(tempoToMetronomeTempo(spev->tempo)); -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("Changing lcd tempo: spev->tempo: %d , ratio: %.9g\n",spev->tempo,m_kMid.pctl->ratioTempo); printf("Result: %g %.9g %d\n",tempoToMetronomeTempo(spev->tempo),tempoToMetronomeTempo(spev->tempo),(int)tempoToMetronomeTempo(spev->tempo)); #endif @@ -1084,7 +1084,7 @@ void tdemidClient::processSpecialEvent() } else if (spev->type==7) { -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("Beat: %d/%d\n",spev->num,spev->den); #endif rhythmview->Beat(spev->num); @@ -1255,7 +1255,7 @@ void tdemidClient::slotSelectSong(int i) i++; if ((i<=0)) // The collection may be empty, or it may be just a bug :-) { -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("Empty\n"); #endif emit stopPause(); @@ -1323,7 +1323,7 @@ void tdemidClient::setCollectionPlayMode(int i) void tdemidClient::saveCollections(void) { if (slman==NULL) return; -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("Saving collections in: %s\n",collectionsfile.ascii()); #endif slman->saveConfig(TQFile::encodeName(collectionsfile)); @@ -1450,7 +1450,7 @@ void tdemidClient::slotSetTempo(double value) return; } -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("Change tempo to %g\n",value); #endif int autocontplaying=0; @@ -1471,7 +1471,7 @@ void tdemidClient::slotSetTempo(double value) sprintf(s,"%g",ratio); if (strcmp(s,"1")!=0) tempoLCD->setLCDColor (255,100,100); else tempoLCD->setLCDColor (100,255,100); -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("ratio: (%.9g = %g ) tempo now: %g , new tempo %g\n",ratio,ratio,tempoToMetronomeTempo(m_kMid.pctl->tempo),value); printf("OldValue: %g , value %g\n",tempoLCD->getOldValue(),value); #endif @@ -1479,7 +1479,7 @@ void tdemidClient::slotSetTempo(double value) if (m_kMid.pctl->paused==1) { pausedatmillisec=(long)(((double)pausedatmillisec/m_kMid.pctl->ratioTempo)*ratio); -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG printf("pausedat: %ld\n",pausedatmillisec); #endif } diff --git a/tdemid/tdemidclient.h b/tdemid/tdemidclient.h index 65fa4e36..a5ebd4c9 100644 --- a/tdemid/tdemidclient.h +++ b/tdemid/tdemidclient.h @@ -21,8 +21,8 @@ or to Antonio Larrosa, Rio Arnoya, 10 5B, 29006 Malaga, Spain ***************************************************************************/ -#ifndef _KMIDCLIENT_H -#define _KMIDCLIENT_H +#ifndef _TDEMIDCLIENT_H +#define _TDEMIDCLIENT_H #include "qslidertime.h" #include @@ -57,7 +57,7 @@ class tdemidClient : public TQWidget, virtual public KMidIface Q_OBJECT private: -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG long passcount; #endif diff --git a/tdemid/tdemidframe.h b/tdemid/tdemidframe.h index fe8c5aef..bba4e6f7 100644 --- a/tdemid/tdemidframe.h +++ b/tdemid/tdemidframe.h @@ -21,8 +21,8 @@ or to Antonio Larrosa, Rio Arnoya, 10 5B, 29006 Malaga, Spain ***************************************************************************/ -#ifndef _KMIDFRAME_H -#define _KMIDFRAME_H +#ifndef _TDEMIDFRAME_H +#define _TDEMIDFRAME_H #include #include @@ -44,7 +44,7 @@ class KDE_EXPORT tdemidFrame : public TDEMainWindow Q_OBJECT private: -#ifdef KMidDEBUG +#ifdef TDEMidDEBUG long passcount; #endif diff --git a/tdemid/version.h b/tdemid/version.h index b2416c18..ed1090c6 100644 --- a/tdemid/version.h +++ b/tdemid/version.h @@ -29,7 +29,7 @@ // And now, DEBUG messages : #ifdef WORKING -#define KMidDEBUG +#define TDEMidDEBUG //#define KDISPTEXTDEBUG //#define COLLECTDLGDEBUG //#define DEVICEMANDEBUG -- cgit v1.2.1