From a8ae0680f23ca5e702a662cf36a465b7a7b2788a Mon Sep 17 00:00:00 2001
From: Hugo Parente Lima <hugo.pl@gmail.com>
Date: Tue, 23 Nov 2010 14:37:16 -0200
Subject: Adapt to API changes in libshiboken.

---
 PySide/QtGui/qpixmap_conversion.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'PySide/QtGui/qpixmap_conversion.h')

diff --git a/PySide/QtGui/qpixmap_conversion.h b/PySide/QtGui/qpixmap_conversion.h
index f6a2e58eb..fc49af6be 100644
--- a/PySide/QtGui/qpixmap_conversion.h
+++ b/PySide/QtGui/qpixmap_conversion.h
@@ -8,15 +8,15 @@ inline bool Converter<QPixmap>::isConvertible(PyObject* pyobj)
 {
     if (ValueTypeConverter<QPixmap>::isConvertible(pyobj))
         return true;
-    SbkBaseType* shiboType = reinterpret_cast<SbkBaseType*>(SbkType<QPixmap>());
-    bool isVariant = Converter<QVariant>::checkType(pyobj);
+    SbkObjectType* shiboType = reinterpret_cast<SbkObjectType*>(SbkType<QPixmap>());
+    bool isVariant = Shiboken::Converter<QVariant>::checkType(pyobj);
     if (isVariant) {
-        QVariant var(Converter<QVariant>::toCpp(pyobj));
+        QVariant var(Shiboken::Converter<QVariant>::toCpp(pyobj));
         return var.type() == QVariant::Pixmap;
-    } else if (Converter<QSize>::checkType(pyobj) || Converter<QString>::checkType(pyobj)) {
+    } else if (Shiboken::Converter<QSize>::checkType(pyobj) || Shiboken::Converter<QString>::checkType(pyobj)) {
         return true;
     } else {
-        return Shiboken::BaseType::isExternalConvertible(shiboType, pyobj);
+        return Shiboken::ObjectType::isExternalConvertible(shiboType, pyobj);
     }
     return false;
 
@@ -24,7 +24,7 @@ inline bool Converter<QPixmap>::isConvertible(PyObject* pyobj)
 
 inline QPixmap Converter<QPixmap>::toCpp(PyObject* pyobj)
 {
-    SbkBaseType* shiboType = reinterpret_cast<SbkBaseType*>(SbkType<QPixmap>());
+    SbkObjectType* shiboType = reinterpret_cast<SbkObjectType*>(SbkType<QPixmap>());
     bool isVariant = Converter<QVariant>::checkType(pyobj);
     if (isVariant) {
         QVariant var(Converter<QVariant>::toCpp(pyobj));
@@ -33,8 +33,8 @@ inline QPixmap Converter<QPixmap>::toCpp(PyObject* pyobj)
         return QPixmap(Shiboken::Converter<QSize >::toCpp(pyobj));
     } else if (Converter<QString>::checkType(pyobj)) {
         return QPixmap(Shiboken::Converter<QString >::toCpp(pyobj));
-    } else if (Shiboken::BaseType::isExternalConvertible(shiboType, pyobj) && Shiboken::BaseType::hasExternalCppConversions(shiboType)) {
-        QPixmap* cptr = reinterpret_cast<QPixmap*>(Shiboken::BaseType::callExternalCppConversion(shiboType, pyobj));
+    } else if (Shiboken::ObjectType::isExternalConvertible(shiboType, pyobj) && Shiboken::ObjectType::hasExternalCppConversions(shiboType)) {
+        QPixmap* cptr = reinterpret_cast<QPixmap*>(Shiboken::ObjectType::callExternalCppConversion(shiboType, pyobj));
         std::auto_ptr<QPixmap> cptr_auto_ptr(cptr);
         return *cptr;
     }
-- 
cgit v1.2.3