Various loplugin warnings in --enable-telepathy

Change-Id: I4c437491466c3029f2a9c93fb630c7b5a8d2ff21

5 files changed, 15 insertions, 4 deletions

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index ef325861c25d..c69bebabbfc5 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -133,6 +133,7 @@ certain functionality.
 @li @c sc.orcus.style
 @li @c sc.orcus.table
 @li @c sc.qa
+@li @c sc.tubes
 @li @c sc.ui - Calc UI
 @li @c sc.uitest - Calc UI Test part
 @li @c sc.viewdata
@@ -566,6 +567,8 @@ certain functionality.
 @li @c store
 @li @c svg
 @li @c test
+@li @c tubes
+@li @c tubes.method
 @li @c ucbhelper
 @li @c unodevtools
 @li @c unoidl
diff --git a/include/tubes/collaboration.hxx b/include/tubes/collaboration.hxx
index 3f32d4188dbe..4f6866618af0 100644
--- a/include/tubes/collaboration.hxx
+++ b/include/tubes/collaboration.hxx
@@ -14,15 +14,20 @@
 
 #include <rtl/ustring.hxx>
 #include <tubes/tubesdllapi.h>
+#include <vcl/vclptr.hxx>
 
 class TeleConference;
+namespace tubes { class TubeContacts; }
 typedef struct _TpContact TpContact;
 
 class TUBES_DLLPUBLIC Collaboration
 {
     TeleConference* mpConference;
-    // This is in fact of type TubeContacts* from anonymous namespace
-    void* mpContacts;
+    VclPtr<tubes::TubeContacts> mpContacts;
+
+    Collaboration(Collaboration &) = delete;
+    void operator =(Collaboration &) = delete;
+
 public:
             Collaboration();
     virtual ~Collaboration();
diff --git a/include/tubes/conference.hxx b/include/tubes/conference.hxx
index 7dfd744d959a..3b80eb13eb33 100644
--- a/include/tubes/conference.hxx
+++ b/include/tubes/conference.hxx
@@ -27,7 +27,7 @@ public:
 
     TeleConference( TpAccount* pAccount,
                     TpDBusTubeChannel* pChannel,
-                    const OString sUuid = OString(),
+                    const OString & sUuid = OString(),
                     bool bMaster = false );
     ~TeleConference();
 
diff --git a/include/tubes/file-transfer-helper.h b/include/tubes/file-transfer-helper.h
index 25a4ce9faa7c..ffcbc4b19837 100644
--- a/include/tubes/file-transfer-helper.h
+++ b/include/tubes/file-transfer-helper.h
@@ -41,7 +41,7 @@ G_BEGIN_DECLS
 #define EMPATHY_IS_FT_HANDLER(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_FT_HANDLER))
 
-typedef struct _EmpathyFTHandlerPriv EmpathyFTHandlerPriv;
+typedef struct EmpathyFTHandlerPriv_ EmpathyFTHandlerPriv;
 
 typedef struct {
   GObject parent;
diff --git a/include/tubes/manager.hxx b/include/tubes/manager.hxx
index dcf24dc0477b..2ea14fce3888 100644
--- a/include/tubes/manager.hxx
+++ b/include/tubes/manager.hxx
@@ -150,6 +150,9 @@ private:
     static ::osl::Mutex&    GetMutex();
 };
 
+// FIXME: should be static and not used in conference.cxx
+void TeleManager_fileReceived( const OUString& rStr, const OString& rUuid );
+
 #endif // INCLUDED_TUBES_MANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */