Commit 8b19a794 authored by Julien Wintz's avatar Julien Wintz
Browse files

Do not override dtkLog in Base classes (applies for the widget factory

as well).
parent d4d7eedb
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
// Code: // Code:
#include <dtkLog>
#include "dtkWidgetFactory.h" #include "dtkWidgetFactory.h"
template <typename T> dtkWidgetFactory<T>::dtkWidgetFactory(void) template <typename T> dtkWidgetFactory<T>::dtkWidgetFactory(void)
...@@ -31,7 +33,7 @@ template <typename T> dtkWidgetFactory<T>::~dtkWidgetFactory(void) ...@@ -31,7 +33,7 @@ template <typename T> dtkWidgetFactory<T>::~dtkWidgetFactory(void)
template <typename T> void dtkWidgetFactory<T>::record(const QString& key, creator widget) template <typename T> void dtkWidgetFactory<T>::record(const QString& key, creator widget)
{ {
if (this->m_widgets.contains(key)) { if (this->m_widgets.contains(key)) {
qDebug() << Q_FUNC_INFO << "Factory already contains key" << key << ". Nothing is done"; dtkTrace() << Q_FUNC_INFO << "Factory already contains key" << key << ". Nothing is done";
return; return;
} }
......
...@@ -416,7 +416,7 @@ namespace Namespace { ...@@ -416,7 +416,7 @@ namespace Namespace {
$input = PyString_FromString($1.toUtf8().constData()); $input = PyString_FromString($1.toUtf8().constData());
} }
%define %QList_typemapsPtr(DATA_TYPE) // %define %QList_typemapsPtr(DATA_TYPE)
%typemap(out) QList<DATA_TYPE> { %typemap(out) QList<DATA_TYPE> {
$result = PyList_New($1.size()); $result = PyList_New($1.size());
...@@ -439,11 +439,11 @@ namespace Namespace { ...@@ -439,11 +439,11 @@ namespace Namespace {
$input = list; $input = list;
} }
%enddef // %QList_typemapsPtr() // %enddef // %QList_typemapsPtr()
%QList_typemapsPtr(dtkCorePlugin *) %QList_typemapsPtr(dtkCorePlugin *)
%define %QList_typemaps(DATA_TYPE) // %define %QList_typemaps(DATA_TYPE)
%typemap(out) QList<DATA_TYPE> { %typemap(out) QList<DATA_TYPE> {
$result = PyList_New($1.size()); $result = PyList_New($1.size());
...@@ -468,7 +468,7 @@ namespace Namespace { ...@@ -468,7 +468,7 @@ namespace Namespace {
$input = list; $input = list;
} }
%enddef // %QList_typemaps() // %enddef // %QList_typemaps()
%typemap(out) QStringList { %typemap(out) QStringList {
$result = PyList_New($1.size()); $result = PyList_New($1.size());
......
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