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

C++11 style fixes

Browse Source
This commit is contained in:
Uwe L. Korn
2014-10-26 22:48:15 +01:00
parent b3af27e302
commit d2119afec0
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,9 +92,9 @@ JreenMessageHandler( QtMsgType type, const char *msg )
XmppSipPlugin::XmppSipPlugin( Account* account ) XmppSipPlugin::XmppSipPlugin( Account* account )
: SipPlugin( account ) : SipPlugin( account )
, m_state( Account::Disconnected ) , m_state( Account::Disconnected )
, m_menu( 0 ) , m_menu( nullptr )
, m_xmlConsole( 0 ) , m_xmlConsole( nullptr )
, m_pubSubManager( 0 ) , m_pubSubManager( nullptr )
{ {
#if QT_VERSION <= QT_VERSION_CHECK( 5, 0, 0 ) #if QT_VERSION <= QT_VERSION_CHECK( 5, 0, 0 )
Jreen::Logger::addHandler( JreenMessageHandler ); Jreen::Logger::addHandler( JreenMessageHandler );

2
src/libtomahawk/sip/SipPlugin.cpp
View File

@@ -67,7 +67,7 @@ SipPlugin::inviteString() const
QMenu* QMenu*
SipPlugin::menu() SipPlugin::menu()
{ {
return 0; return nullptr;
} }

2
src/libtomahawk/sip/SipPlugin.h
View File

@@ -51,7 +51,7 @@ public:
enum AddContactOptions { NoOptions = 0, SendInvite = 1 }; enum AddContactOptions { NoOptions = 0, SendInvite = 1 };
SipPlugin(); SipPlugin();
explicit SipPlugin( Tomahawk::Accounts::Account* account, QObject* parent = 0 ); explicit SipPlugin( Tomahawk::Accounts::Account* account, QObject* parent = nullptr );
virtual ~SipPlugin(); virtual ~SipPlugin();
// plugin id is "pluginfactoryname_someuniqueid". get it from SipPluginFactory::generateId // plugin id is "pluginfactoryname_someuniqueid". get it from SipPluginFactory::generateId