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
parent 8afef6e4
......@@ -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")
......
......@@ -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):
......
......@@ -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;
......
......@@ -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) {
......
......@@ -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);
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
}
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment