[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kmix] apps: Cleanup: Remove unused fields.
From:       Christian Esken <esken () kde ! org>
Date:       2015-01-07 15:10:23
Message-ID: E1Y8sFb-0006zK-8i () scm ! kde ! org
[Download RAW message or body]

Git commit 7b9a7c7413e83f41629a6372339b02abc302dbca by Christian Esken.
Committed on 07/01/2015 at 15:09.
Pushed by esken into branch 'master'.

Cleanup: Remove unused fields.

M  +2    -6    apps/kmixd.cpp
M  +0    -14   apps/kmixd.h

http://commits.kde.org/kmix/7b9a7c7413e83f41629a6372339b02abc302dbca

diff --git a/apps/kmixd.cpp b/apps/kmixd.cpp
index a79c4b3..5b5f1ce 100644
--- a/apps/kmixd.cpp
+++ b/apps/kmixd.cpp
@@ -43,6 +43,7 @@
 #include "core/GlobalConfig.h"
 #include "core/mixertoolbox.h"
 #include "core/kmixdevicemanager.h"
+#include "core/mixer.h"
 #include "core/version.h"
 
 K_PLUGIN_FACTORY(KMixDFactory,
@@ -161,14 +162,9 @@ void KMixD::loadBaseConfig()
     KConfigGroup config(KGlobal::config(), "Global");
 
    m_multiDriverMode = config.readEntry("MultiDriver", false);
-   m_configVersion = config.readEntry( "ConfigVersion", 0 );
-   // WARNING Don't overwrite m_configVersion with the "correct" value, before having it
-   // evaluated. Better only write that in saveBaseConfig()
    QString mixerMasterCard = config.readEntry( "MasterMixer", "" );
    QString masterDev = config.readEntry( "MasterMixerDevice", "" );
-   //if ( ! mixerMasterCard.isEmpty() && ! masterDev.isEmpty() ) {
-      Mixer::setGlobalMaster(mixerMasterCard, masterDev, true);
-   //}
+   Mixer::setGlobalMaster(mixerMasterCard, masterDev, true);
    QString mixerIgnoreExpression = config.readEntry( "MixerIgnoreExpression", "Modem" );
    m_backendFilter = config.readEntry<>( "Backends", QList<QString>() );
    MixerToolBox::instance()->setMixerIgnoreExpression(mixerIgnoreExpression);
diff --git a/apps/kmixd.h b/apps/kmixd.h
index 0653261..378fc27 100644
--- a/apps/kmixd.h
+++ b/apps/kmixd.h
@@ -32,19 +32,7 @@
 #include <QTimer>
 
 // KDE
-//class KAccel;
-class KAction;
-//#include <kxmlguiwindow.h>
 #include <kdedmodule.h> 
-	
-// KMix
-//class KMixPrefDlg;
-//class KMixDockWidget;
-//class KMixWindow;
-//class ViewDockAreaPopup;
-#include "core/mixer.h"
-
-//class OSDWidget;
 
 class
 KMixD : public KDEDModule, protected QDBusContext
@@ -67,8 +55,6 @@ KMixD : public KDEDModule, protected QDBusContext
    bool m_multiDriverMode;
 
    QString m_hwInfoString;
-   QString m_defaultCardOnStart;
-   unsigned int m_configVersion;
    QList<QString> m_backendFilter;
 
   private slots:
[prev in list] [next in list] [prev in thread] [next in thread]