Commit 51476474 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Use Q_SLOTS/Q_SIGNALS

parent eed837ba
Pipeline #167701 canceled with stage
......@@ -38,7 +38,7 @@ class KMixApp : public QObject
void parseOptions(const QCommandLineParser &parser);
public slots:
public Q_SLOTS:
void newInstance(const QStringList &arguments = QStringList(), const QString &workingDirectory = QString());
private:
......
......@@ -65,7 +65,7 @@ private:
protected:
bool queryClose() override;
public slots:
public Q_SLOTS:
void controlsChange(ControlManager::ChangeType changeType);
void quit();
void showSettings();
......@@ -83,7 +83,7 @@ public slots:
void newMixerShown(int tabIndex);
void slotSelectMaster();
protected slots:
protected Q_SLOTS:
void applyPrefs(KMixPrefDlg::PrefChanges changed);
private:
......@@ -120,7 +120,7 @@ private:
private:
static QString getKmixctrlRcFilename(const QString &postfix);
private slots:
private Q_SLOTS:
void slotKdeAudioSetupExec();
void slotConfigureCurrentView();
......
......@@ -39,7 +39,7 @@ public:
static VolumeFeedback *instance();
void init();
public slots:
public Q_SLOTS:
void controlsChange(ControlManager::ChangeType changeType);
private:
......@@ -49,7 +49,7 @@ private:
void volumeChanged();
void masterChanged();
private slots:
private Q_SLOTS:
void slotPlayFeedback();
private:
......
......@@ -87,7 +87,7 @@ class Mixer_PULSE : public Mixer_Backend
void emitControlsReconfigured();
void updateRecommendedMaster(devmap* map);
protected slots:
protected Q_SLOTS:
void pulseControlsReconfigured(QString mixerId);
void pulseControlsReconfigured();
......
......@@ -36,7 +36,7 @@ class KMIXCORE_EXPORT KMixDeviceManager : public QObject
QString getUDI_ALSA(int num);
QString getUDI_OSS(const QString& devname);
signals:
Q_SIGNALS:
void plugged(const char *driverName, const QString &udi, int dev);
void unplugged(const QString &udi);
......@@ -45,7 +45,7 @@ class KMIXCORE_EXPORT KMixDeviceManager : public QObject
virtual ~KMixDeviceManager() = default;
QString _hotpluggingBackend;
private slots:
private Q_SLOTS:
void pluggedSlot(const QString&);
void unpluggedSlot(const QString&);
......
......@@ -206,7 +206,7 @@ public:
protected:
void init( Mixer* mixer, const QString& id, const QString& name, const QString& iconName, MixSet* moveDestinationMixSet );
signals:
Q_SIGNALS:
void iconNameChanged(const QString &newName);
private:
......
......@@ -186,12 +186,12 @@ public:
void commitVolumeChange( shared_ptr<MixDevice> md );
public slots:
public Q_SLOTS:
void readSetFromHWforceUpdate() const;
virtual void setBalance(int balance); // sets the m_balance (see there)
signals:
Q_SIGNALS:
void newBalance(Volume& );
void controlChanged(void); // TODO remove?
......
......@@ -40,7 +40,7 @@ class DialogAddView : public DialogBase
QString getresultViewName() const { return (resultViewName); }
QString getresultMixerId() const { return (resultMixerId); }
public slots:
public Q_SLOTS:
void apply();
private:
......@@ -54,7 +54,7 @@ class DialogAddView : public DialogBase
QString resultViewName;
QString resultMixerId;
private slots:
private Q_SLOTS:
void createPageByID(int mixerId);
void profileSelectionChanged();
};
......
......@@ -41,7 +41,7 @@ public:
bool getAndResetModifyFlag();
bool getModifyFlag() const;
signals:
Q_SIGNALS:
void backendsModified();
private:
......@@ -51,7 +51,7 @@ private:
QListWidget *m_mixerList;
bool modified;
private slots:
private Q_SLOTS:
void backendsModifiedSlot();
void itemActivatedSlot(QListWidgetItem *item);
};
......
......@@ -37,7 +37,7 @@ class DialogSelectMaster : public DialogBase
explicit DialogSelectMaster(const Mixer *mixer = nullptr, QWidget *parent = nullptr);
virtual ~DialogSelectMaster() = default;
public slots:
public Q_SLOTS:
void apply();
private:
......@@ -48,7 +48,7 @@ class DialogSelectMaster : public DialogBase
QComboBox* m_cMixer;
QListWidget *m_channelSelector;
private slots:
private Q_SLOTS:
void createPageByID(int mixerId);
void slotUpdateButtons();
};
......
......@@ -171,7 +171,7 @@ protected:
**/
virtual bool eventFilter(QObject *obj, QEvent *ev) override;
private slots:
private Q_SLOTS:
void restoreConfigInternal();
void saveConfigInternal() const;
......
......@@ -76,7 +76,7 @@ public:
}
bool isActiveList() const { return m_activeList; }
Q_SIGNALS:
Q_SIGNALS:
void dropped(DialogViewConfigurationWidget* list, int index, DialogViewConfigurationItem* item);
protected:
......@@ -116,10 +116,10 @@ class DialogViewConfiguration : public DialogBase
DialogViewConfiguration(QWidget* parent, ViewBase& view);
virtual ~DialogViewConfiguration() = default;
public slots:
public Q_SLOTS:
void apply();
private slots:
private Q_SLOTS:
void slotDropped(DialogViewConfigurationWidget *list, int index, DialogViewConfigurationItem *item);
void moveSelectionToActiveList();
......
......@@ -44,7 +44,7 @@ public:
explicit KMixDockWidget(KXmlGuiWindow *parent);
virtual ~KMixDockWidget();
public slots:
public Q_SLOTS:
void activate(const QPoint &pos) override;
void controlsChange(ControlManager::ChangeType changeType);
......@@ -69,10 +69,10 @@ private:
void setVolumeTip();
void updatePixmap();
protected slots:
protected Q_SLOTS:
void contextMenuAboutToShow();
private slots:
private Q_SLOTS:
void dockMute();
void trayWheelEvent(int delta, Qt::Orientation wheelOrientation);
};
......
......@@ -61,10 +61,10 @@ class KMixerWidget : public QWidget
GUIProfile* getGuiprof() { return GUIProfile::find(_guiprofId); }
signals:
Q_SIGNALS:
void toggleMenuBar();
public slots:
public Q_SLOTS:
void setIcons( bool on );
void toggleMenuBarSlot();
......
......@@ -64,7 +64,7 @@ public:
static KMixPrefDlg *instance(QWidget *parent = nullptr);
void showAtPage(KMixPrefDlg::PrefPage page);
signals:
Q_SIGNALS:
void kmixConfigHasChanged(KMixPrefDlg::PrefChanges changed);
protected:
......@@ -82,7 +82,7 @@ protected:
bool hasChanged() override;
private slots:
private Q_SLOTS:
void settingChanged(KMixPrefDlg::PrefChanged changes = KMixPrefDlg::ChangedAny);
private:
......
......@@ -45,7 +45,7 @@ public:
int labelExtentHint() const override;
void setLabelExtent(int extent) override;
public slots:
public Q_SLOTS:
// Enum handling: next and selecting
void nextEnumId();
int enumId();
......
......@@ -68,7 +68,7 @@ public:
int labelExtentHint() const override;
void setLabelExtent(int extent) override;
public slots:
public Q_SLOTS:
void toggleRecsrc();
void toggleMuted();
void toggleStereoLinked();
......@@ -82,7 +82,7 @@ protected:
bool eventFilter(QObject *obj, QEvent *ev) override;
private slots:
private Q_SLOTS:
void setRecsrc(bool value);
void setMuted(bool value);
void volumeChange( int );
......
......@@ -65,16 +65,16 @@ public:
virtual int labelExtentHint() const { return (0); }
virtual void setLabelExtent(int extent) { Q_UNUSED(extent); }
public slots:
public Q_SLOTS:
/**
* Called whenever there are volume updates pending from the hardware for this MDW.
*/
virtual void update() = 0;
signals:
Q_SIGNALS:
void guiVisibilityChange(MixDeviceWidget* source, bool enable);
protected slots:
protected Q_SLOTS:
void volumeChange(int);
protected:
......@@ -89,7 +89,7 @@ protected:
KActionCollection *channelActions() const { return (m_channelActions); }
KActionCollection *globalActions() const { return (m_globalActions); }
private slots:
private Q_SLOTS:
void configureShortcuts();
private:
......
......@@ -157,14 +157,14 @@ protected:
// Also I do not want Views to interfere with polish()
virtual void constructionFinished() = 0;
public slots:
public Q_SLOTS:
virtual void refreshVolumeLevels(); // TODO remove
virtual void configureView();
signals:
Q_SIGNALS:
void toggleMenuBar();
private slots:
private Q_SLOTS:
void guiVisibilitySlot(MixDeviceWidget* source, bool enable);
void toggleMenuBarSlot();
};
......
......@@ -78,7 +78,7 @@ private:
QPushButton *restoreVolumeButton4;
QIcon restoreVolumeIcon;
public slots:
public Q_SLOTS:
void controlsChange(ControlManager::ChangeType changeType);
void configureView() override;
void showPanelSlot();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment