7 files changed, 14 insertions, 18 deletions

diff --git a/src/plugins/Ui/qsui/listwidgetdrawer.h b/src/plugins/Ui/qsui/listwidgetdrawer.h
index e613d6e24..269640456 100644
--- a/src/plugins/Ui/qsui/listwidgetdrawer.h
+++ b/src/plugins/Ui/qsui/listwidgetdrawer.h
@@ -40,6 +40,7 @@ struct ListWidgetRow
         lengthColumnWidth = 0;
         trackStateColumn = -1;
         autoResize = false;
+        number = 0;
     }
     QStringList titles;
     QList<int> sizes;
diff --git a/src/plugins/Ui/qsui/logo.cpp b/src/plugins/Ui/qsui/logo.cpp
index 548e14fe8..f8fe7cf80 100644
--- a/src/plugins/Ui/qsui/logo.cpp
+++ b/src/plugins/Ui/qsui/logo.cpp
@@ -116,21 +116,21 @@ void Logo::updateLetters()
         m_value = m_elapsed / 100;
         processPreset1();
     }
-    else if (m_elapsed >= 2000 && m_elapsed < 6000)
+    else if (m_elapsed < 6000)
     {
         m_value++;
         processPreset2();
     }
-    else if(m_elapsed >= 6000 && m_elapsed < 9000)
+    else if(m_elapsed < 9000)
     {
         m_value++;
         processPreset3();
     }
-    else if(m_elapsed >= 9000 && m_elapsed < 12000)
+    else if(m_elapsed < 12000)
     {
         processPreset4();
     }
-    else if(m_elapsed >= 12000)
+    else
     {
        m_value = 0;
        m_elapsed = 0;
diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index 56f5622ca..bdc7b81c8 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -343,7 +343,7 @@ void MainWindow::updateVolumeIcon()
         iconName = "audio-volume-muted";
     else if(maxVol < 30)
         iconName = "audio-volume-low";
-    else if(maxVol >= 30 && maxVol < 60)
+    else if(maxVol < 60)
         iconName = "audio-volume-medium";
 
     ACTION(ActionManager::VOL_MUTE)->setIcon(QIcon::fromTheme(iconName, QIcon(QString(":/qsui/") + iconName + ".png")));
diff --git a/src/plugins/Ui/qsui/popupwidget.cpp b/src/plugins/Ui/qsui/popupwidget.cpp
index b5a7ef7be..47921a45d 100644
--- a/src/plugins/Ui/qsui/popupwidget.cpp
+++ b/src/plugins/Ui/qsui/popupwidget.cpp
@@ -83,15 +83,15 @@ void PopupWidget::mouseMoveEvent (QMouseEvent *)
 void PopupWidget::prepare(PlayListTrack *track, QPoint pos)
 {
     pos += QPoint(15,10);
-
-    m_url = track->url();
     hide();
     if(!track)
     {
+        m_url.clear();
         m_timer->stop();
         return;
     }
 
+    m_url = track->url();
     m_label1->setText(m_formatter.format(track));
     qApp->processEvents();
     updateGeometry ();
diff --git a/src/plugins/Ui/skinned/eqslider.cpp b/src/plugins/Ui/skinned/eqslider.cpp
index 31e283155..41c824517 100644
--- a/src/plugins/Ui/skinned/eqslider.cpp
+++ b/src/plugins/Ui/skinned/eqslider.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2009 by Ilya Kotov                                 *
+ *   Copyright (C) 2006-2017 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,12 +21,9 @@
 #include <QPainter>
 #include <QWheelEvent>
 #include <math.h>
-
 #include "skin.h"
-
 #include "eqslider.h"
 
-
 EqSlider::EqSlider(QWidget *parent): PixmapWidget(parent)
 {
     m_skin = Skin::instance();
@@ -144,7 +141,7 @@ double EqSlider::convert(int p)
 
 void EqSlider::wheelEvent(QWheelEvent *e)
 {
-    m_value -= e->delta()/60;
+    m_value -= double(e->delta())/60;
     m_value = m_value > m_max ? m_max : m_value;
     m_value = m_value < m_min ? m_min : m_value;
     draw(false);
diff --git a/src/plugins/Ui/skinned/popupwidget.cpp b/src/plugins/Ui/skinned/popupwidget.cpp
index 533292c81..10fa811bc 100644
--- a/src/plugins/Ui/skinned/popupwidget.cpp
+++ b/src/plugins/Ui/skinned/popupwidget.cpp
@@ -85,15 +85,14 @@ void PopupWidget::mouseMoveEvent (QMouseEvent *)
 void PopupWidget::prepare(PlayListTrack *item, QPoint pos)
 {
     pos += QPoint(15,10);
-
-    m_url = item->url();
     hide();
     if(!item)
     {
         m_timer->stop();
+        m_url.clear();
         return;
     }
-
+    m_url = item->url();
     m_label1->setText(m_formatter.format(item));
     qApp->processEvents();
     updateGeometry ();
diff --git a/src/plugins/Ui/skinned/windowsystem.cpp b/src/plugins/Ui/skinned/windowsystem.cpp
index a971214b3..e4489a250 100644
--- a/src/plugins/Ui/skinned/windowsystem.cpp
+++ b/src/plugins/Ui/skinned/windowsystem.cpp
@@ -1,7 +1,7 @@
 /***************************************************************************
  *   Based on Licq                                                         *
  *   Copyright (C) 2006-2009 Licq developers                               *
- *   Copyright (C) 2011-2016 Ilya Kotov                                    *
+ *   Copyright (C) 2011-2017 Ilya Kotov                                    *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -180,7 +180,6 @@ unsigned char* WindowSystem::getWindowProperty(WId win, const char* prop)
     return NULL;
 
   // These are not needed for now.
-  retCheck = None;
   retFormat = 0;
   retItems = 0UL;
 
@@ -219,7 +218,7 @@ void WindowSystem::revertGravity(WId win)
         sh.win_gravity = NorthWestGravity;
     else
         return;
-    sh.win_gravity = NorthWestGravity;
+
     XSetWMNormalHints(dsp, win, &sh);
 
     XSetWindowAttributes xs;