Kaydet (Commit) 3ef03fbf authored tarafından Matúš Kukan's avatar Matúš Kukan

tubes: make TeleManager::getConference() static

Change-Id: Ic7023a40eb2f09802b100d9317c0a6a66d901476
üst 51802df7
...@@ -356,9 +356,7 @@ ScDocFunc *ScDocShell::CreateDocFunc() ...@@ -356,9 +356,7 @@ ScDocFunc *ScDocShell::CreateDocFunc()
ScDocFuncDirect *pDirect = new ScDocFuncDirect( *this ); ScDocFuncDirect *pDirect = new ScDocFuncDirect( *this );
ScDocFuncRecv *pReceiver = new ScDocFuncRecv( pDirect ); ScDocFuncRecv *pReceiver = new ScDocFuncRecv( pDirect );
ScDocFuncSend *pSender = new ScDocFuncSend( *this, pReceiver ); ScDocFuncSend *pSender = new ScDocFuncSend( *this, pReceiver );
TeleManager *pManager = new TeleManager(); pSender->SetCollaboration( TeleManager::getConference() );
pSender->SetCollaboration( pManager->getConference() );
delete pManager;
return pSender; return pSender;
} }
else else
......
...@@ -123,7 +123,7 @@ public: ...@@ -123,7 +123,7 @@ public:
TUBES_DLLPUBLIC TeleConference* startBuddySession( TpAccount *pAccount, TpContact *pBuddy ); TUBES_DLLPUBLIC TeleConference* startBuddySession( TpAccount *pAccount, TpContact *pBuddy );
/** Get a conference with current UUID to set a session. */ /** 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. */ /** True if there has been tube channel received and is still not used. */
TUBES_DLLPUBLIC static bool hasWaitingConference(); TUBES_DLLPUBLIC static bool hasWaitingConference();
......
...@@ -165,7 +165,7 @@ void TeleManager::addConference( TeleConference* pConference ) ...@@ -165,7 +165,7 @@ void TeleManager::addConference( TeleConference* pConference )
TeleConference* TeleManager::getConference() TeleConference* TeleManager::getConference()
{ {
TeleManagerImpl::MapStringConference::iterator it = TeleManagerImpl::MapStringConference::const_iterator it =
pImpl->maAcceptedConferences.find( pImpl->msCurrentUUID ); pImpl->maAcceptedConferences.find( pImpl->msCurrentUUID );
TeleConference* pConference = NULL; TeleConference* pConference = NULL;
if (it != pImpl->maAcceptedConferences.end()) if (it != pImpl->maAcceptedConferences.end())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment