diff options
Diffstat (limited to 'tubes')
| -rw-r--r-- | tubes/inc/tubes/manager.hxx | 2 | ||||
| -rw-r--r-- | tubes/source/manager.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
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()) |