Additional k => tde renaming and fixes

pull/1/head
Slávek Banko 11 years ago
parent bb8c73b53f
commit 1859432c94

@ -72,7 +72,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
##### activate dependencies ##################### ##### activate dependencies #####################
##### kdemultimedia directories ######################## ##### tdemultimedia directories ########################
tde_conditional_add_subdirectory( BUILD_KMIX kmix ) tde_conditional_add_subdirectory( BUILD_KMIX kmix )

@ -21,7 +21,7 @@ noinst_HEADERS = qttableview.h
METASOURCES = AUTO 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, # the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones. # that depend on the following ones.

@ -15,7 +15,7 @@ libartsgui_kde_la_SOURCES = kwidget_impl.cpp kbutton_impl.cpp \
klevelmeter_normalbars.cpp klevelmeter_firebars.cpp \ klevelmeter_normalbars.cpp klevelmeter_firebars.cpp \
ktickmarks_impl.cpp kvolumefader_impl.cpp klabel_impl.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 $(top_builddir)/arts/gui/common/libartsgui_idl.la
libartsgui_kde_la_LDFLAGS = $(all_libraries) -no-undefined libartsgui_kde_la_LDFLAGS = $(all_libraries) -no-undefined
libartsgui_kde_la_COMPILE_FIRST = ../common/artsgui.h 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_SOURCES = artstestgui.cpp
artstestgui_LDADD = -lqtmcop -ltdecore -lartsflow \ artstestgui_LDADD = -lqtmcop -ltdecore -lartsflow \
$(top_builddir)/arts/gui/common/libartsgui_idl.la $(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_SOURCES = dbtest.cpp
dbtest_LDADD = -lqtmcop -ltdecore -lartsflow \ dbtest_LDADD = -lqtmcop -ltdecore -lartsflow \
$(top_builddir)/arts/gui/kde/libartsgui_kde.la $(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 libartsgui_kde_la_METASOURCES = AUTO

@ -19,8 +19,8 @@
*/ */
#ifndef KPOPUPBOX_IMPL_H #ifndef TDEPOPUPBOX_IMPL_H
#define KPOPUPBOX_IMPL_H #define TDEPOPUPBOX_IMPL_H
#include <kframe_impl.h> #include <kframe_impl.h>
#include <artsgui.h> #include <artsgui.h>

@ -19,8 +19,8 @@
*/ */
#ifndef KPOPUPBOX_PRIVATE_H #ifndef TDEPOPUPBOX_PRIVATE_H
#define KPOPUPBOX_PRIVATE_H #define TDEPOPUPBOX_PRIVATE_H
class HandleDrag; class HandleDrag;

@ -59,7 +59,7 @@ bin_PROGRAMS = artscontrol
artscontrol_SOURCES = main.cpp levelmeters.cpp 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_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 \ 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) -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 xdg_apps_DATA = artscontrol.desktop

@ -84,13 +84,13 @@ mblibs = -ltunepimp
endif endif
################################################## ##################################################
juk_LDADD = -lm $(LDADD_GST) $(mblibs) $(LIB_KIO) $(taglib_libs) $(akode_libs) $(LIB_TDEHTML) $(LIB_ARTS) 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_KIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl $(akode_libs) 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) KDE_CXXFLAGS = $(USE_EXCEPTIONS)
tagguessertest_LDADD = $(LIB_TDECORE) 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 SUBDIRS = pics

@ -22,7 +22,7 @@
// The WebImageFetcher dialog also has a class named CoverIconViewItem and I // 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 // 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. // and such.
namespace CoverUtility namespace CoverUtility
{ {

@ -80,7 +80,7 @@ namespace MediaFiles
* from the result (so result.size() may be < urlList.size()). * from the result (so result.size() may be < urlList.size()).
* *
* @param urlList list of file names or URLs to convert. * @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. * @return list of all local files in urlList, converted to absolute paths.
*/ */
TQStringList convertURLsToLocal(const TQStringList &urlList, TQWidget *w = 0); TQStringList convertURLsToLocal(const TQStringList &urlList, TQWidget *w = 0);

@ -207,7 +207,7 @@ CoverIconViewItem::~CoverIconViewItem()
if(m_job) { if(m_job) {
m_job->kill(); m_job->kill();
// Drain results issued by KIO before being deleted, // Drain results issued by TDEIO before being deleted,
// and before deleting the job. // and before deleting the job.
kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput);

@ -12,11 +12,11 @@ libkaboodle_noinst_la_SOURCES = conf.cpp \
view.cpp \ view.cpp \
kaboodle_factory.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_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_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_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_TDEIO) -ltdetexteditor -lmcop -lartsflow_idl -lkmedia2_idl -lsoundserver_idl
kaboodle_SOURCES = main.cpp \ kaboodle_SOURCES = main.cpp \
kaboodleapp.cpp \ kaboodleapp.cpp \
@ -27,8 +27,8 @@ dummy.cpp:
CLEANFILES = 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_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_KIO) -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 bin_PROGRAMS = kaboodle

@ -12,15 +12,15 @@ kaudiocreator_SOURCES = main.cpp kaudiocreator.cpp encoder.cpp \
EXTRA_DIST = encoder.h kaudiocreator.h kaudiocreator.desktop encoderconfigimp.h \ EXTRA_DIST = encoder.h kaudiocreator.h kaudiocreator.desktop encoderconfigimp.h \
obqueimp.h ripper.h tracksimp.h encodefileimp.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 METASOURCES = AUTO
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp *.h -o $(podir)/kaudiocreator.pot $(XGETTEXT) *.cpp *.h -o $(podir)/kaudiocreator.pot
kaudiocreator_LDADD = $(LIB_KIO) $(top_builddir)/libkcddb/libkcddb.la \ kaudiocreator_LDADD = $(LIB_TDEIO) $(top_builddir)/libkcddb/libkcddb.la \
$(top_builddir)/kscd/libkcompactdisc.la $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(top_builddir)/kscd/libkcompactdisc.la $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
KDE_ICON = AUTO KDE_ICON = AUTO

@ -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. * information dialog.
* @param copyjob the IO job to copy from * @param copyjob the IO job to copy from
*/ */

@ -48,7 +48,7 @@ tde_add_kpart( kmix_panelapplet AUTOMOC
) )
##### kmix (kdeinit) ############################ ##### kmix (tdeinit) ############################
tde_add_tdeinit_executable( kmix AUTOMOC tde_add_tdeinit_executable( kmix AUTOMOC
SOURCES SOURCES
@ -65,7 +65,7 @@ tde_add_tdeinit_executable( kmix AUTOMOC
) )
##### kmixctrl (kdeinit) ######################## ##### kmixctrl (tdeinit) ########################
tde_add_tdeinit_executable( kmixctrl AUTOMOC tde_add_tdeinit_executable( kmixctrl AUTOMOC
SOURCES SOURCES

@ -25,7 +25,7 @@ kmix_la_SOURCES = main.cpp kmix.cpp kmixdockwidget.cpp kmixprefdlg.cpp \
volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel \ volume.cpp kledbutton.cpp verticaltext.cpp mixerIface.skel \
kmixtoolbox.cpp mixertoolbox.cpp dialogviewconfiguration.cpp KMixApp.cpp dialogselectmaster.cpp 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 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 \ 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 kmixtoolbox.cpp mixertoolbox.cpp dialogselectmaster.cpp
kmix_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module 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 xdg_apps_DATA = kmix.desktop

@ -42,34 +42,34 @@ krec_la_SOURCES = \
main.cpp \ main.cpp \
krecord.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 = \ krec_la_LIBADD = \
lib_krec_common.la \ lib_krec_common.la \
$(top_builddir)/arts/gui/kde/libartsgui_kde.la \ $(top_builddir)/arts/gui/kde/libartsgui_kde.la \
$(top_builddir)/arts/tools/libartscontrolsupport.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_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_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 = \ lib_krec_common_la_SOURCES = \
krecglobal.cpp \ krecglobal.cpp \
krecexport_template.cpp \ krecexport_template.cpp \
krecconfig_fileswidget.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_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 libkrecexport_wave_la_LIBADD = lib_krec_common.la

@ -23,9 +23,9 @@ libkcompactdisc_la_LDFLAGS = $(all_libraries) -lpthread
kde_kcfg_DATA = kscd.kcfg 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) \ 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 libkcompactdisc.la -lpthread
profiledata_DATA = kscd.profile.xml profiledata_DATA = kscd.profile.xml

@ -26,7 +26,7 @@ bin_PROGRAMS = kscdmagic
kscdmagic_SOURCES = core.cpp main.cpp sound.cpp xlibwrap.cpp xlib.c kscdmagic_SOURCES = core.cpp main.cpp sound.cpp xlibwrap.cpp xlib.c
# the library search path. # 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, # the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones. # that depend on the following ones.

@ -14,7 +14,7 @@ libkcddb_la_SOURCES = \
cdinfoencodingwidget.cpp cdinfoencodingwidgetbase.ui cdinfoencodingwidget.cpp cdinfoencodingwidgetbase.ui
libkcddb_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 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 METASOURCES = AUTO

@ -16,7 +16,7 @@ tdeconfdir = $(libdir)/tdeconf_update_bin
tdeconf_PROGRAMS = noatun20update tdeconf_PROGRAMS = noatun20update
noatun20update_SOURCES = noatun20update.cpp 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) noatun20update_LDADD = $(LIB_QT)
messages: messages:

@ -482,7 +482,7 @@ bool PlaylistSaver::loadM3U(const KURL &file, int /*opt*/)
if(!TDEIO::NetAccess::download(file, localFile, 0L)) if(!TDEIO::NetAccess::download(file, localFile, 0L))
return false; return false;
// if it's a PLS, transfer control, again (KIO bug?) // if it's a PLS, transfer control, again (TDEIO bug?)
#if 0 #if 0
{ {
KSimpleConfig list(local, true); KSimpleConfig list(local, true);

@ -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_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
noatun_kjofol_la_LIBADD = $(LIB_TDEFILE) $(top_builddir)/noatun/library/libnoatun.la \ noatun_kjofol_la_LIBADD = $(LIB_TDEFILE) $(top_builddir)/noatun/library/libnoatun.la \
$(LIB_KIO) -lm \ $(LIB_TDEIO) -lm \
$(top_builddir)/arts/modules/libartsmodules.la $(top_builddir)/arts/modules/libartsmodules.la
noinst_HEADERS = kjloader.h kjwidget.h kjbutton.h kjseeker.h \ noinst_HEADERS = kjloader.h kjwidget.h kjbutton.h kjseeker.h \

@ -70,8 +70,8 @@ public slots:
// Show a preview of "skin" in mPixmap // Show a preview of "skin" in mPixmap
void showPreview(const TQString &skin); void showPreview(const TQString &skin);
// gets called after a KIO-action has finished // gets called after a TDEIO-action has finished
// KIO is used for installing/removing skins // TDEIO is used for installing/removing skins
void slotResult(TDEIO::Job *job); void slotResult(TDEIO::Job *job);
signals: signals:

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = noatun_metatag.la
noatun_metatag_la_SOURCES = metatag.cpp edit.cpp noatun_metatag_la_SOURCES = metatag.cpp edit.cpp
noatun_metatag_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined 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 $(top_builddir)/noatun/library/noatuntags/libnoatuntags.la
noatun_metatag_la_METASOURCES = AUTO noatun_metatag_la_METASOURCES = AUTO

@ -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_SOURCES = splitplaylist.cpp playlist.cpp view.cpp find.cpp
noatun_splitplaylist_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined 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 noatun_splitplaylist_la_METASOURCES = AUTO

@ -9,8 +9,8 @@ noinst_HEADERS = tdefile_au.h
kde_module_LTLIBRARIES = tdefile_au.la kde_module_LTLIBRARIES = tdefile_au.la
tdefile_au_la_SOURCES = tdefile_au.cpp 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_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
tdefile_au_la_LIBADD = $(LIB_KIO) tdefile_au_la_LIBADD = $(LIB_TDEIO)
# let automoc handle all of the meta source files (moc) # let automoc handle all of the meta source files (moc)
METASOURCES = AUTO METASOURCES = AUTO

@ -9,8 +9,8 @@ noinst_HEADERS = tdefile_avi.h
kde_module_LTLIBRARIES = tdefile_avi.la kde_module_LTLIBRARIES = tdefile_avi.la
tdefile_avi_la_SOURCES = tdefile_avi.cpp 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_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
tdefile_avi_la_LIBADD = $(LIB_KIO) tdefile_avi_la_LIBADD = $(LIB_TDEIO)
# let automoc handle all of the meta source files (moc) # let automoc handle all of the meta source files (moc)
METASOURCES = AUTO METASOURCES = AUTO

@ -9,8 +9,8 @@ noinst_HEADERS = tdefile_flac.h
kde_module_LTLIBRARIES = tdefile_flac.la kde_module_LTLIBRARIES = tdefile_flac.la
tdefile_flac_la_SOURCES = tdefile_flac.cpp 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_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_KIO) tdefile_flac_la_LIBADD = $(LIB_TDEIO)
# let automoc handle all of the meta source files (moc) # let automoc handle all of the meta source files (moc)
METASOURCES = AUTO METASOURCES = AUTO

@ -9,8 +9,8 @@ noinst_HEADERS = tdefile_m3u.h
kde_module_LTLIBRARIES = tdefile_m3u.la kde_module_LTLIBRARIES = tdefile_m3u.la
tdefile_m3u_la_SOURCES = tdefile_m3u.cpp 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_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
tdefile_m3u_la_LIBADD = $(LIB_KSYCOCA) tdefile_m3u_la_LIBADD = $(LIB_TDESYCOCA)
# let automoc handle all of the meta source files (moc) # let automoc handle all of the meta source files (moc)
METASOURCES = AUTO METASOURCES = AUTO

@ -18,8 +18,8 @@
* $Id$ * $Id$
*/ */
#ifndef __KMIME_M3U_H__ #ifndef __TDEFILE_M3U_H__
#define __KMIME_M3U_H__ #define __TDEFILE_M3U_H__
#include <tdefilemetainfo.h> #include <tdefilemetainfo.h>
#include <kurl.h> #include <kurl.h>

@ -9,8 +9,8 @@ noinst_HEADERS = tdefile_mp3.h
kde_module_LTLIBRARIES = tdefile_mp3.la kde_module_LTLIBRARIES = tdefile_mp3.la
tdefile_mp3_la_SOURCES = tdefile_mp3.cpp 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_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_KIO) tdefile_mp3_la_LIBADD = $(LIB_TDEIO)
# let automoc handle all of the meta source files (moc) # let automoc handle all of the meta source files (moc)
METASOURCES = AUTO METASOURCES = AUTO

@ -9,8 +9,8 @@ noinst_HEADERS = tdefile_mpc.h
kde_module_LTLIBRARIES = tdefile_mpc.la kde_module_LTLIBRARIES = tdefile_mpc.la
tdefile_mpc_la_SOURCES = tdefile_mpc.cpp 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_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_KIO) tdefile_mpc_la_LIBADD = $(LIB_TDEIO)
# let automoc handle all of the meta source files (moc) # let automoc handle all of the meta source files (moc)
METASOURCES = AUTO METASOURCES = AUTO

@ -9,8 +9,8 @@ noinst_HEADERS = tdefile_mpeg.h
kde_module_LTLIBRARIES = tdefile_mpeg.la kde_module_LTLIBRARIES = tdefile_mpeg.la
tdefile_mpeg_la_SOURCES = tdefile_mpeg.cpp 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_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
tdefile_mpeg_la_LIBADD = $(LIB_KIO) tdefile_mpeg_la_LIBADD = $(LIB_TDEIO)
# let automoc handle all of the meta source files (moc) # let automoc handle all of the meta source files (moc)
METASOURCES = AUTO METASOURCES = AUTO

@ -9,8 +9,8 @@ noinst_HEADERS = tdefile_ogg.h
kde_module_LTLIBRARIES = tdefile_ogg.la kde_module_LTLIBRARIES = tdefile_ogg.la
tdefile_ogg_la_SOURCES = tdefile_ogg.cpp vcedit.c 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_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
tdefile_ogg_la_LIBADD = $(LIB_KIO) -logg -lvorbis -lvorbisfile tdefile_ogg_la_LIBADD = $(LIB_TDEIO) -logg -lvorbis -lvorbisfile
# let automoc handle all of the meta source files (moc) # let automoc handle all of the meta source files (moc)
METASOURCES = AUTO METASOURCES = AUTO

