diff options
Diffstat (limited to 'noatun')
18 files changed, 23 insertions, 38 deletions
diff --git a/noatun/Makefile.am b/noatun/Makefile.am index 5a3075ce..f0d4de33 100644 --- a/noatun/Makefile.am +++ b/noatun/Makefile.am @@ -21,7 +21,7 @@ noatun20update_LDADD = $(LIB_QT) messages: $(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui"` > rc.cpp - $(XGETTEXT) rc.cpp `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/noatun.pot + $(XGETTEXT) rc.cpp `find . -o -name "*.cpp" -o -name "*.h"` -o $(podir)/noatun.pot api: $(mkinstalldirs) $(top_builddir)/noatun/apidocs/libnoatun diff --git a/noatun/library/noatun/scrollinglabel.h b/noatun/library/noatun/scrollinglabel.h index f2be37ee..aa2b3450 100644 --- a/noatun/library/noatun/scrollinglabel.h +++ b/noatun/library/noatun/scrollinglabel.h @@ -76,4 +76,3 @@ class ScrollingLabel : public TQWidget }; #endif -// vim:ts=2:sw=2:tw=78:noet diff --git a/noatun/library/noatunarts/CMakeLists.txt b/noatun/library/noatunarts/CMakeLists.txt index fa0aa905..1fd853e4 100644 --- a/noatun/library/noatunarts/CMakeLists.txt +++ b/noatun/library/noatunarts/CMakeLists.txt @@ -27,7 +27,7 @@ link_directories( tde_add_library( noatunarts SHARED AUTOMOC SOURCES - noatunarts.cc fft.c Equalizer_impl.cpp + noatunarts.cpp fft.c Equalizer_impl.cpp FFTScopes.cpp StereoEffectStack_impl.cpp StereoVolumeControl_impl.cpp Session_impl.cpp LINK @@ -38,7 +38,7 @@ tde_add_library( noatunarts SHARED AUTOMOC add_custom_command( OUTPUT - noatunarts.cc noatunarts.h + noatunarts.cpp noatunarts.h COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t -I${ARTS_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/noatunarts.idl DEPENDS noatunarts.idl diff --git a/noatun/library/noatunarts/Equalizer_impl.cpp b/noatun/library/noatunarts/Equalizer_impl.cpp index 552c3f91..40bcd35f 100644 --- a/noatun/library/noatunarts/Equalizer_impl.cpp +++ b/noatun/library/noatunarts/Equalizer_impl.cpp @@ -184,7 +184,7 @@ public: while (left<end) { // see the _long_ comment in - // tdemultimedia/arts/modules/synth_std_equalizer_impl.cc + // tdemultimedia/arts/modules/synth_std_equalizer_impl.cpp if (::fabs(*left) + ::fabs(*right) < 0.00000001) goto copy; // if you apologize, it's becomes ok *oleft=*left * mPreamp; diff --git a/noatun/library/noatunarts/Makefile.am b/noatun/library/noatunarts/Makefile.am index eca2f0f0..a1e8a337 100644 --- a/noatun/library/noatunarts/Makefile.am +++ b/noatun/library/noatunarts/Makefile.am @@ -2,7 +2,7 @@ INCLUDES= -I$(kde_includes)/arts $(all_includes) KDE_OPTIONS = nofinal lib_LTLIBRARIES = libnoatunarts.la -libnoatunarts_la_SOURCES = noatunarts.cc fft.c Equalizer_impl.cpp \ +libnoatunarts_la_SOURCES = noatunarts.cpp fft.c Equalizer_impl.cpp \ FFTScopes.cpp StereoEffectStack_impl.cpp \ StereoVolumeControl_impl.cpp Session_impl.cpp libnoatunarts_la_COMPILE_FIRST = noatunarts.h @@ -13,7 +13,7 @@ libnoatunarts_la_METASOURCES = AUTO noatunarts.mcoptype: noatunarts.h noatunarts.mcopclass: noatunarts.h -noatunarts.cc noatunarts.h: noatunarts.idl +noatunarts.cpp noatunarts.h: noatunarts.idl $(MCOPIDL) -t -I$(kde_includes)/arts $(srcdir)/noatunarts.idl mcoptypedir = $(libdir)/mcop @@ -29,5 +29,5 @@ noatuninclude_HEADERS= noatunarts.h noatunincludedir = $(includedir)/noatun -DISTCLEANFILES = noatunarts.cc noatunarts.h noatunarts.mcopclass noatunarts.mcoptype +DISTCLEANFILES = noatunarts.cpp noatunarts.h noatunarts.mcopclass noatunarts.mcoptype diff --git a/noatun/library/noatunarts/StereoEffectStack_impl.cpp b/noatun/library/noatunarts/StereoEffectStack_impl.cpp index 684d9694..9c1013c8 100644 --- a/noatun/library/noatunarts/StereoEffectStack_impl.cpp +++ b/noatun/library/noatunarts/StereoEffectStack_impl.cpp @@ -164,7 +164,7 @@ class StereoEffectStack_impl : public StereoEffectStack_skel, public StdSynthMod return items; } - // as stolen from stereoeffectstack_impl.cc + // as stolen from stereoeffectstack_impl.cpp StereoEffectStack_impl() : nextID(1) { reconnect(); diff --git a/noatun/library/scrollinglabel.cpp b/noatun/library/scrollinglabel.cpp index c2c9dae8..d21a2aad 100644 --- a/noatun/library/scrollinglabel.cpp +++ b/noatun/library/scrollinglabel.cpp @@ -191,6 +191,3 @@ ScrollingLabel::setScroll(bool b) } #include "scrollinglabel.moc" - -// vim:ts=2:sw=2:tw=78:noet - diff --git a/noatun/modules/artseffects/CMakeLists.txt b/noatun/modules/artseffects/CMakeLists.txt index 90864c7d..9d7ae40b 100644 --- a/noatun/modules/artseffects/CMakeLists.txt +++ b/noatun/modules/artseffects/CMakeLists.txt @@ -29,7 +29,7 @@ link_directories( tde_add_kpart( libartseffects SOURCES - artseffects.cc extrastereo_impl.cc + artseffects.cpp extrastereo_impl.cpp LINK artsgui_idl-shared ${ARTS_LIBRARIES} mcop kmedia2_idl artsflow artsflow_idl soundserver_idl @@ -38,7 +38,7 @@ tde_add_kpart( libartseffects add_custom_command( OUTPUT - artseffects.cc artseffects.h + artseffects.cpp artseffects.h COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t -I${CMAKE_BINARY_DIR}/arts/gui/common -I${CMAKE_SOURCE_DIR}/arts/gui/common diff --git a/noatun/modules/artseffects/Makefile.am b/noatun/modules/artseffects/Makefile.am index 49a5bb99..9a458a4b 100644 --- a/noatun/modules/artseffects/Makefile.am +++ b/noatun/modules/artseffects/Makefile.am @@ -2,18 +2,18 @@ INCLUDES= -I$(top_builddir)/arts/gui/common -I$(top_srcdir)/arts/gui/common -I$( lib_LTLIBRARIES = libartseffects.la #libartseffectsui.la -libartseffects_la_SOURCES = artseffects.cc extrastereo_impl.cc -libartseffects_la_COMPILE_FIRST = artseffects.cc +libartseffects_la_SOURCES = artseffects.cpp extrastereo_impl.cpp +libartseffects_la_COMPILE_FIRST = artseffects.cpp libartseffects_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined libartseffects_la_LIBADD = $(top_builddir)/arts/gui/common/libartsgui_idl.la -lkmedia2_idl -lsoundserver_idl -lartsflow artseffects.mcopclass: artseffects.h artseffects.mcoptype: artseffects.h -artseffects.cc artseffects.h: $(srcdir)/artseffects.idl $(MCOPIDL) +artseffects.cpp artseffects.h: $(srcdir)/artseffects.idl $(MCOPIDL) $(MCOPIDL) -t -I$(top_builddir)/arts/gui/common -I$(top_srcdir)/arts/gui/common -I$(kde_includes)/arts $(srcdir)/artseffects.idl -CLEANFILES = artsmidi.cc artsmidi.h artsmidi.mcoptype artsmidi.mcopclass +CLEANFILES = artsmidi.cpp artsmidi.h artsmidi.mcoptype artsmidi.mcopclass mcoptypedir = $(libdir)/mcop mcoptype_DATA = artseffects.mcoptype artseffects.mcopclass diff --git a/noatun/modules/artseffects/extrastereo_impl.cc b/noatun/modules/artseffects/extrastereo_impl.cpp index 3dc92705..3dc92705 100644 --- a/noatun/modules/artseffects/extrastereo_impl.cc +++ b/noatun/modules/artseffects/extrastereo_impl.cpp diff --git a/noatun/modules/artseffects/extrastereogui_impl.cc b/noatun/modules/artseffects/extrastereogui_impl.cpp index 92148ba0..92148ba0 100644 --- a/noatun/modules/artseffects/extrastereogui_impl.cc +++ b/noatun/modules/artseffects/extrastereogui_impl.cpp diff --git a/noatun/modules/excellent/excellentui.rc b/noatun/modules/excellent/excellentui.rc index f9c43c70..0ca0936e 100644 --- a/noatun/modules/excellent/excellentui.rc +++ b/noatun/modules/excellent/excellentui.rc @@ -1,7 +1,4 @@ <!DOCTYPE kpartgui> -<!-- -vim: syntax=xml ---> <kpartgui name="noatunexcellent" version="4"> <MenuBar> <Menu name="file" noMerge="1"><text>&File</text> diff --git a/noatun/modules/kaiman/style.h b/noatun/modules/kaiman/style.h index 0fb4fe42..160dee8b 100644 --- a/noatun/modules/kaiman/style.h +++ b/noatun/modules/kaiman/style.h @@ -1,4 +1,3 @@ -// -*- C++ -*- /* Copyright (c) 2000 Stefan Schimanski (1Stein@gmx.de) 1999-2000 Christian Esken (esken@kde.org) diff --git a/noatun/modules/kjofol-skin/kjguisettingswidget.ui b/noatun/modules/kjofol-skin/kjguisettingswidget.ui index c621cfb1..f46e2111 100644 --- a/noatun/modules/kjofol-skin/kjguisettingswidget.ui +++ b/noatun/modules/kjofol-skin/kjguisettingswidget.ui @@ -456,10 +456,8 @@ <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcolorcombo.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> <include location="global" impldecl="in implementation">knuminput.h</include> <include location="global" impldecl="in implementation">tdefontcombo.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> -</includehints> </UI> diff --git a/noatun/modules/kjofol-skin/kjskinselectorwidget.ui b/noatun/modules/kjofol-skin/kjskinselectorwidget.ui index 41e3c44d..c0ae94de 100644 --- a/noatun/modules/kjofol-skin/kjskinselectorwidget.ui +++ b/noatun/modules/kjofol-skin/kjskinselectorwidget.ui @@ -221,10 +221,8 @@ It can be several lines and usually does not contain anything interesting but st </customwidgets> <layoutdefaults spacing="6" margin="11"/> <includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/noatun/modules/simple/simpleui.rc b/noatun/modules/simple/simpleui.rc index 6e5fb86a..6804bc2e 100644 --- a/noatun/modules/simple/simpleui.rc +++ b/noatun/modules/simple/simpleui.rc @@ -1,7 +1,4 @@ <!DOCTYPE kpartgui> -<!-- -vim: syntax=xml ---> <kpartgui name="simpleui" version="1"> <MenuBar> <Menu name="file"><text>&File</text> diff --git a/noatun/modules/winskin/vis/CMakeLists.txt b/noatun/modules/winskin/vis/CMakeLists.txt index 25b86e8a..fc206056 100644 --- a/noatun/modules/winskin/vis/CMakeLists.txt +++ b/noatun/modules/winskin/vis/CMakeLists.txt @@ -27,7 +27,7 @@ link_directories( tde_add_library( winskinvis SHARED AUTOMOC SOURCES - winskinvis.cc + winskinvis.cpp winSkinFFT_impl.cpp realFFT.cpp realFFTFilter.cpp visQueue.cpp LINK @@ -37,7 +37,7 @@ tde_add_library( winskinvis SHARED AUTOMOC add_custom_command( OUTPUT - winskinvis.cc winskinvis.h + winskinvis.cpp winskinvis.h COMMAND ${ARTS_MCOPIDL_EXECUTABLE} -t -I${ARTS_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/winskinvis.idl DEPENDS winskinvis.idl diff --git a/noatun/modules/winskin/vis/Makefile.am b/noatun/modules/winskin/vis/Makefile.am index b72036d3..473da0cb 100644 --- a/noatun/modules/winskin/vis/Makefile.am +++ b/noatun/modules/winskin/vis/Makefile.am @@ -1,15 +1,15 @@ INCLUDES= -I$(kde_includes)/arts $(all_includes) KDE_OPTIONS = nofinal -DISTCLEANFILES = winskinvis.h winskinvis.cc +DISTCLEANFILES = winskinvis.h winskinvis.cpp winskinvis.mcopclass: winskinvis.h winskinvis.mcoptype: winskinvis.h -winskinvis.cc winskinvis.h : $(srcdir)/winskinvis.idl +winskinvis.cpp winskinvis.h : $(srcdir)/winskinvis.idl $(MCOPIDL) -t -I$(kde_includes)/arts $(srcdir)/winskinvis.idl lib_LTLIBRARIES = libwinskinvis.la -libwinskinvis_la_SOURCES= winskinvis.cc \ +libwinskinvis_la_SOURCES= winskinvis.cpp \ winSkinFFT_impl.cpp realFFT.cpp \ realFFTFilter.cpp visQueue.cpp @@ -18,7 +18,7 @@ libwinskinvis_la_LDFLAGS= $(all_libraries) -avoid-version \ -no-undefined libwinskinvis_la_LIBADD = -lkmedia2_idl -lsoundserver_idl -lartsflow -lartsflow_idl -lmcop -libwinskinvis_la_COMPILE_FIRST = winskinvis.cc +libwinskinvis_la_COMPILE_FIRST = winskinvis.cpp libwinskinvis_la_METASOURCES = AUTO |