Created Singal/Slot/Property namespace for pure C structures.

Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
          Lauro Neto <lauro.neto@openbossa.org>

1 files changed, 11 insertions, 13 deletions

diff --git a/libpyside/qproperty.h b/libpyside/qproperty.h
index ebe4ee762..f137e8076 100644
--- a/libpyside/qproperty.h
+++ b/libpyside/qproperty.h
@@ -29,22 +29,19 @@
 
 extern "C"
 {
-    extern PYSIDE_API PyTypeObject PySideQPropertyType;
+    extern PYSIDE_API PyTypeObject PySidePropertyType;
 
-    struct PySideQPropertyPrivate;
-    struct PYSIDE_API PySideQProperty
+    struct PySidePropertyPrivate;
+    struct PYSIDE_API PySideProperty
     {
         PyObject_HEAD
-        PySideQPropertyPrivate* d;
+        PySidePropertyPrivate* d;
     };
-
-    struct PySideSignalInstanceData;
 };
 
-namespace PySide
-{
+namespace PySide { namespace Property {
 
-PYSIDE_API bool isQPropertyType(PyObject* pyObj);
+PYSIDE_API bool isPropertyType(PyObject* pyObj);
 
 /**
  * This function call set property function and pass value as arg
@@ -55,7 +52,7 @@ PYSIDE_API bool isQPropertyType(PyObject* pyObj);
  * @param   value The value to set in property
  * @return  Return 0 if ok or -1 if this function fail
  **/
-PYSIDE_API int qpropertySet(PySideQProperty* self, PyObject* source, PyObject* value);
+PYSIDE_API int setValue(PySideProperty* self, PyObject* source, PyObject* value);
 
 /**
  * This function call get property function
@@ -65,7 +62,7 @@ PYSIDE_API int qpropertySet(PySideQProperty* self, PyObject* source, PyObject* v
  * @param   source The QObject witch has the property
  * @return  Return the result of property get function or 0 if this fail
  **/
-PYSIDE_API PyObject* qpropertyGet(PySideQProperty* self, PyObject* source);
+PYSIDE_API PyObject* getValue(PySideProperty* self, PyObject* source);
 
 /**
  * This function return the notify name used on this property
@@ -73,7 +70,7 @@ PYSIDE_API PyObject* qpropertyGet(PySideQProperty* self, PyObject* source);
  * @param   self The property object
  * @return  Return a const char with the notify name used
  **/
-PYSIDE_API const char* qpropertyGetNotify(PySideQProperty* self);
+PYSIDE_API const char* getNotifyName(PySideProperty* self);
 
 
 /**
@@ -83,8 +80,9 @@ PYSIDE_API const char* qpropertyGetNotify(PySideQProperty* self);
  * @param   name The property name
  * @return  Return a new reference to property object
  **/
-PYSIDE_API PySideQProperty* qpropertyGetObject(PyObject* source, PyObject* name);
+PYSIDE_API PySideProperty* getObject(PyObject* source, PyObject* name);
 
+} //namespace Property
 } //namespace PySide
 
 #endif