@ -9,8 +9,8 @@ noinst_HEADERS = tdefile_sid.h
kde_module_LTLIBRARIES = tdefile_sid.la kde_module_LTLIBRARIES = tdefile_sid.la
tdefile_sid_la_SOURCES = tdefile_sid.cpp 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_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
tdefile_sid_la_LIBADD = $(LIB_KIO) tdefile_sid_la_LIBADD = $(LIB_TDEIO)
# let automoc handle all of the meta source files (moc) # let automoc handle all of the meta source files (moc)
METASOURCES = AUTO METASOURCES = AUTO

@ -9,8 +9,8 @@ noinst_HEADERS = tdefile_theora.h
kde_module_LTLIBRARIES = tdefile_theora.la kde_module_LTLIBRARIES = tdefile_theora.la
tdefile_theora_la_SOURCES = tdefile_theora.cpp 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_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
tdefile_theora_la_LIBADD = $(LIB_KIO) -logg -lvorbis -ltheora tdefile_theora_la_LIBADD = $(LIB_TDEIO) -logg -lvorbis -ltheora
# let automoc handle all of the meta source files (moc) # let automoc handle all of the meta source files (moc)
METASOURCES = AUTO METASOURCES = AUTO

@ -9,8 +9,8 @@ noinst_HEADERS = tdefile_wav.h
kde_module_LTLIBRARIES = tdefile_wav.la kde_module_LTLIBRARIES = tdefile_wav.la
tdefile_wav_la_SOURCES = tdefile_wav.cpp 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_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module $(KDE_PLUGIN)
tdefile_wav_la_LIBADD = $(LIB_KIO) tdefile_wav_la_LIBADD = $(LIB_TDEIO)
# let automoc handle all of the meta source files (moc) # let automoc handle all of the meta source files (moc)
METASOURCES = AUTO METASOURCES = AUTO

