MAJ terminée. Nous sommes passés en version 14.6.2 . Pour consulter les "releases notes" associées c'est ici :

https://about.gitlab.com/releases/2022/01/11/security-release-gitlab-14-6-2-released/
https://about.gitlab.com/releases/2022/01/04/gitlab-14-6-1-released/

Commit af56709d authored by KLOCZKO Thibaud's avatar KLOCZKO Thibaud
Browse files

Make it compile with Log layer.

parent 75efd95e
......@@ -4,9 +4,9 @@
* Copyright (C) 2008 - Julien Wintz, Inria.
* Created: Fri Nov 7 16:01:09 2008 (+0100)
* Version: $Id$
* Last-Updated: lun. févr. 3 16:48:58 2014 (+0100)
* Last-Updated: mar. févr. 4 11:04:38 2014 (+0100)
* By: Thibaud Kloczko
* Update #: 502
* Update #: 507
*/
/* Commentary:
......@@ -142,7 +142,7 @@ void dtkAbstractData::copy(const dtkAbstractObject& other)
d->thumbnails = data.d_func()->thumbnails;
} else {
dtkWarning(dtkLoggingCategory::defaultCategory()) << "Other is not of same type than this, slicing is occuring.";
dtkWarning() << "Other is not of same type than this, slicing is occuring.";
}
}
......@@ -266,7 +266,7 @@ void dtkAbstractData::enableReader(const QString& reader)
if (it != d->readers.end())
it.value() = true;
else
dtkDebug(dtkLoggingCategory::defaultCategory()) << this->identifier() << " has no such reader: " << reader;
dtkDebug() << this->identifier() << " has no such reader: " << reader;
}
void dtkAbstractData::disableReader(const QString& reader)
......@@ -288,7 +288,7 @@ void dtkAbstractData::enableWriter(const QString& writer)
if (it != d->writers.end())
it.value() = true;
else
dtkDebug(dtkLoggingCategory::defaultCategory()) << this->identifier() << " has no such writer: " << writer;
dtkDebug() << this->identifier() << " has no such writer: " << writer;
}
void dtkAbstractData::disableWriter(const QString& writer)
......@@ -310,7 +310,7 @@ void dtkAbstractData::enableConverter(const QString& converter)
if (it != d->converters.end())
it.value() = true;
else
dtkDebug(dtkLoggingCategory::defaultCategory()) << this->identifier() << " has no such converter: " << converter;
dtkDebug() << this->identifier() << " has no such converter: " << converter;
}
void dtkAbstractData::disableConverter(const QString& converter)
......@@ -332,7 +332,7 @@ void dtkAbstractData::enableSerializer(const QString& serializer)
if (it != d->serializers.end())
it.value() = true;
else
dtkDebug(dtkLoggingCategory::defaultCategory()) << this->identifier() << " has no such serializer: " << serializer;
dtkDebug() << this->identifier() << " has no such serializer: " << serializer;
}
void dtkAbstractData::disableSerializer(const QString& serializer)
......@@ -354,7 +354,7 @@ void dtkAbstractData::enableDeserializer(const QString& deserializer)
if (it != d->deserializers.end())
it.value() = true;
else
dtkDebug(dtkLoggingCategory::defaultCategory()) << this->identifier() << " has no such deserializer: " << deserializer;
dtkDebug() << this->identifier() << " has no such deserializer: " << deserializer;
}
void dtkAbstractData::disableDeserializer(const QString& deserializer)
......@@ -649,7 +649,7 @@ dtkAbstractData *dtkAbstractData::deserialize(const QByteArray &array)
deserialized = deserializer->deserialize(array);
if(!deserialized)
dtkDebug(dtkLoggingCategory::defaultCategory()) << "deserializer failed, try another one ...";
dtkDebug() << "deserializer failed, try another one ...";
else
break;
}
......
......@@ -4,9 +4,9 @@
* Copyright (C) 2011 - Thibaud Kloczko, Inria.
* Created: Thu Sep 22 14:34:08 2011 (+0200)
* Version: $Id$
* Last-Updated: lun. févr. 3 16:51:39 2014 (+0100)
* Last-Updated: mar. févr. 4 11:05:04 2014 (+0100)
* By: Thibaud Kloczko
* Update #: 188
* Update #: 192
*/
/* Commentary:
......@@ -34,13 +34,13 @@
template <typename T> const QVector<dtkAbstractData *>& dtkUpCastIntoDataVector(const QVector<T>& vector)
{
if (vector.isEmpty()) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Input vector is empty. Casting failed. Returns empty vector.";
dtkDebug() << "Input vector is empty. Casting failed. Returns empty vector.";
return *(new QVector<dtkAbstractData *>());
}
dtkAbstractData *data = qobject_cast<dtkAbstractData *>(vector.at(0));
if (!data) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Input vector is not made of dtkAbstractData*. Casting failed. Returns empty vector.";
dtkDebug() << "Input vector is not made of dtkAbstractData*. Casting failed. Returns empty vector.";
return *(new QVector<dtkAbstractData *>());
}
......@@ -56,13 +56,13 @@ template <typename T> const QVector<dtkAbstractData *>& dtkUpCastIntoDataVector(
template <typename T> QVector<dtkAbstractData *>& dtkUpCastIntoDataVector(QVector<T>& vector)
{
if (vector.isEmpty()) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Input vector is empty. Casting failed. Returns empty vector.";
dtkDebug() << "Input vector is empty. Casting failed. Returns empty vector.";
return *(new QVector<dtkAbstractData *>());
}
dtkAbstractData *data = qobject_cast<dtkAbstractData *>(vector.at(0));
if (!data) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Input vector is not made of dtkAbstractData*. Casting failed. Returns empty vector.";
dtkDebug() << "Input vector is not made of dtkAbstractData*. Casting failed. Returns empty vector.";
return *(new QVector<dtkAbstractData *>());
}
......@@ -79,13 +79,13 @@ template <typename T> QVector<dtkAbstractData *>& dtkUpCastIntoDataVector(QVecto
template <typename T> const QList<dtkAbstractData *>& dtkUpCastIntoDataList(const QList<T>& list)
{
if (list.isEmpty()) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Input list is empty. Casting failed. Returns empty list.";
dtkDebug() << "Input list is empty. Casting failed. Returns empty list.";
return *(new QList<dtkAbstractData *>());
}
dtkAbstractData *data = qobject_cast<dtkAbstractData *>(list.at(0));
if (!data) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Input list is not made of dtkAbstractData*. Casting failed. Returns empty list.";
dtkDebug() << "Input list is not made of dtkAbstractData*. Casting failed. Returns empty list.";
return *(new QList<dtkAbstractData *>());
}
......@@ -101,13 +101,13 @@ template <typename T> const QList<dtkAbstractData *>& dtkUpCastIntoDataList(cons
template <typename T> QList<dtkAbstractData *>& dtkUpCastIntoDataList(QList<T>& list)
{
if (list.isEmpty()) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Input list is empty. Casting failed. Returns empty list.";
dtkDebug() << "Input list is empty. Casting failed. Returns empty list.";
return *(new QList<dtkAbstractData *>());
}
dtkAbstractData *data = qobject_cast<dtkAbstractData *>(list.at(0));
if (!data) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Input list is not made of dtkAbstractData*. Casting failed. Returns empty list.";
dtkDebug() << "Input list is not made of dtkAbstractData*. Casting failed. Returns empty list.";
return *(new QList<dtkAbstractData *>());
}
......@@ -124,13 +124,13 @@ template <typename T> QList<dtkAbstractData *>& dtkUpCastIntoDataList(QList<T>&
template <typename T> const QVector<T>& dtkDownCastFromDataVector(const QVector<dtkAbstractData *>& vector)
{
if (vector.isEmpty()) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Input vector is empty. Casting failed. Returns empty vector.";
dtkDebug() << "Input vector is empty. Casting failed. Returns empty vector.";
return *(new QVector<T>());
}
T data = dynamic_cast<T>(vector.at(0));
if (!data) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Output vector is not made of dtkAbstractData*. Casting failed. Returns empty vector.";
dtkDebug() << "Output vector is not made of dtkAbstractData*. Casting failed. Returns empty vector.";
return *(new QVector<T>());
}
......@@ -146,13 +146,13 @@ template <typename T> const QVector<T>& dtkDownCastFromDataVector(const QVector<
template <typename T> QVector<T>& dtkDownCastFromDataVector(QVector<dtkAbstractData *>& vector)
{
if (vector.isEmpty()) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Input vector is empty. Casting failed. Returns empty vector.";
dtkDebug() << "Input vector is empty. Casting failed. Returns empty vector.";
return *(new QVector<T>());
}
T data = qobject_cast<T>(vector.at(0));
if (!data) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Output vector is not made of dtkAbstractData*. Casting failed. Returns empty vector.";
dtkDebug() << "Output vector is not made of dtkAbstractData*. Casting failed. Returns empty vector.";
return *(new QVector<T>());
}
......@@ -169,13 +169,13 @@ template <typename T> QVector<T>& dtkDownCastFromDataVector(QVector<dtkAbstractD
template <typename T> const QList<T>& dtkDownCastFromDataList(const QList<dtkAbstractData *>& list)
{
if (list.isEmpty()) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Input list is empty. Casting failed. Returns empty list.";
dtkDebug() << "Input list is empty. Casting failed. Returns empty list.";
return *(new QList<T>());
}
T data = qobject_cast<T>(list.at(0));
if (!data) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Output list is not made of dtkAbstractData*. Casting failed. Returns empty list.";
dtkDebug() << "Output list is not made of dtkAbstractData*. Casting failed. Returns empty list.";
return *(new QList<T>());
}
......@@ -191,13 +191,13 @@ template <typename T> const QList<T>& dtkDownCastFromDataList(const QList<dtkAbs
template <typename T> QList<T>& dtkDownCastFromDataList(QList<dtkAbstractData *>& list)
{
if (list.isEmpty()) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Input list is empty. Casting failed. Returns empty list.";
dtkDebug() << "Input list is empty. Casting failed. Returns empty list.";
return *(new QList<T>());
}
T data = qobject_cast<T>(list.at(0));
if (!data) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Output list is not made of dtkAbstractData*. Casting failed. Returns empty list.";
dtkDebug() << "Output list is not made of dtkAbstractData*. Casting failed. Returns empty list.";
return *(new QList<T>());
}
......@@ -212,13 +212,13 @@ template <typename T> QList<T>& dtkDownCastFromDataList(QList<dtkAbstractData *>
template <typename T> dtkAbstractDataComposite *dtkAbstractDataCompositeFromVectorCopy(const QVector<T>& vector)
{
if (vector.isEmpty()) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Input vector is empty. Creation failed. Returns empty composite.";
dtkDebug() << "Input vector is empty. Creation failed. Returns empty composite.";
return NULL;
}
dtkAbstractData *data = qobject_cast<dtkAbstractData *>(vector.at(0));
if (!data) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Input vector is not made of dtkAbstractData*. Creation failed. Returns empty composite.";
dtkDebug() << "Input vector is not made of dtkAbstractData*. Creation failed. Returns empty composite.";
return NULL;
}
......@@ -233,13 +233,13 @@ template <typename T> dtkAbstractDataComposite *dtkAbstractDataCompositeFromVect
template <typename T> dtkAbstractDataComposite *dtkAbstractDataCompositeFromVectorCopy(QVector<T>& vector)
{
if (vector.isEmpty()) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Input vector is empty. Creation failed. Returns empty composite.";
dtkDebug() << "Input vector is empty. Creation failed. Returns empty composite.";
return NULL;
}
dtkAbstractData *data = qobject_cast<dtkAbstractData *>(vector.at(0));
if (!data) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Input vector is not made of dtkAbstractData*. Creation failed. Returns empty composite.";
dtkDebug() << "Input vector is not made of dtkAbstractData*. Creation failed. Returns empty composite.";
return NULL;
}
......@@ -254,13 +254,13 @@ template <typename T> dtkAbstractDataComposite *dtkAbstractDataCompositeFromVect
template <typename T> dtkAbstractDataComposite *dtkAbstractDataCompositeFromListCopy(const QList<T>& list)
{
if (list.isEmpty()) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Input list is empty. Creation failed. Returns empty composite.";
dtkDebug() << "Input list is empty. Creation failed. Returns empty composite.";
return NULL;
}
dtkAbstractData *data = qobject_cast<dtkAbstractData *>(list.at(0));
if (!data) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Input list is not made of dtkAbstractData*. Creation failed. Returns empty composite.";
dtkDebug() << "Input list is not made of dtkAbstractData*. Creation failed. Returns empty composite.";
return NULL;
}
......@@ -275,13 +275,13 @@ template <typename T> dtkAbstractDataComposite *dtkAbstractDataCompositeFromList
template <typename T> dtkAbstractDataComposite *dtkAbstractDataCompositeFromListCopy(QList<T>& list)
{
if (list.isEmpty()) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Input list is empty. Creation failed. Returns empty composite.";
dtkDebug() << "Input list is empty. Creation failed. Returns empty composite.";
return NULL;
}
dtkAbstractData *data = qobject_cast<dtkAbstractData *>(list.at(0));
if (!data) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Input list is not made of dtkAbstractData*. Creation failed. Returns empty composite.";
dtkDebug() << "Input list is not made of dtkAbstractData*. Creation failed. Returns empty composite.";
return NULL;
}
......
......@@ -4,9 +4,9 @@
* Copyright (C) 2008 - Julien Wintz, Inria.
* Created: Sat Feb 28 17:54:04 2009 (+0100)
* Version: $Id$
* Last-Updated: lun. févr. 3 16:51:49 2014 (+0100)
* Last-Updated: mar. févr. 4 11:05:37 2014 (+0100)
* By: Thibaud Kloczko
* Update #: 281
* Update #: 283
*/
/* Commentary:
......@@ -61,7 +61,7 @@ dtkAbstractObject::dtkAbstractObject(const dtkAbstractObject& other) : QObject(o
dtkAbstractObject::~dtkAbstractObject(void)
{
if ( d_ptr->count.deref()){
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Warning : deleting object of type " << this->metaObject()->className() << " with non-zero reference count";
dtkDebug() << "Warning : deleting object of type " << this->metaObject()->className() << " with non-zero reference count";
}
delete d_ptr;
......@@ -311,12 +311,12 @@ void dtkAbstractObject::addProperty(const QString& key, const QString& value)
void dtkAbstractObject::setProperty(const QString& key, const QString& value)
{
if(!d_ptr->values.contains(key)) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << this->metaObject()->className() << " has no such property:" << key;
dtkDebug() << this->metaObject()->className() << " has no such property:" << key;
return;
}
if(!d_ptr->values.value(key).contains(value)) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << this->metaObject()->className() << " has no such value:" << value << " for key: " << key;
dtkDebug() << this->metaObject()->className() << " has no such value:" << value << " for key: " << key;
return;
}
......@@ -348,7 +348,7 @@ bool dtkAbstractObject::hasProperty(const QString& key) const
QString dtkAbstractObject::property(const QString& key) const
{
if(!d_ptr->values.contains(key)) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << this->metaObject()->className() << "has no such property:" << key;
dtkDebug() << this->metaObject()->className() << "has no such property:" << key;
return QString();
}
......@@ -432,7 +432,7 @@ void dtkAbstractObject::onMetaDataSet(const QString& key, const QString& value)
QString dtkAbstractObject::metadata(const QString& key) const
{
if(!d_ptr->metadatas.contains(key)) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << this->metaObject()->className() << "has no such property:" << key;
dtkDebug() << this->metaObject()->className() << "has no such property:" << key;
return QString();
}
......@@ -442,7 +442,7 @@ QString dtkAbstractObject::metadata(const QString& key) const
QStringList dtkAbstractObject::metadatas(const QString& key) const
{
if(!d_ptr->metadatas.contains(key)) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << this->metaObject()->className() << "has no such property:" << key;
dtkDebug() << this->metaObject()->className() << "has no such property:" << key;
return QStringList();
}
......
......@@ -4,9 +4,9 @@
* Copyright (C) 2008 - Julien Wintz, Inria.
* Created: Fri Nov 7 15:54:10 2008 (+0100)
* Version: $Id$
* Last-Updated: lun. févr. 3 16:46:57 2014 (+0100)
* Last-Updated: mar. févr. 4 10:56:51 2014 (+0100)
* By: Thibaud Kloczko
* Update #: 123
* Update #: 124
*/
/* Commentary:
......@@ -116,7 +116,7 @@ QStringList dtkAbstractProcessFactory::implementations(const QString& interface)
if(d->interfaces.keys().contains(interface))
implementations << d->interfaces.values(interface);
else
dtkWarning(dtkLoggingCategory::defaultCategory()) << "There is no available implementation of " << interface ;
dtkWarning() << "There is no available implementation of " << interface ;
return implementations;
}
......
......@@ -4,9 +4,9 @@
* Copyright (C) 2008 - Julien Wintz, Inria.
* Created: Fri Nov 7 16:01:09 2008 (+0100)
* Version: $Id$
* Last-Updated: lun. févr. 3 16:50:57 2014 (+0100)
* Last-Updated: mar. févr. 4 11:05:15 2014 (+0100)
* By: Thibaud Kloczko
* Update #: 351
* Update #: 352
*/
/* Commentary:
......@@ -133,7 +133,7 @@ void dtkAbstractView::copy(const dtkAbstractObject& other)
d->interactors = view.d_func()->interactors;
} else {
dtkWarning(dtkLoggingCategory::defaultCategory()) << "Other is not of same type than this, slicing is occuring.";
dtkWarning() << "Other is not of same type than this, slicing is occuring.";
}
}
......@@ -332,7 +332,7 @@ void dtkAbstractView::resize(int width, int height)
void dtkAbstractView::addAnimator(dtkAbstractViewAnimator *animator)
{
if(animator->identifier().isEmpty()) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "No identifier specified for animator. Not add to" << this->identifier();
dtkDebug() << "No identifier specified for animator. Not add to" << this->identifier();
return;
}
......@@ -344,7 +344,7 @@ void dtkAbstractView::addAnimator(dtkAbstractViewAnimator *animator)
void dtkAbstractView::addNavigator(dtkAbstractViewNavigator *navigator)
{
if(navigator->identifier().isEmpty()) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "No identifier specified for navigator. Not add to" << this->identifier();
dtkDebug() << "No identifier specified for navigator. Not add to" << this->identifier();
return;
}
......@@ -356,7 +356,7 @@ void dtkAbstractView::addNavigator(dtkAbstractViewNavigator *navigator)
void dtkAbstractView::addInteractor(dtkAbstractViewInteractor *interactor)
{
if(interactor->identifier().isEmpty()) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "No identifier specified for interactor. Not add to" << this->identifier();
dtkDebug() << "No identifier specified for interactor. Not add to" << this->identifier();
return;
}
......@@ -375,7 +375,7 @@ void dtkAbstractView::enableAnimator(const QString& animator)
d->animators.value(animator)->setView(this);
d->animators.value(animator)->enable();
} else
dtkDebug(dtkLoggingCategory::defaultCategory()) << identifier() << " has no such animator: " << animator;
dtkDebug() << identifier() << " has no such animator: " << animator;
}
void dtkAbstractView::disableAnimator(const QString& animator)
......@@ -394,7 +394,7 @@ void dtkAbstractView::enableNavigator(const QString& navigator)
// d->navigators.value(navigator)->setView(this);
d->navigators.value(navigator)->enable();
} else
dtkDebug(dtkLoggingCategory::defaultCategory()) << identifier() << " has no such navigator: " << navigator;
dtkDebug() << identifier() << " has no such navigator: " << navigator;
}
void dtkAbstractView::disableNavigator(const QString& navigator)
......@@ -413,7 +413,7 @@ void dtkAbstractView::enableInteractor(const QString& interactor)
d->interactors.value(interactor)->setView(this);
d->interactors.value(interactor)->enable();
} else
dtkDebug(dtkLoggingCategory::defaultCategory()) << identifier() << " has no such interactor: " << interactor;
dtkDebug() << identifier() << " has no such interactor: " << interactor;
}
void dtkAbstractView::disableInteractor(const QString& interactor)
......
......@@ -4,9 +4,9 @@
* Copyright (C) 2008 - Julien Wintz, Inria.
* Created: Tue Aug 4 12:20:59 2009 (+0200)
* Version: $Id$
* Last-Updated: lun. févr. 3 16:49:48 2014 (+0100)
* Last-Updated: mar. févr. 4 10:58:11 2014 (+0100)
* By: Thibaud Kloczko
* Update #: 305
* Update #: 318
*/
/* Commentary:
......@@ -124,7 +124,7 @@ void dtkPluginManager::initialize(void)
foreach (QFileInfo entry, dir.entryInfoList())
loadPlugin(entry.absoluteFilePath());
} else {
dtkWarning(dtkLoggingCategory::defaultCategory()) << "Failed to load plugins from path " << path << ". Could not cd to directory.";
dtkWarning() << "Failed to load plugins from path " << path << ". Could not cd to directory.";
}
}
}
......@@ -168,7 +168,7 @@ void dtkPluginManager::load(const QString& name)
if(entry.fileName().contains(name))
loadPlugin(entry.absoluteFilePath());
} else {
dtkWarning(dtkLoggingCategory::defaultCategory()) << "Failed to load plugins from path " << path << ". Could not cd to directory.";
dtkWarning() << "Failed to load plugins from path " << path << ". Could not cd to directory.";
}
}
}
......@@ -200,7 +200,7 @@ void dtkPluginManager::unload(const QString& name)
if (this->plugin(name))
this->unloadPlugin(entry.absoluteFilePath());
} else {
dtkWarning(dtkLoggingCategory::defaultCategory()) << "Failed to load plugins from path " << path << ". Could not cd to directory.";
dtkWarning() << "Failed to load plugins from path " << path << ". Could not cd to directory.";
}
}
}
......@@ -220,7 +220,7 @@ void dtkPluginManager::readSettings(void)
settings.beginGroup("plugins");
if (!settings.contains("path")) {
dtkDebug(dtkLoggingCategory::defaultCategory()) << "Filling in empty path in settings with default path:" << defaultPath;
dtkDebug() << "Filling in empty path in settings with default path:" << defaultPath;
settings.setValue("path", defaultPath);
}
......@@ -229,8 +229,8 @@ void dtkPluginManager::readSettings(void)
settings.endGroup();
if(d->path.isEmpty()) {
dtkWarning(dtkLoggingCategory::defaultCategory()) << "Your dtk config does not seem to be set correctly.";
dtkWarning(dtkLoggingCategory::defaultCategory()) << "Please set plugins.path.";
dtkWarning() << "Your dtk config does not seem to be set correctly.";
dtkWarning() << "Please set plugins.path.";
}
}
......@@ -321,7 +321,7 @@ void dtkPluginManager::loadPlugin(const QString& path)
error += path;
error += " - ";
error += loader->errorString();
if(d->verboseLoading) { dtkDebug(dtkLoggingCategory::defaultCategory()) << error; }
if(d->verboseLoading) { dtkDebug() << error; }
emit loadError(error);
delete loader;
return;
......@@ -332,7 +332,7 @@ void dtkPluginManager::loadPlugin(const QString& path)
if(!plugin) {
QString error = "Unable to retrieve ";
error += path;
if(d->verboseLoading) { dtkDebug(dtkLoggingCategory::defaultCategory()) << error; }
if(d->verboseLoading) { dtkDebug() << error; }
emit loadError(error);
return;
}
......@@ -341,14 +341,14 @@ void dtkPluginManager::loadPlugin(const QString& path)
QString error = "Unable to initialize ";
error += plugin->name();
error += " plugin";
if(d->verboseLoading) { dtkTrace(dtkLoggingCategory::defaultCategory()) << error; }
if(d->verboseLoading) { dtkTrace() << error; }
emit loadError(error);
return;
}
d->loaders.insert(path, loader);
if(d->verboseLoading) { dtkTrace(dtkLoggingCategory::defaultCategory()) << "Loaded plugin " << plugin->name() << " from " << path; }
if(d->verboseLoading) { dtkTrace() << "Loaded plugin " << plugin->name() << " from " << path; }
emit loaded(plugin->name());
}
......@@ -366,19 +366,19 @@ void dtkPluginManager::unloadPlugin(const QString& path)
dtkPlugin *plugin = qobject_cast<dtkPlugin *>(d->loaders.value(path)->instance());
if(!plugin) {
if(d->verboseLoading) { dtkDebug(dtkLoggingCategory::defaultCategory()) << "dtkPluginManager - Unable to retrieve " << plugin->name() << " plugin"; }
if(d->verboseLoading) { dtkDebug() << "dtkPluginManager - Unable to retrieve " << plugin->name() << " plugin"; }
return;
}
if(!plugin->uninitialize()) {
if(d->verboseLoading) { dtkTrace(dtkLoggingCategory::defaultCategory()) << "Unable to uninitialize " << plugin->name() << " plugin"; }
if(d->verboseLoading) { dtkTrace() << "Unable to uninitialize " << plugin->name() << " plugin"; }
return;
}
QPluginLoader *loader = d->loaders.value(path);
if(!loader->unload()) {
if(d->verboseLoading) { dtkDebug(dtkLoggingCategory::defaultCategory()) << "dtkPluginManager - Unable to unload plugin: " << loader->errorString(); }
if(d->verboseLoading) { dtkDebug() << "dtkPluginManager - Unable to unload plugin: " << loader->errorString(); }
return;
}
......
......@@ -49,78 +49,78 @@ dtkDistributedCommunicator& dtkDistributedCommunicator::operator = (const dtkDis
void dtkDistributedCommunicator::initialize(void)
{
DTK_DEFAULT_IMPLEMENTATION;
//DTK_DEFAULT_IMPLEMENTATION;
}
dtkDistributedCommunicator *dtkDistributedCommunicator::spawn(QString cmd, qlonglong np)
{
DTK_DEFAULT_IMPLEMENTATION;
//DTK_DEFAULT_IMPLEMENTATION;
return new dtkDistributedCommunicator;
}
bool dtkDistributedCommunicator::initialized(void)
{
DTK_DEFAULT_IMPLEMENTATION;
//DTK_DEFAULT_IMPLEMENTATION;
return false;
}
void dtkDistributedCommunicator::uninitialize(void)
{
DTK_DEFAULT_IMPLEMENTATION;
//DTK_DEFAULT_IMPLEMENTATION;
}
int dtkDistributedCommunicator::rank(void)
{
DTK_DEFAULT_IMPLEMENTATION;
//DTK_DEFAULT_IMPLEMENTATION;
return -1;
}
int dtkDistributedCommunicator::size(void)
{
DTK_DEFAULT_IMPLEMENTATION;
//DTK_DEFAULT_IMPLEMENTATION;
return 0;
}
void dtkDistributedCommunicator::send(void *data, qint64 size, DataType dataType, qint16 target, int tag)
{
DTK_DEFAULT_IMPLEMENTATION;
//DTK_DEFAULT_IMPLEMENTATION;
}
void dtkDistributedCommunicator::send(dtkAbstractData *data, qint16 target, int tag)
{
DTK_DEFAULT_IMPLEMENTATION;
//DTK_DEFAULT_IMPLEMENTATION;
}