Snorenotify api update

Fix "control reaches end of non-void function" in DelegateConfigWrapper

.circleci/Docker/docker-commands.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-
-get_repository_root(){
-    local REPOSITORY_ROOT="$(git rev-parse --show-toplevel)"
-    echo "$REPOSITORY_ROOT"
-}
-
-get_repository_subdir(){
-    REPOSITORY_ROOT=$(get_repository_root)
-    CUR_DIR=$(pwd)
-    SUB_DIR=$(echo "$CUR_DIR" | grep -oP "^$REPOSITORY_ROOT\K.*")
-    echo "$SUB_DIR"
-}
-
-docker-interactive() {
-    REPOSITORY_ROOT=$(get_repository_root)
-    SUB_DIR=$(get_repository_subdir)
-
-    echo "SUB_DIR: " "$SUB_DIR"
-
-    source $REPOSITORY_ROOT/.circleci/Docker/Docker.variables
-    echo "Starting container: " "$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER"
-
-    echo "Got command: " "$*"
-    USER_ID=$(id -u $USER)
-    echo "Using USER_ID:" $USER_ID
-
-    docker run  --env LOCAL_USER_ID=$USER_ID \
-                --rm \
-                --interactive \
-                --volume $REPOSITORY_ROOT:/tmp/workspace \
-                --workdir /tmp/workspace$SUB_DIR \
-                --env "TERM=xterm-256color" \
-                --tty \
-                "$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER" /bin/bash
-}
-
-docker-help() {
-    echo "docker-interactive     - Start an interactive bash session inside docker container and remove it on exit"
-    echo "docker-help            - Show this help text"
-}

.circleci/config.yml

@@ -1,15 +0,0 @@
----
-version: 2.0
-
-jobs:
-  "Tomahawk - build, test":
-    docker:
-      - image: tomahawkmusicplayer/ubuntu:latest
-    steps:
-      - checkout
-      - run: /usr/local/bin/build-and-test.sh
-workflows:
-  version: 2
-  build_and_test:
-    jobs:
-      - "Tomahawk - build, test"

Docker/docker-commands.sh

@@ -0,0 +1,79 @@
+#!/bin/bash
+
+get_repository_root(){
+    local REPOSITORY_ROOT="$(git rev-parse --show-toplevel)"
+    echo "$REPOSITORY_ROOT"
+}
+
+get_repository_subdir(){
+    REPOSITORY_ROOT=$(get_repository_root)
+    CUR_DIR=$(pwd)
+    SUB_DIR=$(echo "$CUR_DIR" | grep -oP "^$REPOSITORY_ROOT\K.*")
+    echo "$SUB_DIR"
+}
+
+# Run commands inside docker container
+_docker_run() {
+    REPOSITORY_ROOT=$(get_repository_root)
+    SUB_DIR=$(get_repository_subdir)
+
+    echo "SUB_DIR: " "$SUB_DIR"
+
+    source $REPOSITORY_ROOT/Docker/Docker.variables
+    echo "Starting container: " "$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER"
+
+    echo "Got command: " "$*"
+    USER_ID=$(id -u $USER)
+    echo "Using USER_ID:" $USER_ID
+
+    docker run  --env LOCAL_USER_ID=$USER_ID \
+                --rm \
+                --volume $REPOSITORY_ROOT:/tmp/workspace \
+				--workdir /tmp/workspace$SUB_DIR \
+                --env "TERM=xterm-256color" \
+                --tty \
+                --privileged \
+				"$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER" \
+				$*
+}
+
+# 1st command: Run make target inside docker
+docker-make() {
+    _docker_run make "${@}"
+}
+
+# 2nd command: Run bash command inside docker
+docker-run() {
+    _docker_run "${@}"
+}
+
+# 3rd command: Run bash interactive inside docker
+docker-interactive() {
+    REPOSITORY_ROOT=$(get_repository_root)
+    SUB_DIR=$(get_repository_subdir)
+
+    echo "SUB_DIR: " "$SUB_DIR"
+
+    source $REPOSITORY_ROOT/Docker/Docker.variables
+    echo "Starting container: " "$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER"
+
+    echo "Got command: " "$*"
+    USER_ID=$(id -u $USER)
+    echo "Using USER_ID:" $USER_ID
+
+    docker run  --env LOCAL_USER_ID=$USER_ID \
+                --rm \
+                --interactive \
+                --volume $REPOSITORY_ROOT:/tmp/workspace \
+				--workdir /tmp/workspace$SUB_DIR \
+                --env "TERM=xterm-256color" \
+                --tty \
+				"$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER" /bin/bash
+}
+
+docker-help() {
+    echo "docker-make            - Run a make target inside docker container"
+    echo "docker-run             - Run a specific bash command inside docker container and remove container on exit"
+    echo "docker-interactive     - Start an interactive bash session inside docker container and remove it on exit"
+    echo "docker-help            - Show this help text"
+}

