From 5b98bc9c752de01a6f423f133d67a9f0bfcc464c Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Thu, 14 Jun 2012 17:09:13 +0200 Subject: [PATCH] Style and fix merge --- src/libtomahawk/GlobalActionManager.cpp | 9 +-------- src/sourcetree/SourceTreeView.cpp | 1 + 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/libtomahawk/GlobalActionManager.cpp b/src/libtomahawk/GlobalActionManager.cpp index e1ddf7e63..c2904df07 100644 --- a/src/libtomahawk/GlobalActionManager.cpp +++ b/src/libtomahawk/GlobalActionManager.cpp @@ -166,7 +166,7 @@ GlobalActionManager::getShortLink( const playlist_ptr& pl ) // No built-in Qt facilities for doing a FORM POST. So we build the payload ourselves... const QByteArray boundary = "----------------------------2434992cccab"; - QByteArray data(QByteArray("--" + boundary + "\r\n")); + QByteArray data( QByteArray( "--" + boundary + "\r\n" ) ); data += "Content-Disposition: form-data; name=\"data\"; filename=\"playlist.jspf\"\r\n"; data += "Content-Type: application/octet-stream\r\n\r\n"; data += msg; @@ -1233,13 +1233,6 @@ GlobalActionManager::waitingForResolved( bool /* success */ ) } -QString -GlobalActionManager::hostname() const -{ - return QString( "http://stage.toma.hk" ); -} - - /// SPOTIFY URL HANDLING bool diff --git a/src/sourcetree/SourceTreeView.cpp b/src/sourcetree/SourceTreeView.cpp index 55134566f..6316407e3 100644 --- a/src/sourcetree/SourceTreeView.cpp +++ b/src/sourcetree/SourceTreeView.cpp @@ -2,6 +2,7 @@ * * Copyright 2010-2011, Christian Muehlhaeuser * Copyright 2010-2012, Jeff Mitchell + * Copyright 2010-2012, Leo Franchi * * Tomahawk is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by