fixed gcc 4.7 warnings, replaced deprecated functions

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

3 files changed, 5 insertions, 18 deletions

diff --git a/src/plugins/Ui/skinned/dock.cpp b/src/plugins/Ui/skinned/dock.cpp
index 020106d79..46dcdd233 100644
--- a/src/plugins/Ui/skinned/dock.cpp
+++ b/src/plugins/Ui/skinned/dock.cpp
@@ -135,7 +135,7 @@ void Dock::addWidget (QWidget *widget)
 
 void Dock::move (QWidget* mv, QPoint npos)
 {
-    QRect desktopRect = QApplication::desktop()->availableGeometry(m_mainWidget);
+    //QRect desktopRect = QApplication::desktop()->availableGeometry(m_mainWidget);
 
     /*if(npos.y() < desktopRect.y())
         npos.setY(desktopRect.y());*/
diff --git a/src/plugins/Ui/skinned/eqgraph.cpp b/src/plugins/Ui/skinned/eqgraph.cpp
index 4753d89ae..72b9d7bb4 100644
--- a/src/plugins/Ui/skinned/eqgraph.cpp
+++ b/src/plugins/Ui/skinned/eqgraph.cpp
@@ -116,7 +116,7 @@ void EQGraph::draw()
         return;
     }
 
-    int i, y, ymin, ymax, py = 0;
+    int i, y;
     double x[] = { 0, 11, 23, 35, 47, 59, 71, 83, 97, 109 }, yf[10];
     double *bands = new double[10];
 
@@ -133,19 +133,6 @@ void EQGraph::draw()
             y = 0;
         if (y > 18)
             y = 18;
-        if (!i)
-            py = y;
-        if (y < py)
-        {
-            ymin = y;
-            ymax = py;
-        }
-        else
-        {
-            ymin = py;
-            ymax = y;
-        }
-        py = y;
 
         QPainter paint (&pixmap);
         paint.drawPixmap (i*m_ratio, y*m_ratio, m_skin->getEqSpline (y));
diff --git a/src/plugins/Ui/skinned/pixmapwidget.h b/src/plugins/Ui/skinned/pixmapwidget.h
index e2a2f810b..8272fbc9a 100644
--- a/src/plugins/Ui/skinned/pixmapwidget.h
+++ b/src/plugins/Ui/skinned/pixmapwidget.h
@@ -23,7 +23,7 @@
 #include <QWidget>
 
 /**
-	@author Ilya Kotov <forkotov02@hotmail.ru>
+    @author Ilya Kotov <forkotov02@hotmail.ru>
 */
 class QPixmap;
 
@@ -33,14 +33,14 @@ Q_OBJECT
 public:
     PixmapWidget(QWidget *parent = 0);
 
-    ~PixmapWidget();
+    virtual ~PixmapWidget();
 
     virtual void setPixmap(const QPixmap);
 
 protected:
     void paintEvent ( QPaintEvent * event );
 
-private: 
+private:
       QPixmap m_pixmap;