diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-13 23:35:05 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-17 16:40:26 +0200 |
commit | ee956067d633f8e0b40e303e58c10bba42a0da85 (patch) | |
tree | 7613a7a607a5c6ea508f8dbf9263a66a2b060f73 /tubes/inc | |
parent | 53b180a49af8aaa25b9b38a8b020113483f0af6b (diff) |
tubes: remove now unused code, when we don't use maConferences
Change-Id: I403253793791236eaf8e9fd3fc72489ebd447d99
Diffstat (limited to 'tubes/inc')
-rw-r--r-- | tubes/inc/tubes/conference.hxx | 11 | ||||
-rw-r--r-- | tubes/inc/tubes/manager.hxx | 25 |
2 files changed, 1 insertions, 35 deletions
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx index 4849b4254b1e..a43a6dc8bf68 100644 --- a/tubes/inc/tubes/conference.hxx +++ b/tubes/inc/tubes/conference.hxx @@ -33,8 +33,6 @@ #include "tubes/tubesdllapi.h" #include "tubes/packet.hxx" #include "tubes/file-transfer-helper.h" -#include <boost/shared_ptr.hpp> -#include <boost/enable_shared_from_this.hpp> #include <rtl/ustring.hxx> #include <telepathy-glib/telepathy-glib.h> #include <queue> @@ -45,7 +43,7 @@ typedef ::std::queue<TelePacket> TelePacketQueue; class TeleManager; /** Conference setup by TeleManager */ -class TeleConference : public boost::enable_shared_from_this<TeleConference> +class TeleConference { public: @@ -118,15 +116,8 @@ private: TelePacketQueue maPacketQueue; bool mbTubeOfferedHandlerInvoked : 1; - - // hide from the public - using boost::enable_shared_from_this<TeleConference>::shared_from_this; - }; - -typedef boost::shared_ptr<TeleConference> TeleConferencePtr; - #endif // INCLUDED_TUBES_CONFERENCE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx index a15d101cb3cf..79ab92b575c2 100644 --- a/tubes/inc/tubes/manager.hxx +++ b/tubes/inc/tubes/manager.hxx @@ -39,7 +39,6 @@ #include <rtl/ref.hxx> #include <tools/link.hxx> #include <telepathy-glib/telepathy-glib.h> -#include <vector> #include <tubes/warnings_guard_boost_signals2.hpp> // For testing purposes, we might need more in future. @@ -47,8 +46,6 @@ #define LIBO_TUBES_DBUS_MSG_METHOD "LibOMsg" #define LIBO_TUBES_DBUS_PATH "/org/libreoffice/calc" -typedef ::std::vector<TeleConferencePtr> TeleConferenceVector; - namespace osl { class Mutex; } class TeleManagerImpl; @@ -135,28 +132,8 @@ public: */ TeleConference* startBuddySession( TpAccount *pAccount, TpContact *pBuddy ); - void unregisterConference( TeleConferencePtr pConference ); - void disconnect(); - /** Send data to all registered conferences. - - @returns to how many conferences the packet was send - */ - sal_uInt32 sendPacket( const TelePacket& rPacket ) const; - - /** Pop a received data packet. - - XXX This needs to be elaborated to pop from a specific conference, or - for a specific document. Currently the conferences are simply iterated - and the first non-empty queue is popped. - - @returns whether there was any packet to pop - */ - bool popPacket( TelePacket& rPacket ); - - void sendFile( rtl::OUString &localUri, TeleConference::FileSentCallback pCallback, void* pUserData); - boost::signals2::signal<void ( const rtl::OUString &localUri )> sigFileReceived; boost::signals2::signal<void (TeleConference*)> sigConferenceCreated; @@ -231,8 +208,6 @@ public: private: void ensureLegacyChannel( TpAccount* pAccount, TpContact* pBuddy ); - TeleConferenceVector maConferences; - bool mbChannelReadyHandlerInvoked : 1; static TeleManagerImpl* pImpl; |