From kde-commits Fri Dec 30 21:57:05 2011 From: Christian Esken Date: Fri, 30 Dec 2011 21:57:05 +0000 To: kde-commits Subject: KDE/kdemultimedia/kmix Message-Id: <20111230215705.A97EBAC7DB () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=132528236623525 SVN commit 1270943 by esken: krazy-check: Fix include directives M +2 -12 apps/kmixd.cpp M +2 -1 backends/mixer_backend.cpp M +3 -2 backends/mixer_oss4.cpp M +2 -1 backends/mixer_pulse.cpp M +2 -1 backends/mixer_sun.cpp M +2 -1 core/mixdevice.cpp M +1 -1 core/mixer.cpp M +1 -1 core/mixertoolbox.cpp M +2 -1 core/volume.cpp M +2 -1 dbus/dbusmixerwrapper.cpp M +3 -3 dbus/dbusmixerwrapper.h M +2 -1 dbus/dbusmixsetwrapper.cpp M +3 -3 dbus/dbusmixsetwrapper.h M +2 -1 gui/dialogaddview.cpp M +2 -1 gui/dialogselectmaster.cpp M +2 -1 gui/dialogviewconfiguration.cpp M +2 -2 gui/kmixdockwidget.h M +2 -2 gui/kmixerwidget.cpp M +3 -4 gui/kmixprefdlg.cpp M +2 -1 gui/kmixprefdlg.h M +1 -2 gui/kmixtoolbox.cpp M +2 -1 gui/ksmallslider.cpp M +8 -7 gui/mdwslider.cpp M +3 -3 gui/mixdevicewidget.cpp M +2 -2 gui/viewdockareapopup.cpp M +2 -2 tests/dialogtest.cpp --- trunk/KDE/kdemultimedia/kmix/apps/kmixd.cpp #1270942:1270943 @@ -20,6 +20,8 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "kmixd.h" + #include #include @@ -27,9 +29,7 @@ #include #include #include -//#include #include -//#include #include #include #include @@ -40,20 +40,10 @@ #include // KMix -//#include "gui/guiprofile.h" #include "core/mixertoolbox.h" -#include "kmixd.h" #include "core/kmixdevicemanager.h" -//#include "gui/kmixerwidget.h" -//#include "gui/kmixprefdlg.h" -//#include "gui/kmixdockwidget.h" -//#include "gui/kmixtoolbox.h" #include "core/version.h" -//#include "gui/viewdockareapopup.h" -//#include "gui/dialogselectmaster.h" -//#include "gui/osdwidget.h" - K_PLUGIN_FACTORY(KMixDFactory, registerPlugin(); ) --- trunk/KDE/kdemultimedia/kmix/backends/mixer_backend.cpp #1270942:1270943 @@ -18,9 +18,10 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "mixer_backend.h" + #include -#include "mixer_backend.h" // for the "ERR_" declartions, #include mixer.h #include "core/mixer.h" #include --- trunk/KDE/kdemultimedia/kmix/backends/mixer_oss4.cpp #1270942:1270943 @@ -21,6 +21,9 @@ //OSS4 mixer backend for KMix by Yoper Team released under GPL v2 or later +/* We're getting soundcard.h via mixer_oss4.h */ +#include "mixer_oss4.h" + #include #include #include @@ -28,8 +31,6 @@ #include #include -/* We're getting soundcard.h via mixer_oss4.h */ -#include "mixer_oss4.h" #include #include #include --- trunk/KDE/kdemultimedia/kmix/backends/mixer_pulse.cpp #1270942:1270943 @@ -19,13 +19,14 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "mixer_pulse.h" + #include #include #include #include -#include "mixer_pulse.h" #include "core/mixer.h" #include --- trunk/KDE/kdemultimedia/kmix/backends/mixer_sun.cpp #1270942:1270943 @@ -20,6 +20,8 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "mixer_sun.h" + #include #include #include @@ -29,7 +31,6 @@ #include #include -#include "mixer_sun.h" #include "core/mixer.h" #include #include --- trunk/KDE/kdemultimedia/kmix/core/mixdevice.cpp #1270942:1270943 @@ -19,12 +19,13 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "core/mixdevice.h" + #include #include #include -#include "core/mixdevice.h" #include "core/mixer.h" #include "gui/guiprofile.h" #include "core/volume.h" --- trunk/KDE/kdemultimedia/kmix/core/mixer.cpp #1270942:1270943 @@ -20,13 +20,13 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "core/mixer.h" #include #include #include #include -#include "core/mixer.h" #include "backends/mixer_backend.h" #include "backends/kmix-backends.cpp" #include "core/volume.h" --- trunk/KDE/kdemultimedia/kmix/core/mixertoolbox.cpp #1270942:1270943 @@ -19,6 +19,7 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "core/mixer.h" #include #include @@ -30,7 +31,6 @@ #include "core/kmixdevicemanager.h" #include "core/mixdevice.h" -#include "core/mixer.h" #include "core/mixertoolbox.h" --- trunk/KDE/kdemultimedia/kmix/core/volume.cpp #1270942:1270943 @@ -19,12 +19,13 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "core/volume.h" + // for operator<<() #include #include -#include "core/volume.h" int Volume::_channelMaskEnum[9] = --- trunk/KDE/kdemultimedia/kmix/dbus/dbusmixerwrapper.cpp #1270942:1270943 @@ -19,9 +19,10 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "dbusmixerwrapper.h" + #include -#include "dbusmixerwrapper.h" #include "core/mixdevice.h" #include "core/volume.h" #include "mixeradaptor.h" --- trunk/KDE/kdemultimedia/kmix/dbus/dbusmixerwrapper.h #1270942:1270943 @@ -19,8 +19,8 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef DBUS_MIXER_WRAPPER_H -#define DBUS_MIXER_WRAPPER_H +#ifndef DBUSMIXERWRAPPER_H +#define DBUSMIXERWRAPPER_H #include #include @@ -62,4 +62,4 @@ void slotControlsReconfigured(); }; -#endif /* DBUS_MIXER_WRAPPER_H */ +#endif /* DBUSMIXERWRAPPER_H */ --- trunk/KDE/kdemultimedia/kmix/dbus/dbusmixsetwrapper.cpp #1270942:1270943 @@ -18,8 +18,9 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "dbusmixsetwrapper.h" + #include "core/mixdevice.h" -#include "dbusmixsetwrapper.h" #include "mixsetadaptor.h" DBusMixSetWrapper::DBusMixSetWrapper(QObject* parent, QString path) --- trunk/KDE/kdemultimedia/kmix/dbus/dbusmixsetwrapper.h #1270942:1270943 @@ -18,8 +18,8 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef DBUS_KMIX_WRAPPER_H -#define DBUS_KMIX_WRAPPER_H +#ifndef DBUSMIXSETWRAPPER_H +#define DBUSMIXSETWRAPPER_H #include #include "core/mixer.h" @@ -55,4 +55,4 @@ }; -#endif /* DBUS_KMIX_WRAPPER_H */ +#endif /* DBUSMIXSETWRAPPER_H */ --- trunk/KDE/kdemultimedia/kmix/gui/dialogaddview.cpp #1270942:1270943 @@ -19,6 +19,8 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "gui/dialogaddview.h" + #include #include #include @@ -30,7 +32,6 @@ #include #include -#include "gui/dialogaddview.h" #include "core/mixdevice.h" #include "core/mixer.h" --- trunk/KDE/kdemultimedia/kmix/gui/dialogselectmaster.cpp #1270942:1270943 @@ -19,6 +19,8 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "gui/dialogselectmaster.h" + #include #include #include @@ -30,7 +32,6 @@ #include #include -#include "gui/dialogselectmaster.h" #include "core/mixdevice.h" #include "core/mixer.h" --- trunk/KDE/kdemultimedia/kmix/gui/dialogviewconfiguration.cpp #1270942:1270943 @@ -19,6 +19,8 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "dialogviewconfiguration.h" + #include #include @@ -33,7 +35,6 @@ #include #include -#include "dialogviewconfiguration.h" #include "gui/guiprofile.h" #include "gui/mixdevicewidget.h" #include "core/mixdevice.h" --- trunk/KDE/kdemultimedia/kmix/gui/kmixdockwidget.h #1270942:1270943 @@ -25,7 +25,7 @@ class QString; #include - +class QWidgetAction; #include class KMixWindow; @@ -46,7 +46,7 @@ public: explicit KMixDockWidget(KMixWindow *parent,bool volumePopup); - ~KMixDockWidget(); + virtual ~KMixDockWidget(); void setErrorPixmap(); void ignoreNextEvent(); --- trunk/KDE/kdemultimedia/kmix/gui/kmixerwidget.cpp #1270942:1270943 @@ -18,6 +18,7 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "gui/kmixerwidget.h" // Qt #include @@ -39,12 +40,11 @@ // KMix #include "apps/kmix.h" #include "gui/guiprofile.h" -#include "gui/kmixerwidget.h" #include "gui/kmixtoolbox.h" #include "gui/mixdevicewidget.h" +#include "gui/viewsliders.h" #include "core/mixer.h" #include "core/mixertoolbox.h" -#include "viewsliders.h" /** --- trunk/KDE/kdemultimedia/kmix/gui/kmixprefdlg.cpp #1270942:1270943 @@ -20,18 +20,17 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "gui/kmixprefdlg.h" + #include #include #include #include #include -#include -// For "kapp" #include +#include -//#include "apps/kmix.h" -#include "gui/kmixprefdlg.h" #include "gui/kmixerwidget.h" --- trunk/KDE/kdemultimedia/kmix/gui/kmixprefdlg.h #1270942:1270943 @@ -26,6 +26,7 @@ class KMixPrefWidget; class QCheckBox; +class QFrame; class QRadioButton; class @@ -37,7 +38,7 @@ public: KMixPrefDlg( QWidget *parent ); - ~KMixPrefDlg(); + virtual ~KMixPrefDlg(); signals: void signalApplied( KMixPrefDlg *prefDlg ); --- trunk/KDE/kdemultimedia/kmix/gui/kmixtoolbox.cpp #1270942:1270943 @@ -19,6 +19,7 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "gui/kmixtoolbox.h" #include #include @@ -35,8 +36,6 @@ #include "core/mixer.h" #include "viewbase.h" -#include "gui/kmixtoolbox.h" - // TODO KMixToolbox is rather superfluous today, as there is no "KMix Applet" any more, and it was probably always bad style. // I only have to think what to do with KMixToolBox::notification() --- trunk/KDE/kdemultimedia/kmix/gui/ksmallslider.cpp #1270942:1270943 @@ -19,6 +19,8 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "gui/ksmallslider.h" + // For INT_MAX #include @@ -33,7 +35,6 @@ #include #include "kglobalsettings.h" -#include "ksmallslider.h" #include "core/mixer.h" KSmallSlider::KSmallSlider( int minValue, int maxValue, int pageStep, --- trunk/KDE/kdemultimedia/kmix/gui/mdwslider.cpp #1270942:1270943 @@ -19,6 +19,8 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "gui/mdwslider.h" + #include #include #include @@ -40,14 +42,13 @@ #include #include +#include "core/mixer.h" #include "gui/guiprofile.h" -#include "mdwslider.h" -#include "volumeslider.h" -#include "core/mixer.h" -#include "viewbase.h" -#include "ksmallslider.h" -#include "verticaltext.h" -#include "mdwmoveaction.h" +#include "gui/volumeslider.h" +#include "gui/viewbase.h" +#include "gui/ksmallslider.h" +#include "gui/verticaltext.h" +#include "gui/mdwmoveaction.h" VolumeSliderExtraData MDWSlider::DummVolumeSliderExtraData; --- trunk/KDE/kdemultimedia/kmix/gui/mixdevicewidget.cpp #1270942:1270943 @@ -19,6 +19,9 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "gui/mixdevicewidget.h" + +#include #include #include #include @@ -33,10 +36,7 @@ #include #include -#include - #include "core/mixer.h" -#include "gui/mixdevicewidget.h" #include "core/mixertoolbox.h" #include "viewbase.h" #include "ksmallslider.h" --- trunk/KDE/kdemultimedia/kmix/gui/viewdockareapopup.cpp #1270942:1270943 @@ -127,12 +127,12 @@ QWidget* ViewDockAreaPopup::add(MixDevice *md) { QString dummyMatchAll("*"); - QString matchAllPlaybackAndTheCswitch("pvolume,pswitch,cswitch"); + QString matchAllPlaybackAndTheCswitch("pvolume,cvolume,pswitch,cswitch"); ProfControl *pctl = new ProfControl( dummyMatchAll, matchAllPlaybackAndTheCswitch); MixDeviceWidget *mdw = new MDWSlider( md, // only 1 device. true, // Show Mute LED - false, // Show Record LED + true, // Show Record LED false, // Small Qt::Horizontal, // Direction: only 1 device, so doesn't matter this, // parent --- trunk/KDE/kdemultimedia/kmix/tests/dialogtest.cpp #1270942:1270943 @@ -1,3 +1,5 @@ +#include + #include #include #include @@ -8,9 +10,7 @@ #include #include -#include - extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) { KAboutData aboutData( "dialogtest", 0, ki18n("dialogtest"),