src/infoplugins/generic/snorenotify/SnoreNotifyPlugin.cpp

@@ -51,7 +51,7 @@ SnoreNotifyPlugin::SnoreNotifyPlugin()
 
     Snore::SnoreCore &snore = Snore::SnoreCore::instance();
     snore.loadPlugins( Snore::SnorePlugin::Backend | Snore::SnorePlugin::SecondaryBackend );
-    snore.setDefaultSettingsValue("Silent", true, Snore::LocalSetting );
+    snore.setDefaultSettingsValue( {QStringLiteral("Silent"), Snore::LocalSetting}, true );
 
     m_application = Snore::Application( qApp->applicationName(), m_defaultIcon );
     m_application.hints().setValue( "use-markup", true );

src/libtomahawk/accounts/DelegateConfigWrapper.cpp

@@ -247,6 +247,7 @@ DelegateConfigWrapper::getTestConfigMessage( int code )
 	case Tomahawk::Accounts::ConfigTestResultAccountExpired:
 	    return tr( "Your account has expired." );
     }
+    return QString();
 }
 
 

src/libtomahawk/utils/AnimatedSpinner.cpp

@@ -28,6 +28,7 @@
 #include <QApplication>
 #include <QHideEvent>
 #include <QPainter>
+#include <QPainterPath>
 #include <QPaintEvent>
 #include <QShowEvent>
 

src/libtomahawk/utils/TomahawkUtilsGui.cpp

@@ -32,6 +32,7 @@
 
 #include <QLayout>
 #include <QPainter>
+#include <QPainterPath>
 #include <QPixmap>
 #include <QBitmap>
 #include <QPalette>

src/libtomahawk/widgets/DropDownButton.cpp

@@ -19,6 +19,8 @@
 #include "DropDownButton.h"
 
 #include <QMouseEvent>
+#include <QPaintEvent>
+#include <QPainterPath>
 
 #include "Artist.h"
 #include "Album.h"

src/libtomahawk/widgets/HoverControls.cpp

@@ -27,6 +27,7 @@
 #include <QPixmap>
 #include <QPaintEvent>
 #include <QPainter>
+#include <QPainterPath>
 
 using namespace Tomahawk;
 

src/libtomahawk/widgets/SourceTreePopupDialog.cpp

@@ -22,6 +22,7 @@
 #include <QApplication>
 #include <QPaintEvent>
 #include <QPainter>
+#include <QPainterPath>
 #include <QDialogButtonBox>
 #include <QVBoxLayout>
 #include <QHBoxLayout>

src/libtomahawk/widgets/searchlineedit/SearchButton.cpp

@@ -19,10 +19,11 @@
 
 #include "SearchButton.h"
 
-#include <qcompleter.h>
-#include <qevent.h>
-#include <qlineedit.h>
-#include <qpainter.h>
+#include <QCompleter>
+#include <QEvent>
+#include <QLineEdit>
+#include <QPainter>
+#include <QPainterPath>
 
 SearchButton::SearchButton(QWidget *parent)
     : QAbstractButton(parent)

src/tests/TestServent.h

@@ -93,11 +93,8 @@ private slots:
         Servent* servent;
         listenAllBasic( &servent );
 
-        // Check for IPv4 localhost
-        QVERIFY( servent->isIPWhitelisted( QHostAddress::LocalHost ) );
-
-        // Check for IPv6 localhost
-        QVERIFY( servent->isIPWhitelisted( QHostAddress::LocalHostIPv6 ) );
+        // Check for IPv4/v6 localhost
+        QVERIFY( servent->isIPWhitelisted( QHostAddress::LocalHost ) || servent->isIPWhitelisted( QHostAddress::LocalHostIPv6 ) );
 
         // Verify that all interface addresses are whitelisted.
         foreach ( QHostAddress addr, QNetworkInterface::allAddresses() )

src/tomahawk/widgets/AccountsPopupWidget.cpp

@@ -24,6 +24,7 @@
 
 #include <QDebug>
 #include <QPainter>
+#include <QPainterPath>
 #include <QPaintEvent>
 #include <QVBoxLayout>
 

src/tomahawk/widgets/SlideSwitchButton.cpp

@@ -24,6 +24,7 @@
 
 #include <QMouseEvent>
 #include <QPainter>
+#include <QPainterPath>
 #include <QPropertyAnimation>
 #include <QStyleOptionButton>
 #include <QPixmap>

src/tomahawk/widgets/SocialWidget.cpp

@@ -29,8 +29,9 @@
 #include "Source.h"
 #include "Track.h"
 
-#include <QPainter>
 #include <QDialog>
+#include <QPainter>
+#include <QPainterPath>
 #include <QPropertyAnimation>
 
 #define ARROW_HEIGHT 6