Small optimizations on libpyside.

1 files changed, 7 insertions, 27 deletions

diff --git a/libpyside/dynamicqmetaobject.cpp b/libpyside/dynamicqmetaobject.cpp
index cc83007b5..42447d700 100644
--- a/libpyside/dynamicqmetaobject.cpp
+++ b/libpyside/dynamicqmetaobject.cpp
@@ -100,11 +100,11 @@ static int registerString(const QByteArray& s, QList<QByteArray>* strings)
 {
     int idx = 0;
     QList<QByteArray>::const_iterator it = strings->begin();
-    QList<QByteArray>::const_iterator it_end = strings->end();
-    while(it != it_end) {
+    QList<QByteArray>::const_iterator itEnd = strings->end();
+    while (it != itEnd) {
         if (strcmp(*it, s) == 0)
             return idx;
-        idx += (*it).size() + 1;
+        idx += it->size() + 1;
         ++it;
     }
     strings->append(s);
@@ -209,8 +209,10 @@ MethodData::MethodData()
 }
 
 MethodData::MethodData(QMetaMethod::MethodType mtype, const char* signature, const char* type)
-    : m_signature(signature), m_type(type), m_mtype(mtype)
+    : m_signature(signature), m_mtype(mtype)
 {
+    if (qstrcmp(type, "void"))
+        m_type = type;
 }
 
 void MethodData::clear()
@@ -219,23 +221,6 @@ void MethodData::clear()
     m_type.clear();
 }
 
-bool MethodData::operator==(const MethodData& other) const
-{
-    return ((m_signature == other.signature()) && (m_mtype == other.methodType()));
-}
-
-QByteArray MethodData::signature() const
-{
-    return m_signature;
-}
-
-QByteArray MethodData::type() const
-{
-    if (m_type == "void")
-        return QByteArray();
-    return m_type;
-}
-
 bool MethodData::isValid() const
 {
     return m_signature.size();
@@ -267,11 +252,6 @@ bool PropertyData::isValid() const
     return !m_name.isEmpty();
 }
 
-QByteArray PropertyData::name() const
-{
-    return m_name;
-}
-
 int PropertyData::notifyId() const
 {
     return m_notifyId;
@@ -304,7 +284,7 @@ DynamicQMetaObject::DynamicQMetaObject(PyTypeObject* type, const QMetaObject* ba
     parsePythonType(type);
 }
 
-DynamicQMetaObject::DynamicQMetaObject(const char* className, const QMetaObject* metaObject) 
+DynamicQMetaObject::DynamicQMetaObject(const char* className, const QMetaObject* metaObject)
     : m_d(new DynamicQMetaObjectPrivate)
 {
     d.superdata = metaObject;