mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 03:10:12 +02:00
Code Issues Releases Wiki Activity

Make hatchet account plugin Qt5 compatible

Browse Source
This commit is contained in:
Uwe L. Korn
2013-08-30 14:56:21 +02:00
parent aee2e7372d
commit c137195e04
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/accounts/hatchet/account/HatchetAccount.cpp
View File

@@ -20,6 +20,7 @@
#include <QHostInfo> #include <QHostInfo>
#include "HatchetAccountConfig.h" #include "HatchetAccountConfig.h"
#include "TomahawkPlugin.h"
#include "utils/Closure.h" #include "utils/Closure.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "sip/HatchetSip.h" #include "sip/HatchetSip.h"
@@ -116,7 +117,7 @@ AccountConfigWidget*
HatchetAccount::configurationWidget() HatchetAccount::configurationWidget()
{ {
if ( m_configWidget.isNull() ) if ( m_configWidget.isNull() )
m_configWidget = QWeakPointer<HatchetAccountConfig>( new HatchetAccountConfig( this ) ); m_configWidget = QPointer<HatchetAccountConfig>( new HatchetAccountConfig( this ) );
return m_configWidget.data(); return m_configWidget.data();
} }
@@ -172,7 +173,7 @@ HatchetAccount::sipPlugin()
if ( m_tomahawkSipPlugin.isNull() ) if ( m_tomahawkSipPlugin.isNull() )
{ {
tLog() << Q_FUNC_INFO; tLog() << Q_FUNC_INFO;
m_tomahawkSipPlugin = QWeakPointer< HatchetSipPlugin >( new HatchetSipPlugin( this ) ); m_tomahawkSipPlugin = QPointer< HatchetSipPlugin >( new HatchetSipPlugin( this ) );
connect( m_tomahawkSipPlugin.data(), SIGNAL( authUrlDiscovered( Tomahawk::Accounts::HatchetAccount::Service, QString ) ), connect( m_tomahawkSipPlugin.data(), SIGNAL( authUrlDiscovered( Tomahawk::Accounts::HatchetAccount::Service, QString ) ),
this, SLOT( authUrlDiscovered( Tomahawk::Accounts::HatchetAccount::Service, QString ) ) ); this, SLOT( authUrlDiscovered( Tomahawk::Accounts::HatchetAccount::Service, QString ) ) );

8
src/accounts/hatchet/account/HatchetAccount.h
View File

@@ -40,6 +40,8 @@ class ACCOUNTDLLEXPORT HatchetAccountFactory : public AccountFactory
{ {
Q_OBJECT Q_OBJECT
Q_INTERFACES( Tomahawk::Accounts::AccountFactory ) Q_INTERFACES( Tomahawk::Accounts::AccountFactory )
Q_PLUGIN_METADATA( IID "org.tomahawk-player.Player.AccountFactory" )
public: public:
HatchetAccountFactory(); HatchetAccountFactory();
virtual ~HatchetAccountFactory(); virtual ~HatchetAccountFactory();
@@ -48,7 +50,7 @@ public:
virtual QString prettyName() const { return "Hatchet"; } virtual QString prettyName() const { return "Hatchet"; }
virtual QString description() const { return tr( "Connect to your Hatchet account" ); } virtual QString description() const { return tr( "Connect to your Hatchet account" ); }
virtual bool isUnique() const { return true; } virtual bool isUnique() const { return true; }
AccountTypes types() const { return AccountTypes( SipType ); }; AccountTypes types() const { return AccountTypes( SipType ); }
// virtual bool allowUserCreation() const { return false; } // virtual bool allowUserCreation() const { return false; }
#ifndef ENABLE_HEADLESS #ifndef ENABLE_HEADLESS
virtual QPixmap icon() const; virtual QPixmap icon() const;
@@ -111,11 +113,11 @@ private:
QVariantMap parseReply( QNetworkReply* reply, bool& ok ) const; QVariantMap parseReply( QNetworkReply* reply, bool& ok ) const;
QWeakPointer<HatchetAccountConfig> m_configWidget; QPointer<HatchetAccountConfig> m_configWidget;
Account::ConnectionState m_state; Account::ConnectionState m_state;
QWeakPointer< HatchetSipPlugin > m_tomahawkSipPlugin; QPointer< HatchetSipPlugin > m_tomahawkSipPlugin;
QHash< Service, QString > m_extraAuthUrls; QHash< Service, QString > m_extraAuthUrls;
static HatchetAccount* s_instance; static HatchetAccount* s_instance;

2
src/accounts/hatchet/sip/WebSocket.cpp
View File

@@ -105,7 +105,7 @@ WebSocket::disconnectWs( websocketpp::close::status::value status, const QString
error_code ec; error_code ec;
if ( m_connection ) if ( m_connection )
{ {
m_connection->close( status, reason.toAscii().constData(), ec ); m_connection->close( status, reason.toLatin1().constData(), ec );
QMetaObject::invokeMethod( this, "readOutput", Qt::QueuedConnection ); QMetaObject::invokeMethod( this, "readOutput", Qt::QueuedConnection );
QTimer::singleShot( 5000, this, SLOT( disconnectSocket() ) ); //safety QTimer::singleShot( 5000, this, SLOT( disconnectSocket() ) ); //safety
return; return;