summaryrefslogtreecommitdiff
path: root/tubes/inc
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-08-07 10:59:58 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-08-08 10:04:17 +0200
commitb870f1420ea926f231502272eec08c45e9da4cc5 (patch)
treec47bd194512b1450408a50cfd70049e372d87b7b /tubes/inc
parent34c6421bddddb2128dd59acc867f73739ac1ca62 (diff)
tubes: make contacts dialog a member of Collaboration class
Change-Id: Ib50b550f9486bc1abfeefd5d1aac57c0d712ec04
Diffstat (limited to 'tubes/inc')
-rw-r--r--tubes/inc/tubes/collaboration.hxx3
-rw-r--r--tubes/inc/tubes/contacts.hxx38
-rw-r--r--tubes/inc/tubes/manager.hxx6
3 files changed, 9 insertions, 38 deletions
diff --git a/tubes/inc/tubes/collaboration.hxx b/tubes/inc/tubes/collaboration.hxx
index 15d59d4abf66..8378ddae6823 100644
--- a/tubes/inc/tubes/collaboration.hxx
+++ b/tubes/inc/tubes/collaboration.hxx
@@ -21,6 +21,8 @@ typedef struct _TpContact TpContact;
class TUBES_DLLPUBLIC Collaboration
{
TeleConference* mpConference;
+ // This is in fact of type TubeContacts* from anonymous namespace
+ void* mpContacts;
public:
Collaboration();
virtual ~Collaboration();
@@ -33,6 +35,7 @@ public:
TUBES_DLLPRIVATE TeleConference* GetConference() const;
TUBES_DLLPRIVATE sal_uInt64 GetId() const;
+ void DisplayContacts();
void SendFile( TpContact* pContact, const OUString& rURL ) const;
void SendPacket( const OString& rPacket ) const;
void SetConference( TeleConference* pConference );
diff --git a/tubes/inc/tubes/contacts.hxx b/tubes/inc/tubes/contacts.hxx
deleted file mode 100644
index a2b1f7fb42b6..000000000000
--- a/tubes/inc/tubes/contacts.hxx
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Major Contributor(s):
- * Copyright (C) 2012 Michael Meeks <michael.meeks@suse.com> (initial developer)
- *
- * All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-
-#include "sal/config.h"
-#include <tubes/tubesdllapi.h>
-
-class Collaboration;
-
-namespace tubes {
- void TUBES_DLLPUBLIC createContacts( Collaboration* pCollaboration );
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index ab5e39a0ae51..533233a102b0 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -39,6 +39,7 @@
#define LIBO_TUBES_DBUS_PATH "/org/libreoffice/calc"
namespace osl { class Mutex; }
+class Collaboration;
class ContactList;
class TeleConference;
class TeleManagerImpl;
@@ -128,6 +129,11 @@ public:
/** Get a conference with current UUID to set a session. */
TUBES_DLLPUBLIC static TeleConference* getConference();
+ static void registerCollaboration( Collaboration* pCollaboration );
+ static void unregisterCollaboration( Collaboration* pCollaboration );
+ /** Display contact list dialog for all documents. */
+ static void displayAllContacts();
+
static void registerDemoConference( TeleConference* pConference );
static void unregisterDemoConference( TeleConference* pConference );
/** Broadcast packet to all conferences. Used for demo mode. */