kcolorchooser: drop it

[kde/kde-extraapps.git] / kmix / apps / kmix.h

diff --git a/kmix/apps/kmix.h b/kmix/apps/kmix.h
index 6664771..180ace6 100644 (file)
--- a/kmix/apps/kmix.h
+++ b/kmix/apps/kmix.h
@@ -37,26 +37,24 @@ class KAction;
 
 // KMix
 #include "core/GlobalConfig.h"
+#include "core/mixer.h"
 
 class KMixDockWidget;
 class KMixerWidget;
 class KMixWindow;
 class Mixer;
-#include "core/mixer.h"
-
 class OSDWidget;
 class DialogSelectMaster;
 
-class
-KMixWindow : public KXmlGuiWindow
+class KMixWindow : public KXmlGuiWindow
 {
    Q_OBJECT
 
-  public:
+public:
    KMixWindow(bool invisible);
    ~KMixWindow();
 
-  private:
+private:
    void saveBaseConfig();
    void saveViewConfig();
    void loadConfig();
@@ -70,12 +68,9 @@ KMixWindow : public KXmlGuiWindow
    void initWidgets();
    //void setErrorMixerWidget();
 
-   void setBeepOnVolumeChange(bool beep);
-   void fixConfigAfterRead();
-
    virtual bool queryClose();
 
-  public slots:
+public slots:
    void controlsChange(int changeType);
    void quit();
    void showSettings();
@@ -94,13 +89,11 @@ KMixWindow : public KXmlGuiWindow
    void newMixerShown(int tabIndex);
    void slotSelectMaster();
 
-    private:
-        KMixerWidget* findKMWforTab( const QString& tabId );
+private:
+   KMixerWidget* findKMWforTab( const QString& tabId );
 
-        void forkExec(const QStringList& args);
-        void errorPopup(const QString& msg);
+   void errorPopup(const QString& msg);
 
-   KAccel *m_keyAccel;
    KAction* _actionShowMenubar;
 
 private:
@@ -110,7 +103,6 @@ private:
    GlobalConfigData configDataSnapshot;
 
    bool m_startVisible;
-   bool m_visibilityUpdateAllowed;
    bool m_multiDriverMode;         // Not officially supported.
    bool m_autouseMultimediaKeys;   // Due to message freeze, not in config dialog in KDE4.4
 
@@ -124,7 +116,6 @@ private:
    bool m_dontSetDefaultCardOnStart;
    QLabel      *m_errorLabel;
    QList<QString> m_backendFilter;
-   unsigned int m_configVersion;
    void showVolumeDisplay();
    void increaseOrDecreaseVolume(bool increase);
 
@@ -133,14 +124,17 @@ private:
    bool addMixerWidget(const QString& mixer_ID, QString guiprofId, int insertPosition);
    void setInitialSize();
 
-    private:
-    static QString getKmixctrlRcFilename(QString postfix);
-       bool profileExists(QString guiProfileId);
-       bool updateDocking();
-       void removeDock();
-       void updateTabsClosable();
+protected:
+   bool x11Event(XEvent *xevent) final;
+
+private:
+   static QString getKmixctrlRcFilename(QString postfix);
+   bool profileExists(QString guiProfileId);
+   bool updateDocking();
+   void removeDock();
+   void updateTabsClosable();
 
-  private slots:
+private slots:
    void slotHWInfo();
    void slotKdeAudioSetupExec();
    void slotConfigureCurrentView();