aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Lima <hugo.lima@openbossa.org>2010-02-18 17:48:59 -0200
committerHugo Lima <hugo.lima@openbossa.org>2010-02-18 18:00:49 -0200
commit3599b75f885983aa87e8ef8baf0fb2c65ef175cb (patch)
tree502649d75b4e6ebb956c7da2ba47c775166c8d79
parent20077974e87ea27bb4710aaa89edd0bf97ba60ce (diff)
Put all custom converters inside Shiboken namespace.
-rw-r--r--PySide/QtCore/qbool_conversions.h2
-rw-r--r--PySide/QtCore/qhash_conversions.h2
-rw-r--r--PySide/QtCore/qlist_conversions.h2
-rw-r--r--PySide/QtCore/qmap_conversions.h2
-rw-r--r--PySide/QtCore/qpair_conversions.h2
-rw-r--r--PySide/QtCore/qset_conversions.h2
-rw-r--r--PySide/QtCore/qstring_conversions.h2
-rw-r--r--PySide/QtCore/qvariant_conversions.h2
-rw-r--r--PySide/QtCore/qvector_conversions.h2
-rw-r--r--PySide/QtGui/qpixmap_conversion.h2
10 files changed, 20 insertions, 0 deletions
diff --git a/PySide/QtCore/qbool_conversions.h b/PySide/QtCore/qbool_conversions.h
index 39bd51ae4..7559b3c09 100644
--- a/PySide/QtCore/qbool_conversions.h
+++ b/PySide/QtCore/qbool_conversions.h
@@ -1,3 +1,4 @@
+namespace Shiboken {
template <>
struct Converter<QBool> : public ConverterBase<QBool>
{
@@ -12,3 +13,4 @@ struct Converter<QBool> : public ConverterBase<QBool>
return QBool(pyobj == Py_True);
}
};
+}
diff --git a/PySide/QtCore/qhash_conversions.h b/PySide/QtCore/qhash_conversions.h
index b1aa9c2a5..881704469 100644
--- a/PySide/QtCore/qhash_conversions.h
+++ b/PySide/QtCore/qhash_conversions.h
@@ -1,3 +1,4 @@
+namespace Shiboken {
template <typename qhash>
struct Converter_qhash
{
@@ -42,3 +43,4 @@ struct Converter_qhash
template<typename KT, typename VT>
struct Converter<QHash<KT, VT> > : Converter_qhash<QHash<KT, VT> > {};
+}
diff --git a/PySide/QtCore/qlist_conversions.h b/PySide/QtCore/qlist_conversions.h
index 4ccfbe5cf..aa323054f 100644
--- a/PySide/QtCore/qlist_conversions.h
+++ b/PySide/QtCore/qlist_conversions.h
@@ -1,2 +1,4 @@
+namespace Shiboken {
template<typename T>
struct Converter<QList<T> > : Converter_std_list<QList<T> > {};
+}
diff --git a/PySide/QtCore/qmap_conversions.h b/PySide/QtCore/qmap_conversions.h
index d670605da..f7cd2c85b 100644
--- a/PySide/QtCore/qmap_conversions.h
+++ b/PySide/QtCore/qmap_conversions.h
@@ -1,3 +1,4 @@
+namespace Shiboken {
template <typename qmap>
struct Converter_qmap
{
@@ -42,3 +43,4 @@ struct Converter_qmap
template<typename KT, typename VT>
struct Converter<QMap<KT, VT> > : Converter_qmap<QMap<KT, VT> > {};
+}
diff --git a/PySide/QtCore/qpair_conversions.h b/PySide/QtCore/qpair_conversions.h
index 54eaaa61f..27a3c4a63 100644
--- a/PySide/QtCore/qpair_conversions.h
+++ b/PySide/QtCore/qpair_conversions.h
@@ -1,2 +1,4 @@
+namespace Shiboken {
template<typename FT, typename ST>
struct Converter<QPair<FT, ST> > : Converter_std_pair<QPair<FT, ST> > {};
+}
diff --git a/PySide/QtCore/qset_conversions.h b/PySide/QtCore/qset_conversions.h
index 183f2ce06..60f7d076f 100644
--- a/PySide/QtCore/qset_conversions.h
+++ b/PySide/QtCore/qset_conversions.h
@@ -1,3 +1,4 @@
+namespace Shiboken {
template <typename qset>
struct Converter_qset
{
@@ -40,3 +41,4 @@ struct Converter_qset
template<typename T>
struct Converter<QSet<T> > : Converter_qset<QSet<T> > {};
+}
diff --git a/PySide/QtCore/qstring_conversions.h b/PySide/QtCore/qstring_conversions.h
index b2dc61952..e0b8ce09e 100644
--- a/PySide/QtCore/qstring_conversions.h
+++ b/PySide/QtCore/qstring_conversions.h
@@ -1,3 +1,4 @@
+namespace Shiboken {
inline bool Converter< QString >::isConvertible(PyObject* pyobj)
{
return PyString_Check(pyobj)
@@ -51,3 +52,4 @@ inline QString Converter< QString >::toCpp(PyObject* pyobj)
#endif
return *SbkQString_cptr(pyobj);
}
+}
diff --git a/PySide/QtCore/qvariant_conversions.h b/PySide/QtCore/qvariant_conversions.h
index 43205f006..d71516203 100644
--- a/PySide/QtCore/qvariant_conversions.h
+++ b/PySide/QtCore/qvariant_conversions.h
@@ -29,6 +29,7 @@ struct QMetaTypeId< PyObjectHolder >
};
QT_END_NAMESPACE
+namespace Shiboken {
// all types are convertible to QVariant
inline bool Converter<QVariant>::isConvertible(PyObject* pyobj)
{
@@ -81,3 +82,4 @@ inline QVariant Converter<QVariant>::toCpp(PyObject* pyobj)
return QVariant(typeCode, reinterpret_cast<SbkBaseWrapper*>(pyobj)->cptr);
}
}
+}
diff --git a/PySide/QtCore/qvector_conversions.h b/PySide/QtCore/qvector_conversions.h
index df70713f2..f3470f4dc 100644
--- a/PySide/QtCore/qvector_conversions.h
+++ b/PySide/QtCore/qvector_conversions.h
@@ -1,2 +1,4 @@
+namespace Shiboken {
template<typename T>
struct Converter<QVector<T> > : Converter_std_list<QVector<T> > {};
+}
diff --git a/PySide/QtGui/qpixmap_conversion.h b/PySide/QtGui/qpixmap_conversion.h
index 18e3ce910..411592dd2 100644
--- a/PySide/QtGui/qpixmap_conversion.h
+++ b/PySide/QtGui/qpixmap_conversion.h
@@ -1,3 +1,4 @@
+namespace Shiboken {
inline bool Converter< QPixmap >::isConvertible(PyObject* pyobj)
{
bool isVariant = SbkQVariant_Check(pyobj);
@@ -25,3 +26,4 @@ inline QPixmap Converter< QPixmap >::toCpp(PyObject* pyobj)
return *SbkQPixmap_cptr(pyobj);
}
+}