diff --git a/devices/cdparanoia.cpp b/devices/cdparanoia.cpp
index 9deee9c04..305616abe 100644
--- a/devices/cdparanoia.cpp
+++ b/devices/cdparanoia.cpp
@@ -89,11 +89,11 @@ void CdParanoia::setParanoiaMode(int mode)
     }
 }
 
-void CdParanoia::setNeverSkip(bool b)
-{
-    neverSkip = b;
-    setParanoiaMode(paranoiaMode);
-}
+//void CdParanoia::setNeverSkip(bool b)
+//{
+//    neverSkip = b;
+//    setParanoiaMode(paranoiaMode);
+//}
 
 qint16 * CdParanoia::read()
 {
@@ -115,15 +115,15 @@ int CdParanoia::lastSectorOfTrack(int track)
     return paranoia ? cdda_track_lastsector(drive, track) : -1;
 }
 
-int CdParanoia::firstSectorOfDisc()
-{
-    return paranoia ? cdda_disc_firstsector(drive) : -1;
-}
+//int CdParanoia::firstSectorOfDisc()
+//{
+//    return paranoia ? cdda_disc_firstsector(drive) : -1;
+//}
 
-int CdParanoia::lastSectorOfDisc()
-{
-    return paranoia ? cdda_disc_lastsector(drive) : -1;
-}
+//int CdParanoia::lastSectorOfDisc()
+//{
+//    return paranoia ? cdda_disc_lastsector(drive) : -1;
+//}
 
 void CdParanoia::reset()
 {
diff --git a/devices/cdparanoia.h b/devices/cdparanoia.h
index 50be0c12b..99dfeb7d5 100644
--- a/devices/cdparanoia.h
+++ b/devices/cdparanoia.h
@@ -41,7 +41,7 @@ public:
 
     void setParanoiaMode(int mode);
     void setFullParanoiaMode(bool f) { setParanoiaMode(f ? 3 : 0); }
-    void setNeverSkip(bool b);
+//    void setNeverSkip(bool b);
     void setMaxRetries(int m) { maxRetries=m; }
 
     qint16 * read();
@@ -49,8 +49,8 @@ public:
 
     int firstSectorOfTrack(int track);
     int lastSectorOfTrack(int track);
-    int firstSectorOfDisc();
-    int lastSectorOfDisc();
+//    int firstSectorOfDisc();
+//    int lastSectorOfDisc();
     int length();
 
     int lengthOfTrack(int n);
diff --git a/devices/device.h b/devices/device.h
index 7d544c4bb..387cc3fa2 100644
--- a/devices/device.h
+++ b/devices/device.h
@@ -97,7 +97,8 @@ public:
         : MusicLibraryItemRoot(name)
         , update(0)
         , needToFixVa(false)
-        , jobAbortRequested(false) {
+        , jobAbortRequested(false)
+        , transcoding(false) {
         setUseArtistImages(false);
         setUseAlbumImages(true);
         Q_UNUSED(m)
diff --git a/devices/encoders.h b/devices/encoders.h
index dc3895457..502fce76c 100644
--- a/devices/encoders.h
+++ b/devices/encoders.h
@@ -41,7 +41,7 @@ namespace Encoders
 
     struct Encoder {
         Encoder()
-            : defaultValueIndex(0) {
+            : defaultValueIndex(0), ffmpegValueMultiplier(0), transcoder(false) {
         }
         Encoder(const QString &n, const QString &d, const QString &t, const QString &e, const QString &a, const QString &c,
                 const QString &f, const QString &v, const QList<Setting> &vs, const QString &l, const QString &h, int def, int mult=1)
diff --git a/devices/filejob.cpp b/devices/filejob.cpp
index 22a36f230..fd28e7ff6 100644
--- a/devices/filejob.cpp
+++ b/devices/filejob.cpp
@@ -55,6 +55,11 @@ FileThread::FileThread()
 {
 }
 
+FileThread::~FileThread()
+{
+    stop();
+}
+
 void FileThread::addJob(FileJob *job)
 {
     if (!thread) {
diff --git a/devices/filejob.h b/devices/filejob.h
index ae92e1ca7..b875c3997 100644
--- a/devices/filejob.h
+++ b/devices/filejob.h
@@ -40,6 +40,7 @@ public:
     static FileThread * self();
 
     FileThread();
+    ~FileThread();
     void addJob(FileJob *job);
     void stop();
 private:
diff --git a/devices/fsdevice.cpp b/devices/fsdevice.cpp
index 68571ec0f..bfd90e7fb 100644
--- a/devices/fsdevice.cpp
+++ b/devices/fsdevice.cpp
@@ -66,6 +66,7 @@ MusicScanner::MusicScanner()
     , stopRequested(false)
     , count(0)
     , lastUpdate(0)
+    , lastCacheProg(-1)
 {
     thread=new Thread(metaObject()->className());
     moveToThread(thread);
diff --git a/devices/mtpdevice.cpp b/devices/mtpdevice.cpp
index 9c8922404..223f6cbcc 100644
--- a/devices/mtpdevice.cpp
+++ b/devices/mtpdevice.cpp
@@ -67,21 +67,22 @@ static const QString constMusicFolder=QLatin1String("Music");
 
 static int progressMonitor(uint64_t const processed, uint64_t const total, void const * const data)
 {
-    ((MtpConnection *)data)->emitProgress((int)(((processed*1.0)/(total*1.0)*100.0)+0.5));
-    return ((MtpConnection *)data)->abortRequested() ? -1 : 0;
+    const MtpConnection *con=static_cast<const MtpConnection *>(data);
+    const_cast<MtpConnection *>(con)->emitProgress((int)(((processed*1.0)/(total*1.0)*100.0)+0.5));
+    return con->abortRequested() ? -1 : 0;
 }
 
 static int trackListMonitor(uint64_t const processed, uint64_t const total, void const * const data)
 {
-    Q_UNUSED(total)
-    ((MtpConnection *)data)->trackListProgress(((processed*100.0)/(total*1.0))+0.5);
-    return ((MtpConnection *)data)->abortRequested() ? -1 : 0;
+    const MtpConnection *con=static_cast<const MtpConnection *>(data);
+    const_cast<MtpConnection *>(con)->trackListProgress(((processed*100.0)/(total*1.0))+0.5);
+    return con->abortRequested() ? -1 : 0;
 }
 
 static uint16_t fileReceiver(void *params, void *priv, uint32_t sendlen, unsigned char *data, uint32_t *putlen)
 {
     Q_UNUSED(params)
-    QByteArray *byteData=(QByteArray *)priv;
+    QByteArray *byteData=static_cast<QByteArray *>(priv);
     (*byteData)+=QByteArray((char *)data, (int)sendlen);
     *putlen = sendlen;
     return LIBMTP_HANDLER_RETURN_OK;
diff --git a/dynamic/dynamic.cpp b/dynamic/dynamic.cpp
index 16e3ab48a..f0fb2572c 100644
--- a/dynamic/dynamic.cpp
+++ b/dynamic/dynamic.cpp
@@ -81,31 +81,31 @@ static const QString constStatusStateResp=QLatin1String("STATE:");
 static const QString constStatusRuleResp=QLatin1String("RULES:");
 static const QString constUpdateRequiredResp=QLatin1String("UPDATE_REQUIRED");
 
-Dynamic::Command Dynamic::toCommand(const QString &cmd)
-{
-    if (constIdCmd==cmd) {
-        return Id;
-    }
-    if (constListCmd==cmd) {
-        return List;
-    }
-    if (constStatusCmd==cmd) {
-        return Status;
-    }
-    if (constSaveCmd==cmd) {
-        return Save;
-    }
-    if (constDeleteCmd==cmd) {
-        return Del;
-    }
-    if (constSetActiveCmd==cmd) {
-        return SetActive;
-    }
-    if (constControlCmd==cmd) {
-        return Control;
-    }
-    return Unknown;
-}
+//Dynamic::Command Dynamic::toCommand(const QString &cmd)
+//{
+//    if (constIdCmd==cmd) {
+//        return Id;
+//    }
+//    if (constListCmd==cmd) {
+//        return List;
+//    }
+//    if (constStatusCmd==cmd) {
+//        return Status;
+//    }
+//    if (constSaveCmd==cmd) {
+//        return Save;
+//    }
+//    if (constDeleteCmd==cmd) {
+//        return Del;
+//    }
+//    if (constSetActiveCmd==cmd) {
+//        return SetActive;
+//    }
+//    if (constControlCmd==cmd) {
+//        return Control;
+//    }
+//    return Unknown;
+//}
 
 QString Dynamic::toString(Command cmd)
 {
diff --git a/dynamic/dynamic.h b/dynamic/dynamic.h
index 156a599fc..f53607f20 100644
--- a/dynamic/dynamic.h
+++ b/dynamic/dynamic.h
@@ -68,7 +68,7 @@ public:
         Control
     };
 
-    static Command toCommand(const QString &cmd);
+//    static Command toCommand(const QString &cmd);
     static QString toString(Command cmd);
     static void enableDebug();
 
diff --git a/gui/cachesettings.cpp b/gui/cachesettings.cpp
index de659d0d0..a129b5e34 100644
--- a/gui/cachesettings.cpp
+++ b/gui/cachesettings.cpp
@@ -215,7 +215,7 @@ void CacheTree::showEvent(QShowEvent *e)
 {
     if (!calculated) {
         for (int i=0; i<topLevelItemCount(); ++i) {
-            ((CacheItem *)topLevelItem(i))->calculate();
+            static_cast<CacheItem *>(topLevelItem(i))->calculate();
         }
         calculated=true;
     }
@@ -297,7 +297,7 @@ void CacheSettings::controlButton()
 {
     button->setEnabled(false);
     for (int i=0; i<tree->topLevelItemCount(); ++i) {
-        CacheItem *item=(CacheItem *)tree->topLevelItem(i);
+        CacheItem *item=static_cast<CacheItem *>(tree->topLevelItem(i));
 
         if (item->isSelected() && !item->isEmpty()) {
             button->setEnabled(true);
@@ -310,7 +310,7 @@ void CacheSettings::deleteAll()
 {
     QList<CacheItem *> toDelete;
     for (int i=0; i<tree->topLevelItemCount(); ++i) {
-        CacheItem *item=(CacheItem *)tree->topLevelItem(i);
+        CacheItem *item=static_cast<CacheItem *>(tree->topLevelItem(i));
 
         if (item->isSelected() && !item->isEmpty()) {
             toDelete.append(item);
diff --git a/gui/coverdialog.cpp b/gui/coverdialog.cpp
index 6cf25b505..a5cba567e 100644
--- a/gui/coverdialog.cpp
+++ b/gui/coverdialog.cpp
@@ -383,7 +383,7 @@ CoverDialog::CoverDialog(QWidget *parent)
     QFont f(list->font());
     QFontMetrics origFm(f);
     iSize=origFm.height()*7;
-    iSize=((iSize/10)*10)+(iSize%10 ? 10 : 0);
+    iSize=((iSize/10)*10)+((iSize%10) ? 10 : 0);
     f.setPointSizeF(f.pointSizeF()*0.75);
     QFontMetrics fm(f);
     list->setFont(f);
@@ -619,14 +619,14 @@ void CoverDialog::showImage(QListWidgetItem *item)
         return;
     }
 
-    CoverItem *cover=(CoverItem *)item;
+    CoverItem *cover=static_cast<CoverItem *>(item);
 
     if (CoverItem::Type_Existing==cover->type()) {
         previewDialog()->downloading(cover->url());
-        previewDialog()->showImage(((ExistingCover *)cover)->image(), cover->url());
+        previewDialog()->showImage(static_cast<ExistingCover *>(cover)->image(), cover->url());
     } else if (CoverItem::Type_Local==cover->type()) {
         previewDialog()->downloading(cover->url());
-        previewDialog()->showImage(((LocalCover *)cover)->image(), cover->url());
+        previewDialog()->showImage(static_cast<LocalCover *>(cover)->image(), cover->url());
     } else {
         previewDialog()->downloading(cover->url());
         NetworkJob *j=downloadImage(cover->url(), DL_LargePreview);
@@ -667,7 +667,7 @@ void CoverDialog::sendQuery()
         QList<CoverItem *> keep;
 
         while (list->count()) {
-            CoverItem *item=(CoverItem *)list->takeItem(0);
+            CoverItem *item=static_cast<CoverItem *>(list->takeItem(0));
             if (CoverItem::Type_Existing==item->type() || CoverItem::Type_Local==item->type()) {
                 keep.append(item);
             } else {
@@ -765,7 +765,7 @@ void CoverDialog::sendDiscoGsQuery(const QString &fixedQuery, int page)
 void CoverDialog::checkStatus()
 {
     QList<QListWidgetItem*> items=list->selectedItems();
-    enableButtonOk(1==items.size() && CoverItem::Type_Existing!=((CoverItem *)items.at(0))->type());
+    enableButtonOk(1==items.size() && CoverItem::Type_Existing!=static_cast<CoverItem *>(items.at(0))->type());
 }
 
 void CoverDialog::cancelQuery()
@@ -825,8 +825,7 @@ void CoverDialog::menuRequested(const QPoint &pos)
     removeAction->setEnabled(!items.isEmpty());
     if (removeAction->isEnabled()) {
         foreach (QListWidgetItem *i, items) {
-            CoverItem *c=(CoverItem *)i;
-            if (CoverItem::Type_Existing==c->type()) {
+            if (CoverItem::Type_Existing==static_cast<CoverItem *>(i)->type()) {
                 removeAction->setEnabled(false);
             }
         }
@@ -1140,9 +1139,9 @@ void CoverDialog::slotButtonClicked(int button)
     case Ok: {
         QList<QListWidgetItem*> items=list->selectedItems();
         if (1==items.size()) {
-            CoverItem *cover=(CoverItem *)items.at(0);
+            CoverItem *cover=static_cast<CoverItem *>(items.at(0));
             if (CoverItem::Type_Local==cover->type()) {
-                if (saveCover(cover->url(), ((LocalCover *)cover)->image())) {
+                if (saveCover(cover->url(), static_cast<LocalCover *>(cover)->image())) {
                     accept();
                 }
             } else if (CoverItem::Type_Existing!=cover->type()) {
diff --git a/gui/covers.cpp b/gui/covers.cpp
index df49bda28..2226330e6 100644
--- a/gui/covers.cpp
+++ b/gui/covers.cpp
@@ -364,10 +364,10 @@ Covers * Covers::self()
     #endif
 }
 
-bool Covers::isCoverFile(const QString &file)
-{
-    return standardNames().contains(file);
-}
+//bool Covers::isCoverFile(const QString &file)
+//{
+//    return standardNames().contains(file);
+//}
 
 static bool fExists(const QString &dir, const QString &file)
 {
diff --git a/gui/covers.h b/gui/covers.h
index 7265251d7..cdb115c26 100644
--- a/gui/covers.h
+++ b/gui/covers.h
@@ -161,7 +161,7 @@ public:
     static const QLatin1String constArtistImage;
 
     static Covers * self();
-    static bool isCoverFile(const QString &file);
+//    static bool isCoverFile(const QString &file);
     static bool copyImage(const QString &sourceDir, const QString &destDir, const QString &coverFile, const QString &destName, unsigned short maxSize=0);
     static bool copyCover(const Song &song, const QString &sourceDir, const QString &destDir, const QString &name=QString(), unsigned short maxSize=0);
     static const QStringList &standardNames();
diff --git a/gui/settings.cpp b/gui/settings.cpp
index ac0674dd3..6cfdfcc1a 100644
--- a/gui/settings.cpp
+++ b/gui/settings.cpp
@@ -84,9 +84,9 @@ struct MpdDefaults
 
     void read() {
         QFile f("/etc/mpd.conf");
-        int details=0;
 
         if (f.open(QIODevice::ReadOnly|QIODevice::Text)) {
+            int details=0;
             while (!f.atEnd()) {
                 QString line = f.readLine().trimmed();
                 if (line.startsWith('#')) {
diff --git a/gui/stdactions.h b/gui/stdactions.h
index 1e79292e4..d3199eb60 100644
--- a/gui/stdactions.h
+++ b/gui/stdactions.h
@@ -30,7 +30,6 @@
 class StdActions
 {
 public:
-
     static StdActions *self();
 
     StdActions();
@@ -63,7 +62,6 @@ public:
     Action *replaygainAction;
     #endif
     #ifdef ENABLE_DEVICES_SUPPORT
-    Action *devicesTabAction;
     Action *copyToDeviceAction;
     Action *deleteSongsAction;
     #endif
@@ -72,5 +70,9 @@ public:
     Action *removeAction;
     Action *backAction;
     Action *searchAction;
+
+private:
+    StdActions(const StdActions &o);
+    StdActions & operator=(const StdActions &o);
 };
 #endif
diff --git a/http/httpsocket.cpp b/http/httpsocket.cpp
index 5aca621a3..4c2a4c0cc 100644
--- a/http/httpsocket.cpp
+++ b/http/httpsocket.cpp
@@ -318,7 +318,7 @@ void HttpSocket::readClient()
         return;
     }
 
-    QTcpSocket *socket = (QTcpSocket*)sender();
+    QTcpSocket *socket = static_cast<QTcpSocket *>(sender());
     if (socket->canReadLine()) {
         QList<QByteArray> tokens = split(socket->readLine()); // QRegExp("[ \r\n][ \r\n]*"));
         if (tokens.length()>=2 && "GET"==tokens[0]) {
@@ -438,11 +438,8 @@ void HttpSocket::readClient()
 
                         writeMimeType(detectMimeType(song.file), socket, readBytesFrom, totalBytes, true);
                         ok=true;
-                        static const int constChunkSize=32768;
-                        char buffer[constChunkSize];
                         qint32 readPos = 0;
                         qint32 bytesRead = 0;
-                        bool stop=false;
 
                         if (0!=readBytesFrom) {
                             if (!f.seek(readBytesFrom)) {
@@ -456,6 +453,9 @@ void HttpSocket::readClient()
                         }
 
                         if (ok) {
+                            static const int constChunkSize=32768;
+                            char buffer[constChunkSize];
+                            bool stop=false;
                             do {
                                 bytesRead = f.read(buffer, constChunkSize);
                                 readPos+=bytesRead;
@@ -485,11 +485,9 @@ void HttpSocket::readClient()
 
 void HttpSocket::discardClient()
 {
-    QTcpSocket *socket = (QTcpSocket*)sender();
-    socket->deleteLater();
+    static_cast<QTcpSocket *>(sender())->deleteLater();
 }
 
-
 void HttpSocket::mpdAddress(const QString &a)
 {
     mpdAddr=a;
diff --git a/models/dirviewitem.cpp b/models/dirviewitem.cpp
index f6000c914..7b00a9b08 100644
--- a/models/dirviewitem.cpp
+++ b/models/dirviewitem.cpp
@@ -26,7 +26,7 @@
 
 #include "dirviewitem.h"
 
-QString DirViewItem::fullName()
+QString DirViewItem::fullName() const
 {
     QString fn = m_name;
     DirViewItem *item = parent();
diff --git a/models/dirviewitem.h b/models/dirviewitem.h
index db03cf612..b6d1b56b7 100644
--- a/models/dirviewitem.h
+++ b/models/dirviewitem.h
@@ -48,7 +48,7 @@ public:
     DirViewItem * parent() const { return m_parentItem; }
     virtual int childCount() const { return 0; }
     virtual DirViewItem * child(int) const { return 0; }
-    QString fullName();
+    QString fullName() const;
     const QString & data() const { return m_name; }
     const QString & name() const { return m_name; }
     virtual Type type() const=0;
diff --git a/models/multimusicmodel.h b/models/multimusicmodel.h
index 3d375224d..0a75fa47b 100644
--- a/models/multimusicmodel.h
+++ b/models/multimusicmodel.h
@@ -46,7 +46,7 @@ public:
     QList<Song> songs(const QModelIndexList &indexes, bool playableOnly=false, bool fullPath=false) const;
     QStringList filenames(const QModelIndexList &indexes, bool playableOnly=false, bool fullPath=false) const;
     const QSet<QString> & genres() { return colGenres; }
-    int row(void *i) const { return collections.indexOf((MusicLibraryItemRoot *)i); }
+    int row(void *i) const { return collections.indexOf(static_cast<MusicLibraryItemRoot *>(i)); }
     void clearImages();
 
 Q_SIGNALS:
diff --git a/models/musiclibraryitem.h b/models/musiclibraryitem.h
index 1e7d5b260..4f26396ed 100644
--- a/models/musiclibraryitem.h
+++ b/models/musiclibraryitem.h
@@ -51,7 +51,7 @@ public:
     virtual MusicLibraryItem * childItem(int) const { return 0; }
     virtual int childCount() const { return 0; }
     int row() const;
-    void setRow(int r) { m_row=r+1; }
+    void setRow(int r) const { m_row=r+1; }
     int columnCount() const { return 1; }
     const QString & data() const { return m_itemData; }
     void setData(const QString &d) { m_itemData=d; }
diff --git a/models/musiclibraryitemalbum.cpp b/models/musiclibraryitemalbum.cpp
index 0e49a0a07..f8be52374 100644
--- a/models/musiclibraryitemalbum.cpp
+++ b/models/musiclibraryitemalbum.cpp
@@ -193,7 +193,7 @@ bool MusicLibraryItemAlbum::setCover(const QImage &img, bool update) const
     return false;
 }
 
-const QPixmap & MusicLibraryItemAlbum::cover()
+const QPixmap & MusicLibraryItemAlbum::cover() const
 {
     if (m_coverIsDefault) {
         if (largeImages()) {
@@ -251,14 +251,14 @@ const QPixmap & MusicLibraryItemAlbum::cover()
                 // Not showing album images in this model, so dont request any!
             }
             #ifdef ENABLE_DEVICES_SUPPORT
-            else if (root->isDevice()) {
+            else if (root && root->isDevice()) {
                 // This item is in the devices model, so get cover from device...
                 song.id=firstSong->song().id;
                 static_cast<Device *>(parentItem()->parentItem())->requestCover(song);
             }
             #endif
             #ifdef ENABLE_ONLINE_SERVICES
-            else if (root->isOnlineService()) {
+            else if (root && root->isOnlineService()) {
                 img.img=OnlineServicesModel::self()->requestImage(static_cast<OnlineService *>(root)->id(), parentItem()->data(), data(), m_imageUrl);
                 // ONLINE: Image URL is encoded in song.name...
 //                if (!m_imageUrl.isEmpty()) {
@@ -470,7 +470,7 @@ bool MusicLibraryItemAlbum::containsArtist(const QString &a)
     return m_artists.contains(a);
 }
 
-void MusicLibraryItemAlbum::clearImage()
+void MusicLibraryItemAlbum::clearImage() const
 {
     if (!m_coverIsDefault) {
         m_coverIsDefault=true;
diff --git a/models/musiclibraryitemalbum.h b/models/musiclibraryitemalbum.h
index dd75db9a8..3b54778b9 100644
--- a/models/musiclibraryitemalbum.h
+++ b/models/musiclibraryitemalbum.h
@@ -65,7 +65,7 @@ public:
     virtual ~MusicLibraryItemAlbum();
 
     bool setCover(const QImage &img, bool update=false) const;
-    const QPixmap & cover();
+    const QPixmap & cover() const;
     bool hasRealCover() const { return !m_coverIsDefault; }
     quint32 year() const { return m_year; }
     quint32 totalTime();
@@ -89,7 +89,7 @@ public:
     void setImageUrl(const QString &u) { m_imageUrl=u; }
     bool updateYear();
     bool containsArtist(const QString &a);
-    void clearImage();
+    void clearImage() const;
     // Return orignal album name. If we are grouping by composer, then album will appear as "Album (Artist)"
     const QString & originalName() const { return m_originalName; }
 
diff --git a/models/musiclibraryitemartist.cpp b/models/musiclibraryitemartist.cpp
index 495c465c2..62cb89c65 100644
--- a/models/musiclibraryitemartist.cpp
+++ b/models/musiclibraryitemartist.cpp
@@ -103,7 +103,7 @@ bool MusicLibraryItemArtist::setCover(const QImage &img, bool update) const
     return false;
 }
 
-const QPixmap & MusicLibraryItemArtist::cover()
+const QPixmap & MusicLibraryItemArtist::cover() const
 {
     if (m_coverIsDefault) {
         if (largeImages()) {
@@ -188,7 +188,7 @@ const QPixmap & MusicLibraryItemArtist::cover()
     return *m_cover;
 }
 
-void MusicLibraryItemArtist::clearImages()
+void MusicLibraryItemArtist::clearImages() const
 {
     if (!m_coverIsDefault) {
         m_coverIsDefault=true;
diff --git a/models/musiclibraryitemartist.h b/models/musiclibraryitemartist.h
index 0ed3151c9..f3eb24475 100644
--- a/models/musiclibraryitemartist.h
+++ b/models/musiclibraryitemartist.h
@@ -58,11 +58,11 @@ public:
     Type itemType() const { return Type_Artist; }
     static void clearDefaultCover();
     bool setCover(const QImage &img, bool update=false) const;
-    const QPixmap & cover();
+    const QPixmap & cover() const;
     bool hasRealCover() const { return !m_coverIsDefault; }
     const QString & imageUrl() const { return m_imageUrl; }
     void setImageUrl(const QString &u) { m_imageUrl=u; }
-    void clearImages();
+    void clearImages() const;
     // 'data' could be 'Composer' if we are set to use that, but need to save real artist...
     const QString & actualArtist() const { return m_actualArtist; }
 
diff --git a/models/musiclibraryitempodcast.cpp b/models/musiclibraryitempodcast.cpp
index 2a2b8e53e..62e7a53f3 100644
--- a/models/musiclibraryitempodcast.cpp
+++ b/models/musiclibraryitempodcast.cpp
@@ -252,7 +252,7 @@ bool MusicLibraryItemPodcast::setCover(const QImage &img, bool update) const
     return false;
 }
 
-const QPixmap & MusicLibraryItemPodcast::cover()
+const QPixmap & MusicLibraryItemPodcast::cover() const
 {
     if (m_coverIsDefault) {
         if (largeImages()) {
@@ -309,7 +309,7 @@ void MusicLibraryItemPodcast::remove(MusicLibraryItemSong *i)
     }
 }
 
-void MusicLibraryItemPodcast::clearImage()
+void MusicLibraryItemPodcast::clearImage() const
 {
     if (!m_coverIsDefault) {
         m_coverIsDefault=true;
diff --git a/models/musiclibraryitempodcast.h b/models/musiclibraryitempodcast.h
index aeaefa518..dbd94b1cf 100644
--- a/models/musiclibraryitempodcast.h
+++ b/models/musiclibraryitempodcast.h
@@ -59,14 +59,14 @@ public:
     RssStatus loadRss(QNetworkReply *dev);
     bool save();
     bool setCover(const QImage &img, bool update=false) const;
-    const QPixmap & cover();
+    const QPixmap & cover() const;
     bool hasRealCover() const { return !m_coverIsDefault; }
     void remove(int row);
     void remove(MusicLibraryItemSong *i);
     Type itemType() const { return Type_Podcast; }
     const QUrl & imageUrl() const { return m_imageUrl; }
     void setImageUrl(const QString &u) { m_imageUrl=u; }
-    void clearImage();
+    void clearImage() const;
     const QUrl & rssUrl() const { return m_rssUrl; }
     void removeFiles();
     void setUnplayedCount();
diff --git a/models/musiclibraryitemroot.cpp b/models/musiclibraryitemroot.cpp
index 5edbfd7e0..e18bc613a 100644
--- a/models/musiclibraryitemroot.cpp
+++ b/models/musiclibraryitemroot.cpp
@@ -805,7 +805,7 @@ const MusicLibraryItem * MusicLibraryItemRoot::findSong(const Song &s) const
             }
         }
     } else {
-        MusicLibraryItemArtist *artistItem = ((MusicLibraryItemRoot *)this)->artist(s, false);
+        MusicLibraryItemArtist *artistItem = const_cast<MusicLibraryItemRoot *>(this)->artist(s, false);
         if (artistItem) {
             MusicLibraryItemAlbum *albumItem = artistItem->album(s, false);
             if (albumItem) {
diff --git a/models/musiclibraryitemroot.h b/models/musiclibraryitemroot.h
index 0433b23ee..8398a1f67 100644
--- a/models/musiclibraryitemroot.h
+++ b/models/musiclibraryitemroot.h
@@ -90,7 +90,7 @@ public:
     quint32 fromXML(QXmlStreamReader &reader, const QDateTime &date=QDateTime(), const QString &baseFolder=QString(), MusicLibraryProgressMonitor *prog=0);
     Type itemType() const { return Type_Root; }
     void add(const QSet<Song> &songs);
-    bool supportsAlbumArtistTag() { return supportsAlbumArtist; }
+    bool supportsAlbumArtistTag() const { return supportsAlbumArtist; }
     void setSupportsAlbumArtistTag(bool s) { supportsAlbumArtist=s; }
     bool useAlbumImages() const { return albumImages; }
     void setUseAlbumImages(bool a) { albumImages=a; }
diff --git a/models/musiclibrarymodel.cpp b/models/musiclibrarymodel.cpp
index db9d34d08..2ac1c3208 100644
--- a/models/musiclibrarymodel.cpp
+++ b/models/musiclibrarymodel.cpp
@@ -119,26 +119,26 @@ void MusicLibraryModel::convertCache(const QString &compressedName)
     }
 }
 
-void MusicLibraryModel::cleanCache()
-{
-    QSet<QString> existing;
-    QList<MPDConnectionDetails> connections=Settings::self()->allConnections();
-    foreach (const MPDConnectionDetails &conn, connections) {
-        QString withPort=cacheFileName(conn);
-        QString withoutPort=cacheFileName(conn, false);
-        if (withPort!=withoutPort) {
-            existing.insert(withoutPort);
-        }
-        existing.insert(withPort);
-    }
-    QDir dir(Utils::cacheDir(constLibraryCache));
-    QFileInfoList files=dir.entryInfoList(QStringList() << "*"+constLibraryExt << "*"+constLibraryCompressedExt, QDir::Files);
-    foreach (const QFileInfo &file, files) {
-        if (!existing.contains(file.fileName())) {
-            QFile::remove(file.absoluteFilePath());
-        }
-    }
-}
+//void MusicLibraryModel::cleanCache()
+//{
+//    QSet<QString> existing;
+//    QList<MPDConnectionDetails> connections=Settings::self()->allConnections();
+//    foreach (const MPDConnectionDetails &conn, connections) {
+//        QString withPort=cacheFileName(conn);
+//        QString withoutPort=cacheFileName(conn, false);
+//        if (withPort!=withoutPort) {
+//            existing.insert(withoutPort);
+//        }
+//        existing.insert(withPort);
+//    }
+//    QDir dir(Utils::cacheDir(constLibraryCache));
+//    QFileInfoList files=dir.entryInfoList(QStringList() << "*"+constLibraryExt << "*"+constLibraryCompressedExt, QDir::Files);
+//    foreach (const QFileInfo &file, files) {
+//        if (!existing.contains(file.fileName())) {
+//            QFile::remove(file.absoluteFilePath());
+//        }
+//    }
+//}
 
 MusicLibraryModel::MusicLibraryModel(QObject *parent, bool isMpdModel, bool isCheckable)
     : MusicModel(parent)
@@ -531,39 +531,39 @@ bool MusicLibraryModel::update(const QSet<Song> &songs)
     return updatedSongs;
 }
 
-void MusicLibraryModel::uncheckAll()
-{
-    if (!checkable) {
-        return;
-    }
+//void MusicLibraryModel::uncheckAll()
+//{
+//    if (!checkable) {
+//        return;
+//    }
 
-    foreach (MusicLibraryItem *artist, rootItem->childItems()) {
-        MusicLibraryItemArtist *artistItem=static_cast<MusicLibraryItemArtist *>(artist);
-        QModelIndex artistIndex=index(artistItem->row(), 0, QModelIndex());
+//    foreach (MusicLibraryItem *artist, rootItem->childItems()) {
+//        MusicLibraryItemArtist *artistItem=static_cast<MusicLibraryItemArtist *>(artist);
+//        QModelIndex artistIndex=index(artistItem->row(), 0, QModelIndex());
 
-        foreach (MusicLibraryItem *album, artistItem->childItems()) {
-            MusicLibraryItemAlbum *albumItem=static_cast<MusicLibraryItemAlbum *>(album);
-            QModelIndex albumIndex=index(albumItem->row(), 0, artistIndex);
+//        foreach (MusicLibraryItem *album, artistItem->childItems()) {
+//            MusicLibraryItemAlbum *albumItem=static_cast<MusicLibraryItemAlbum *>(album);
+//            QModelIndex albumIndex=index(albumItem->row(), 0, artistIndex);
 
-            foreach (MusicLibraryItem *song, albumItem->childItems()) {
-                if (Qt::Unchecked!=song->checkState()) {
-                    song->setCheckState(Qt::Unchecked);
-                    QModelIndex songIndex=index(song->row(), 0, albumIndex);
-                    emit dataChanged(songIndex, songIndex);
-                }
-            }
-            if (Qt::Unchecked!=albumItem->checkState()) {
-                albumItem->setCheckState(Qt::Unchecked);
-                emit dataChanged(albumIndex, albumIndex);
-            }
-        }
-        if (Qt::Unchecked!=artistItem->checkState()) {
-            artistItem->setCheckState(Qt::Unchecked);
-            emit dataChanged(artistIndex, artistIndex);
-        }
-    }
-    emit checkedSongs(QSet<Song>());
-}
+//            foreach (MusicLibraryItem *song, albumItem->childItems()) {
+//                if (Qt::Unchecked!=song->checkState()) {
+//                    song->setCheckState(Qt::Unchecked);
+//                    QModelIndex songIndex=index(song->row(), 0, albumIndex);
+//                    emit dataChanged(songIndex, songIndex);
+//                }
+//            }
+//            if (Qt::Unchecked!=albumItem->checkState()) {
+//                albumItem->setCheckState(Qt::Unchecked);
+//                emit dataChanged(albumIndex, albumIndex);
+//            }
+//        }
+//        if (Qt::Unchecked!=artistItem->checkState()) {
+//            artistItem->setCheckState(Qt::Unchecked);
+//            emit dataChanged(artistIndex, artistIndex);
+//        }
+//    }
+//    emit checkedSongs(QSet<Song>());
+//}
 
 void MusicLibraryModel::toggleGrouping()
 {
diff --git a/models/musiclibrarymodel.h b/models/musiclibrarymodel.h
index 30f5eb837..eef0e990f 100644
--- a/models/musiclibrarymodel.h
+++ b/models/musiclibrarymodel.h
@@ -50,7 +50,7 @@ public:
     static MusicLibraryModel * self();
 
     static void convertCache(const QString &compressedName);
-    static void cleanCache();
+//    static void cleanCache();
 
     MusicLibraryModel(QObject *parent=0, bool isMpdModel=true, bool isCheckable=false);
     ~MusicLibraryModel();
@@ -83,7 +83,7 @@ public:
         { rootItem->getDetails(artists, albumArtists, composers, albums, genres); }
     QSet<QString> getAlbumArtists();
     bool update(const QSet<Song> &songs);
-    void uncheckAll();
+//    void uncheckAll();
     bool useAlbumImages() const { return rootItem->useAlbumImages(); }
     void setUseAlbumImages(bool a) { rootItem->setUseAlbumImages(a); }
     bool useArtistImages() const { return rootItem->useArtistImages(); }
diff --git a/models/streamsmodel.cpp b/models/streamsmodel.cpp
index cfcb80637..822b74d79 100644
--- a/models/streamsmodel.cpp
+++ b/models/streamsmodel.cpp
@@ -1168,6 +1168,9 @@ void StreamsModel::jobFinished()
 
     if (jobs.contains(job)) {
         CategoryItem *cat=jobs[job];
+        if (!cat) {
+            return;
+        }
         cat->state=CategoryItem::Fetched;
         jobs.remove(job);
 
@@ -1194,7 +1197,7 @@ void StreamsModel::jobFinished()
                 }
             }
 
-            if (cat && cat->parent==root && cat->supportsBookmarks) {
+            if (cat->parent==root && cat->supportsBookmarks) {
                 QList<Item *> bookmarks=cat->loadBookmarks();
                 if (bookmarks.count()) {
                     CategoryItem *bookmarksCat=cat->getBookmarksCategory();
@@ -1976,11 +1979,11 @@ QModelIndex StreamsModel::categoryIndex(const CategoryItem *cat) const
 
 const QString StreamsModel::constPrefix=QLatin1String("cantata-");
 
-bool StreamsModel::validProtocol(const QString &file)
-{
-    QString scheme=QUrl(file).scheme();
-    return scheme.isEmpty() || MPDConnection::self()->urlHandlers().contains(scheme);
-}
+//bool StreamsModel::validProtocol(const QString &file)
+//{
+//    QString scheme=QUrl(file).scheme();
+//    return scheme.isEmpty() || MPDConnection::self()->urlHandlers().contains(scheme);
+//}
 
 QString StreamsModel::modifyUrl(const QString &u, bool addPrefix, const QString &name)
 {
diff --git a/models/streamsmodel.h b/models/streamsmodel.h
index a1787a142..b73010f06 100644
--- a/models/streamsmodel.h
+++ b/models/streamsmodel.h
@@ -186,7 +186,7 @@ public:
     static StreamsModel * self();
     static QString favouritesDir();
     static QString modifyUrl(const QString &u,  bool addPrefix=true, const QString &name=QString());
-    static bool validProtocol(const QString &file);
+//    static bool validProtocol(const QString &file);
 
     StreamsModel(QObject *parent = 0);
     ~StreamsModel();
diff --git a/mpd/mpdconnection.cpp b/mpd/mpdconnection.cpp
index 42065a481..8e9345379 100644
--- a/mpd/mpdconnection.cpp
+++ b/mpd/mpdconnection.cpp
@@ -63,7 +63,7 @@ K_GLOBAL_STATIC(MPDConnection, conn)
 static inline int socketTimeout(int dataSize)
 {
     static const int constDataBlock=100000;
-    return ((dataSize/constDataBlock)+(dataSize%constDataBlock ? 1 : 0))*constSocketCommsTimeout;
+    return ((dataSize/constDataBlock)+((dataSize%constDataBlock) ? 1 : 0))*constSocketCommsTimeout;
 }
 
 static QByteArray log(const QByteArray &data)
@@ -275,7 +275,7 @@ MPDConnection::ConnectionReturn MPDConnection::connectToMPD(MpdSocket &socket, b
             playQueueIds.clear();
             emit cantataStreams(QList<Song>(), false);
             int min, maj, patch;
-            if (3==sscanf(&(recvdata.constData()[7]), "%d.%d.%d", &maj, &min, &patch)) {
+            if (3==sscanf(&(recvdata.constData()[7]), "%3d.%3d.%3d", &maj, &min, &patch)) {
                 long v=((maj&0xFF)<<16)+((min&0xFF)<<8)+(patch&0xFF);
                 if (v!=ver) {
                     ver=v;
@@ -468,13 +468,13 @@ void MPDConnection::setDetails(const MPDConnectionDetails &d)
     }
 }
 
-void MPDConnection::disconnectMpd()
-{
-    if (State_Connected==state) {
-        disconnectFromMPD();
-        emit stateChanged(false);
-    }
-}
+//void MPDConnection::disconnectMpd()
+//{
+//    if (State_Connected==state) {
+//        disconnectFromMPD();
+//        emit stateChanged(false);
+//    }
+//}
 
 MPDConnection::Response MPDConnection::sendCommand(const QByteArray &command, bool emitErrors, bool retry)
 {
@@ -944,11 +944,11 @@ void MPDConnection::play()
     sendCommand("play");
 }
 
-void MPDConnection::startPlayingSong(quint32 song)
-{
-    toggleStopAfterCurrent(false);
-    sendCommand("play "+QByteArray::number(song));
-}
+//void MPDConnection::startPlayingSong(quint32 song)
+//{
+//    toggleStopAfterCurrent(false);
+//    sendCommand("play "+QByteArray::number(song));
+//}
 
 void MPDConnection::startPlayingSongId(qint32 songId)
 {
diff --git a/mpd/mpdconnection.h b/mpd/mpdconnection.h
index 1cb08b063..0f3deeaad 100644
--- a/mpd/mpdconnection.h
+++ b/mpd/mpdconnection.h
@@ -205,7 +205,7 @@ public:
 public Q_SLOTS:
     void reconnect();
     void setDetails(const MPDConnectionDetails &d);
-    void disconnectMpd();
+//    void disconnectMpd();
     // Current Playlist
     void add(const QStringList &files, bool replace, quint8 priority);
     void add(const QStringList &files, quint32 pos, quint32 size, int action, quint8 priority);
@@ -229,7 +229,7 @@ public Q_SLOTS:
     void goToNext();
     void setPause(bool toggle);
     void play();
-    void startPlayingSong(quint32 song = 0);
+//    void startPlayingSong(quint32 song = 0);
     void startPlayingSongId(qint32 songId = 0);
     void goToPrevious();
     void setConsume(bool toggle);
diff --git a/online/magnatuneservice.h b/online/magnatuneservice.h
index 6d7f247de..21ade4921 100644
--- a/online/magnatuneservice.h
+++ b/online/magnatuneservice.h
@@ -65,7 +65,7 @@ public:
     static QString membershipStr(MemberShip f, bool trans=false);
     static QString downloadTypeStr(DownloadType f, bool trans=false);
 
-    MagnatuneService(MusicModel *m) : OnlineService(m, constName), membership(MB_None) { }
+    MagnatuneService(MusicModel *m) : OnlineService(m, constName), membership(MB_None), download(DL_Mp3) { }
 
     Song fixPath(const Song &orig, bool) const;
     void createLoader();
diff --git a/online/onlinedevice.cpp b/online/onlinedevice.cpp
index dab38ae3d..2b50bfdbe 100644
--- a/online/onlinedevice.cpp
+++ b/online/onlinedevice.cpp
@@ -38,7 +38,7 @@ void OnlineDevice::copySongTo(const Song &s, const QString &baseDir, const QStri
         return;
     }
 
-    overWrite=overWrite;
+    overWrite=overwrite;
     lastProg=-1;
     currentMpdDir=baseDir;
     currentDestFile=baseDir+musicPath;
diff --git a/online/onlinedevice.h b/online/onlinedevice.h
index c988f4fb6..e68a90470 100644
--- a/online/onlinedevice.h
+++ b/online/onlinedevice.h
@@ -33,7 +33,7 @@ class OnlineDevice : public Device
     Q_OBJECT
 
 public:
-    OnlineDevice() : Device(0, QString(), QString()), lastProg(-1), job(0) { }
+    OnlineDevice() : Device(0, QString(), QString()), lastProg(-1), overWrite(false), job(0) { }
     virtual ~OnlineDevice() { }
 
     bool isConnected() const { return true; }
diff --git a/online/onlineservicespage.cpp b/online/onlineservicespage.cpp
index 2a2ab872a..4ef09ea72 100644
--- a/online/onlineservicespage.cpp
+++ b/online/onlineservicespage.cpp
@@ -148,12 +148,6 @@ void OnlineServicesPage::clear()
     view->setLevel(0);
 }
 
-QString OnlineServicesPage::activeService() const
-{
-    OnlineService *srv=activeSrv();
-    return srv ? srv->id() : QString();
-}
-
 OnlineService * OnlineServicesPage::activeSrv() const
 {
     const QModelIndexList selected = view->selectedIndexes(false); // Dont need sorted selection here...
@@ -465,12 +459,12 @@ void OnlineServicesPage::refreshService()
     if (MusicLibraryItem::Type_Root==item->itemType()) {
         OnlineService *srv=static_cast<OnlineService *>(item);
 
-        if (srv->isLoaded() && srv->childCount()>0 &&
-                MessageBox::No==MessageBox::questionYesNo(this, i18n("Re-download music listing for %1?", srv->id()), i18n("Re-download"),
-                                                          GuiItem(i18n("Re-download")), StdGuiItem::cancel())) {
-            return;
-        }
         if (srv) {
+            if (srv->isLoaded() && srv->childCount()>0 &&
+                    MessageBox::No==MessageBox::questionYesNo(this, i18n("Re-download music listing for %1?", srv->id()), i18n("Re-download"),
+                                                              GuiItem(i18n("Re-download")), StdGuiItem::cancel())) {
+                return;
+            }
             srv->reload(0==srv->childCount());
         }
     }
diff --git a/online/onlineservicespage.h b/online/onlineservicespage.h
index fd7218c89..72cb7a41b 100644
--- a/online/onlineservicespage.h
+++ b/online/onlineservicespage.h
@@ -41,7 +41,6 @@ public:
 
     void setEnabled(bool e);
     void clear();
-    QString activeService() const;
     QStringList selectedFiles() const;
     QList<Song> selectedSongs() const;
     void addSelectionToPlaylist(const QString &name=QString(), bool replace=false, quint8 priorty=0);
diff --git a/replaygain/albumscanner.h b/replaygain/albumscanner.h
index 80681aaf6..51105aa06 100644
--- a/replaygain/albumscanner.h
+++ b/replaygain/albumscanner.h
@@ -36,7 +36,7 @@ class AlbumScanner : public Job
 
 public:
     struct Values {
-        Values() : ok(false) { }
+        Values() : gain(0.0), peak(0.0), ok(false) { }
         double gain;
         double peak;
         bool ok;
diff --git a/replaygain/ffmpeginput.cpp b/replaygain/ffmpeginput.cpp
index ab44156a4..7aa5e5031 100644
--- a/replaygain/ffmpeginput.cpp
+++ b/replaygain/ffmpeginput.cpp
@@ -292,7 +292,7 @@ size_t FfmpegInput::readFrames()
         return 0;
     }
 
-    size_t bufferPosition = 0, numberRead;
+    size_t bufferPosition=0, numberRead=0;
 
     while (handle->currentBytes < BUFFER_SIZE) {
         numberRead = readOnePacket();
diff --git a/replaygain/rgdialog.cpp b/replaygain/rgdialog.cpp
index 5e59efff4..e440f93d5 100644
--- a/replaygain/rgdialog.cpp
+++ b/replaygain/rgdialog.cpp
@@ -71,11 +71,6 @@ enum Columns
 
 static int iCount=0;
 
-static inline QString createAlbumName(const Song &s)
-{
-    return s.albumArtist()+QLatin1String(" - ")+s.album;
-}
-
 int RgDialog::instanceCount()
 {
     return iCount;
diff --git a/replaygain/trackscanner.cpp b/replaygain/trackscanner.cpp
index 5f4c764a8..17879fd25 100644
--- a/replaygain/trackscanner.cpp
+++ b/replaygain/trackscanner.cpp
@@ -74,7 +74,7 @@ TrackScanner::Data TrackScanner::global(const QList<TrackScanner *> &scanners)
 }
 
 #ifdef EBUR128_USE_SPEEX_RESAMPLER
-static int constEbur128Mode=EBUR128_MODE_M|EBUR128_MODE_I|EBUR128_MODE_TRUE_PEAK);
+static int constEbur128Mode=EBUR128_MODE_M|EBUR128_MODE_I|EBUR128_MODE_TRUE_PEAK;
 #else
 static int constEbur128Mode=EBUR128_MODE_M|EBUR128_MODE_I|EBUR128_MODE_SAMPLE_PEAK;
 #endif
@@ -193,7 +193,7 @@ void TrackScanner::run()
 //         if (result) abort();
 //     }
 
-    if ((state->mode & EBUR128_MODE_SAMPLE_PEAK) == EBUR128_MODE_SAMPLE_PEAK) {
+    if (EBUR128_MODE_SAMPLE_PEAK==(state->mode & EBUR128_MODE_SAMPLE_PEAK)) {
         for (unsigned i = 0; i < state->channels; ++i) {
             double sp;
             ebur128_sample_peak(state, i, &sp);
@@ -203,7 +203,7 @@ void TrackScanner::run()
         }
     }
     #ifdef EBUR128_USE_SPEEX_RESAMPLER
-    if ((state->mode & EBUR128_MODE_TRUE_PEAK) == EBUR128_MODE_TRUE_PEAK) {
+    if (EBUR128_MODE_TRUE_PEAK==(state->mode & EBUR128_MODE_TRUE_PEAK)) {
         for (unsigned i = 0; i < state->channels; ++i) {
             double tp;
             ebur128_true_peak(state, i, &tp);
diff --git a/streams/streamfetcher.cpp b/streams/streamfetcher.cpp
index e75b59782..2b602ff25 100644
--- a/streams/streamfetcher.cpp
+++ b/streams/streamfetcher.cpp
@@ -163,6 +163,10 @@ static QString parse(const QByteArray &data)
 StreamFetcher::StreamFetcher(QObject *p)
     : QObject(p)
     , job(0)
+    , row(0)
+    , replacePlayQueue(true)
+    , prio(0)
+    , redirects(0)
 {
 }
 
diff --git a/streams/tar.cpp b/streams/tar.cpp
index 1667841a9..88e0a656a 100644
--- a/streams/tar.cpp
+++ b/streams/tar.cpp
@@ -27,6 +27,7 @@
 Tar::Tar(const QString &fileName)
     : file(fileName)
     , compressor(0)
+    , dev(0)
 {
 }
 
@@ -63,7 +64,7 @@ static const qint64 constHeaderLen=512;
 
 static qint64 roundUp(qint64 sz)
 {
-    return ((sz/constHeaderLen)*constHeaderLen)+(sz%constHeaderLen ? constHeaderLen : 0);
+    return ((sz/constHeaderLen)*constHeaderLen)+((sz%constHeaderLen) ? constHeaderLen : 0);
 }
 
 struct TarHeader
@@ -78,9 +79,7 @@ static unsigned int octStrToInt(char *ch, unsigned int size)
 {
     unsigned int val = 0;
     while (size > 0){
-        if (ch) {
-            val = (val * 8) + (*ch - '0');
-        }
+        val = (val * 8) + (*ch - '0');
         ch++;
         size--;
     }
diff --git a/support/combobox.cpp b/support/combobox.cpp
index ee53f616b..201302c98 100644
--- a/support/combobox.cpp
+++ b/support/combobox.cpp
@@ -102,7 +102,7 @@ void ComboBox::showPopup()
         // Hide scrollers - these look ugly...
         foreach (QObject *c, view()->parentWidget()->children()) {
             if (0==qstrcmp("QComboBoxPrivateScroller", c->metaObject()->className())) {
-                ((QWidget *)c)->setMaximumHeight(0);
+                static_cast<QWidget *>(c)->setMaximumHeight(0);
             }
         }
         #endif
diff --git a/support/fancytabwidget.cpp b/support/fancytabwidget.cpp
index eddf346c5..b869715e5 100644
--- a/support/fancytabwidget.cpp
+++ b/support/fancytabwidget.cpp
@@ -637,36 +637,36 @@ void FancyTabWidget::AddTab(QWidget* tab, const QIcon& icon, const QString& labe
   setMinimumWidth(128);
 }
 
-void FancyTabWidget::InsertTab(QWidget* tab, const QIcon& icon, const QString& label, const QString &tt, bool enabled) {
-  stack_->insertWidget(0, tab);
-  items_.prepend(Item(icon, label, tt, enabled));
-  setMinimumWidth(128);
-  Recreate();
-}
+//void FancyTabWidget::InsertTab(QWidget* tab, const QIcon& icon, const QString& label, const QString &tt, bool enabled) {
+//  stack_->insertWidget(0, tab);
+//  items_.prepend(Item(icon, label, tt, enabled));
+//  setMinimumWidth(128);
+//  Recreate();
+//}
 
-void FancyTabWidget::RemoveTab(QWidget *tab)
-{
-  int idx=stack_->indexOf(tab);
-  if (idx>-1 && idx<items_.count()) {
-    stack_->removeWidget(tab);
-    items_.takeAt(idx);
-    Recreate();
-  }
-}
+//void FancyTabWidget::RemoveTab(QWidget *tab)
+//{
+//  int idx=stack_->indexOf(tab);
+//  if (idx>-1 && idx<items_.count()) {
+//    stack_->removeWidget(tab);
+//    items_.takeAt(idx);
+//    Recreate();
+//  }
+//}
 
-int FancyTabWidget::IndexOf(QWidget *tab)
-{
-  return stack_->indexOf(tab);
-}
+//int FancyTabWidget::IndexOf(QWidget *tab)
+//{
+//  return stack_->indexOf(tab);
+//}
 
-void FancyTabWidget::AddSpacer(int size) {
-  items_ << Item(size);
-}
+//void FancyTabWidget::AddSpacer(int size) {
+//  items_ << Item(size);
+//}
 
-void FancyTabWidget::SetBackgroundPixmap(const QPixmap& pixmap) {
-  background_pixmap_ = pixmap;
-  update();
-}
+//void FancyTabWidget::SetBackgroundPixmap(const QPixmap& pixmap) {
+//  background_pixmap_ = pixmap;
+//  update();
+//}
 
 static void drawFadedLine(QPainter *p, const QRect &r, const QColor &col)
 {
@@ -782,9 +782,9 @@ void FancyTabWidget::ShowWidget(int index) {
   emit CurrentChanged(idx);
 }
 
-void FancyTabWidget::AddBottomWidget(QWidget* widget) {
-  top_layout_->addWidget(widget);
-}
+//void FancyTabWidget::AddBottomWidget(QWidget* widget) {
+//  top_layout_->addWidget(widget);
+//}
 
 void FancyTabWidget::SetMode(Mode mode) {
   if(mode==mode_) {
diff --git a/support/fancytabwidget.h b/support/fancytabwidget.h
index 169234fd9..8089869a7 100644
--- a/support/fancytabwidget.h
+++ b/support/fancytabwidget.h
@@ -215,12 +215,12 @@ public:
     };
 
     void AddTab(QWidget *tab, const QIcon &icon, const QString &label, const QString &tt=QString(), bool enabled=true);
-    void InsertTab(QWidget *tab, const QIcon &icon, const QString &label, const QString &tt=QString(), bool enabled=true);
-    void RemoveTab(QWidget *tab);
-    int IndexOf(QWidget *tab);
-    void AddSpacer(int size = 40);
-    void SetBackgroundPixmap(const QPixmap& pixmap);
-    void AddBottomWidget(QWidget* widget);
+//    void InsertTab(QWidget *tab, const QIcon &icon, const QString &label, const QString &tt=QString(), bool enabled=true);
+//    void RemoveTab(QWidget *tab);
+//    int IndexOf(QWidget *tab);
+//    void AddSpacer(int size = 40);
+//    void SetBackgroundPixmap(const QPixmap& pixmap);
+//    void AddBottomWidget(QWidget* widget);
     int current_index() const;
     QWidget * currentWidget() const;
     bool isEnabled(int index) const { return index>=0 && index<items_.count() ? items_[index].enabled_ : false; }
@@ -269,7 +269,7 @@ private:
 
     QWidget* tab_bar_;
     QStackedWidget* stack_;
-    QPixmap background_pixmap_;
+//    QPixmap background_pixmap_;
     QWidget* side_widget_;
     QVBoxLayout* side_layout_;
     QVBoxLayout* top_layout_;
diff --git a/support/gtkproxystyle.cpp b/support/gtkproxystyle.cpp
index 571300317..3bc78bb44 100644
--- a/support/gtkproxystyle.cpp
+++ b/support/gtkproxystyle.cpp
@@ -250,11 +250,7 @@ QRect GtkProxyStyle::subControlRect(ComplexControl control, const QStyleOptionCo
                 }
                 break;
             case SC_ScrollBarGroove:
-                if (horizontal) {
-                    ret=QRect(0, 0, sb->rect.width(), sb->rect.height());
-                } else {
-                    ret=QRect(0, 0, sb->rect.width(), sb->rect.height());
-                }
+                ret=QRect(0, 0, sb->rect.width(), sb->rect.height());
                 break;
             case SC_ScrollBarSlider:
                 if (horizontal) {
diff --git a/support/gtkstyle.cpp b/support/gtkstyle.cpp
index b70094e61..88cdc9fe9 100644
--- a/support/gtkstyle.cpp
+++ b/support/gtkstyle.cpp
@@ -206,23 +206,23 @@ QString GtkStyle::iconTheme()
     #endif
 }
 
-extern void GtkStyle::setThemeName(const QString &n)
-{
-    #if defined Q_OS_WIN || defined QT_NO_STYLE_GTK
-    Q_UNUSED(n)
-    #else
-    themeNameSetting=n;
-    #endif
-}
+//extern void GtkStyle::setThemeName(const QString &n)
+//{
+//    #if defined Q_OS_WIN || defined QT_NO_STYLE_GTK
+//    Q_UNUSED(n)
+//    #else
+//    themeNameSetting=n;
+//    #endif
+//}
 
-extern void GtkStyle::setIconTheme(const QString &n)
-{
-    #if defined Q_OS_WIN || defined QT_NO_STYLE_GTK
-    Q_UNUSED(n)
-    #else
-    iconThemeSetting=n;
-    #endif
-}
+//extern void GtkStyle::setIconTheme(const QString &n)
+//{
+//    #if defined Q_OS_WIN || defined QT_NO_STYLE_GTK
+//    Q_UNUSED(n)
+//    #else
+//    iconThemeSetting=n;
+//    #endif
+//}
 
 #if !defined Q_OS_WIN && !defined QT_NO_STYLE_GTK
 static GtkProxyStyle *gtkProxyStyle=0;
diff --git a/support/gtkstyle.h b/support/gtkstyle.h
index b29197026..7d1c436d4 100644
--- a/support/gtkstyle.h
+++ b/support/gtkstyle.h
@@ -36,8 +36,8 @@ namespace GtkStyle
     extern void drawSelection(const QStyleOptionViewItemV4 &opt, QPainter *painter, double opacity);
     extern QString themeName();
     extern QString iconTheme();
-    extern void setThemeName(const QString &n);
-    extern void setIconTheme(const QString &n);
+//    extern void setThemeName(const QString &n);
+//    extern void setIconTheme(const QString &n);
     extern void applyTheme(QWidget *widget);
     extern bool useSymbolicIcons();
     extern bool useLightIcons();
diff --git a/support/inputdialog.cpp b/support/inputdialog.cpp
index d8816c582..3e16c2ee6 100644
--- a/support/inputdialog.cpp
+++ b/support/inputdialog.cpp
@@ -67,7 +67,7 @@ void InputDialog::init(bool intInput, const QString &caption, const QString &lab
         setMinimumWidth(Utils::isHighDpi() ? 700 : 350);
     }
     layout->addWidget(new QLabel(label, wid));
-    layout->addWidget(intInput ? (QWidget *)spin : (QWidget *)edit);
+    layout->addWidget(intInput ? static_cast<QWidget *>(spin) : static_cast<QWidget *>(edit));
     layout->setMargin(0);
 
     setCaption(caption);
diff --git a/support/pagewidget.cpp b/support/pagewidget.cpp
index 1494040ea..1ad488ec7 100644
--- a/support/pagewidget.cpp
+++ b/support/pagewidget.cpp
@@ -58,6 +58,7 @@ class PageWidgetItemDelegate : public QAbstractItemDelegate
 public:
     PageWidgetItemDelegate(QObject *parent)
         : QAbstractItemDelegate(parent)
+        , underMouse(false)
     {
         int height=QApplication::fontMetrics().height();
         iconSize=height>22 ? Icon::stdSize(height*2.5) : 32;
diff --git a/support/shortcuthandler.cpp b/support/shortcuthandler.cpp
index 870d4c6b8..044bc9c1b 100644
--- a/support/shortcuthandler.cpp
+++ b/support/shortcuthandler.cpp
@@ -46,7 +46,7 @@ bool ShortcutHandler::hasSeenAlt(const QWidget *widget) const
     if (qobject_cast<const QMenu *>(widget)) {
         return openMenus.count() && openMenus.last()==widget;
     } else {
-        return openMenus.isEmpty() && seenAlt.contains((QWidget *)(widget->window()));
+        return openMenus.isEmpty() && seenAlt.contains(static_cast<QWidget *>(widget->window()));
     }
 }
 
diff --git a/tags/tagserver.h b/tags/tagserver.h
index e93c6d86a..4c505e355 100644
--- a/tags/tagserver.h
+++ b/tags/tagserver.h
@@ -34,6 +34,10 @@ public:
 
     int process();
 
+private:
+    TagServer(const TagServer &);
+    TagServer & operator=(const TagServer &o);
+
 private:
     QFile *in;
     QFile *out;
diff --git a/widgets/coverwidget.cpp b/widgets/coverwidget.cpp
index 4d5be5a7c..97c630031 100644
--- a/widgets/coverwidget.cpp
+++ b/widgets/coverwidget.cpp
@@ -162,7 +162,7 @@ const QPixmap & CoverWidget::stdPixmap(bool stream)
         pix = (stream ? Icons::self()->streamIcon : Icons::self()->albumIcon).pixmap(iconSize, iconSize).scaled(s, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
 
         QString &file=stream ? noStreamCoverFileName : noCoverFileName;
-        if (stream &file.isEmpty()) {
+        if (stream && file.isEmpty()) {
             #ifdef Q_OS_WIN
             QString iconFile=QCoreApplication::applicationDirPath()+"/icons/stream.png";
             #else
diff --git a/widgets/itemview.cpp b/widgets/itemview.cpp
index 099741980..0f01773de 100644
--- a/widgets/itemview.cpp
+++ b/widgets/itemview.cpp
@@ -578,7 +578,7 @@ void ItemView::setMode(Mode m)
             groupedView->setModel(0);
         }
         treeView->setHidden(false);
-        ((TreeDelegate *)treeView->itemDelegate())->setSimple(Mode_SimpleTree==mode);
+        static_cast<TreeDelegate *>(treeView->itemDelegate())->setSimple(Mode_SimpleTree==mode);
         itemModel->setRootIndex(QModelIndex());
         treeView->reset();
     } else if (Mode_GroupedTree==mode) {
@@ -650,7 +650,7 @@ void ItemView::setLevel(int l, bool haveChildren)
 //                listView->setAlternatingRowColors(false);
                 listView->setWordWrap(true);
                 listView->setDragDropMode(QAbstractItemView::DragOnly);
-                ((ActionItemDelegate *)listView->itemDelegate())->setLargeIcons(iconGridSize.width()>(ActionItemDelegate::constLargeActionIconSize*6));
+                static_cast<ActionItemDelegate *>(listView->itemDelegate())->setLargeIcons(iconGridSize.width()>(ActionItemDelegate::constLargeActionIconSize*6));
             }
         } else if(QListView::ListMode!=listView->viewMode()) {
             listView->setGridSize(listGridSize);
@@ -659,7 +659,7 @@ void ItemView::setLevel(int l, bool haveChildren)
 //            listView->setAlternatingRowColors(true);
             listView->setWordWrap(false);
             listView->setDragDropMode(QAbstractItemView::DragOnly);
-            ((ActionItemDelegate *)listView->itemDelegate())->setLargeIcons(false);
+            static_cast<ActionItemDelegate *>(listView->itemDelegate())->setLargeIcons(false);
         }
     }
 
@@ -754,7 +754,7 @@ void ItemView::setGridSize(const QSize &sz)
     iconGridSize=sz;
     if (Mode_IconTop==mode && 0==currentLevel) {
         listView->setGridSize(listGridSize);
-        ((ActionItemDelegate *)listView->itemDelegate())->setLargeIcons(iconGridSize.width()>(ActionItemDelegate::constLargeActionIconSize*6));
+        static_cast<ActionItemDelegate *>(listView->itemDelegate())->setLargeIcons(iconGridSize.width()>(ActionItemDelegate::constLargeActionIconSize*6));
     }
 }
 
diff --git a/widgets/treeview.cpp b/widgets/treeview.cpp
index c36cd5c5b..3e38f7bf2 100644
--- a/widgets/treeview.cpp
+++ b/widgets/treeview.cpp
@@ -378,12 +378,12 @@ void TreeView::correctSelection()
     selectionModel()->select(s, QItemSelectionModel::SelectCurrent);
 }
 
-void TreeView::itemWasActivated(const QModelIndex &index)
-{
-    if (!forceSingleClick) {
-        setExpanded(index, !isExpanded(index));
-    }
-}
+//void TreeView::itemWasActivated(const QModelIndex &index)
+//{
+//    if (!forceSingleClick) {
+//        setExpanded(index, !isExpanded(index));
+//    }
+//}
 
 void TreeView::itemWasClicked(const QModelIndex &index)
 {
diff --git a/widgets/treeview.h b/widgets/treeview.h
index 498b5676b..13e203bdb 100644
--- a/widgets/treeview.h
+++ b/widgets/treeview.h
@@ -65,7 +65,7 @@ public:
 
 private Q_SLOTS:
     void correctSelection();
-    void itemWasActivated(const QModelIndex &index);
+//    void itemWasActivated(const QModelIndex &index);
     void itemWasClicked(const QModelIndex &index);
 
 Q_SIGNALS: