From 70ed6c52ef695e66f1739c2bba119c03876a2532 Mon Sep 17 00:00:00 2001
From: Vladimir Stoiakin <VStoiakin@lavabit.com>
Date: Fri, 17 Apr 2020 21:44:54 +0300
Subject: [PATCH] dbus: avoid using of non-API library headers
Change-Id: I89e0f1a9006e01690fdf4fdc8cd49f404733d0bf
---
bin/dbus/dbuscallmanager.cpp | 4 ++--
bin/dbus/dbuscallmanager.h | 2 +-
bin/dbus/dbusclient.h | 2 +-
bin/dbus/dbusconfigurationmanager.h | 4 ++--
bin/dbus/dbusinstance.cpp | 8 ++++----
bin/dbus/dbusinstance.h | 2 +-
bin/dbus/dbuspluginmanagerinterface.cpp | 2 +-
bin/dbus/dbuspluginmanagerinterface.h | 2 +-
bin/dbus/dbuspresencemanager.h | 2 +-
bin/dbus/dbusvideomanager.cpp | 2 +-
bin/dbus/dbusvideomanager.h | 2 +-
bin/dbus/main.cpp | 2 +-
bin/dbus/meson.build | 17 ++++-------------
bin/main.cpp | 4 +---
14 files changed, 22 insertions(+), 33 deletions(-)
diff --git a/bin/dbus/dbuscallmanager.cpp b/bin/dbus/dbuscallmanager.cpp
index 78af29c7d9..2501a9391e 100644
--- a/bin/dbus/dbuscallmanager.cpp
+++ b/bin/dbus/dbuscallmanager.cpp
@@ -19,7 +19,7 @@
*/
#include "dbuscallmanager.h"
-#include "jami/callmanager_interface.h"
+#include "callmanager_interface.h"
DBusCallManager::DBusCallManager(DBus::Connection& connection)
: DBus::ObjectAdaptor(connection, "/cx/ring/Ring/CallManager")
@@ -400,4 +400,4 @@ DBusCallManager::raiseParticipantHand(const std::string& accountId,
const bool& state)
{
DRing::raiseParticipantHand(accountId, confId, peerId, state);
-}
\ No newline at end of file
+}
diff --git a/bin/dbus/dbuscallmanager.h b/bin/dbus/dbuscallmanager.h
index 8ed03425cf..76aaaa4059 100644
--- a/bin/dbus/dbuscallmanager.h
+++ b/bin/dbus/dbuscallmanager.h
@@ -25,7 +25,7 @@
#include <map>
#include <string>
-#include "jami/def.h"
+#include "def.h"
#include "dbus_cpp.h"
#if __GNUC__ >= 5 || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6)
diff --git a/bin/dbus/dbusclient.h b/bin/dbus/dbusclient.h
index e8f0e23368..db69873c3a 100644
--- a/bin/dbus/dbusclient.h
+++ b/bin/dbus/dbusclient.h
@@ -25,7 +25,7 @@
#include "config.h"
#endif // HAVE_CONFIG_H
-#include "jami/def.h"
+#include "def.h"
#include <memory>
class DBusConfigurationManager;
diff --git a/bin/dbus/dbusconfigurationmanager.h b/bin/dbus/dbusconfigurationmanager.h
index d1d4e99efa..4cda895941 100644
--- a/bin/dbus/dbusconfigurationmanager.h
+++ b/bin/dbus/dbusconfigurationmanager.h
@@ -29,10 +29,10 @@
#include <map>
#include <string>
-#include "jami/def.h"
+#include "def.h"
#include "dbus_cpp.h"
-#include "jami/datatransfer_interface.h"
+#include "datatransfer_interface.h"
#if __GNUC__ >= 5 || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6)
/* This warning option only exists for gcc 4.6.0 and greater. */
diff --git a/bin/dbus/dbusinstance.cpp b/bin/dbus/dbusinstance.cpp
index f9fb721bce..c7a4d9849a 100644
--- a/bin/dbus/dbusinstance.cpp
+++ b/bin/dbus/dbusinstance.cpp
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "compiler_intrinsics.h"
+
#include "dbusinstance.h"
DBusInstance::DBusInstance(DBus::Connection& connection,
@@ -28,15 +28,15 @@ DBusInstance::DBusInstance(DBus::Connection& connection,
{}
void
-DBusInstance::Register(const int32_t& pid UNUSED,
- const std::string& name UNUSED)
+DBusInstance::Register(const int32_t& /*pid*/,
+ const std::string& /*name*/)
{
++count_;
}
void
-DBusInstance::Unregister(const int32_t& pid UNUSED)
+DBusInstance::Unregister(const int32_t& /*pid*/)
{
--count_;
diff --git a/bin/dbus/dbusinstance.h b/bin/dbus/dbusinstance.h
index bc2b2447dd..73457af0dd 100644
--- a/bin/dbus/dbusinstance.h
+++ b/bin/dbus/dbusinstance.h
@@ -21,7 +21,7 @@
#ifndef __RING_DBUSINSTANCE_H__
#define __RING_DBUSINSTANCE_H__
-#include "jami/def.h"
+#include "def.h"
#include <functional>
diff --git a/bin/dbus/dbuspluginmanagerinterface.cpp b/bin/dbus/dbuspluginmanagerinterface.cpp
index 16325470d8..46371c8c5c 100644
--- a/bin/dbus/dbuspluginmanagerinterface.cpp
+++ b/bin/dbus/dbuspluginmanagerinterface.cpp
@@ -19,7 +19,7 @@
*/
#include "dbuspluginmanagerinterface.h"
-#include "jami/plugin_manager_interface.h"
+#include "plugin_manager_interface.h"
DBusPluginManagerInterface::DBusPluginManagerInterface(DBus::Connection& connection)
: DBus::ObjectAdaptor(connection, "/cx/ring/Ring/PluginManagerInterface")
diff --git a/bin/dbus/dbuspluginmanagerinterface.h b/bin/dbus/dbuspluginmanagerinterface.h
index ec2864b118..9b3855ad1a 100644
--- a/bin/dbus/dbuspluginmanagerinterface.h
+++ b/bin/dbus/dbuspluginmanagerinterface.h
@@ -24,7 +24,7 @@
#include <map>
#include <string>
-#include "jami/def.h"
+#include "def.h"
#include "dbus_cpp.h"
#if __GNUC__ >= 5 || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 6)
diff --git a/bin/dbus/dbuspresencemanager.h b/bin/dbus/dbuspresencemanager.h
index 41fb34ff13..1f1a257f5d 100644
--- a/bin/dbus/dbuspresencemanager.h
+++ b/bin/dbus/dbuspresencemanager.h
@@ -25,7 +25,7 @@
#include <map>
#include <string>
-#include "jami/def.h"
+#include "def.h"
#include "dbus_cpp.h"
#if __GNUC__ >= 5 || (__GNUC__ >=4 && __GNUC_MINOR__ >= 6)
diff --git a/bin/dbus/dbusvideomanager.cpp b/bin/dbus/dbusvideomanager.cpp
index aa440ee8d8..9000793133 100644
--- a/bin/dbus/dbusvideomanager.cpp
+++ b/bin/dbus/dbusvideomanager.cpp
@@ -19,7 +19,7 @@
*/
#include "dbusvideomanager.h"
-#include "jami/videomanager_interface.h"
+#include "videomanager_interface.h"
DBusVideoManager::DBusVideoManager(DBus::Connection& connection)
: DBus::ObjectAdaptor(connection, "/cx/ring/Ring/VideoManager")
diff --git a/bin/dbus/dbusvideomanager.h b/bin/dbus/dbusvideomanager.h
index 664a2f4668..c082f089b0 100644
--- a/bin/dbus/dbusvideomanager.h
+++ b/bin/dbus/dbusvideomanager.h
@@ -23,7 +23,7 @@
#include <map>
#include <string>
-#include "jami/def.h"
+#include "def.h"
#include "dbus_cpp.h"
#if __GNUC__ >= 5 || (__GNUC__ >=4 && __GNUC_MINOR__ >= 6)
diff --git a/bin/dbus/main.cpp b/bin/dbus/main.cpp
index 5625ca10a5..d0e2f55b67 100644
--- a/bin/dbus/main.cpp
+++ b/bin/dbus/main.cpp
@@ -22,7 +22,7 @@
*/
#include "dbusclient.h"
-#include "jami/jami.h"
+#include "jami.h"
#include <signal.h>
#include <getopt.h>
diff --git a/bin/dbus/meson.build b/bin/dbus/meson.build
index 24b77b1a05..bb3120fef7 100644
--- a/bin/dbus/meson.build
+++ b/bin/dbus/meson.build
@@ -1,7 +1,5 @@
jamid_includedirs = include_directories(
- '../..',
- '../../src',
- '../../src/jami'
+ '../..'
)
jamid_sources = files(
@@ -44,10 +42,7 @@ if conf.get('ENABLE_VIDEO')
input: 'cx.ring.Ring.VideoManager.xml',
output: 'dbusvideomanager.adaptor.h'
)
-
- jamid_sources += files(
- 'dbusvideomanager.cpp'
- )
+ jamid_sources += files('dbusvideomanager.cpp')
endif
if conf.get('ENABLE_PLUGIN')
@@ -56,10 +51,7 @@ if conf.get('ENABLE_PLUGIN')
input: 'cx.ring.Ring.PluginManagerInterface.xml',
output: 'dbuspluginmanagerinterface.adaptor.h'
)
-
- jamid_sources += files(
- 'dbuspluginmanagerinterface.cpp'
- )
+ jamid_sources += files('dbuspluginmanagerinterface.cpp')
endif
if progpod2man.found()
@@ -76,8 +68,7 @@ jamid = executable('jamid',
jamid_targets,
include_directories: jamid_includedirs,
sources: jamid_sources,
- dependencies: depdbuscpp,
- link_with: libjami,
+ dependencies: [depdbuscpp, depjami],
install: true,
install_dir: get_option('libdir')
)
diff --git a/bin/main.cpp b/bin/main.cpp
index 1af1122316..761b4b8acf 100644
--- a/bin/main.cpp
+++ b/bin/main.cpp
@@ -21,9 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "jami/jami.h"
-
-#include "logger.h"
+#include "jami.h"
#if REST_API
#include "restcpp/restclient.h"
--
GitLab