diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-03 11:44:57 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-04 01:57:10 +0200 |
| commit | 3ef03fbf80760a1d21df5cfb410e94162f121914 (patch) | |
| tree | f2132e8b5cc71731503fce922577a9df223b5ce2 | |
| parent | 51802df73230d08fe13bba58936da810100cc4d1 (diff) | |
tubes: make TeleManager::getConference() static
Change-Id: Ic7023a40eb2f09802b100d9317c0a6a66d901476
| -rw-r--r-- | sc/source/ui/collab/sendfunc.cxx | 4 | ||||
| -rw-r--r-- | tubes/inc/tubes/manager.hxx | 2 | ||||
| -rw-r--r-- | tubes/source/manager.cxx | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx index 1a1203d3f19c..d52f8b035ba9 100644 --- a/sc/source/ui/collab/sendfunc.cxx +++ b/sc/source/ui/collab/sendfunc.cxx @@ -356,9 +356,7 @@ ScDocFunc *ScDocShell::CreateDocFunc() ScDocFuncDirect *pDirect = new ScDocFuncDirect( *this ); ScDocFuncRecv *pReceiver = new ScDocFuncRecv( pDirect ); ScDocFuncSend *pSender = new ScDocFuncSend( *this, pReceiver ); - TeleManager *pManager = new TeleManager(); - pSender->SetCollaboration( pManager->getConference() ); - delete pManager; + pSender->SetCollaboration( TeleManager::getConference() ); return pSender; } else diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx index b5a68b21f788..8f7afa6bf9b6 100644 --- a/tubes/inc/tubes/manager.hxx +++ b/tubes/inc/tubes/manager.hxx @@ -123,7 +123,7 @@ public: TUBES_DLLPUBLIC TeleConference* startBuddySession( TpAccount *pAccount, TpContact *pBuddy ); /** Get a conference with current UUID to set a session. */ - TUBES_DLLPUBLIC TeleConference* getConference(); + TUBES_DLLPUBLIC static TeleConference* getConference(); /** True if there has been tube channel received and is still not used. */ TUBES_DLLPUBLIC static bool hasWaitingConference(); diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index 40754a4d1667..7722844832d8 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -165,7 +165,7 @@ void TeleManager::addConference( TeleConference* pConference ) TeleConference* TeleManager::getConference() { - TeleManagerImpl::MapStringConference::iterator it = + TeleManagerImpl::MapStringConference::const_iterator it = pImpl->maAcceptedConferences.find( pImpl->msCurrentUUID ); TeleConference* pConference = NULL; if (it != pImpl->maAcceptedConferences.end()) |