diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-27 20:49:24 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-28 08:52:46 +0200 |
commit | 97c28ad74f09da7337119f3acf2e6b911b48523f (patch) | |
tree | 960a78ae3b9545e801fe796e22d1685acb18b238 /tubes/source/collaboration.cxx | |
parent | 0274bc0569a338136e137e93a03a9f6f0b249df9 (diff) |
Various loplugin warnings in --enable-telepathy
Change-Id: I4c437491466c3029f2a9c93fb630c7b5a8d2ff21
Diffstat (limited to 'tubes/source/collaboration.cxx')
-rw-r--r-- | tubes/source/collaboration.cxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/tubes/source/collaboration.cxx b/tubes/source/collaboration.cxx index a6e5ec09b760..ce097b2c38b6 100644 --- a/tubes/source/collaboration.cxx +++ b/tubes/source/collaboration.cxx @@ -12,9 +12,10 @@ #include <tubes/conference.hxx> #include <tubes/manager.hxx> +#include <contacts.hxx> + Collaboration::Collaboration() : - mpConference( NULL ), - mpContacts( NULL ) + mpConference( nullptr ) { TeleManager::registerCollaboration( this ); } @@ -40,10 +41,17 @@ void Collaboration::Invite( TpContact* pContact ) const } } +void Collaboration::DisplayContacts() +{ + if (!mpContacts) + mpContacts = VclPtr<tubes::TubeContacts>::Create( this ); + mpContacts->Populate(); +} + void Collaboration::SendFile( TpContact* pContact, const OUString& rURL ) const { if (mpConference) - mpConference->sendFile( pContact, rURL, NULL, NULL ); + mpConference->sendFile( pContact, rURL, nullptr, nullptr ); } void Collaboration::SendPacket( const OString& rPacket ) const |