Deprecated functions marked as deprecated.

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Marcelo Lira <marcelo.lira@openbossa.org>

9 files changed, 27 insertions, 19 deletions

diff --git a/libpyside/destroylistener.h b/libpyside/destroylistener.h
index 54dda2c2e..0ba10399a 100644
--- a/libpyside/destroylistener.h
+++ b/libpyside/destroylistener.h
@@ -8,11 +8,12 @@
 namespace PySide
 {
 class DestroyListenerPrivate;
+/// \deprecated This class is deprecated and isn't used by libpyside anymore.
 class PYSIDE_API DestroyListener : public QObject
 {
     Q_OBJECT
     public:
-        static DestroyListener* instance();
+        PYSIDE_DEPRECATED(static DestroyListener* instance());
         static void destroy();
         void listen(QObject* obj);
 
diff --git a/libpyside/dynamicqmetaobject.h b/libpyside/dynamicqmetaobject.h
index 3ebaf1d08..3fbeffc3e 100644
--- a/libpyside/dynamicqmetaobject.h
+++ b/libpyside/dynamicqmetaobject.h
@@ -34,7 +34,7 @@ namespace PySide
 class DynamicQMetaObject : public QMetaObject
 {
 public:
-    DynamicQMetaObject(const char* className, const QMetaObject* metaObject); //deprecated
+    DynamicQMetaObject(const char* className, const QMetaObject* metaObject);
     DynamicQMetaObject(PyTypeObject* type, const QMetaObject* metaobject);
     ~DynamicQMetaObject();
 
diff --git a/libpyside/pyside.cpp b/libpyside/pyside.cpp
index 45ada8f47..0eb1e7a55 100644
--- a/libpyside/pyside.cpp
+++ b/libpyside/pyside.cpp
@@ -80,7 +80,7 @@ bool fillQtProperties(PyObject* qObj, const QMetaObject* metaObj, PyObject* kwds
                     Shiboken::AutoDecRef retval(PyObject_CallObject(propSetter, args));
                 } else {
                     PyObject* attr = PyObject_GenericGetAttr(qObj, key);
-                    if (PySide::Property::isPropertyType(attr))
+                    if (PySide::Property::checkType(attr))
                         PySide::Property::setValue(reinterpret_cast<PySideProperty*>(attr), qObj, value);
                 }
             } else {
@@ -216,7 +216,7 @@ PyObject* getMetaDataFromQObject(QObject* cppSelf, PyObject* self, PyObject* nam
     if (!Shiboken::Object::isValid(reinterpret_cast<SbkObject*>(self), false))
         return attr;
 
-    if (attr && Property::isPropertyType(attr)) {
+    if (attr && Property::checkType(attr)) {
         PyObject *value = Property::getValue(reinterpret_cast<PySideProperty*>(attr), self);
         Py_DECREF(attr);
         if (!value)
diff --git a/libpyside/pyside.h b/libpyside/pyside.h
index 3ef7d3881..14987aca0 100644
--- a/libpyside/pyside.h
+++ b/libpyside/pyside.h
@@ -77,8 +77,7 @@ template<typename T>
 struct initQtMetaType<T, false> {
 };
 
-/// \deprecated
-PYSIDE_API void initDynamicMetaObject(SbkObjectType* type, const QMetaObject* base);
+PYSIDE_DEPRECATED(PYSIDE_API void initDynamicMetaObject(SbkObjectType* type, const QMetaObject* base));
 PYSIDE_API void initDynamicMetaObject(SbkObjectType* type, const QMetaObject* base, const std::size_t& cppObjSize);
 PYSIDE_API void initQObjectSubType(SbkObjectType* type, PyObject* args, PyObject* kwds);
 
diff --git a/libpyside/pysidemacros.h b/libpyside/pysidemacros.h
index 24c9496b5..a652ba29f 100644
--- a/libpyside/pysidemacros.h
+++ b/libpyside/pysidemacros.h
@@ -33,11 +33,14 @@
             #define PYSIDE_API __declspec(dllimport)
         #endif
     #endif
+    #define PYSIDE_DEPRECATED(func) __declspec(deprecated) func
 #else
     #if __GNUC__ >= 4
         #define PYSIDE_API __attribute__ ((visibility("default")))
+        #define PYSIDE_DEPRECATED(func) func __attribute__ ((deprecated))
     #else
         #define PYSIDE_API
+        #define DEPRECATED(func) func
     #endif
 #endif
 
diff --git a/libpyside/pysideproperty.cpp b/libpyside/pysideproperty.cpp
index 10a93c9ca..af3985221 100644
--- a/libpyside/pysideproperty.cpp
+++ b/libpyside/pysideproperty.cpp
@@ -384,7 +384,7 @@ PySideProperty* getObject(PyObject* source, PyObject* name)
     }
 
     attr = getFromType(source->ob_type, name);
-    if (attr && isPropertyType(attr)) {
+    if (attr && checkType(attr)) {
         Py_INCREF(attr);
         return reinterpret_cast<PySideProperty*>(attr);
     }
diff --git a/libpyside/pysideproperty.h b/libpyside/pysideproperty.h
index ce2704a13..21be9881b 100644
--- a/libpyside/pysideproperty.h
+++ b/libpyside/pysideproperty.h
@@ -45,8 +45,8 @@ typedef void (*MetaCallHandler)(PySideProperty*,PyObject*,QMetaObject::Call, voi
 
 PYSIDE_API bool checkType(PyObject* pyObj);
 
-//Deprecated (use checkType)
-PYSIDE_API bool isPropertyType(PyObject* pyObj);
+/// @deprecated Use checkType
+PYSIDE_DEPRECATED(PYSIDE_API bool isPropertyType(PyObject* pyObj));
 
 /**
  * This function call set property function and pass value as arg
diff --git a/libpyside/pysidesignal.cpp b/libpyside/pysidesignal.cpp
index 782aeb5b7..7fdb01fb7 100644
--- a/libpyside/pysidesignal.cpp
+++ b/libpyside/pysidesignal.cpp
@@ -751,6 +751,17 @@ static typename T::value_type join(T t, const char* sep)
     return res;
 }
 
+static void _addSignalToWrapper(SbkObjectType* wrapperType, const char* signalName, PySideSignal* signal)
+{
+    PyObject* typeDict = wrapperType->super.ht_type.tp_dict;
+    PyObject* homonymousMethod;
+    if ((homonymousMethod = PyDict_GetItemString(typeDict, signalName))) {
+        Py_INCREF(homonymousMethod);
+        signal->homonymousMethod = homonymousMethod;
+    }
+    PyDict_SetItemString(typeDict, signalName, reinterpret_cast<PyObject*>(signal));
+}
+
 void registerSignals(SbkObjectType* pyObj, const QMetaObject* metaObject)
 {
     typedef QHash<QByteArray, QList<QByteArray> > SignalSigMap;
@@ -779,7 +790,7 @@ void registerSignals(SbkObjectType* pyObj, const QMetaObject* metaObject)
         SignalSigMap::mapped_type::const_iterator endJ = it.value().end();
         for (; j != endJ; ++j)
             appendSignature(self, strdup(j->constData()));
-        addSignalToWrapper(pyObj, it.key(), self);
+        _addSignalToWrapper(pyObj, it.key(), self);
         Py_DECREF((PyObject*) self);
     }
 }
@@ -795,13 +806,7 @@ PyObject* buildQtCompatible(const char* signature)
 
 void addSignalToWrapper(SbkObjectType* wrapperType, const char* signalName, PySideSignal* signal)
 {
-    PyObject* typeDict = wrapperType->super.ht_type.tp_dict;
-    PyObject* homonymousMethod;
-    if ((homonymousMethod = PyDict_GetItemString(typeDict, signalName))) {
-        Py_INCREF(homonymousMethod);
-        signal->homonymousMethod = homonymousMethod;
-    }
-    PyDict_SetItemString(typeDict, signalName, reinterpret_cast<PyObject*>(signal));
+    _addSignalToWrapper(wrapperType, signalName, signal);
 }
 
 PyObject* getObject(PySideSignalInstance* signal)
diff --git a/libpyside/pysidesignal.h b/libpyside/pysidesignal.h
index 65c2ef39d..a3f23953d 100644
--- a/libpyside/pysidesignal.h
+++ b/libpyside/pysidesignal.h
@@ -59,7 +59,7 @@ PYSIDE_API bool checkType(PyObject* type);
  * @return  Return a new reference to PyObject* of type  PySideSignal
  * @deprecated Use registerSignals
  **/
-PYSIDE_API PySideSignal* newObject(const char* name, ...);
+PYSIDE_DEPRECATED(PYSIDE_API PySideSignal* newObject(const char* name, ...));
 
 /**
  * Register all C++ signals of a QObject on Python type.
@@ -112,7 +112,7 @@ PYSIDE_API void updateSourceObject(PyObject* source);
 /**
  * @deprecated Use registerSignals
  **/
-PYSIDE_API void addSignalToWrapper(SbkObjectType* wrapperType, const char* signalName, PySideSignal* signal);
+PYSIDE_DEPRECATED(PYSIDE_API void addSignalToWrapper(SbkObjectType* wrapperType, const char* signalName, PySideSignal* signal));
 
 /**
  * This function verify if the signature is a QtSignal base on SIGNAL flag