[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kmix/kmix-improvements] src: Krazy and gcc warning fixes
From: Trever Fischer <tdfischer () fedoraproject ! org>
Date: 2013-02-19 19:56:03
Message-ID: 20130219195603.1E9E6A60C8 () git ! kde ! org
[Download RAW message or body]
Git commit 75454a67c260dd8ca2696e77a11bdd67b786e0de by Trever Fischer.
Committed on 27/09/2012 at 18:02.
Pushed by tdfischer into branch 'kmix-improvements'.
Krazy and gcc warning fixes
M +1 -0 src/daemon/Control.cpp
M +1 -1 src/daemon/Control.h
M +1 -1 src/daemon/ControlGroup.h
M +1 -1 src/daemon/KMixDApp.cpp
M +3 -3 src/daemon/KMixDApp.h
M +20 -0 src/daemon/backends/ALSA.cpp
M +20 -0 src/daemon/backends/ALSA.h
M +20 -0 src/daemon/backends/ALSAControl.cpp
M +20 -0 src/daemon/backends/ALSAControl.h
M +1 -1 src/daemon/backends/PulseAudio.cpp
M +5 -0 src/daemon/backends/PulseAudio.h
M +20 -0 src/daemon/backends/PulseSinkControl.cpp
M +20 -0 src/daemon/backends/PulseSinkControl.h
M +20 -0 src/daemon/backends/PulseSinkInputControl.cpp
M +21 -1 src/daemon/backends/PulseSinkInputControl.h
M +20 -0 src/daemon/backends/PulseSourceOutputControl.cpp
M +20 -0 src/daemon/backends/PulseSourceOutputControl.h
M +21 -0 src/gui/ControlGroupTab.cpp
M +20 -0 src/gui/ControlGroupTab.h
M +20 -0 src/gui/ControlMonitor.cpp
M +20 -0 src/gui/ControlMonitor.h
M +22 -2 src/gui/ControlSlider.cpp
M +1 -1 src/gui/ControlSlider.h
M +1 -2 src/gui/kmix_autostart.desktop
http://commits.kde.org/kmix/75454a67c260dd8ca2696e77a11bdd67b786e0de
diff --git a/src/daemon/Control.cpp b/src/daemon/Control.cpp
index 9b3eceb..0711b2b 100644
--- a/src/daemon/Control.cpp
+++ b/src/daemon/Control.cpp
@@ -117,6 +117,7 @@ void Control::setCurrentTarget(Control *t)
void Control::changeTarget(Control *t)
{
+ Q_UNUSED(t);
}
void Control::startMonitor()
diff --git a/src/daemon/Control.h b/src/daemon/Control.h
index 6e2c3a2..215c6c1 100644
--- a/src/daemon/Control.h
+++ b/src/daemon/Control.h
@@ -68,7 +68,7 @@ public:
HardwareInput,
HardwareOutput
} Category;
- Control(Category, QObject *parent = 0);
+ explicit Control(Category, QObject *parent = 0);
~Control();
virtual QString displayName() const = 0;
diff --git a/src/daemon/ControlGroup.h b/src/daemon/ControlGroup.h
index 44c707c..003a984 100644
--- a/src/daemon/ControlGroup.h
+++ b/src/daemon/ControlGroup.h
@@ -32,7 +32,7 @@ class ControlGroup : public QObject
Q_PROPERTY(QString displayName READ displayName);
Q_PROPERTY(QStringList controls READ controls);
public:
- ControlGroup(const QString &displayName, QObject *parent = 0);
+ explicit ControlGroup(const QString &displayName, QObject *parent = 0);
~ControlGroup();
QString displayName() const;
QStringList controls() const;
diff --git a/src/daemon/KMixDApp.cpp b/src/daemon/KMixDApp.cpp
index ed3553e..9c8e3e5 100644
--- a/src/daemon/KMixDApp.cpp
+++ b/src/daemon/KMixDApp.cpp
@@ -71,7 +71,7 @@ QString KMixDApp::masterControl() const
int KMixDApp::masterVolume() const
{
if (m_master) {
- int sum;
+ int sum = 0;
for(int i = 0;i<m_master->channels();i++) {
sum+=m_master->getVolume(i);
}
diff --git a/src/daemon/KMixDApp.h b/src/daemon/KMixDApp.h
index 27a8cb0..ed0d680 100644
--- a/src/daemon/KMixDApp.h
+++ b/src/daemon/KMixDApp.h
@@ -18,8 +18,8 @@
* 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 KMixApp_h
-#define KMixApp_h
+#ifndef KMIXDAPP_H
+#define KMIXDAPP_H
#include <QtCore/QCoreApplication>
#include <QtCore/QStringList>
@@ -54,4 +54,4 @@ private:
Control *m_master;
};
-#endif
+#endif // KMIXDAPP_H
diff --git a/src/daemon/backends/ALSA.cpp b/src/daemon/backends/ALSA.cpp
index f098396..1686132 100644
--- a/src/daemon/backends/ALSA.cpp
+++ b/src/daemon/backends/ALSA.cpp
@@ -1,3 +1,23 @@
+/*
+ * KMix -- KDE's full featured mini mixer
+ *
+ * Copyright (C) Trever Fischer <tdfischer@fedoraproject.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 "ALSA.h"
#include "ALSAControl.h"
#include <QtCore/QDebug>
diff --git a/src/daemon/backends/ALSA.h b/src/daemon/backends/ALSA.h
index 7608af2..b0f5485 100644
--- a/src/daemon/backends/ALSA.h
+++ b/src/daemon/backends/ALSA.h
@@ -1,3 +1,23 @@
+/*
+ * KMix -- KDE's full featured mini mixer
+ *
+ * Copyright (C) Trever Fischer <tdfischer@fedoraproject.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 ALSABACKEND_H
#define ALSABACKEND_H
#include "Backend.h"
diff --git a/src/daemon/backends/ALSAControl.cpp \
b/src/daemon/backends/ALSAControl.cpp index 19a589c..b394794 100644
--- a/src/daemon/backends/ALSAControl.cpp
+++ b/src/daemon/backends/ALSAControl.cpp
@@ -1,3 +1,23 @@
+/*
+ * KMix -- KDE's full featured mini mixer
+ *
+ * Copyright (C) Trever Fischer <tdfischer@fedoraproject.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 "ALSAControl.h"
namespace Backends {
diff --git a/src/daemon/backends/ALSAControl.h b/src/daemon/backends/ALSAControl.h
index f92fd62..526ce45 100644
--- a/src/daemon/backends/ALSAControl.h
+++ b/src/daemon/backends/ALSAControl.h
@@ -1,3 +1,23 @@
+/*
+ * KMix -- KDE's full featured mini mixer
+ *
+ * Copyright (C) Trever Fischer <tdfischer@fedoraproject.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 ALSACONTROL_H
#define ALSACONTROL_H
diff --git a/src/daemon/backends/PulseAudio.cpp b/src/daemon/backends/PulseAudio.cpp
index 3010067..d9c05d3 100644
--- a/src/daemon/backends/PulseAudio.cpp
+++ b/src/daemon/backends/PulseAudio.cpp
@@ -93,7 +93,7 @@ void PulseAudio::source_output_cb(pa_context *cxt, const \
pa_source_output_info * }
PulseSourceOutputControl *control;
const char *app;
- if (app = pa_proplist_gets(info->proplist, PA_PROP_APPLICATION_ID)) {
+ if ((app = pa_proplist_gets(info->proplist, PA_PROP_APPLICATION_ID))) {
qDebug() << "recording App ID:" << app;
if (strcmp(app, "org.PulseAudio.pavucontrol") == 0)
return;
diff --git a/src/daemon/backends/PulseAudio.h b/src/daemon/backends/PulseAudio.h
index 151182f..5ddad40 100644
--- a/src/daemon/backends/PulseAudio.h
+++ b/src/daemon/backends/PulseAudio.h
@@ -18,6 +18,9 @@
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \
02110-1301, USA.
*/
+#ifndef PULSEAUDIO_H
+#define PULSEAUDIO_H
+
#include "Backend.h"
#include <pulse/pulseaudio.h>
#include <pulse/glib-mainloop.h>
@@ -56,3 +59,5 @@ private:
};
} //namespace Backends
+
+#endif // PULSEAUDIO_H
diff --git a/src/daemon/backends/PulseSinkControl.cpp \
b/src/daemon/backends/PulseSinkControl.cpp index 4c7dd46..aa1cdd2 100644
--- a/src/daemon/backends/PulseSinkControl.cpp
+++ b/src/daemon/backends/PulseSinkControl.cpp
@@ -1,3 +1,23 @@
+/*
+ * KMix -- KDE's full featured mini mixer
+ *
+ * Copyright (C) Trever Fischer <tdfischer@fedoraproject.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 "PulseSinkControl.h"
#include <QtCore/QDebug>
#include "PulseAudio.h"
diff --git a/src/daemon/backends/PulseSinkControl.h \
b/src/daemon/backends/PulseSinkControl.h index a43bf5e..bd0be34 100644
--- a/src/daemon/backends/PulseSinkControl.h
+++ b/src/daemon/backends/PulseSinkControl.h
@@ -1,3 +1,23 @@
+/*
+ * KMix -- KDE's full featured mini mixer
+ *
+ * Copyright (C) Trever Fischer <tdfischer@fedoraproject.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 PULSESINKCONTROL_H
#define PULSESINKCONTROL_H
diff --git a/src/daemon/backends/PulseSinkInputControl.cpp \
b/src/daemon/backends/PulseSinkInputControl.cpp index 3594517..8a05389 100644
--- a/src/daemon/backends/PulseSinkInputControl.cpp
+++ b/src/daemon/backends/PulseSinkInputControl.cpp
@@ -1,3 +1,23 @@
+/*
+ * KMix -- KDE's full featured mini mixer
+ *
+ * Copyright (C) Trever Fischer <tdfischer@fedoraproject.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 "PulseSinkInputControl.h"
#include "PulseSinkControl.h"
#include "PulseAudio.h"
diff --git a/src/daemon/backends/PulseSinkInputControl.h \
b/src/daemon/backends/PulseSinkInputControl.h index 34b78c7..a96c63b 100644
--- a/src/daemon/backends/PulseSinkInputControl.h
+++ b/src/daemon/backends/PulseSinkInputControl.h
@@ -1,3 +1,23 @@
+/*
+ * KMix -- KDE's full featured mini mixer
+ *
+ * Copyright (C) Trever Fischer <tdfischer@fedoraproject.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 PULSESINKINPUTCONTROL_H
#define PULSESINKINPUTCONTROL_H
@@ -18,7 +38,7 @@ public:
signals:
void sinkChanged(PulseSinkInputControl *self, int idx);
private:
- int m_sinkIdx;
+ unsigned int m_sinkIdx;
};
}
diff --git a/src/daemon/backends/PulseSourceOutputControl.cpp \
b/src/daemon/backends/PulseSourceOutputControl.cpp index c265da5..3220e2b 100644
--- a/src/daemon/backends/PulseSourceOutputControl.cpp
+++ b/src/daemon/backends/PulseSourceOutputControl.cpp
@@ -1,3 +1,23 @@
+/*
+ * KMix -- KDE's full featured mini mixer
+ *
+ * Copyright (C) Trever Fischer <tdfischer@fedoraproject.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 "PulseSourceOutputControl.h"
#include <QtCore/QDebug>
diff --git a/src/daemon/backends/PulseSourceOutputControl.h \
b/src/daemon/backends/PulseSourceOutputControl.h index 88cd580..32b8707 100644
--- a/src/daemon/backends/PulseSourceOutputControl.h
+++ b/src/daemon/backends/PulseSourceOutputControl.h
@@ -1,3 +1,23 @@
+/*
+ * KMix -- KDE's full featured mini mixer
+ *
+ * Copyright (C) Trever Fischer <tdfischer@fedoraproject.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 PULSESOURCEOUTPUTCONTROL_H
#define PULSESOURCEOUTPUTCONTROL_H
diff --git a/src/gui/ControlGroupTab.cpp b/src/gui/ControlGroupTab.cpp
index 71b5f03..6b134c0 100644
--- a/src/gui/ControlGroupTab.cpp
+++ b/src/gui/ControlGroupTab.cpp
@@ -1,3 +1,23 @@
+/*
+ * KMix -- KDE's full featured mini mixer
+ *
+ * Copyright (C) Trever Fischer <tdfischer@fedoraproject.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 "ControlGroupTab.h"
#include "ControlSlider.h"
#include <QtGui/QVBoxLayout>
@@ -35,6 +55,7 @@ ControlGroupTab::~ControlGroupTab()
void ControlGroupTab::resizeEvent(QResizeEvent *evt)
{
m_emptyLabel->setGeometry(geometry());
+ QWidget::resizeEvent(evt);
}
void ControlGroupTab::controlAdded(const QString &path)
diff --git a/src/gui/ControlGroupTab.h b/src/gui/ControlGroupTab.h
index 144d5ca..fd65eb8 100644
--- a/src/gui/ControlGroupTab.h
+++ b/src/gui/ControlGroupTab.h
@@ -1,3 +1,23 @@
+/*
+ * KMix -- KDE's full featured mini mixer
+ *
+ * Copyright (C) Trever Fischer <tdfischer@fedoraproject.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 CONTROLGROUPTAB_H
#define CONTROLGROUPTAB_H
diff --git a/src/gui/ControlMonitor.cpp b/src/gui/ControlMonitor.cpp
index 233813a..7a0e501 100644
--- a/src/gui/ControlMonitor.cpp
+++ b/src/gui/ControlMonitor.cpp
@@ -1,3 +1,23 @@
+/*
+ * KMix -- KDE's full featured mini mixer
+ *
+ * Copyright (C) Trever Fischer <tdfischer@fedoraproject.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 "ControlMonitor.h"
#include "control_interface.h"
#include "controlmonitoradaptor.h"
diff --git a/src/gui/ControlMonitor.h b/src/gui/ControlMonitor.h
index 5af702d..b567b0c 100644
--- a/src/gui/ControlMonitor.h
+++ b/src/gui/ControlMonitor.h
@@ -1,3 +1,23 @@
+/*
+ * KMix -- KDE's full featured mini mixer
+ *
+ * Copyright (C) Trever Fischer <tdfischer@fedoraproject.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 CONTROLMONITOR_H
#define CONTROLMONITOR_H
diff --git a/src/gui/ControlSlider.cpp b/src/gui/ControlSlider.cpp
index 39da91a..5ed794d 100644
--- a/src/gui/ControlSlider.cpp
+++ b/src/gui/ControlSlider.cpp
@@ -1,3 +1,23 @@
+/*
+ * KMix -- KDE's full featured mini mixer
+ *
+ * Copyright (C) Trever Fischer <tdfischer@fedoraproject.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 "ControlSlider.h"
#include "ControlMonitor.h"
#include <QtGui/QVBoxLayout>
@@ -15,8 +35,8 @@ const QString KMIX_DBUS_SERVICE = "org.kde.kmixd";
ControlSlider::ControlSlider(org::kde::KMix::Control *control, QWidget *parent)
: QWidget(parent)
- , m_control(control)
, m_mute(0)
+ , m_control(control)
{
QVBoxLayout *layout = new QVBoxLayout(this);
setLayout(layout);
@@ -73,7 +93,7 @@ ControlSlider::ControlSlider(org::kde::KMix::Control *control, \
QWidget *parent) m_targetSwitcher = new QComboBox(this);
int i = 0;
int currentIdx = 0;
- foreach(QString path, control->alternateTargets()) {
+ foreach(const QString &path, control->alternateTargets()) {
org::kde::KMix::Control target(KMIX_DBUS_SERVICE, path, \
QDBusConnection::sessionBus());
m_targetSwitcher->insertItem(i, target.displayName(), target.id());
if (control->currentTarget() == path)
diff --git a/src/gui/ControlSlider.h b/src/gui/ControlSlider.h
index 8aa9aff..cff70f8 100644
--- a/src/gui/ControlSlider.h
+++ b/src/gui/ControlSlider.h
@@ -41,7 +41,7 @@ class ControlSlider : public QWidget
Q_OBJECT
public:
- ControlSlider(org::kde::KMix::Control *control, QWidget *parent = 0);
+ explicit ControlSlider(org::kde::KMix::Control *control, QWidget *parent = 0);
~ControlSlider();
private slots:
void volumeChange(int channel);
diff --git a/src/gui/kmix_autostart.desktop b/src/gui/kmix_autostart.desktop
index f8040da..f5fd705 100755
--- a/src/gui/kmix_autostart.desktop
+++ b/src/gui/kmix_autostart.desktop
@@ -1,6 +1,5 @@
[Desktop Entry]
Exec=kmix
-DocPath=kmix/index.html
OnlyShowIn=KDE;
Type=Application
MimeType=
@@ -82,4 +81,4 @@ Name[uk]=KMix
Name[x-test]=xxKMixxx
Name[zh_CN]=KMix
Name[zh_TW]=音效調整_KMix
-Categories=Qt;KDE;AudioVideo;Mixer;
+Categories=Qt;KDE;Audio;Mixer;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic