mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-03 12:47:45 +02:00
Style and fix merge
This commit is contained in:
@@ -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...
|
// No built-in Qt facilities for doing a FORM POST. So we build the payload ourselves...
|
||||||
const QByteArray boundary = "----------------------------2434992cccab";
|
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-Disposition: form-data; name=\"data\"; filename=\"playlist.jspf\"\r\n";
|
||||||
data += "Content-Type: application/octet-stream\r\n\r\n";
|
data += "Content-Type: application/octet-stream\r\n\r\n";
|
||||||
data += msg;
|
data += msg;
|
||||||
@@ -1233,13 +1233,6 @@ GlobalActionManager::waitingForResolved( bool /* success */ )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
QString
|
|
||||||
GlobalActionManager::hostname() const
|
|
||||||
{
|
|
||||||
return QString( "http://stage.toma.hk" );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/// SPOTIFY URL HANDLING
|
/// SPOTIFY URL HANDLING
|
||||||
|
|
||||||
bool
|
bool
|
||||||
|
@@ -2,6 +2,7 @@
|
|||||||
*
|
*
|
||||||
* Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
|
* Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
|
||||||
* Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>
|
* Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>
|
||||||
|
* Copyright 2010-2012, Leo Franchi <lfranchi@kde.org>
|
||||||
*
|
*
|
||||||
* Tomahawk is free software: you can redistribute it and/or modify
|
* Tomahawk is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
Reference in New Issue
Block a user