From 7f43785640199123442dc3fbb8a8a7be62ceaf9d Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Tue, 15 Jun 2021 11:23:32 -0400
Subject: [PATCH] Rename 'dring' occurrences to 'jami'.
Automated via:
$ git grep -l dring | xargs sed -i 's/dring/jami/g'
$ git ls-files | xargs sed -i 's/Error : jami/Error : jamid/g'
Then some changes by hand to adjust jamiId into fileId, and jami_info
into transfer_info.
Change-Id: Ic0be8fe918a2d9eb52e28d598ee4581db245674f
---
cmake/FindRing.cmake | 10 ++---
make-lrc.py | 2 +-
src/api/contactmodel.h | 2 +-
src/callbackshandler.cpp | 2 +-
src/contactmodel.cpp | 2 +-
src/dbus/callmanager.cpp | 4 +-
src/dbus/configurationmanager.cpp | 4 +-
src/dbus/instancemanager.cpp | 2 +-
src/dbus/pluginmanager.cpp | 4 +-
src/dbus/presencemanager.cpp | 4 +-
src/dbus/videomanager.cpp | 4 +-
src/qtwrapper/configurationmanager_wrap.h | 51 ++++++++++++-----------
src/qtwrapper/instancemanager_wrap.h | 4 +-
13 files changed, 48 insertions(+), 47 deletions(-)
diff --git a/cmake/FindRing.cmake b/cmake/FindRing.cmake
index c503d502..ca3fc3bc 100644
--- a/cmake/FindRing.cmake
+++ b/cmake/FindRing.cmake
@@ -4,12 +4,12 @@
SET(RING_FOUND true)
-IF(EXISTS ${CMAKE_INSTALL_PREFIX}/include/dring/dring.h)
- SET(ring_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include/dring)
-ELSEIF(EXISTS ${RING_INCLUDE_DIR}/dring.h)
+IF(EXISTS ${CMAKE_INSTALL_PREFIX}/include/jami/jami.h)
+ SET(ring_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include/jami)
+ELSEIF(EXISTS ${RING_INCLUDE_DIR}/jami.h)
SET(ring_INCLUDE_DIRS ${RING_INCLUDE_DIR})
-ELSEIF(EXISTS ${RING_BUILD_DIR}/dring/dring.h)
- SET(ring_INCLUDE_DIRS ${RING_BUILD_DIR}/dring)
+ELSEIF(EXISTS ${RING_BUILD_DIR}/jami/jami.h)
+ SET(ring_INCLUDE_DIRS ${RING_BUILD_DIR}/jami)
ELSE()
MESSAGE(STATUS "Daemon header not found!
Add -DRING_BUILD_DIR or -DCMAKE_INSTALL_PREFIX")
diff --git a/make-lrc.py b/make-lrc.py
index 5fb44535..018982ae 100644
--- a/make-lrc.py
+++ b/make-lrc.py
@@ -154,7 +154,7 @@ def generate(force, qtver, sdk, toolset, arch):
'-DQt5Concurrent_DIR=' + qt_cmake_dir + 'Qt5Concurrent',
'-DQt5Gui_DIR=' + qt_cmake_dir + 'Qt5Gui',
'-Dring_BIN=' + daemon_bin,
- '-DRING_INCLUDE_DIR=' + daemon_dir + '\\src\\dring',
+ '-DRING_INCLUDE_DIR=' + daemon_dir + '\\src\\jami',
'-DCMAKE_SYSTEM_VERSION=' + sdk
]
if not os.path.exists(build_dir):
diff --git a/src/api/contactmodel.h b/src/api/contactmodel.h
index 83f43cf9..c111ff7b 100644
--- a/src/api/contactmodel.h
+++ b/src/api/contactmodel.h
@@ -154,7 +154,7 @@ Q_SIGNALS:
const MapStringString& payloads) const;
/**
* Connect this signal to know when a file transfer interaction is incoming
- * @param dringId Daemon's ID for incoming transfer
+ * @param fileId Daemon's ID for incoming transfer
* @param transferInfo DataTransferInfo structure from daemon
*/
void newAccountTransfer(const QString& fileId, datatransfer::Info info) const;
diff --git a/src/callbackshandler.cpp b/src/callbackshandler.cpp
index 0f912104..71a641a3 100644
--- a/src/callbackshandler.cpp
+++ b/src/callbackshandler.cpp
@@ -586,7 +586,7 @@ CallbacksHandler::slotDataTransferEvent(const QString& accountId,
}
// WARNING: info.status could be INVALID in case of async signaling
- // So listeners must only take account of dringId in such case.
+ // So listeners must only take account of fileId in such case.
// Is useful for "termination" status like unjoinable_peer.
switch (event) {
diff --git a/src/contactmodel.cpp b/src/contactmodel.cpp
index ee2cacff..265b5b75 100644
--- a/src/contactmodel.cpp
+++ b/src/contactmodel.cpp
@@ -191,7 +191,7 @@ public Q_SLOTS:
/**
* Listen from callbacksHandler to know when a file transfer interaction is incoming
- * @param dringId Daemon's ID for incoming transfer
+ * @param fileId Daemon's ID for incoming transfer
* @param transferInfo DataTransferInfo structure from daemon
*/
void slotNewAccountTransfer(const QString& fileId, datatransfer::Info info);
diff --git a/src/dbus/callmanager.cpp b/src/dbus/callmanager.cpp
index e93ec1ff..cf06d2f3 100644
--- a/src/dbus/callmanager.cpp
+++ b/src/dbus/callmanager.cpp
@@ -36,12 +36,12 @@ CallManager::instance()
if (!interface->connection().isConnected()) {
GlobalInstances::dBusErrorHandler().connectionError(
- "Error : dring not connected. Service " + interface->service()
+ "Error : jamid not connected. Service " + interface->service()
+ " not connected. From call manager interface.");
}
if (!interface->isValid()) {
GlobalInstances::dBusErrorHandler().invalidInterfaceError(
- "Error : dring is not available, make sure it is running");
+ "Error : jamid is not available, make sure it is running");
}
#endif
return *interface;
diff --git a/src/dbus/configurationmanager.cpp b/src/dbus/configurationmanager.cpp
index 7537355a..2791c550 100644
--- a/src/dbus/configurationmanager.cpp
+++ b/src/dbus/configurationmanager.cpp
@@ -34,12 +34,12 @@ ConfigurationManager::instance()
QDBusConnection::sessionBus());
if (!interface->connection().isConnected()) {
GlobalInstances::dBusErrorHandler().connectionError(
- "Error : dring not connected. Service " + interface->service()
+ "Error : jamid not connected. Service " + interface->service()
+ " not connected. From configuration manager interface.");
}
if (!interface->isValid()) {
GlobalInstances::dBusErrorHandler().invalidInterfaceError(
- "Error : dring is not available, make sure it is running");
+ "Error : jamid is not available, make sure it is running");
}
#endif
return *interface;
diff --git a/src/dbus/instancemanager.cpp b/src/dbus/instancemanager.cpp
index 8b34ee1b..7c2e16ab 100644
--- a/src/dbus/instancemanager.cpp
+++ b/src/dbus/instancemanager.cpp
@@ -43,7 +43,7 @@ InstanceManager::instance(bool muteDring)
if (!interface->connection().isConnected()) {
GlobalInstances::dBusErrorHandler().connectionError(
- "Error : dring not connected. Service " + interface->service()
+ "Error : jamid not connected. Service " + interface->service()
+ " not connected. From instance interface.");
}
static bool registered = false;
diff --git a/src/dbus/pluginmanager.cpp b/src/dbus/pluginmanager.cpp
index 17bec082..064082eb 100644
--- a/src/dbus/pluginmanager.cpp
+++ b/src/dbus/pluginmanager.cpp
@@ -34,12 +34,12 @@ PluginManager::instance()
if (!interface->connection().isConnected()) {
GlobalInstances::dBusErrorHandler().connectionError(
- "Error : dring not connected. Service " + interface->service()
+ "Error : jamid not connected. Service " + interface->service()
+ " not connected. From presence interface.");
}
if (!interface->isValid()) {
GlobalInstances::dBusErrorHandler().invalidInterfaceError(
- "Error : dring is not available, make sure it is running");
+ "Error : jamid is not available, make sure it is running");
}
#endif
return *interface;
diff --git a/src/dbus/presencemanager.cpp b/src/dbus/presencemanager.cpp
index 2dc7777e..d3f42109 100644
--- a/src/dbus/presencemanager.cpp
+++ b/src/dbus/presencemanager.cpp
@@ -34,12 +34,12 @@ PresenceManager::instance()
if (!interface->connection().isConnected()) {
GlobalInstances::dBusErrorHandler().connectionError(
- "Error : dring not connected. Service " + interface->service()
+ "Error : jamid not connected. Service " + interface->service()
+ " not connected. From presence interface.");
}
if (!interface->isValid()) {
GlobalInstances::dBusErrorHandler().invalidInterfaceError(
- "Error : dring is not available, make sure it is running");
+ "Error : jamid is not available, make sure it is running");
}
#endif
return *interface;
diff --git a/src/dbus/videomanager.cpp b/src/dbus/videomanager.cpp
index 2063ac7f..975d5840 100644
--- a/src/dbus/videomanager.cpp
+++ b/src/dbus/videomanager.cpp
@@ -34,12 +34,12 @@ VideoManager::instance()
QDBusConnection::sessionBus());
if (!interface->connection().isConnected()) {
GlobalInstances::dBusErrorHandler().connectionError(
- "Error : dring not connected. Service " + interface->service()
+ "Error : jamid not connected. Service " + interface->service()
+ " not connected. From video manager interface.");
}
if (!interface->isValid()) {
GlobalInstances::dBusErrorHandler().invalidInterfaceError(
- "Error : dring is not available, make sure it is running");
+ "Error : jamid is not available, make sure it is running");
}
#endif
return *interface;
diff --git a/src/qtwrapper/configurationmanager_wrap.h b/src/qtwrapper/configurationmanager_wrap.h
index 250baa74..94d228e7 100644
--- a/src/qtwrapper/configurationmanager_wrap.h
+++ b/src/qtwrapper/configurationmanager_wrap.h
@@ -811,18 +811,18 @@ public Q_SLOTS: // METHODS
uint32_t sendFileLegacy(const DataTransferInfo& lrc_info, DRing::DataTransferId& id)
{
- DRing::DataTransferInfo dring_info;
- dring_info.accountId = lrc_info.accountId.toStdString();
- dring_info.lastEvent = decltype(dring_info.lastEvent)(lrc_info.lastEvent);
- dring_info.flags = lrc_info.flags;
- dring_info.totalSize = lrc_info.totalSize;
- dring_info.bytesProgress = lrc_info.bytesProgress;
- dring_info.peer = lrc_info.peer.toStdString();
- dring_info.conversationId = lrc_info.conversationId.toStdString();
- dring_info.displayName = lrc_info.displayName.toStdString();
- dring_info.path = lrc_info.path.toStdString();
- dring_info.mimetype = lrc_info.mimetype.toStdString();
- return uint32_t(DRing::sendFileLegacy(dring_info, id));
+ DRing::DataTransferInfo transfer_info;
+ transfer_info.accountId = lrc_info.accountId.toStdString();
+ transfer_info.lastEvent = decltype(transfer_info.lastEvent)(lrc_info.lastEvent);
+ transfer_info.flags = lrc_info.flags;
+ transfer_info.totalSize = lrc_info.totalSize;
+ transfer_info.bytesProgress = lrc_info.bytesProgress;
+ transfer_info.peer = lrc_info.peer.toStdString();
+ transfer_info.conversationId = lrc_info.conversationId.toStdString();
+ transfer_info.displayName = lrc_info.displayName.toStdString();
+ transfer_info.path = lrc_info.path.toStdString();
+ transfer_info.mimetype = lrc_info.mimetype.toStdString();
+ return uint32_t(DRing::sendFileLegacy(transfer_info, id));
}
void sendFile(const QString& accountId,
@@ -840,19 +840,20 @@ public Q_SLOTS: // METHODS
uint32_t dataTransferInfo(QString accountId, QString transfer_id, DataTransferInfo& lrc_info)
{
- DRing::DataTransferInfo dring_info;
- auto error = uint32_t(
- DRing::dataTransferInfo(accountId.toStdString(), transfer_id.toStdString(), dring_info));
- lrc_info.accountId = QString::fromStdString(dring_info.accountId);
- lrc_info.lastEvent = quint32(dring_info.lastEvent);
- lrc_info.flags = dring_info.flags;
- lrc_info.totalSize = dring_info.totalSize;
- lrc_info.bytesProgress = dring_info.bytesProgress;
- lrc_info.peer = QString::fromStdString(dring_info.peer);
- lrc_info.conversationId = QString::fromStdString(dring_info.conversationId);
- lrc_info.displayName = QString::fromStdString(dring_info.displayName);
- lrc_info.path = QString::fromStdString(dring_info.path);
- lrc_info.mimetype = QString::fromStdString(dring_info.mimetype);
+ DRing::DataTransferInfo transfer_info;
+ auto error = uint32_t(DRing::dataTransferInfo(accountId.toStdString(),
+ transfer_id.toStdString(),
+ transfer_info));
+ lrc_info.accountId = QString::fromStdString(transfer_info.accountId);
+ lrc_info.lastEvent = quint32(transfer_info.lastEvent);
+ lrc_info.flags = transfer_info.flags;
+ lrc_info.totalSize = transfer_info.totalSize;
+ lrc_info.bytesProgress = transfer_info.bytesProgress;
+ lrc_info.peer = QString::fromStdString(transfer_info.peer);
+ lrc_info.conversationId = QString::fromStdString(transfer_info.conversationId);
+ lrc_info.displayName = QString::fromStdString(transfer_info.displayName);
+ lrc_info.path = QString::fromStdString(transfer_info.path);
+ lrc_info.mimetype = QString::fromStdString(transfer_info.mimetype);
return error;
}
diff --git a/src/qtwrapper/instancemanager_wrap.h b/src/qtwrapper/instancemanager_wrap.h
index ad37b2f2..024fedce 100644
--- a/src/qtwrapper/instancemanager_wrap.h
+++ b/src/qtwrapper/instancemanager_wrap.h
@@ -27,7 +27,7 @@
#include <QVariant>
#include <QTimer>
-#include "dring.h"
+#include "jami.h"
#include "../typedefs.h"
#include "conversions_wrap.hpp"
@@ -41,7 +41,7 @@ public:
InstanceManagerInterface(bool muteDring = false);
~InstanceManagerInterface();
- // TODO: These are not present in dring.h
+ // TODO: These are not present in jami.h
public Q_SLOTS: // METHODS
void Register(int pid, const QString& name)
--
GitLab