tubes: we use less symbols after bc21b49a464ae153341ee8d836993ca89b1a6919

Change-Id: Ibf2e3d3f5de87848ba8efb669308fe790d6622d6

4 files changed, 10 insertions, 13 deletions

diff --git a/tubes/Package_inc.mk b/tubes/Package_inc.mk
index 1502b90db147..c6606fcade4e 100644
--- a/tubes/Package_inc.mk
+++ b/tubes/Package_inc.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_Package_Package,tubes_inc,$(SRCDIR)/tubes/inc))
 
 $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/collaboration.hxx,tubes/collaboration.hxx))
 $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/conference.hxx,tubes/conference.hxx))
-$(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/contact-list.hxx,tubes/contact-list.hxx))
 $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/contacts.hxx,tubes/contacts.hxx))
 $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/manager.hxx,tubes/manager.hxx))
 $(eval $(call gb_Package_add_file,tubes_inc,inc/tubes/tubesdllapi.h,tubes/tubesdllapi.h))
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx
index 6a026049237e..99eb009ec5b4 100644
--- a/tubes/inc/tubes/conference.hxx
+++ b/tubes/inc/tubes/conference.hxx
@@ -64,14 +64,14 @@ public:
     /** Pop a received packet. */
     bool                    popPacket( OString& rPacket );
 
-    TUBES_DLLPUBLIC void    invite( TpContact *pContact );
+    void                    invite( TpContact *pContact );
 
     /** Emitted when a packet is received. */
     boost::signals2::signal<void (const OString&)> sigPacketReceived;
 
     typedef void          (*FileSentCallback)( bool aSuccess, void* pUserData);
     TUBES_DLLPUBLIC void    sendFile( TpContact* pContact, rtl::OUString &localUri, FileSentCallback pCallback, void* pUserData);
-    TUBES_DLLPUBLIC const OString& getUuid() const { return msUuid; }
+    const OString&          getUuid() const { return msUuid; }
 
     // --- following only to be called only by manager's callbacks ---
     // TODO: make friends instead
diff --git a/tubes/inc/tubes/contact-list.hxx b/tubes/inc/tubes/contact-list.hxx
index eca9f7090336..6dc4f3212483 100644
--- a/tubes/inc/tubes/contact-list.hxx
+++ b/tubes/inc/tubes/contact-list.hxx
@@ -33,8 +33,6 @@
 #include <utility>
 #include <vector>
 
-#include "tubes/tubesdllapi.h"
-
 typedef struct _TpAccount TpAccount;
 typedef struct _TpContact TpContact;
 typedef struct _TpAccountManager TpAccountManager;
@@ -42,7 +40,7 @@ typedef struct _TpAccountManager TpAccountManager;
 typedef ::std::pair< TpAccount *, TpContact * > AccountContactPair;
 typedef ::std::vector< AccountContactPair > AccountContactPairV;
 
-class TUBES_DLLPUBLIC ContactList
+class ContactList
 {
 public:
     ContactList(TpAccountManager *pAccountManager);
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index 8f7afa6bf9b6..67f319c5154a 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -73,10 +73,10 @@ public:
     TUBES_DLLPUBLIC bool                    init( bool bListen );
 
     /** Connect to DBus and create AccountManager. */
-    TUBES_DLLPUBLIC bool                    createAccountManager();
+    bool                    createAccountManager();
 
     /** Setup client handlers. */
-    TUBES_DLLPUBLIC bool                    registerClients();
+    bool                    registerClients();
 
     /** Prepare the Telepathy Account Manager.
         Requires createAccountManager() to have succeeded.
@@ -86,13 +86,13 @@ public:
 
         TODO: this needs some signalling mechanism
      */
-    TUBES_DLLPUBLIC void                    prepareAccountManager();
-    TUBES_DLLPUBLIC AccountManagerStatus    getAccountManagerStatus() const;
+    void                    prepareAccountManager();
+    AccountManagerStatus    getAccountManagerStatus() const;
 
     /** Fetches the contact list. Returns 0 before connect() is called successfully.
         Is non-functional until prepareAccountManager().
      */
-    TUBES_DLLPUBLIC ContactList*            getContactList() const;
+    ContactList*            getContactList() const;
 
     /** Start a group session in a MUC.
 
@@ -108,7 +108,7 @@ public:
             empty, only the conference's UUID is used and rConferenceRoom is
             ignored, hopefully resulting in a local DBus tube.
      */
-    TUBES_DLLPUBLIC TeleConference*         startGroupSession( TpAccount *pAccount,
+    TeleConference*         startGroupSession( TpAccount *pAccount,
                                                 const rtl::OUString& rConferenceRoom,
                                                 const rtl::OUString& rConferenceServer );
 
@@ -120,7 +120,7 @@ public:
         @param pBuddy
             The buddy to be connected. Must be a contact of pAccount.
      */
-    TUBES_DLLPUBLIC TeleConference*         startBuddySession( TpAccount *pAccount, TpContact *pBuddy );
+    TeleConference*         startBuddySession( TpAccount *pAccount, TpContact *pBuddy );
 
     /** Get a conference with current UUID to set a session. */
     TUBES_DLLPUBLIC static TeleConference*  getConference();