coding style fixes

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

20 files changed, 40 insertions, 22 deletions

diff --git a/src/plugins/General/statusicon/qmmptrayicon.cpp b/src/plugins/General/statusicon/qmmptrayicon.cpp
index eeb36bb84..89e13ce8d 100644
--- a/src/plugins/General/statusicon/qmmptrayicon.cpp
+++ b/src/plugins/General/statusicon/qmmptrayicon.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008-2013 by Ilya Kotov                                 *
+ *   Copyright (C) 2008-2016 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -33,6 +33,9 @@
 QmmpTrayIcon::QmmpTrayIcon(QObject *parent)
         : QSystemTrayIcon(parent)
 {
+#ifdef Q_WS_X11
+    m_showNiceToolTip = false;
+#endif
 }
 
 
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
index 8232c4735..0e9ca5781 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
@@ -80,6 +80,7 @@ DecoderFFmpeg::DecoderFFmpeg(const QString &path, QIODevice *i)
     m_decoded_frame = 0;
     m_channels = 0;
     c = 0;
+    wma_idx = 0;
     av_init_packet(&m_pkt);
     av_init_packet(&m_temp_pkt);
 }
diff --git a/src/plugins/Input/ffmpeg_legacy/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg_legacy/decoder_ffmpeg.cpp
index 022a4b8ae..d8d657880 100644
--- a/src/plugins/Input/ffmpeg_legacy/decoder_ffmpeg.cpp
+++ b/src/plugins/Input/ffmpeg_legacy/decoder_ffmpeg.cpp
@@ -73,6 +73,8 @@ DecoderFFmpeg::DecoderFFmpeg(const QString &path, QIODevice *i)
     m_output_at = 0;
     m_skipBytes = 0;
     m_stream = 0;
+    c = 0;
+    wma_idx = 0;
     av_init_packet(&m_pkt);
     av_init_packet(&m_temp_pkt);
 }
diff --git a/src/plugins/Input/flac/decoder_flac.cpp b/src/plugins/Input/flac/decoder_flac.cpp
index a848a12ea..8e4b8bb5f 100644
--- a/src/plugins/Input/flac/decoder_flac.cpp
+++ b/src/plugins/Input/flac/decoder_flac.cpp
@@ -240,6 +240,7 @@ DecoderFLAC::DecoderFLAC(const QString &path, QIODevice *i)
     m_sz = 0;
     m_buf = 0;
     m_offset = 0;
+    m_track = 0;
 }
 
 
diff --git a/src/plugins/Input/modplug/decoder_modplug.cpp b/src/plugins/Input/modplug/decoder_modplug.cpp
index 51c2854ea..82af89309 100644
--- a/src/plugins/Input/modplug/decoder_modplug.cpp
+++ b/src/plugins/Input/modplug/decoder_modplug.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008-2015 by Ilya Kotov                                 *
+ *   Copyright (C) 2008-2016 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -51,6 +51,9 @@ DecoderModPlug::DecoderModPlug(const QString &path) : Decoder(0)
     m_soundFile = 0;
     m_sampleSize = 0;
     m_instance = this;
+    m_bps = 0;
+    m_preampFactor = 0.0f;
+    m_usePreamp = false;
 }
 
 DecoderModPlug::~DecoderModPlug()
diff --git a/src/plugins/Input/vorbis/decoder_vorbis.cpp b/src/plugins/Input/vorbis/decoder_vorbis.cpp
index e4c852bb2..297a68cd5 100644
--- a/src/plugins/Input/vorbis/decoder_vorbis.cpp
+++ b/src/plugins/Input/vorbis/decoder_vorbis.cpp
@@ -76,6 +76,7 @@ DecoderVorbis::DecoderVorbis(const QString &url, QIODevice *i)
     m_last_section = -1;
     m_bitrate = 0;
     m_url = url;
+    len = 0;
 }
 
 
diff --git a/src/plugins/Output/oss/outputoss.cpp b/src/plugins/Output/oss/outputoss.cpp
index 2d02967f3..8b70a6e55 100644
--- a/src/plugins/Output/oss/outputoss.cpp
+++ b/src/plugins/Output/oss/outputoss.cpp
@@ -122,7 +122,7 @@ bool OutputOSS::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat forma
 
     ioctl(m_audio_fd, SNDCTL_DSP_RESET, 0);
 
-    configure(freq, map, format);
+    configure(freq, ChannelMap(chan), format);
     return true;
 }
 
diff --git a/src/plugins/Output/oss/outputoss.h b/src/plugins/Output/oss/outputoss.h
index 7ccb0a542..0a1c31203 100644
--- a/src/plugins/Output/oss/outputoss.h
+++ b/src/plugins/Output/oss/outputoss.h
@@ -46,7 +46,6 @@ private:
     QString m_audio_device;
 
     int m_audio_fd;
-    long bl, br;
 };
 
 class VolumeOSS : public Volume
diff --git a/src/plugins/Transports/http/httpstreamreader.cpp b/src/plugins/Transports/http/httpstreamreader.cpp
index 7ec396bb4..52fddd84f 100644
--- a/src/plugins/Transports/http/httpstreamreader.cpp
+++ b/src/plugins/Transports/http/httpstreamreader.cpp
@@ -118,6 +118,7 @@ HttpStreamReader::HttpStreamReader(const QString &url, HTTPInputSource *parent)
     m_handle = 0;
     m_metacount = 0;
     m_meta_sent = false;
+    m_ready = false;
     m_thread = new DownloadThread(this);
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("HTTP");
diff --git a/src/plugins/Ui/skinned/pixmapwidget.cpp b/src/plugins/Ui/skinned/pixmapwidget.cpp
index 7a8d8150b..d802a3ce1 100644
--- a/src/plugins/Ui/skinned/pixmapwidget.cpp
+++ b/src/plugins/Ui/skinned/pixmapwidget.cpp
@@ -31,7 +31,7 @@ PixmapWidget::PixmapWidget(QWidget *parent)
 PixmapWidget::~PixmapWidget()
 {}
 
-void PixmapWidget::setPixmap(const QPixmap pixmap, bool fixed_size)
+void PixmapWidget::setPixmap(const QPixmap &pixmap, bool fixed_size)
 {
     m_pixmap = pixmap;
     if(fixed_size)
diff --git a/src/plugins/Ui/skinned/pixmapwidget.h b/src/plugins/Ui/skinned/pixmapwidget.h
index 52e7871eb..13b63150b 100644
--- a/src/plugins/Ui/skinned/pixmapwidget.h
+++ b/src/plugins/Ui/skinned/pixmapwidget.h
@@ -35,7 +35,7 @@ public:
 
     virtual ~PixmapWidget();
 
-    virtual void setPixmap(const QPixmap, bool fixed_size = false);
+    virtual void setPixmap(const QPixmap &pixmap, bool fixed_size = false);
 
 protected:
     void paintEvent ( QPaintEvent * event );
diff --git a/src/plugins/Ui/skinned/playlist.cpp b/src/plugins/Ui/skinned/playlist.cpp
index 4093602b1..7a33b95b0 100644
--- a/src/plugins/Ui/skinned/playlist.cpp
+++ b/src/plugins/Ui/skinned/playlist.cpp
@@ -631,7 +631,7 @@ void PlayList::generateCopySelectedMenu()
 
     foreach(QString name, m_pl_manager->playListNames())
     {
-        action = m_copySelectedMenu->addAction("&"+name.replace("&", "&&"));
+        m_copySelectedMenu->addAction("&"+name.replace("&", "&&"));
     }
 }
 
diff --git a/src/plugins/Ui/skinned/windowsystem.cpp b/src/plugins/Ui/skinned/windowsystem.cpp
index 4fb1aec1e..a971214b3 100644
--- a/src/plugins/Ui/skinned/windowsystem.cpp
+++ b/src/plugins/Ui/skinned/windowsystem.cpp
@@ -86,9 +86,8 @@ QString WindowSystem::netWindowManagerName()
     }
 
     XFree(retValue2);
-    retValue2 = NULL;
-
     retValue2 = getWindowProperty(win, "_NET_WM_NAME");
+
     XFree(retValue1);
     if (retValue2 == NULL)
         return QString();
@@ -156,7 +155,6 @@ unsigned char* WindowSystem::getWindowProperty(WId win, const char* prop)
   if (reqAtom == None)
     return NULL;
 
-  int retCheck = None;
   Atom retType = None;
   int retFormat = 0;
   unsigned long retItems = 0UL;
@@ -164,7 +162,7 @@ unsigned char* WindowSystem::getWindowProperty(WId win, const char* prop)
   unsigned char* retValue = NULL;
 
   // Check if the property exists and calculate its length.
