refactoring

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@10216 90c681e8-e032-0410-971d-27865f9a5e38

4 files changed, 22 insertions, 26 deletions

diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp
index 8efaacad7..c4e0576ad 100644
--- a/src/plugins/Output/alsa/outputalsa.cpp
+++ b/src/plugins/Output/alsa/outputalsa.cpp
@@ -149,7 +149,6 @@ bool OutputALSA::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat form
     if (rate != exact_rate)
     {
         qWarning("OutputALSA: The rate %d Hz is not supported by your hardware.\n==> Using %d Hz instead.", rate, exact_rate);
-        rate = exact_rate;
     }
     uint c = map.count();
     if ((err = snd_pcm_hw_params_set_channels_near(pcm_handle, hwparams, &c)) < 0)
diff --git a/src/plugins/Ui/skinned/mainvisual.cpp b/src/plugins/Ui/skinned/mainvisual.cpp
index bd67cde32..45291a1e2 100644
--- a/src/plugins/Ui/skinned/mainvisual.cpp
+++ b/src/plugins/Ui/skinned/mainvisual.cpp
@@ -120,28 +120,29 @@ void MainVisual::showEvent (QShowEvent *)
 void MainVisual::mousePressEvent (QMouseEvent *e)
 {
     if (e->button() == Qt::RightButton)
+    {
         m_menu->exec(e->globalPos());
-    else
+        return;
+    }
+
+    m_pixmap = m_bg;
+    if (!m_vis)
+        setVisual(new mainvisual::Analyzer);
+    else if (m_vis->name() == "Analyzer")
+        setVisual(new mainvisual::Scope);
+    else if (m_vis->name() == "Scope")
+        setVisual(nullptr);
+
+    QString str = m_vis ? m_vis->name() : "Off";
+    for(QAction *act : m_visModeGroup->actions())
     {
-        m_pixmap = m_bg;
-        if (!m_vis)
-            setVisual(new mainvisual::Analyzer);
-        else if (m_vis->name() == "Analyzer")
-            setVisual(new mainvisual::Scope);
-        else if (m_vis->name() == "Scope")
-            setVisual(nullptr);
-
-        QString str = m_vis ? m_vis->name() : "Off";
-        for(QAction *act : m_visModeGroup->actions())
+        if (str == act->data().toString())
         {
-            if (str == act->data().toString())
-            {
-                act->setChecked(true);
-                break;
-            }
+            act->setChecked(true);
+            break;
         }
-        writeSettings();
     }
+    writeSettings();
 }
 
 void MainVisual::start()
diff --git a/src/plugins/Ui/skinned/shortcutdialog.cpp b/src/plugins/Ui/skinned/shortcutdialog.cpp
index 83243c220..6b22294e7 100644
--- a/src/plugins/Ui/skinned/shortcutdialog.cpp
+++ b/src/plugins/Ui/skinned/shortcutdialog.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2010-2013 by Ilya Kotov                                 *
+ *   Copyright (C) 2010-2021 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -38,8 +38,7 @@ ShortcutDialog::~ShortcutDialog()
 
 void ShortcutDialog::keyPressEvent (QKeyEvent *event)
 {
-    int key = event->key();
-    switch (key)
+    switch(event->key())
     {
     case Qt::Key_Shift:
     case Qt::Key_Control:
@@ -51,7 +50,6 @@ void ShortcutDialog::keyPressEvent (QKeyEvent *event)
     case Qt::Key_Menu:
     case 0:
     case Qt::Key_unknown:
-        key = 0;
         m_ui.keyLineEdit->clear();
         QWidget::keyPressEvent(event);
         return;
diff --git a/src/qmmp/metadatamanager.cpp b/src/qmmp/metadatamanager.cpp
index d5f877758..ac42d4165 100644
--- a/src/qmmp/metadatamanager.cpp
+++ b/src/qmmp/metadatamanager.cpp
@@ -174,15 +174,13 @@ QList<QRegularExpression> MetaDataManager::regExps() const
 
 bool MetaDataManager::supports(const QString &fileName) const
 {
-    DecoderFactory *fact = nullptr;
-    EngineFactory *efact = nullptr;
     if (!fileName.contains("://")) //local file
     {
         if (!QFile::exists(fileName))
             return false;
-        if((fact = Decoder::findByFilePath(fileName)))
+        if(Decoder::findByFilePath(fileName))
             return true;
-        else if((efact = AbstractEngine::findByFilePath(fileName)))
+        else if(AbstractEngine::findByFilePath(fileName))
             return true;
         return false;
     }