diff --git a/qcma_common.pri b/qcma_common.pri
index 3dc7a38..62a6d0b 100644
--- a/qcma_common.pri
+++ b/qcma_common.pri
@@ -58,9 +58,9 @@ RESOURCES += qcmares.qrc translations.qrc
 CONFIG += link_pkgconfig
 PKGCONFIG = libvitamtp libavformat libavcodec libavutil libswscale
 
-CXXFLAGS_WARNINGS = -Wall -Wextra -Wshadow -Wcast-align -Wctor-dtor-privacy \
-                    -Wdisabled-optimization -Wformat=2 -Winit-self -Wmissing-declarations \
-                    -Wmissing-include-dirs -Woverloaded-virtual -Wredundant-decls \
+CXXFLAGS_WARNINGS = -Wall -Wextra -Wcast-align \
+                    -Wdisabled-optimization -Wformat=2 -Winit-self \
+                    -Wmissing-include-dirs -Woverloaded-virtual \
                     -Wstrict-overflow=5 -Wundef -Wno-unused -Wno-missing-field-initializers \
                     -Wno-format-nonliteral
 
diff --git a/src/cmautils.cpp b/src/cmautils.cpp
index a832cca..40ed279 100644
--- a/src/cmautils.cpp
+++ b/src/cmautils.cpp
@@ -58,17 +58,19 @@ bool getDiskSpace(const QString &dir, quint64 *free, quint64 *total)
 
 bool removeRecursively(const QString &path)
 {
-    QFileInfo info(path);
+    QFileInfo file_info(path);
 
-    if(info.isDir()) {
+    if(file_info.isDir()) {
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
         return QDir(path).removeRecursively();
 #else
         bool result = false;
         QDir dir(path);
 
+        QDir::Filters filter = QDir::NoDotAndDotDot | QDir::System | QDir::Hidden  | QDir::AllDirs | QDir::Files;
+
         if(dir.exists(path)) {
-            Q_FOREACH(QFileInfo info, dir.entryInfoList(QDir::NoDotAndDotDot | QDir::System | QDir::Hidden  | QDir::AllDirs | QDir::Files, QDir::DirsFirst)) {
+            foreach(QFileInfo info, dir.entryInfoList(filter, QDir::DirsFirst)) {
                 if(info.isDir()) {
                     result = removeRecursively(info.absoluteFilePath());
                 } else {
diff --git a/src/gui/singleapplication.cpp b/src/gui/singleapplication.cpp
index 3862d0a..277a985 100644
--- a/src/gui/singleapplication.cpp
+++ b/src/gui/singleapplication.cpp
@@ -24,8 +24,8 @@
 const int SingleApplication::timeout = 500;
 const QString SingleApplication::SHARED_KEY = "QCMA_KEY";
 
-SingleApplication::SingleApplication(int &argc, char **argv) :
-    QApplication(argc, argv)
+SingleApplication::SingleApplication(int &s_argc, char **s_argv) :
+    QApplication(s_argc, s_argv)
 {
     server = new QLocalServer(this);
     connect(server, SIGNAL(newConnection()), this, SLOT(receiveMessage()));
diff --git a/src/indicator/unityindicator.cpp b/src/indicator/unityindicator.cpp
index 0d60177..646d9a6 100644
--- a/src/indicator/unityindicator.cpp
+++ b/src/indicator/unityindicator.cpp
@@ -120,19 +120,19 @@ void UnityIndicator::init()
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), separator2);
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), quit);
 
-    gulong handle;
-    handle = g_signal_connect(options, "activate", G_CALLBACK(optionsIndicator), this);
-    m_handlers.append(QPair<gpointer, gulong>(options, handle));
-    handle = g_signal_connect(reload, "activate", G_CALLBACK(reloadIndicator), this);
-    m_handlers.append(QPair<gpointer, gulong>(reload, handle));
-    handle = g_signal_connect(backup, "activate", G_CALLBACK(backupIndicator), this);
-    m_handlers.append(QPair<gpointer, gulong>(backup, handle));
-    handle = g_signal_connect(about, "activate", G_CALLBACK(aboutIndicator), this);
-    m_handlers.append(QPair<gpointer, gulong>(about, handle));
-    handle = g_signal_connect(about_qt, "activate", G_CALLBACK(aboutQtIndicator), this);
-    m_handlers.append(QPair<gpointer, gulong>(about_qt, handle));
-    handle = g_signal_connect(quit, "activate", G_CALLBACK(quitIndicator), this);
-    m_handlers.append(QPair<gpointer, gulong>(quit, handle));
+    gulong gobject_handler;
+    gobject_handler = g_signal_connect(options, "activate", G_CALLBACK(optionsIndicator), this);
+    m_handlers.append(QPair<gpointer, gulong>(options, gobject_handler));
+    gobject_handler = g_signal_connect(reload, "activate", G_CALLBACK(reloadIndicator), this);
+    m_handlers.append(QPair<gpointer, gulong>(reload, gobject_handler));
+    gobject_handler = g_signal_connect(backup, "activate", G_CALLBACK(backupIndicator), this);
+    m_handlers.append(QPair<gpointer, gulong>(backup, gobject_handler));
+    gobject_handler = g_signal_connect(about, "activate", G_CALLBACK(aboutIndicator), this);
+    m_handlers.append(QPair<gpointer, gulong>(about, gobject_handler));
+    gobject_handler = g_signal_connect(about_qt, "activate", G_CALLBACK(aboutQtIndicator), this);
+    m_handlers.append(QPair<gpointer, gulong>(about_qt, gobject_handler));
+    gobject_handler = g_signal_connect(quit, "activate", G_CALLBACK(quitIndicator), this);
+    m_handlers.append(QPair<gpointer, gulong>(quit, gobject_handler));
 
     gtk_widget_show(options);
     gtk_widget_show(reload);