@ -16,7 +16,7 @@ tdeio_audiocd_la_SOURCES = audiocd.cpp
tdeio_audiocd_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) 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 noinst_HEADERS = audiocd.h

@ -90,7 +90,7 @@ class AudioCDProtocol : public TDEIO::SlaveBase
uint discid(struct cdrom_drive *); 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. * it will set the extension itself depending on the fileType.
* You must also give the trackNumber for the size of the file * You must also give the trackNumber for the size of the file
* to be calculated. * to be calculated.

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libaudiocd_encoder_flac.la
libaudiocd_encoder_flac_la_SOURCES = encoderflac.cpp 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) libaudiocd_encoder_flac_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)

@ -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_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) libaudiocd_encoder_lame_la_LDFLAGS = -avoid-version -module -no-undefined $(taglib_libs) $(all_libraries)

@ -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_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) libaudiocd_encoder_vorbis_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)

@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = libaudiocd_encoder_wav.la
libaudiocd_encoder_wav_la_SOURCES = encoderwav.cpp encodercda.cpp 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) libaudiocd_encoder_wav_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)

@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libtdemidpart.la
lib_LTLIBRARIES = libtdemidlib.la lib_LTLIBRARIES = libtdemidlib.la
libtdemidlib_la_LDFLAGS = $(all_libraries) 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_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
libtdemidpart_la_LIBADD = libtdemidlib.la libtdemidpart_la_LIBADD = libtdemidlib.la
@ -28,7 +28,7 @@ noinst_HEADERS = tdemidframe.h tdemidclient.h kdisptext.h \
channelcfgdlg.h instrname.h rhythmview.h \ channelcfgdlg.h instrname.h rhythmview.h \
songlist.h slman.h tdemid_part.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_SOURCES = main.cpp
tdemid_LDADD = libtdemidlib.la tdemid_LDADD = libtdemidlib.la

@ -1,5 +1,5 @@
#ifndef _KMIDIFACE_H_ #ifndef _TDEMIDIFACE_H_
#define _KMIDIFACE_H_ #define _TDEMIDIFACE_H_
#include <dcopobject.h> #include <dcopobject.h>

@ -1,5 +1,5 @@
#ifndef __KMIDPART_H__ #ifndef __TDEMIDPART_H__
#define __KMIDPART_H__ #define __TDEMIDPART_H__
#include <tdeparts/browserextension.h> #include <tdeparts/browserextension.h>
#include <tdeparts/factory.h> #include <tdeparts/factory.h>

