summaryrefslogtreecommitdiff
path: root/tubes/inc
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-07-26 12:56:19 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-07-26 15:59:22 +0200
commit7f77377850537194ea634f0d2c81e8cc5cb90a1b (patch)
treed7bd3f88383a247d8584f7037a96068b509334c5 /tubes/inc
parentb70c2d352ddb6350ec366b055b28b3d892b54b1c (diff)
tubes: clean this out
Change-Id: I7d4cafbe51695c0ff36480311858b9167344c119
Diffstat (limited to 'tubes/inc')
-rw-r--r--tubes/inc/tubes/manager.hxx13
1 files changed, 3 insertions, 10 deletions
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index 9938f6f2313d..b5a68b21f788 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -30,13 +30,8 @@
#define INCLUDED_TUBES_MANAGER_HXX
#include <sal/config.h>
-#include "tubes/tubesdllapi.h"
-#include "tubes/conference.hxx"
-#include "tubes/contact-list.hxx"
+#include <tubes/tubesdllapi.h>
#include <rtl/ustring.hxx>
-#include <salhelper/thread.hxx>
-#include <rtl/ref.hxx>
-#include <tools/link.hxx>
// For testing purposes, we might need more in future.
#define LIBO_TUBES_DBUS_INTERFACE "org.libreoffice.calc"
@@ -44,11 +39,11 @@
#define LIBO_TUBES_DBUS_PATH "/org/libreoffice/calc"
namespace osl { class Mutex; }
+class ContactList;
+class TeleConference;
class TeleManagerImpl;
typedef struct _TpAccount TpAccount;
typedef struct _TpContact TpContact;
-typedef struct _GMainLoop GMainLoop;
-typedef struct _GMainContext GMainContext;
/** Interface to Telepathy DBus Tubes.
@@ -193,8 +188,6 @@ private:
static sal_uInt32 nRefCount;
static rtl::OString aNameSuffix;
- friend class TeleManagerImpl; // access to mutex
-
static ::osl::Mutex& GetMutex();
};