summaryrefslogtreecommitdiff
path: root/tubes/source/contacts.cxx
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-08-07 15:35:20 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-08-08 10:04:17 +0200
commit510576b6d8ba1cbd0bac6584f5ce56c93abc36ae (patch)
tree6dfa575a7eebe39892a47079c2a25a39bb6bc6ad /tubes/source/contacts.cxx
parentb870f1420ea926f231502272eec08c45e9da4cc5 (diff)
tubes: finish efforts to make TeleManager static
Change-Id: I1d25a6074c3465a6e8c1df3127093d30d913b65d
Diffstat (limited to 'tubes/source/contacts.cxx')
-rw-r--r--tubes/source/contacts.cxx13
1 files changed, 5 insertions, 8 deletions
diff --git a/tubes/source/contacts.cxx b/tubes/source/contacts.cxx
index c6037f42bd96..37a9de46a904 100644
--- a/tubes/source/contacts.cxx
+++ b/tubes/source/contacts.cxx
@@ -68,7 +68,6 @@ class TubeContacts : public ModelessDialog
PushButton maBtnListen;
SvxSimpleTableContainer maListContainer;
SvxSimpleTable maList;
- TeleManager* mpManager;
Collaboration* mpCollaboration;
DECL_LINK( BtnDemoHdl, void * );
@@ -105,13 +104,13 @@ class TubeContacts : public ModelessDialog
void Listen()
{
- if (!mpManager->registerClients())
+ if (!TeleManager::registerClients())
SAL_INFO( "sc.tubes", "Could not register client handlers." );
}
void StartDemoSession()
{
- TeleConference* pConference = mpManager->startDemoSession();
+ TeleConference* pConference = TeleManager::startDemoSession();
if (!pConference)
SAL_WARN( "tubes", "Could not start demo session!" );
else
@@ -132,7 +131,7 @@ class TubeContacts : public ModelessDialog
TpAccount* pAccount = pAC->mpAccount;
TpContact* pContact = pAC->mpContact;
SAL_INFO( "tubes", "picked " << tp_contact_get_identifier( pContact ) );
- TeleConference* pConference = mpManager->startBuddySession( pAccount, pContact );
+ TeleConference* pConference = TeleManager::startBuddySession( pAccount, pContact );
if (!pConference)
SAL_WARN( "tubes", "Could not start session with " <<
tp_contact_get_identifier( pContact ) );
@@ -154,7 +153,7 @@ class TubeContacts : public ModelessDialog
{
TpAccount* pAccount = pAC->mpAccount;
SAL_INFO( "tubes", "picked " << tp_account_get_display_name( pAccount ) );
- TeleConference* pConference = mpManager->startGroupSession( pAccount,
+ TeleConference* pConference = TeleManager::startGroupSession( pAccount,
rtl::OUString("liboroom"), rtl::OUString("conference.jabber.org") );
if (!pConference)
SAL_WARN( "tubes", "Could not start group session." );
@@ -176,7 +175,6 @@ public:
maBtnListen( this, TubesResId( BTN_LISTEN ) ),
maListContainer( this, TubesResId( CTL_LIST ) ),
maList( maListContainer ),
- mpManager( new TeleManager() ),
mpCollaboration( pCollaboration )
{
Hide();
@@ -201,7 +199,6 @@ public:
}
virtual ~TubeContacts()
{
- delete mpManager;
}
static rtl::OUString fromUTF8( const char *pStr )
@@ -214,7 +211,7 @@ public:
{
SAL_INFO( "sc.tubes", "Populating contact list dialog" );
maList.Clear();
- ContactList *pContacts = mpManager->getContactList();
+ ContactList *pContacts = TeleManager::getContactList();
if ( pContacts )
{
AccountContactPairV aPairs = pContacts->getContacts();