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 --- 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 +- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'arts') 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 -- cgit v1.2.3