-  retCheck = XGetWindowProperty(dsp, win,
+  int retCheck = XGetWindowProperty(dsp, win,
       reqAtom, 0L, 0L, False, AnyPropertyType,
       &retType, &retFormat, &retItems, &retMoreBytes, &retValue);
 
diff --git a/src/qmmp/dithering.cpp b/src/qmmp/dithering.cpp
index 32dcb9890..809db2a2f 100644
--- a/src/qmmp/dithering.cpp
+++ b/src/qmmp/dithering.cpp
@@ -27,19 +27,15 @@ Dithering::Dithering() : Effect()
     m_lsb = 0.0f;
     m_required = false;
     m_enabled = false;
+    m_chan = 2;
+    clearHistory();
 }
 
 void Dithering::configure(quint32 srate, ChannelMap map)
 {
     m_chan = map.count();
     m_required = false;
-    for(int i = 0; i < 9; ++i)
-    {
-        m_dither[i].error[0] = 0.0f;
-        m_dither[i].error[1] = 0.0f;
-        m_dither[i].error[2] = 0.0f;
-        m_dither[i].random = 0;
-    }
+    clearHistory();
     Effect::configure(srate, map);
 }
 
@@ -84,6 +80,17 @@ void Dithering::setEnabled(bool enabled)
     (m_required && m_enabled) ? qDebug("Dithering: enabled") : qDebug("Dithering: disabled");
 }
 
+void Dithering::clearHistory()
+{
+    for(int i = 0; i < 9; ++i)
+    {
+        m_dither[i].error[0] = 0.0f;
+        m_dither[i].error[1] = 0.0f;
+        m_dither[i].error[2] = 0.0f;
+        m_dither[i].random = 0;
+    }
+}
+
 quint32 Dithering::prng(quint32 state) // 32-bit pseudo-random number generator
 {
     return (state * 0x0019660dL + 0x3c6ef35fL) & 0xffffffffL;
diff --git a/src/qmmp/dithering_p.h b/src/qmmp/dithering_p.h
index a80a84504..2e02191d7 100644
--- a/src/qmmp/dithering_p.h
+++ b/src/qmmp/dithering_p.h
@@ -40,6 +40,7 @@ public:
     void setEnabled(bool enabled);
 
 private:
+    void clearHistory();
     int m_chan;
 
     typedef struct
diff --git a/src/qmmp/output.cpp b/src/qmmp/output.cpp
index e2474c676..12519d09e 100644
--- a/src/qmmp/output.cpp
+++ b/src/qmmp/output.cpp
@@ -17,6 +17,7 @@
 Output::Output()
 {
     m_frequency = 0;
+    m_sample_size = 0;
     m_format = Qmmp::PCM_UNKNOWM;
 }
 
diff --git a/src/qmmp/outputwriter.cpp b/src/qmmp/outputwriter.cpp
index b1cc8668c..2f5faea23 100644
--- a/src/qmmp/outputwriter.cpp
+++ b/src/qmmp/outputwriter.cpp
@@ -53,6 +53,7 @@ OutputWriter::OutputWriter (QObject* parent) : QThread (parent)
     m_format_converter = 0;
     m_channel_converter = 0;
     m_output_buf = 0;
+    m_output_size = 0;
 }
 
 OutputWriter::~OutputWriter()
diff --git a/src/qmmpui/playlistmodel.cpp b/src/qmmpui/playlistmodel.cpp
index dd4cec525..20e82650e 100644
--- a/src/qmmpui/playlistmodel.cpp
+++ b/src/qmmpui/playlistmodel.cpp
@@ -203,12 +203,9 @@ void PlayListModel::insert(int index, QList<PlayListTrack *> tracks)
 
     int flags = 0;
 
-    PlayListItem *prevItem = m_container->item(index);
     foreach(PlayListTrack *track, tracks)
     {
         m_container->insertTrack(index, track);
-        index = prevItem ? m_container->indexOf(prevItem) : m_container->count();
-
         m_total_length += track->length();
         if(m_container->trackCount() == 1)
         {
diff --git a/src/qmmpui/playlistmodel.h b/src/qmmpui/playlistmodel.h
index 68ecaee16..f7d393162 100644
--- a/src/qmmpui/playlistmodel.h
+++ b/src/qmmpui/playlistmodel.h
@@ -50,7 +50,8 @@ struct SimpleSelection
      */
     SimpleSelection()
     {
-        ;
+        m_bottom = -1;
+        m_top = 1;
     }
     /*!
      * Returns \p true if this selection is valid; otherwise returns returns \p false.
diff --git a/src/qmmpui/playlisttask.cpp b/src/qmmpui/playlisttask.cpp
index a8be22bdd..8600e17e8 100644
--- a/src/qmmpui/playlisttask.cpp
+++ b/src/qmmpui/playlisttask.cpp
@@ -108,6 +108,7 @@ PlayListTask::PlayListTask(QObject *parent) : QThread(parent)
     m_current_track = 0;
     m_column = 0;
     m_task = EMPTY;
+    m_sort_mode = PlayListModel::TITLE;
 
     m_sort_keys.insert(PlayListModel::TITLE, Qmmp::TITLE);
     m_sort_keys.insert(PlayListModel::DISCNUMBER, Qmmp::DISCNUMBER);