@ -185,7 +185,7 @@ tdemidClient::tdemidClient(TQWidget *parent, TDEActionCollection *ac, const char
tdeconf->setGroup("Midimapper"); tdeconf->setGroup("Midimapper");
TQCString qs=TQFile::encodeName(tdeconf->readPathEntry("Loadfile","gm.map")); TQCString qs=TQFile::encodeName(tdeconf->readPathEntry("Loadfile","gm.map"));
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("Read Config file: %s\n",qs.data()); printf("Read Config file: %s\n",qs.data());
#endif #endif
setMidiMapFilename(qs.data()); setMidiMapFilename(qs.data());
@ -321,7 +321,7 @@ int tdemidClient::openFile(const char *filename)
if (midifile_opened) delete midifile_opened; if (midifile_opened) delete midifile_opened;
midifile_opened=new char[strlen(filename)+1]; midifile_opened=new char[strlen(filename)+1];
strcpy(midifile_opened,filename); strcpy(midifile_opened,filename);
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("TOTAL TIME: %g milliseconds\n",player->information()->millisecsTotal); printf("TOTAL TIME: %g milliseconds\n",player->information()->millisecsTotal);
#endif #endif
// noteArray=player->parseNotes(); // noteArray=player->parseNotes();
@ -530,7 +530,7 @@ void tdemidClient::slotPlay()
m_kMid.pctl->error=0; m_kMid.pctl->error=0;
m_kMid.pctl->SPEVplayed=0; m_kMid.pctl->SPEVplayed=0;
m_kMid.pctl->SPEVprocessed=0; m_kMid.pctl->SPEVprocessed=0;
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
passcount=0; passcount=0;
#endif #endif
noteArray->iteratorBegin(); noteArray->iteratorBegin();
@ -538,11 +538,11 @@ void tdemidClient::slotPlay()
TQApplication::flushX(); TQApplication::flushX();
if ((m_kMid.pid=fork())==0) if ((m_kMid.pid=fork())==0)
{ {
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("PlayerProcessID: %d\n",getpid()); printf("PlayerProcessID: %d\n",getpid());
#endif #endif
player->play(0,(void (*)(void))tdemidOutput); player->play(0,(void (*)(void))tdemidOutput);
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("End of child process\n"); printf("End of child process\n");
#endif #endif
_exit(0); _exit(0);
@ -551,7 +551,7 @@ void tdemidClient::slotPlay()
spev=player->specialEvents(); spev=player->specialEvents();
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("writing SPEV\n"); printf("writing SPEV\n");
player->debugSpecialEvents(); player->debugSpecialEvents();
printf("writing SPEV(END)\n"); printf("writing SPEV(END)\n");
@ -569,7 +569,7 @@ void tdemidClient::slotPlay()
timer4timebar->start(1000); timer4timebar->start(1000);
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("PlayerProcess: %d . ParentProcessID: %d\n",m_kMid.pid,getpid()); printf("PlayerProcess: %d . ParentProcessID: %d\n",m_kMid.pid,getpid());
printf("******************************-\n"); printf("******************************-\n");
#endif #endif
@ -620,7 +620,7 @@ void tdemidClient::slotSeek(int i)
if (m_kMid.pid!=0) if (m_kMid.pid!=0)
{ {
kill(m_kMid.pid,SIGTERM); kill(m_kMid.pid,SIGTERM);
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("Waiting for Process %d to be killed\n",m_kMid.pid); printf("Waiting for Process %d to be killed\n",m_kMid.pid);
#endif #endif
waitpid(m_kMid.pid, NULL, 0); waitpid(m_kMid.pid, NULL, 0);
@ -630,7 +630,7 @@ void tdemidClient::slotSeek(int i)
allNotesOff(); allNotesOff();
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("change Time: %d\n",i); printf("change Time: %d\n",i);
#endif #endif
@ -648,13 +648,13 @@ void tdemidClient::slotSeek(int i)
TQApplication::flushX(); TQApplication::flushX();
if ((m_kMid.pid=fork())==0) if ((m_kMid.pid=fork())==0)
{ {
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("Player_ProcessID: %d\n",getpid()); printf("Player_ProcessID: %d\n",getpid());
#endif #endif
player->play(0,(void (*)(void))tdemidOutput); player->play(0,(void (*)(void))tdemidOutput);
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("End of child process\n"); printf("End of child process\n");
#endif #endif
_exit(0); _exit(0);
@ -687,7 +687,7 @@ void tdemidClient::slotSeek(int i)
void tdemidClient::moveEventPointersTo(ulong ms) void tdemidClient::moveEventPointersTo(ulong ms)
{ {
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("Move To: %lu\n",ms); printf("Move To: %lu\n",ms);
#endif #endif
spev=player->specialEvents(); spev=player->specialEvents();
@ -812,7 +812,7 @@ void tdemidClient::slotNextSong()
int r; int r;
while ((r=1+(int) ((double)(currentsl->NumberOfSongs())*rand()/(RAND_MAX+1.0)))==currentsl->getActiveSongID()) ; while ((r=1+(int) ((double)(currentsl->NumberOfSongs())*rand()/(RAND_MAX+1.0)))==currentsl->getActiveSongID()) ;
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("random number:%d\n",r); printf("random number:%d\n",r);
#endif #endif
currentsl->setActiveSong(r); currentsl->setActiveSong(r);
@ -838,7 +838,7 @@ void tdemidClient::slotNextSong()
void tdemidClient::slotPause() void tdemidClient::slotPause()
{ {
if (m_kMid.pctl->playing==0) return; if (m_kMid.pctl->playing==0) return;
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("song Pause\n"); printf("song Pause\n");
#endif #endif
if (m_kMid.pctl->paused==0) if (m_kMid.pctl->paused==0)
@ -869,11 +869,11 @@ void tdemidClient::slotPause()
TQApplication::flushX(); TQApplication::flushX();
if ((m_kMid.pid=fork())==0) if ((m_kMid.pid=fork())==0)
{ {
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("PlayerProcessID: %d\n",getpid()); printf("PlayerProcessID: %d\n",getpid());
#endif #endif
player->play(0,(void (*)(void))tdemidOutput); player->play(0,(void (*)(void))tdemidOutput);
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("End of child process\n"); printf("End of child process\n");
#endif #endif
_exit(0); _exit(0);
@ -938,13 +938,13 @@ void tdemidClient::slotStop()
if (m_kMid.pctl->playing==0) return; if (m_kMid.pctl->playing==0) return;
if (m_kMid.pctl->paused) return; if (m_kMid.pctl->paused) return;
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("song Stop\n"); printf("song Stop\n");
#endif #endif
if (m_kMid.pid!=0) if (m_kMid.pid!=0)
{ {
kill(m_kMid.pid,SIGTERM); kill(m_kMid.pid,SIGTERM);
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("Killing\n"); printf("Killing\n");
#endif #endif
waitpid(m_kMid.pid, NULL, 0); waitpid(m_kMid.pid, NULL, 0);
@ -1015,7 +1015,7 @@ void tdemidClient::tdemidOutput(void)
char *text=new char[ev->length+1]; char *text=new char[ev->length+1];
strncpy(text,(char *)ev->data,ev->length); strncpy(text,(char *)ev->data,ev->length);
text[ev->length]=0; text[ev->length]=0;
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("%s , played at: %ld\n",text,currentmillisec-beginmillisec); printf("%s , played at: %ld\n",text,currentmillisec-beginmillisec);
#endif #endif
} }
@ -1040,7 +1040,7 @@ void tdemidClient::processSpecialEvent()
} }
*/ */
//#ifdef KMidDEBUG //#ifdef TDEMidDEBUG
// printf(":::: %ld",passcount++); // printf(":::: %ld",passcount++);
// printf("%d %s %ld",spev->type,spev->text,spev->absmilliseconds); // printf("%d %s %ld",spev->type,spev->text,spev->absmilliseconds);
//#endif //#endif
@ -1071,7 +1071,7 @@ void tdemidClient::processSpecialEvent()
else if (spev->type==3) else if (spev->type==3)
{ {
tempoLCD->display(tempoToMetronomeTempo(spev->tempo)); 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("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)); printf("Result: %g %.9g %d\n",tempoToMetronomeTempo(spev->tempo),tempoToMetronomeTempo(spev->tempo),(int)tempoToMetronomeTempo(spev->tempo));
#endif #endif
@ -1084,7 +1084,7 @@ void tdemidClient::processSpecialEvent()
} }
else if (spev->type==7) else if (spev->type==7)
{ {
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("Beat: %d/%d\n",spev->num,spev->den); printf("Beat: %d/%d\n",spev->num,spev->den);
#endif #endif
rhythmview->Beat(spev->num); rhythmview->Beat(spev->num);
@ -1255,7 +1255,7 @@ void tdemidClient::slotSelectSong(int i)
i++; i++;
if ((i<=0)) // The collection may be empty, or it may be just a bug :-) if ((i<=0)) // The collection may be empty, or it may be just a bug :-)
{ {
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("Empty\n"); printf("Empty\n");
#endif #endif
emit stopPause(); emit stopPause();
@ -1323,7 +1323,7 @@ void tdemidClient::setCollectionPlayMode(int i)
void tdemidClient::saveCollections(void) void tdemidClient::saveCollections(void)
{ {
if (slman==NULL) return; if (slman==NULL) return;
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("Saving collections in: %s\n",collectionsfile.ascii()); printf("Saving collections in: %s\n",collectionsfile.ascii());
#endif #endif
slman->saveConfig(TQFile::encodeName(collectionsfile)); slman->saveConfig(TQFile::encodeName(collectionsfile));
@ -1450,7 +1450,7 @@ void tdemidClient::slotSetTempo(double value)
return; return;
} }
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("Change tempo to %g\n",value); printf("Change tempo to %g\n",value);
#endif #endif
int autocontplaying=0; int autocontplaying=0;
@ -1471,7 +1471,7 @@ void tdemidClient::slotSetTempo(double value)
sprintf(s,"%g",ratio); sprintf(s,"%g",ratio);
if (strcmp(s,"1")!=0) tempoLCD->setLCDColor (255,100,100); if (strcmp(s,"1")!=0) tempoLCD->setLCDColor (255,100,100);
else tempoLCD->setLCDColor (100,255,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("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); printf("OldValue: %g , value %g\n",tempoLCD->getOldValue(),value);
#endif #endif
@ -1479,7 +1479,7 @@ void tdemidClient::slotSetTempo(double value)
if (m_kMid.pctl->paused==1) if (m_kMid.pctl->paused==1)
{ {
pausedatmillisec=(long)(((double)pausedatmillisec/m_kMid.pctl->ratioTempo)*ratio); pausedatmillisec=(long)(((double)pausedatmillisec/m_kMid.pctl->ratioTempo)*ratio);
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
printf("pausedat: %ld\n",pausedatmillisec); printf("pausedat: %ld\n",pausedatmillisec);
#endif #endif
} }

@ -21,8 +21,8 @@
or to Antonio Larrosa, Rio Arnoya, 10 5B, 29006 Malaga, Spain or to Antonio Larrosa, Rio Arnoya, 10 5B, 29006 Malaga, Spain
***************************************************************************/ ***************************************************************************/
#ifndef _KMIDCLIENT_H #ifndef _TDEMIDCLIENT_H
#define _KMIDCLIENT_H #define _TDEMIDCLIENT_H
#include "qslidertime.h" #include "qslidertime.h"
#include <libtdemid/player.h> #include <libtdemid/player.h>
@ -57,7 +57,7 @@ class tdemidClient : public TQWidget, virtual public KMidIface
Q_OBJECT Q_OBJECT
private: private:
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
long passcount; long passcount;
#endif #endif

@ -21,8 +21,8 @@
or to Antonio Larrosa, Rio Arnoya, 10 5B, 29006 Malaga, Spain or to Antonio Larrosa, Rio Arnoya, 10 5B, 29006 Malaga, Spain
***************************************************************************/ ***************************************************************************/
#ifndef _KMIDFRAME_H #ifndef _TDEMIDFRAME_H
#define _KMIDFRAME_H #define _TDEMIDFRAME_H
#include <tdemainwindow.h> #include <tdemainwindow.h>
#include <tdemenubar.h> #include <tdemenubar.h>
@ -44,7 +44,7 @@ class KDE_EXPORT tdemidFrame : public TDEMainWindow
Q_OBJECT Q_OBJECT
private: private:
#ifdef KMidDEBUG #ifdef TDEMidDEBUG
long passcount; long passcount;
#endif #endif

@ -29,7 +29,7 @@
// And now, DEBUG messages : // And now, DEBUG messages :
#ifdef WORKING #ifdef WORKING
#define KMidDEBUG #define TDEMidDEBUG
//#define KDISPTEXTDEBUG //#define KDISPTEXTDEBUG
//#define COLLECTDLGDEBUG //#define COLLECTDLGDEBUG
//#define DEVICEMANDEBUG //#define DEVICEMANDEBUG

Loading…
Cancel
Save