removed unused debug messages

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

2 files changed, 70 insertions, 71 deletions

diff --git a/src/ui/display.cpp b/src/ui/display.cpp
index d2cce8165..e4916f00a 100644
--- a/src/ui/display.cpp
+++ b/src/ui/display.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006 by Ilya Kotov                                      *
+ *   Copyright (C) 2006-2008 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -43,82 +43,82 @@
 
 #include "display.h"
 
-MainDisplay::MainDisplay ( QWidget *parent )
-        : PixmapWidget ( parent )
+MainDisplay::MainDisplay (QWidget *parent)
+        : PixmapWidget (parent)
 {
     m_skin = Skin::getPointer();
-    setPixmap ( m_skin->getMain() );
-    setMaximumSize ( QSize ( 275,116 ) );
-    setMinimumSize ( QSize ( 275,116 ) );
+    setPixmap (m_skin->getMain());
+    setMaximumSize (QSize (275,116));
+    setMinimumSize (QSize (275,116));
 
     m_mw = qobject_cast<MainWindow*>(parent);
 
-    Button *previous = new Button ( this,
-                                    Skin::BT_PREVIOUS_N, Skin::BT_PREVIOUS_P );
-    previous->move ( 16, 88 );
-    connect ( previous,SIGNAL ( clicked() ),parent,SLOT ( previous() ) );
-    Button *play = new Button ( this,
-                                Skin::BT_PLAY_N, Skin::BT_PLAY_P );
-    play->move ( 39, 88 );
-    connect ( play,SIGNAL ( clicked() ),parent,SLOT ( play() ) );
-    Button *pause = new Button ( this, Skin::BT_PAUSE_N,Skin::BT_PAUSE_P );
-    pause->move ( 62, 88 );
-    connect ( pause,SIGNAL ( clicked() ),parent,SLOT ( pause() ) );
-    Button *stop = new Button ( this, Skin::BT_STOP_N,Skin::BT_STOP_P );
-    stop->move ( 85, 88 );
-    connect ( stop,SIGNAL ( clicked() ),parent,SLOT ( stop() ) );
-    connect ( stop,SIGNAL ( clicked() ),this,SLOT ( hideTimeDisplay() ) );
-    Button *next = new Button ( this, Skin::BT_NEXT_N,Skin::BT_NEXT_P );
-    next->move ( 108, 88 );
-    connect ( next,SIGNAL ( clicked() ),parent,SLOT ( next() ) );
-    Button *eject = new Button ( this, Skin::BT_EJECT_N,Skin::BT_EJECT_P );
-    eject->move ( 136, 89 );
-    connect ( eject,SIGNAL ( clicked() ),parent,SLOT ( addFile() ) );
-    connect ( m_skin, SIGNAL ( skinChanged() ), this, SLOT ( updateSkin() ) );
-    posbar = new PositionBar ( this );
-    posbar->move ( 16,72 );
+    Button *previous = new Button (this, Skin::BT_PREVIOUS_N, Skin::BT_PREVIOUS_P);
+    previous->move (16, 88);
+    connect (previous,SIGNAL (clicked()), parent, SLOT (previous()));
+    Button *play = new Button (this, Skin::BT_PLAY_N, Skin::BT_PLAY_P);
+    play->move (39, 88);
+    connect (play,SIGNAL (clicked()),parent,SLOT (play()));
+    Button *pause = new Button (this, Skin::BT_PAUSE_N,Skin::BT_PAUSE_P);
+    pause->move (62, 88);
+    connect (pause,SIGNAL (clicked()),parent,SLOT (pause()));
+    Button *stop = new Button (this, Skin::BT_STOP_N,Skin::BT_STOP_P);
+    stop->move (85, 88);
+    connect (stop,SIGNAL (clicked()),parent,SLOT (stop()));
+    connect (stop,SIGNAL (clicked()),this,SLOT (hideTimeDisplay()));
+    Button *next = new Button (this, Skin::BT_NEXT_N,Skin::BT_NEXT_P);
+    next->move (108, 88);
+    connect (next,SIGNAL (clicked()),parent,SLOT (next()));
+    Button *eject = new Button (this, Skin::BT_EJECT_N,Skin::BT_EJECT_P);
+    eject->move (136, 89);
+    connect (eject,SIGNAL (clicked()),parent,SLOT (addFile()));
+    connect (m_skin, SIGNAL (skinChanged()), this, SLOT (updateSkin()));
+    posbar = new PositionBar (this);
+    posbar->move (16,72);
+
     //connect(posbar, SIGNAL(sliderMoved(int)), SLOT(setTime(int)));
     MainVisual* vis = new MainVisual (this);
     vis->move(24,39);
     vis->show();
 
-    m_eqButton = new ToggleButton ( this,Skin::BT_EQ_ON_N,Skin::BT_EQ_ON_P,
-                                    Skin::BT_EQ_OFF_N,Skin::BT_EQ_OFF_P );
-    m_eqButton->move ( 219,58 );
+    m_eqButton = new ToggleButton (this,Skin::BT_EQ_ON_N,Skin::BT_EQ_ON_P,
+                                    Skin::BT_EQ_OFF_N,Skin::BT_EQ_OFF_P);
+    m_eqButton->move (219,58);
     m_eqButton->show();
-    m_plButton = new ToggleButton ( this,Skin::BT_PL_ON_N,Skin::BT_PL_ON_P,
-                                    Skin::BT_PL_OFF_N,Skin::BT_PL_OFF_P );
-    m_plButton->move ( 241,58 );
+    m_plButton = new ToggleButton (this,Skin::BT_PL_ON_N,Skin::BT_PL_ON_P,
+                                    Skin::BT_PL_OFF_N,Skin::BT_PL_OFF_P);
+    m_plButton->move (241,58);
     m_plButton->show();
 
-    m_repeatButton = new ToggleButton ( this,Skin::REPEAT_ON_N,Skin::REPEAT_ON_P,
-                                        Skin::REPEAT_OFF_N,Skin::REPEAT_OFF_P );
+    m_repeatButton = new ToggleButton (this,Skin::REPEAT_ON_N,Skin::REPEAT_ON_P,
+                                        Skin::REPEAT_OFF_N,Skin::REPEAT_OFF_P);
     connect(m_repeatButton,SIGNAL(clicked(bool)),this,SIGNAL(repeatableToggled(bool)));
 
-    m_repeatButton->move ( 210,89 );
+    m_repeatButton->move (210,89);
     m_repeatButton->show();
 
-    m_shuffleButton = new ToggleButton ( this,Skin::SHUFFLE_ON_N,Skin::SHUFFLE_ON_P,
-                                         Skin::SHUFFLE_OFF_N,Skin::SHUFFLE_OFF_P );
+    m_shuffleButton = new ToggleButton (this,Skin::SHUFFLE_ON_N,Skin::SHUFFLE_ON_P,
+                                         Skin::SHUFFLE_OFF_N,Skin::SHUFFLE_OFF_P);
     connect(m_shuffleButton,SIGNAL(clicked(bool)),this,SIGNAL(shuffleToggled(bool)));
-    m_shuffleButton->move ( 164,89 );
+    m_shuffleButton->move (164,89);
     m_shuffleButton->show();
 
-    m_kbps = new SymbolDisplay( this,3 );
-    m_kbps -> move ( 111,43 );
+
+    m_kbps = new SymbolDisplay(this,3);
+    m_kbps -> move (111,43);
     m_kbps -> show();
 
-    m_freq = new SymbolDisplay( this,2 );
-    m_freq -> move ( 156,43 );
+    m_freq = new SymbolDisplay(this,2);
+    m_freq -> move (156,43);
     m_freq -> show();
 
-    TextScroller *m_text = new TextScroller ( this );
-    m_text->resize ( 154,15 );
-    m_text->move ( 109,23 );
+    TextScroller *m_text = new TextScroller (this);
+    m_text->resize (154,15);
+    m_text->move (109,23);
     m_text->show();
 
-    m_monoster = new MonoStereo ( this );
-    m_monoster->move ( 212,41 );
+    m_monoster = new MonoStereo (this);
+    m_monoster->move (212,41);
     m_monoster->show();
 
     m_playstatus = new PlayStatus(this);
@@ -142,40 +142,40 @@ MainDisplay::MainDisplay ( QWidget *parent )
 
 MainDisplay::~MainDisplay()
 {
-    QSettings settings ( QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat );
-    settings.setValue ( "Playlist/visible",m_plButton->isChecked() );
-    settings.setValue ( "Equalizer/visible",m_eqButton->isChecked() );
+    QSettings settings (QDir::homePath() +"/.qmmp/qmmprc", QSettings::IniFormat);
+    settings.setValue ("Playlist/visible",m_plButton->isChecked());
+    settings.setValue ("Equalizer/visible",m_eqButton->isChecked());
 }
 
-void MainDisplay::setTime ( int t )
+void MainDisplay::setTime (int t)
 {
-    posbar->setValue ( t );
+    posbar->setValue (t);
     m_timeIndicator->setTime(t);
 }
-void MainDisplay::setMaxTime ( long mt ) // TODO: should be removed
+void MainDisplay::setMaxTime (long mt) // TODO: should be removed
 {
-    posbar->setMax ( mt );
+    posbar->setMax (mt);
     m_timeIndicator->setSongDuration(mt);
 }
 
 
 void MainDisplay::updateSkin()
 {
-    setPixmap ( m_skin->getMain() );
+    setPixmap (m_skin->getMain());
 }
 
-void MainDisplay::setEQ ( QWidget* w )
+void MainDisplay::setEQ (QWidget* w)
 {
     m_equlizer = w;
-    m_eqButton->setON ( m_equlizer->isVisible() );
+    m_eqButton->setON (m_equlizer->isVisible());
     connect (m_eqButton, SIGNAL (clicked(bool)), m_equlizer, SLOT (setVisible (bool)));
     connect (m_equlizer, SIGNAL (closed ()), m_eqButton, SLOT (click()));
 }
 
-void MainDisplay::setPL ( QWidget* w )
+void MainDisplay::setPL (QWidget* w)
 {
     m_playlist = w;
-    m_plButton->setON ( m_playlist->isVisible() );
+    m_plButton->setON (m_playlist->isVisible());
     connect (m_plButton, SIGNAL (clicked (bool)), m_playlist, SLOT (setVisible (bool)));
     connect (m_playlist, SIGNAL (closed ()), m_plButton, SLOT (click()));
 }
@@ -184,16 +184,16 @@ void MainDisplay::setInfo(const OutputState &st)
 {
 
 
-    switch ( ( int ) st.type() )
+    switch ((int) st.type())
     {
     case OutputState::Info:
     {
-        //if ( seeking )
+        //if (seeking)
         // break;
-        setTime ( st.elapsedSeconds() );
-        m_kbps->display ( st.bitrate() );
-        m_freq->display ( st.frequency() /1000 );
-        m_monoster->setChannels ( st.channels() );
+        setTime (st.elapsedSeconds());
+        m_kbps->display (st.bitrate());
+        m_freq->display (st.frequency() /1000);
+        m_monoster->setChannels (st.channels());
         update();
         break;
     }
@@ -280,7 +280,7 @@ void MainDisplay::hideTimeDisplay()
 
 void MainDisplay::mousePressEvent(QMouseEvent *e)
 {
-    if ( e->button() == Qt::RightButton)
+    if (e->button() == Qt::RightButton)
     {
         m_mw->menu()->exec(e->globalPos());
     }
diff --git a/src/ui/shadedbar.cpp b/src/ui/shadedbar.cpp
index 63b2017c0..978cf2d71 100644
--- a/src/ui/shadedbar.cpp
+++ b/src/ui/shadedbar.cpp
@@ -82,7 +82,6 @@ void ShadedBar::mouseMoveEvent (QMouseEvent *e)
             m_value = convert(po);
             draw();
             emit sliderMoved(m_value);
-            qDebug("%d", m_value);
         }
     }
 }