Git commit bf01e8125ace0c5dc19023968cce802dbb1e9aa0 by Yuri Chornoivan. Committed on 22/09/2018 at 15:35. Pushed by yurchor into branch 'master'. Fix minor EBN issues and typos M +7 -7 apps/KMixApp.cpp M +5 -5 apps/kmix.cpp M +1 -1 apps/kmixd.cpp M +3 -3 backends/mixer_backend.cpp M +3 -3 backends/mixer_backend.h M +4 -3 backends/mixer_oss.cpp M +4 -3 backends/mixer_oss4.cpp M +20 -1 backends/mixer_oss4.h M +3 -3 backends/mixer_pulse.cpp M +3 -2 backends/mixer_sun.cpp M +1 -1 core/ControlPool.h M +16 -3 core/MasterControl.cpp M +17 -4 core/MasterControl.h M +1 -1 core/mixdevice.h M +1 -1 core/mixdevicecomposite.h M +2 -2 core/mixer.cpp M +3 -3 core/mixer.h M +3 -3 core/mixertoolbox.cpp M +1 -1 core/volume.cpp M +3 -3 core/volume.h M +1 -1 desktop/kmix_autostart.desktop M +1 -1 gui/dialogbase.h M +2 -2 gui/guiprofile.cpp M +1 -1 gui/guiprofile.h M +2 -2 gui/kmixdockwidget.cpp M +1 -1 gui/kmixerwidget.h M +3 -3 gui/ksmallslider.cpp M +3 -3 gui/mdwslider.cpp M +3 -3 gui/viewbase.cpp M +1 -1 gui/viewdockareapopup.cpp M +1 -1 gui/volumeslider.cpp M +1 -1 gui/volumeslider.h M +21 -0 tests/profiletest.cpp https://commits.kde.org/kmix/bf01e8125ace0c5dc19023968cce802dbb1e9aa0 diff --git a/apps/KMixApp.cpp b/apps/KMixApp.cpp index d00309b..22ac91f 100644 --- a/apps/KMixApp.cpp +++ b/apps/KMixApp.cpp @@ -80,8 +80,8 @@ bool KMixApp::restoreSessionIfApplicable(bool hasArgKeepv= isibility, bool reset) * * Now we must make sure that window creation is definitely done, before = the "other" process comes, as it might * want to restore the session. Working on a half-created window would no= t be smart! Why can this happen? It - * depends on implementation details insinde Qt, which COULD potentially = lead to the following scenarios: - * 1) "Autostart" and "session restore" run concurrenty in 2 differnent T= hreads. + * depends on implementation details inside Qt, which COULD potentially l= ead to the following scenarios: + * 1) "Autostart" and "session restore" run concurrently in 2 different T= hreads. * 2) The current "main/gui" thread "pops up" a "session restore" message= from the Qt event dispatcher. * This means that "Autostart" and "session restore" run interleaved = in a single Thread. */ @@ -102,8 +102,8 @@ bool KMixApp::restoreSessionIfApplicable(bool hasArgKee= pvisibility, bool reset) qCDebug(KMIX_LOG) << "Restoring window " << n; if (n > 1) { - // This code path is "impossible". It is here only for analyzing possi= ble issues with session resoring. - // KMix is a single-instance app. If more than one instance is craeate= d we have a bug. + // This code path is "impossible". It is here only for analyzing possi= ble issues with session restoring. + // KMix is a single-instance app. If more than one instance is created= we have a bug. qCWarning(KMIX_LOG) << "KDE session management wants to restore multip= le instances of KMix. Please report this as a bug."; break; } @@ -111,7 +111,7 @@ bool KMixApp::restoreSessionIfApplicable(bool hasArgKee= pvisibility, bool reset) { // Create window, if it was not yet created (e.g. via autostart or man= ually) createWindowOnce(hasArgKeepvisibility, reset); - // #restore() is called with the parameter of "show =3D=3D false", as = KMixWindow iteself decides on it. + // #restore() is called with the parameter of "show =3D=3D false", as = KMixWindow itself decides on it. m_kmix->restore(n, false); createCount++; n++; @@ -202,10 +202,10 @@ void KMixApp::newInstance(const QStringList &argument= s, const QString &workingDi * * Typical use case: Autostart * - * =3D> We don't want to change the visibiliy, thus we don't call show= () here. + * =3D> We don't want to change the visibility, thus we don't call sho= w() here. * * Hint: --keepVisibility is used in kmix_autostart.desktop. It was use= d in history by KMilo - * (see BKO 58901), but nowadays Mixer Applets nmight want to use= it, though they should + * (see BKO 58901), but nowadays Mixer Applets might want to use = it, though they should * use KMixD instead. */ qCDebug(KMIX_LOG) diff --git a/apps/kmix.cpp b/apps/kmix.cpp index b60f7e9..89e5889 100644 --- a/apps/kmix.cpp +++ b/apps/kmix.cpp @@ -546,7 +546,7 @@ void KMixWindow::loadBaseConfig() /** * Loads the volumes of all mixers from kmixctrlrc. * In other words: - * Restores the default voumes as stored via saveVolumes() or the + * Restores the default volumes as stored via saveVolumes() or the * execution of "kmixctrl --save" */ = @@ -754,7 +754,7 @@ void KMixWindow::recreateGUI(bool saveConfig, const QSt= ring& mixerId, bool force bool dockingSucceded =3D updateDocking(); if (!dockingSucceded && !Mixer::mixers().empty()) { - show(); // avoid invisible and unaccessible main window + show(); // avoid invisible and inaccessible main window } } else @@ -957,7 +957,7 @@ void KMixWindow::unplugged(const QString& udi) * This widget shows an error message like "no mixers detected. void KMixWindow::setErrorMixerWidget() { - QString s =3D i18n("Please plug in your soundcard.No soundcard found. Pro= bably you have not set it up or are missing soundcard drivers. Please check= your operating system manual for installing your soundcard."); // !! bette= r text + QString s =3D i18n("Please plug in your soundcard. No soundcard found. Pr= obably you have not set it up or are missing soundcard drivers. Please chec= k your operating system manual for installing your soundcard."); // !! bett= er text m_errorLabel =3D new QLabel( s,this ); m_errorLabel->setAlignment( Qt::AlignCenter ); m_errorLabel->setWordWrap(true); @@ -1031,7 +1031,7 @@ bool KMixWindow::addMixerWidget(const QString& mixer_= ID, QString guiprofId, int = kmw->loadConfig(KSharedConfig::openConfig().data()); // Now force to read for new tabs, especially after hotplug. Note: Doing = it here is bad design and possibly - // obsolete, as the backend should take care of upating itself. + // obsolete, as the backend should take care of updating itself. kmw->mixer()->readSetFromHWforceUpdate(); return true; } @@ -1175,7 +1175,7 @@ void KMixWindow::showAbout() = /** * Apply the Preferences from the preferences dialog. Depending on what ha= s been changed, - * the corresponding announcemnts are made. + * the corresponding announcements are made. */ void KMixWindow::applyPrefs() { diff --git a/apps/kmixd.cpp b/apps/kmixd.cpp index bdc4d5d..55b53ea 100644 --- a/apps/kmixd.cpp +++ b/apps/kmixd.cpp @@ -77,7 +77,7 @@ KMixD::KMixD(QObject* parent, const QList&) : * on DBUS, likely creating deadlocks. See Bug 317926 for that. By artific= ially delaying initialization, * KMixD gets hopefully out of the way of the other applications, avoiding= these deadlocks. A small delay * should also not harm too much, as apps using the Mixer DBUS calls on KM= ixD must be prepared that the - * interface is not available rihgt when they start. + * interface is not available right when they start. */ void KMixD::delayedInitialization() { diff --git a/backends/mixer_backend.cpp b/backends/mixer_backend.cpp index c768ad8..5da1b76 100644 --- a/backends/mixer_backend.cpp +++ b/backends/mixer_backend.cpp @@ -22,7 +22,7 @@ = #include = -// for the "ERR_" declartions, #include mixer.h +// for the "ERR_" declarations, #include mixer.h #include "core/mixer.h" #include "core/ControlManager.h" = @@ -186,7 +186,7 @@ void Mixer_Backend::readSetFromHW() { /* * This could be reworked: - * Plan: Read everything (incuding enum's) in readVolumeFromHW(). + * Plan: Read everything (including enum's) in readVolumeFromHW(). * readVolumeFromHW() should then be renamed to readHW(). */ md->setEnumId( enumIdHW(md->id()) ); @@ -260,7 +260,7 @@ shared_ptr Mixer_Backend::recommendedMaster() qCCritical(KMIX_LOG) << "Mixer_Backend::recommendedMaster(): returning = invalid master. This is a bug in KMix. Please file a bug report stating how= you produced this."; } = - // If we reach this code path, then obiously m_recommendedMaster =3D=3D 0= (see above) + // If we reach this code path, then obviously m_recommendedMaster =3D=3D = 0 (see above) return m_recommendedMaster; = } diff --git a/backends/mixer_backend.h b/backends/mixer_backend.h index 78e41d1..5a8715c 100644 --- a/backends/mixer_backend.h +++ b/backends/mixer_backend.h @@ -65,11 +65,11 @@ protected: = /** * Returns the driver name, e.g. "ALSA" or "OSS". This virtual method is= for looking up the - * driver name on instanciated objects. + * driver name on instantiated objects. * * Please note, that there is also a static implementation of the driver= Name * (Because there is no "virtual static" in C++, I need the method twice= ). - * The static implementation is for the Mixer Factory (who needs it *bef= ore* instanciating an object). + * The static implementation is for the Mixer Factory (who needs it *bef= ore* instantiating an object). * While it is not a member function, its implementation can still be fo= und in the corresponding * Backend implementation. For example in mixer_oss.cpp there is a globa= l function called OSS_getDriverName(). */ @@ -203,7 +203,7 @@ protected: * * TODO This is not entirely correct. Example: If the first card (cardDi= scrimiator =3D=3D 1) is unpluggged, then * s_mixerNums["cardName"] is changed from 2 to 1. The next plug of re= gisterCard("cardName") will use - * cardDiscriminator =3D=3D 2, but the card with taht discrimniator wa= s not unplugged =3D> BANG!!! + * cardDiscriminator =3D=3D 2, but the card with that discriminator wa= s not unplugged =3D> BANG!!! * * @param cardBaseName */ diff --git a/backends/mixer_oss.cpp b/backends/mixer_oss.cpp index 754b28a..9e5641a 100644 --- a/backends/mixer_oss.cpp +++ b/backends/mixer_oss.cpp @@ -29,6 +29,7 @@ #include #include #include +#include = // Since we're guaranteed an OSS setup here, let's make life easier #if !defined(__NetBSD__) && !defined(__OpenBSD__) @@ -106,13 +107,13 @@ int Mixer_OSS::open() QString finalDeviceName; finalDeviceName =3D deviceName( m_devnum ); qCDebug(KMIX_LOG) << "OSS open() " << finalDeviceName; - if ((m_fd=3D ::open( finalDeviceName.toLatin1().data(), O_RDWR)) < 0) + if ((m_fd=3D QT_OPEN( finalDeviceName.toLatin1().data(), O_RDWR)) < 0) { if ( errno =3D=3D EACCES ) return Mixer::ERR_PERM; else { finalDeviceName =3D deviceNameDevfs( m_devnum ); - if ((m_fd=3D ::open( finalDeviceName.toLatin1().data(), O_RDWR= )) < 0) + if ((m_fd=3D QT_OPEN( finalDeviceName.toLatin1().data(), O_RDW= R)) < 0) { if ( errno =3D=3D EACCES ) return Mixer::ERR_PERM; @@ -311,7 +312,7 @@ int Mixer_OSS::setRecsrcToOSS( const QString& id, bool = on ) } = // Re-read status of record source(s). Just in case the hardware/drive= r has - // some limitaton (like exclusive switches) + // some limitation (like exclusive switches) int recsrcMask; if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &recsrcMask) =3D=3D -1) errormsg(Mixer::ERR_READ); diff --git a/backends/mixer_oss4.cpp b/backends/mixer_oss4.cpp index 78a4d24..f24d834 100644 --- a/backends/mixer_oss4.cpp +++ b/backends/mixer_oss4.cpp @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU Library General Public * License along with this program; if not, write to the Free - * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 021= 11-1307, USA. + * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA = 02110-1301, USA. */ = //OSS4 mixer backend for KMix by Yoper Team released under GPL v2 or later @@ -33,6 +33,7 @@ = #include #include +#include = Mixer_Backend* OSS4_getMixer(Mixer *mixer, int device) { @@ -183,7 +184,7 @@ MixDevice::ChannelType Mixer_OSS4::classifyAndRename(QS= tring &name, int flags) = int Mixer_OSS4::open() { - if ( (m_fd=3D ::open("/dev/mixer", O_RDWR)) < 0 ) + if ( (m_fd=3D QT_OPEN("/dev/mixer", O_RDWR)) < 0 ) { if ( errno =3D=3D EACCES ) return Mixer::ERR_PERM; @@ -233,7 +234,7 @@ int Mixer_OSS4::open() } = ::close(m_fd); - if ( (m_fd=3D ::open(mi.devnode, O_RDWR)) < 0 ) + if ( (m_fd=3D QT_OPEN(mi.devnode, O_RDWR)) < 0 ) { return Mixer::ERR_OPEN; } diff --git a/backends/mixer_oss4.h b/backends/mixer_oss4.h index ca049ca..8bfd990 100644 --- a/backends/mixer_oss4.h +++ b/backends/mixer_oss4.h @@ -1,4 +1,23 @@ -//-*-C++-*- +/* + * KMix -- KDE's full featured mini mixer + * + * Copyright (C) 1996-2000 Christian Esken + * esken@kde.org + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the Free + * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA = 02110-1301, USA. + */ = #ifndef MIXER_OSS4_H #define MIXER_OSS4_H diff --git a/backends/mixer_pulse.cpp b/backends/mixer_pulse.cpp index 024d6fc..d83c959 100644 --- a/backends/mixer_pulse.cpp +++ b/backends/mixer_pulse.cpp @@ -103,7 +103,7 @@ static void translateMasksAndMaps(devinfo& dev) dev.chanIDs.clear(); = if (dev.channel_map.channels !=3D dev.volume.channels) { - qCCritical(KMIX_LOG) << "Hiddeous Channel mixup map says " << dev.= channel_map.channels << ", volume says: " << dev.volume.channels; + qCCritical(KMIX_LOG) << "Hideous Channel mixup map says " << dev.c= hannel_map.channels << ", volume says: " << dev.volume.channels; return; } if (1 =3D=3D dev.channel_map.channels && PA_CHANNEL_POSITION_MONO =3D= =3D dev.channel_map.map[0]) { @@ -477,7 +477,7 @@ void ext_stream_restore_read_cb(pa_context *c, const pa= _ext_stream_restore_info rule.mute =3D false; rule.device =3D ""; s_RestoreRules[KMIXPA_EVENT_KEY] =3D rule; - qCDebug(KMIX_LOG) << "Initialising restore rule for new user: = " << i18n("Event Sounds"); + qCDebug(KMIX_LOG) << "Initializing restore rule for new user: = " << i18n("Event Sounds"); } = if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) { @@ -789,7 +789,7 @@ void Mixer_PULSE::emitControlsReconfigured() * a) It seems there seems to be some object deletion hazard with a QMen= u (the one for "move stream") * b) I do not see why executing it Queued is better, because you can n= ever know when it is actually being * executed: it could be "right now". It looks like Qt currently exe= cutes it after the QMenu hazard has - * resolved itselves miracously. + * resolved itself miraculously. * c) I am definitely strongly opposed on this "execute later" approach.= It is pure gambling IMO and might be * broken any time (from DEBUG to RELEASE build, or by a new Qt or KD= E version). * diff --git a/backends/mixer_sun.cpp b/backends/mixer_sun.cpp index 1b7bfd3..44a7ff2 100644 --- a/backends/mixer_sun.cpp +++ b/backends/mixer_sun.cpp @@ -34,6 +34,7 @@ #include "core/mixer.h" #include #include +#include //=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D // CONSTANT/ENUM DEFINITIONS //=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D @@ -157,12 +158,12 @@ int Mixer_SUN::open() // // Open the mixer hardware driver // - QString audiodev(getenv("AUDIODEV")); + QString audiodev(qgetenv("AUDIODEV")); if(audiodev.isNull()) audiodev =3D "/dev/audio"; audiodev +=3D "ctl"; _udi =3D audiodev; // use device name as UDI. Doesn't matter as we only= use it for hotplugging/unplugging. - if ( ( fd =3D ::open( audiodev.toLatin1().data(), O_RDWR ) ) < 0 ) + if ( ( fd =3D QT_OPEN( audiodev.toLatin1().data(), O_RDWR ) ) < 0 ) { if ( errno =3D=3D EACCES ) return Mixer::ERR_PERM; diff --git a/core/ControlPool.h b/core/ControlPool.h index b045ce0..b935763 100644 --- a/core/ControlPool.h +++ b/core/ControlPool.h @@ -22,7 +22,7 @@ #ifndef CONTROL_POOL_H #define CONTROL_POOL_H = -#include "config.h" +#include = #if defined(HAVE_STD_SHARED_PTR) #include diff --git a/core/MasterControl.cpp b/core/MasterControl.cpp index c6e446d..576a08d 100644 --- a/core/MasterControl.cpp +++ b/core/MasterControl.cpp @@ -1,8 +1,21 @@ /* - * MasterControl.cpp + * KMix -- KDE's full featured mini mixer * - * Created on: 02.01.2011 - * Author: kde + * Copyright 2011 Christian Esken + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the Free + * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA = 02110-1301, USA. */ = #include "MasterControl.h" diff --git a/core/MasterControl.h b/core/MasterControl.h index 0b2f694..dbd28cd 100644 --- a/core/MasterControl.h +++ b/core/MasterControl.h @@ -1,14 +1,27 @@ /* - * MasterControl.h + * KMix -- KDE's full featured mini mixer * - * Created on: 02.01.2011 - * Author: kde + * Copyright 2011 Christian Esken + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the Free + * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA = 02110-1301, USA. */ = #ifndef MASTERCONTROL_H_ #define MASTERCONTROL_H_ = -#include "config.h" +#include #include "kmixcore_export.h" = #if defined(HAVE_STD_SHARED_PTR) diff --git a/core/mixdevice.h b/core/mixdevice.h index 7d26354..f563832 100644 --- a/core/mixdevice.h +++ b/core/mixdevice.h @@ -21,7 +21,7 @@ #ifndef MixDevice_h #define MixDevice_h = -#include "config.h" +#include = #if defined(HAVE_STD_SHARED_PTR) #include diff --git a/core/mixdevicecomposite.h b/core/mixdevicecomposite.h index a3d55bc..28b22c5 100644 --- a/core/mixdevicecomposite.h +++ b/core/mixdevicecomposite.h @@ -81,7 +81,7 @@ public: = = // Methods for handling the switches. This methods are useful, because = the Sswitch in the Volume object - // is an abstract concept. It places no interpration on the meaning of = the switch (e.g. does "switch set" mean + // is an abstract concept. It places no interpretation on the meaning o= f the switch (e.g. does "switch set" mean // "mute on", or does it mean "playback on". bool isMuted() Q_DECL_OVERRIDE; void setMuted(bool value) Q_DECL_OVERRIDE; diff --git a/core/mixer.cpp b/core/mixer.cpp index 7101bb3..034263c 100644 --- a/core/mixer.cpp +++ b/core/mixer.cpp @@ -32,7 +32,7 @@ #include "core/volume.h" = /** - * Some general design hints. Hierachy is Mixer->MixDevice->Volume + * Some general design hints. Hierarchy is Mixer->MixDevice->Volume */ = QList Mixer::s_mixers; @@ -179,7 +179,7 @@ const QString Mixer::dbusPath() // Bug 308014: By checking _cardRegistered, we can be sure that everyth= ing is fine, including the fact that // the cardId (aka "card instance") is set. If _cardRegistered would be= false, we will create potentially // wrong/duplicated DBUS Paths here. - qCWarning(KMIX_LOG) << "Mixer id was empty when ceating DBUS path. Emer= gency code created the id=3D" <<_id; + qCWarning(KMIX_LOG) << "Mixer id was empty when creating DBUS path. Eme= rgency code created the id=3D" <<_id; } // Bug 308014: Actually this a shortcut (you could also call it a hack).= It would likely better if registerCard() // would create the Id, but it requires cooperation from ALL= backends. Also Mixer->getId() would need to diff --git a/core/mixer.h b/core/mixer.h index e8760a7..e6f4423 100644 --- a/core/mixer.h +++ b/core/mixer.h @@ -50,7 +50,7 @@ public: /** * Status for Mixer operations. * = - * OK_UNCHANGED is a apecial variant of OK. It must be implemented by + * OK_UNCHANGED is a special variant of OK. It must be implemented by * backends that use needsPolling() =3D=3D true. See Mixer_OSS.cpp for an * example. Rationale is that we need a proper change check: Otherwise * the DBUS Session Bus is massively spammed. Also quite likely the Mixer @@ -85,7 +85,7 @@ public: /// mixer_oss.cpp (0 is Volume, 4 is PCM, etc.) shared_ptr getMixdeviceById( const QString& deviceID ); = - /// Open/grab the mixer for further intraction + /// Open/grab the mixer for further interaction bool openIfValid(); = /// Returns whether the card is open/operational @@ -131,7 +131,7 @@ public: = int getCardInstance() const { return _mixerBackend->getCardInst= ance(); } = - /// Returns an Universal Device Identifaction of the Mixer. This is an= ID that relates to the underlying operating system. + /// Returns an Universal Device Identification of the Mixer. This is a= n ID that relates to the underlying operating system. // For OSS and ALSA this is taken from Solid (actually HAL). For Solar= is this is just the device name. // Examples: // ALSA: /org/freedesktop/Hal/devices/usb_device_d8c_1_noserial_if0_so= und_card_0_2_alsa_control__1 diff --git a/core/mixertoolbox.cpp b/core/mixertoolbox.cpp index 3e3b47c..099d505 100644 --- a/core/mixertoolbox.cpp +++ b/core/mixertoolbox.cpp @@ -57,7 +57,7 @@ MixerToolBox* MixerToolBox::instance() = = /** - * Scan for Mixers in the System. This is the method that implicitely fill= s the + * Scan for Mixers in the System. This is the method that implicitly fills= the * list of Mixer's, which is accessible via the static Mixer::mixer() meth= od. * * This is run only once during the initialization phase of KMix. It has t= he following tasks: @@ -67,11 +67,11 @@ MixerToolBox* MixerToolBox::instance() * * @deprecated TODO this method has to go away. Migrate to MultiDriverMode= enum * - * @par multiDriverMode Whether the Mixer scan should try more all backend= ends. + * @par multiDriverMode Whether the Mixer scan should try more all backend= s. * 'true' means to scan all backends. 'false' means: After scanni= ng the * current backend the next backend is only scanned if no Mixers = were found yet. * @par backendList Activated backends (typically a value from the kmixrc = or a default) - * @par ref_hwInfoString Here a descripitive text of the scan is returned = (Hardware Information) + * @par ref_hwInfoString Here a descriptive text of the scan is returned (= Hardware Information) */ void MixerToolBox::initMixer(bool multiDriverModeBool, QList back= endList, QString& ref_hwInfoString, bool hotplug) { diff --git a/core/volume.cpp b/core/volume.cpp index 971c0c5..c1646c4 100644 --- a/core/volume.cpp +++ b/core/volume.cpp @@ -116,7 +116,7 @@ void Volume::addVolumeChannels(ChannelMask chmask) void Volume::addVolumeChannel(VolumeChannel vc) { _volumesL.insert(vc.chid, vc); - // Add the correpsonnding "muted version" of the chnnel. + // Add the corresponding "muted version" of the channel. // VolumeChannel* zeroChannel =3D new VolumeChannel(vc.chid); // zeroChannel->volume =3D 0; // _volumesMuted.insert(zeroChannel->chid, *zeroChannel); // TODO remove _= volumesMuted diff --git a/core/volume.h b/core/volume.h index ba494de..77780c1 100644 --- a/core/volume.h +++ b/core/volume.h @@ -84,7 +84,7 @@ friend class MixDevice; = enum VolumeTypeFlag { Playback =3D 1, Capture =3D 2, Both =3D 3 }; = - // regular constructor (old, deprecsted) + // regular constructor (old, deprecated) //Volume( ChannelMask chmask, long maxVolume, long minVolume, bool has= Switch, bool isCapture ); // regular constructor Volume(long maxVolume, long minVolume, bool hasSwitch, bool isCapture = ); @@ -143,7 +143,7 @@ friend class MixDevice; friend std::ostream& operator<<(std::ostream& os, const Volume& vol); friend QDebug operator<<(QDebug os, const Volume& vol); = - // _channelMaskEnum[] and the following elements moved to public seect= ion. operator<<() could not + // _channelMaskEnum[] and the following elements moved to public secti= on. operator<<() could not // access it, when private. Strange, as operator<<() is declared frien= d. static int _channelMaskEnum[9]; QMap getVolumes() const; @@ -160,7 +160,7 @@ protected: = long _minVolume; long _maxVolume; - // setSwitch() and isSwitchActivated() are tricky. No regular class (in= cuding the Backends) shall use + // setSwitch() and isSwitchActivated() are tricky. No regular class (in= cluding the Backends) shall use // these functions. Our friend class MixDevice will handle that gracefu= lly for us. void setSwitch( bool active ); bool isSwitchActivated() const // TODO rename to isActive() diff --git a/desktop/kmix_autostart.desktop b/desktop/kmix_autostart.desktop index f32943a..815cafc 100755 --- a/desktop/kmix_autostart.desktop +++ b/desktop/kmix_autostart.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Exec=3Dkmix --keepvisibility -DocPath=3Dkmix/index.html +X-DocPath=3Dkmix/index.html OnlyShowIn=3DKDE; Type=3DApplication MimeType=3D diff --git a/gui/dialogbase.h b/gui/dialogbase.h index 1ef6f96..27e67b0 100644 --- a/gui/dialogbase.h +++ b/gui/dialogbase.h @@ -66,7 +66,7 @@ public: * Get a spacing hint suitable for use within the dialog layout. * * @return The spacing hint - * @deprecated Kept for compatiblity with KDE4. + * @deprecated Kept for compatibility with KDE4. * Use @c verticalSpacing() or @c horizontalSpacing() as appropriate. **/ static Q_DECL_DEPRECATED int spacingHint(); diff --git a/gui/guiprofile.cpp b/gui/guiprofile.cpp index e63c22c..7999ce5 100644 --- a/gui/guiprofile.cpp +++ b/gui/guiprofile.cpp @@ -509,8 +509,8 @@ QString xmlify(QString raw) raw =3D raw.replace('&', "&"); raw =3D raw.replace('<', "<"); raw =3D raw.replace('>', ">"); - raw =3D raw.replace("'", "'"); - raw =3D raw.replace("\"", """); + raw =3D raw.replace('\'', "'"); + raw =3D raw.replace('\"', """); // qCDebug(KMIX_LOG) << "After : " << raw; return raw; } diff --git a/gui/guiprofile.h b/gui/guiprofile.h index 1735854..ac95c8d 100644 --- a/gui/guiprofile.h +++ b/gui/guiprofile.h @@ -62,7 +62,7 @@ public: = /** * GuiVisibility can be used in different contexts. One is, to define in t= he XML GUI Profile, which control to show, e.g. show - * "MIC Boost" in EXTENDED mode. The other is for representing the GUI com= pexity (e.g. for letting the user select a preset like "SIMPLE". + * "MIC Boost" in EXTENDED mode. The other is for representing the GUI com= plexity (e.g. for letting the user select a preset like "SIMPLE". */ class GuiVisibility { diff --git a/gui/kmixdockwidget.cpp b/gui/kmixdockwidget.cpp index 7b61bc3..16e0eca 100644 --- a/gui/kmixdockwidget.cpp +++ b/gui/kmixdockwidget.cpp @@ -81,8 +81,8 @@ KMixDockWidget::KMixDockWidget(KMixWindow* parent) (ControlChangeType::Type) (ControlChangeType::Volume | ControlChangeType= ::MasterChanged), this, QString("KMixDockWidget")); = - // Refresh in all cases. When there is no Golbal Master we still ne= ed - // to initialize correctly (e.g. for showin 0% or hiding it) + // Refresh in all cases. When there is no Global Master we still ne= ed + // to initialize correctly (e.g. for showing 0% or hiding it) refreshVolumeLevels(); } = diff --git a/gui/kmixerwidget.h b/gui/kmixerwidget.h index 2e5ea2b..ef35fb6 100644 --- a/gui/kmixerwidget.h +++ b/gui/kmixerwidget.h @@ -77,7 +77,7 @@ class KMixerWidget : public QWidget QString _guiprofId; ProfTab* _tab; std::vector _views; - KActionCollection* _actionCollection; // -<- applciations wide action = collection + KActionCollection* _actionCollection; // -<- applications wide action = collection = void createLayout(ViewBase::ViewFlags vflags); bool possiblyAddView(ViewBase* vbase); diff --git a/gui/ksmallslider.cpp b/gui/ksmallslider.cpp index 5c7528c..0a90f4f 100644 --- a/gui/ksmallslider.cpp +++ b/gui/ksmallslider.cpp @@ -187,7 +187,7 @@ void gradient( QPainter &p, bool hor, const QRect &rect= , const QColor &ca, const // would make it slow if (!hor) { - for ( y =3D rect.top(); y <=3D rect.bottom(); y++ ) { + for ( y =3D rect.top(); y <=3D rect.bottom(); ++y ) { rl +=3D rcdelta; gl +=3D gcdelta; bl +=3D bcdelta; @@ -197,7 +197,7 @@ void gradient( QPainter &p, bool hor, const QRect &rect= , const QColor &ca, const } } else { - for( x =3D rect.left(); x <=3D rect.right(); x++) { + for( x =3D rect.left(); x <=3D rect.right(); ++x) { rl +=3D rcdelta; gl +=3D gcdelta; bl +=3D bcdelta; @@ -331,7 +331,7 @@ void KSmallSlider::wheelEvent( QWheelEvent * qwe) emit valueChanged(newVal); qwe->accept(); // Accept the event = - // Hint: Qt autmatically triggers a valueChange() when we do setValue() + // Hint: Qt automatically triggers a valueChange() when we do setValue= () } = = diff --git a/gui/mdwslider.cpp b/gui/mdwslider.cpp index 903a6a2..942cda9 100644 --- a/gui/mdwslider.cpp +++ b/gui/mdwslider.cpp @@ -206,7 +206,7 @@ QSize MDWSlider::sizeHint() const * This method is a helper for users of this class who would like * to show multiple MDWSlider, and align the sliders. * It returns the "height" (if vertical) of this widgets label. - * Warning: Line wraps are computed for a fixed size (100), this may be un= accurate in case, + * Warning: Line wraps are computed for a fixed size (100), this may be in= accurate in case, * the widgets have different sizes. */ int MDWSlider::labelExtentHint() const @@ -998,8 +998,8 @@ void MDWSlider::increaseVolume() } = /** - * This slot is called on a Keyboard Shortcut event, except for the XF86Au= dio* shortcuts which hare handeled by the - * KMixWindow class. So for 99.9% of all users, this methos is never calle= d. + * This slot is called on a Keyboard Shortcut event, except for the XF86Au= dio* shortcuts which hare handled by the + * KMixWindow class. So for 99.9% of all users, this method is never calle= d. */ void MDWSlider::decreaseVolume() { diff --git a/gui/viewbase.cpp b/gui/viewbase.cpp index 69fe8a6..6a32248 100644 --- a/gui/viewbase.cpp +++ b/gui/viewbase.cpp @@ -54,7 +54,7 @@ ViewBase::ViewBase(QWidget* parent, QString id, Qt::Windo= wFlags f, ViewBase::Vie , guiLevel(GuiVisibility::GuiSIMPLE) { setObjectName(id); - // When loding the View from the XML profile, guiLevel can get overridd= en + // When loading the View from the XML profile, guiLevel can get overrid= den m_viewId =3D id; configureIcon =3D QIcon::fromTheme( QLatin1String( "configure" )); = @@ -348,7 +348,7 @@ void ViewBase::load(KConfig *config) = if (mdw->inherits("MDWSlider")) { - // only sliders have the ability to split apart in mutliple channels + // only sliders have the ability to split apart in multiple channels bool splitChannels =3D devcg.readEntry("Split", !mdw->isStereoLinked(= )); mdw->setStereoLinked(!splitChannels); } @@ -468,7 +468,7 @@ void ViewBase::save(KConfig *config) = if (mdw->inherits("MDWSlider")) { - // only sliders have the ability to split apart in mutliple channels + // only sliders have the ability to split apart in multiple channels devcg.writeEntry("Split", !mdw->isStereoLinked()); } /* diff --git a/gui/viewdockareapopup.cpp b/gui/viewdockareapopup.cpp index 1fb6a17..c4ec647 100644 --- a/gui/viewdockareapopup.cpp +++ b/gui/viewdockareapopup.cpp @@ -201,7 +201,7 @@ Application: KMix (kmix), signal: Segmentation fault = // --- Due to the strange crash, delete everything manually : START ---= ------------ // I am a bit confused why this doesn't crash. I moved the "optionsLayo= ut->takeAt(0) delete" loop at the beginning, - // so the obejcts should already be deleted. ... + // so the objects should already be deleted. ... delete configureViewButton; delete restoreVolumeButton1; delete restoreVolumeButton2; diff --git a/gui/volumeslider.cpp b/gui/volumeslider.cpp index bc57ee0..271dead 100644 --- a/gui/volumeslider.cpp +++ b/gui/volumeslider.cpp @@ -3,7 +3,7 @@ * KMix -- KDE's full featured mini mixer * * - * Copyright Christian Esken + * Copyright Christian Esken * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gui/volumeslider.h b/gui/volumeslider.h index dfef353..be733ab 100644 --- a/gui/volumeslider.h +++ b/gui/volumeslider.h @@ -3,7 +3,7 @@ * KMix -- KDE's full featured mini mixer * * - * Copyright Christian Esken + * Copyright Christian Esken * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/tests/profiletest.cpp b/tests/profiletest.cpp index 77421e3..9ef86ee 100644 --- a/tests/profiletest.cpp +++ b/tests/profiletest.cpp @@ -1,3 +1,24 @@ +/* + * KMix -- KDE's full featured mini mixer + * + * Copyright (C) 2005 Christian Esken + * esken@kde.org + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the Free + * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA = 02110-1301, USA. + */ + #include "../gui/guiprofile.h" = #include