qtcollider: optimize QcWidgetFactory::newInstance()

Most optimization comes from replacing a call to QMetaObject::invokeMethod() with getting the QMetaMethod and calling its invoke() directly.
supercollider · May 3, 2012 · 66e7ede · 66e7ede
1 parent c7e6514
commit 66e7ede
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 20 deletions.
diff --git a/QtCollider/QcWidgetFactory.h b/QtCollider/QcWidgetFactory.h
@@ -25,6 +25,7 @@
 #include "QcObjectFactory.h"
 #include "QWidgetProxy.h"
 
+#include <QMetaMethod>
 #include <QLayout>
 
 template <class QWIDGET>
@@ -60,12 +61,37 @@ class QcWidgetFactory : public QcObjectFactory<QWIDGET>
       }
     }
 
-    QObjectProxy *prox( proxy(w, scObject) );
-
-    // check if parent arg is valid;
+    // NOTE: performance: it is completely equal if parent is passed
+    // in constructor, or set later, but for some reason it is cheaper
+    // if it is set here, before setting other stuff like geometry, etc.
 
     QObjectProxy *parentProxy( arg[0].value<QObjectProxy*>() );
+    QWidget *parent = parentProxy ? qobject_cast<QWidget*>( parentProxy->object() ) : 0;
 
+    if( parent )
+    {
+      const QMetaObject *mo = parent->metaObject();
+      int mi = mo->indexOfMethod( "addChild(QWidget*)" );
+      bool ok;
+      if( mi >= 0 )
+      {
+          QMetaMethod mm = mo->method( mi );
+          ok = mm.invoke( parent, Q_ARG(QWidget*, w) );
+          if(!ok)
+          {
+              qcErrorMsg("Could not set parent!");
+              delete w;
+              return 0;
+          }
+      }
+      else
+      {
+          if(parent->layout())
+              parent->layout()->addWidget(w);
+          else
+              w->setParent( parent );
+      }
+    }
 
     // set requested geometry
 
@@ -78,21 +104,13 @@ class QcWidgetFactory : public QcObjectFactory<QWIDGET>
 
     w->setAcceptDrops( true );
 
-    // set parent
+    // ensure visible:
 
-    QWidget *parent = parentProxy ? qobject_cast<QWidget*>( parentProxy->object() ) : 0;
-
-    if( parent ) {
+    if(parent && parent->isVisible()) w->show();
 
-      // Ok, we have the parent, so stuff the child in
-
-      const QMetaObject *mo = parent->metaObject();
-      bool ok = mo->invokeMethod( parent, "addChild", Q_ARG( QWidget*, w ) );
+    // create the proxy:
 
-      if( !ok ) w->setParent( parent );
-
-      w->show();
-    }
+    QObjectProxy *prox( proxy(w, scObject) );
 
     return prox;
   }

diff --git a/QtCollider/widgets/BasicWidgets.h b/QtCollider/widgets/BasicWidgets.h
@@ -38,7 +38,6 @@ class QcDefaultWidget : public QWidget
   Q_OBJECT
   public:
     QcDefaultWidget() { setLayout( new QcDefaultLayout() ); }
-    Q_INVOKABLE void addChild( QWidget* w ) { layout()->addWidget(w); }
 };
 
 class QcHLayoutWidget : public QWidget
@@ -153,7 +152,6 @@ class QcCustomPainted : public QcCanvas, QcHelper
     QcCustomPainted() {
       setLayout( new QcDefaultLayout() );
     }
-    Q_INVOKABLE void addChild( QWidget* w ) { layout()->addWidget(w); }
   protected:
     // reimplement event handlers just so events don't propagate
     virtual void mousePressEvent( QMouseEvent * ) {}

diff --git a/QtCollider/widgets/QcScrollArea.cpp b/QtCollider/widgets/QcScrollArea.cpp
@@ -107,10 +107,8 @@ void QcScrollArea::setWidget( QObjectProxy *proxy )
 
 void QcScrollArea::addChild( QWidget* w )
 {
-  if( widget() ) {
+  if( widget() )
     w->setParent( widget() );
-    w->show();
-  }
 }
 
 QRectF QcScrollArea::innerBounds() const {