From 3b778895e906de502f7a3573d9e161a53d2d5db5 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Thu, 29 Apr 2021 18:51:22 +0000 Subject: optimization git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9866 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Ui/qsui/actionmanager.cpp | 14 +++++++------- src/plugins/Ui/qsui/actionmanager.h | 16 +++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) (limited to 'src/plugins/Ui/qsui') diff --git a/src/plugins/Ui/qsui/actionmanager.cpp b/src/plugins/Ui/qsui/actionmanager.cpp index a3c3695e8..dedbd11f1 100644 --- a/src/plugins/Ui/qsui/actionmanager.cpp +++ b/src/plugins/Ui/qsui/actionmanager.cpp @@ -137,7 +137,7 @@ ActionManager* ActionManager::instance() return m_instance; } -QAction *ActionManager::createAction(QString name, QString confKey, QString key, QString iconName) +QAction *ActionManager::createAction(const QString &name, const QString &confKey, const QString &key, const QString &iconName) { QAction *action = new QAction(name, this); #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) @@ -157,7 +157,7 @@ QAction *ActionManager::createAction(QString name, QString confKey, QString key, return action; } -QAction *ActionManager::createAction2(QString name, QString confKey, QString key, QString iconName) +QAction *ActionManager::createAction2(const QString &name, const QString &confKey, const QString &key, const QString &iconName) { QAction *action = createAction(name, confKey, key); action->setCheckable(true); @@ -205,7 +205,7 @@ void ActionManager::resetShortcuts() } } -void ActionManager::registerAction(int id, QAction *action, QString confKey, QString key) +void ActionManager::registerAction(int id, QAction *action, const QString &confKey, const QString &key) { if(m_actions.value(id)) qFatal("ActionManager: invalid action id"); @@ -222,7 +222,7 @@ void ActionManager::registerAction(int id, QAction *action, QString confKey, QSt settings.endGroup(); } -void ActionManager::registerWidget(int id, QWidget *w, QString text, QString name) +void ActionManager::registerWidget(int id, QWidget *w, const QString &text, const QString &name) { if(m_actions.value(id)) qFatal("ActionManager: invalid action id"); @@ -233,7 +233,7 @@ void ActionManager::registerWidget(int id, QWidget *w, QString text, QString nam m_actions[id] = action; } -QToolBar *ActionManager::createToolBar(ActionManager::ToolBarInfo info, QWidget *parent) +QToolBar *ActionManager::createToolBar(const ToolBarInfo &info, QWidget *parent) { QToolBar *toolBar = new QToolBar(info.title, parent); updateToolBar(toolBar, info); @@ -243,7 +243,7 @@ QToolBar *ActionManager::createToolBar(ActionManager::ToolBarInfo info, QWidget return toolBar; } -void ActionManager::updateToolBar(QToolBar *toolBar, ActionManager::ToolBarInfo info) +void ActionManager::updateToolBar(QToolBar *toolBar, const ToolBarInfo &info) { toolBar->clear(); toolBar->setIconSize(info.iconSize); @@ -313,7 +313,7 @@ QList ActionManager::readToolBarSettings() const return list; } -void ActionManager::writeToolBarSettings(QList l) +void ActionManager::writeToolBarSettings(const QList &l) { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.beginWriteArray("SimpleUiToolbars"); diff --git a/src/plugins/Ui/qsui/actionmanager.h b/src/plugins/Ui/qsui/actionmanager.h index 0174348fe..b9028db0b 100644 --- a/src/plugins/Ui/qsui/actionmanager.h +++ b/src/plugins/Ui/qsui/actionmanager.h @@ -129,19 +129,21 @@ public: QList actions(); void saveActions(); void resetShortcuts(); - void registerAction(int id, QAction *action, QString confKey, QString key); - void registerWidget(int id, QWidget *w, QString text, QString name); - QToolBar *createToolBar(ToolBarInfo info, QWidget *parent); - void updateToolBar(QToolBar *toolBar, ToolBarInfo info); + void registerAction(int id, QAction *action, const QString &confKey, const QString &key); + void registerWidget(int id, QWidget *w, const QString &text, const QString &name); + QToolBar *createToolBar(const ToolBarInfo &info, QWidget *parent); + void updateToolBar(QToolBar *toolBar, const ToolBarInfo &info); ActionManager::ToolBarInfo defaultToolBar() const; QList readToolBarSettings() const; - void writeToolBarSettings(QList l); + void writeToolBarSettings(const QList &l); static ActionManager* instance(); private: - QAction *createAction(QString name, QString confKey, QString key = QString(), QString iconName = QString()); - QAction *createAction2(QString name, QString confKey, QString key = QString(), QString iconName = QString()); + QAction *createAction(const QString &name, const QString &confKey, const QString &key = QString(), + const QString &iconName = QString()); + QAction *createAction2(const QString &name, const QString &confKey, const QString &key = QString(), + const QString &iconName = QString()); void readStates(); void saveStates(); -- cgit v1.2.3-13-gbd6f