mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-07 14:46:33 +02:00
Code Issues Releases Wiki Activity

jreen hack for qt5

Browse Source
This commit is contained in:
Dominik Schmidt
2013-05-25 18:45:17 +02:00
parent 16417ef7ab
commit 578c89c1b2
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/accounts/xmpp/XmppAccount.h
View File

@@ -38,6 +38,7 @@ namespace Accounts
class ACCOUNTDLLEXPORT XmppAccountFactory : public AccountFactory class ACCOUNTDLLEXPORT XmppAccountFactory : public AccountFactory
{ {
Q_PLUGIN_METADATA( IID "org.tomahawk-player.Player.AccountFactory" )
Q_OBJECT Q_OBJECT
Q_INTERFACES( Tomahawk::Accounts::AccountFactory ) Q_INTERFACES( Tomahawk::Accounts::AccountFactory )

2
src/accounts/xmpp/sip/XmlConsole.cpp
View File

@@ -105,7 +105,7 @@ XmlConsole::XmlConsole(Client* client, QWidget *parent) :
m_stackOutgoing.paramColor = QColor(0xdd8811); m_stackOutgoing.paramColor = QColor(0xdd8811);
QAction *action = new QAction(tr("Close"),this); QAction *action = new QAction(tr("Close"),this);
action->setSoftKeyRole(QAction::NegativeSoftKey); // action->setSoftKeyRole(QAction::NegativeSoftKey);
connect(action, SIGNAL(triggered()), SLOT(close())); connect(action, SIGNAL(triggered()), SLOT(close()));
addAction(action); addAction(action);
} }

4
src/accounts/xmpp/sip/XmppSip.cpp
View File

@@ -100,7 +100,7 @@ XmppSipPlugin::XmppSipPlugin( Account* account )
, m_pubSubManager( 0 ) , m_pubSubManager( 0 )
#endif #endif
{ {
Jreen::Logger::addHandler( JreenMessageHandler ); // Jreen::Logger::addHandler( JreenMessageHandler );
m_currentUsername = readUsername(); m_currentUsername = readUsername();
m_currentServer = readServer(); m_currentServer = readServer();
@@ -115,7 +115,7 @@ XmppSipPlugin::XmppSipPlugin( Account* account )
setupClientHelper(); setupClientHelper();
m_client->registerPayload( new TomahawkXmppMessageFactory ); 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 ); m_client->setResource( m_currentResource );
#ifndef ENABLE_HEADLESS #ifndef ENABLE_HEADLESS