coding style fixes

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

13 files changed, 20 insertions, 11 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);