From 578c89c1b2bc6ecb4283ec83285ead319696d647 Mon Sep 17 00:00:00 2001 From: Dominik Schmidt Date: Sat, 25 May 2013 18:45:17 +0200 Subject: [PATCH] jreen hack for qt5 --- src/accounts/xmpp/XmppAccount.h | 1 + src/accounts/xmpp/sip/XmlConsole.cpp | 2 +- src/accounts/xmpp/sip/XmppSip.cpp | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/accounts/xmpp/XmppAccount.h b/src/accounts/xmpp/XmppAccount.h index e50f2540f..a7c4ff8e5 100644 --- a/src/accounts/xmpp/XmppAccount.h +++ b/src/accounts/xmpp/XmppAccount.h @@ -38,6 +38,7 @@ namespace Accounts class ACCOUNTDLLEXPORT XmppAccountFactory : public AccountFactory { + Q_PLUGIN_METADATA( IID "org.tomahawk-player.Player.AccountFactory" ) Q_OBJECT Q_INTERFACES( Tomahawk::Accounts::AccountFactory ) diff --git a/src/accounts/xmpp/sip/XmlConsole.cpp b/src/accounts/xmpp/sip/XmlConsole.cpp index 7d4fe2208..266db9fa0 100644 --- a/src/accounts/xmpp/sip/XmlConsole.cpp +++ b/src/accounts/xmpp/sip/XmlConsole.cpp @@ -105,7 +105,7 @@ XmlConsole::XmlConsole(Client* client, QWidget *parent) : m_stackOutgoing.paramColor = QColor(0xdd8811); QAction *action = new QAction(tr("Close"),this); - action->setSoftKeyRole(QAction::NegativeSoftKey); +// action->setSoftKeyRole(QAction::NegativeSoftKey); connect(action, SIGNAL(triggered()), SLOT(close())); addAction(action); } diff --git a/src/accounts/xmpp/sip/XmppSip.cpp b/src/accounts/xmpp/sip/XmppSip.cpp index cd878d392..076eab737 100644 --- a/src/accounts/xmpp/sip/XmppSip.cpp +++ b/src/accounts/xmpp/sip/XmppSip.cpp @@ -100,7 +100,7 @@ XmppSipPlugin::XmppSipPlugin( Account* account ) , m_pubSubManager( 0 ) #endif { - Jreen::Logger::addHandler( JreenMessageHandler ); +// Jreen::Logger::addHandler( JreenMessageHandler ); m_currentUsername = readUsername(); m_currentServer = readServer(); @@ -115,7 +115,7 @@ XmppSipPlugin::XmppSipPlugin( Account* account ) setupClientHelper(); m_client->registerPayload( new TomahawkXmppMessageFactory ); - m_currentResource = QString::fromAscii( "tomahawk%1" ).arg( QString::number( qrand() % 10000 ) ); + m_currentResource = QString::fromLatin1( "tomahawk%1" ).arg( QString::number( qrand() % 10000 ) ); m_client->setResource( m_currentResource ); #ifndef ENABLE_HEADLESS