No more training wheels. The last occurrences of the old template Converter where removed.

Also related fixes here and there.

1 files changed, 21 insertions, 0 deletions

diff --git a/PySide/QtGui/glue/qmenu_glue.cpp b/PySide/QtGui/glue/qmenu_glue.cpp
new file mode 100644
index 000000000..0636dfab0
--- /dev/null
+++ b/PySide/QtGui/glue/qmenu_glue.cpp
@@ -0,0 +1,21 @@
+inline PyObject* addActionWithPyObject(QMenu* self, const QIcon& icon, const QString& text, PyObject* callback, const QKeySequence& shortcut)
+{
+    QAction* act = new QAction(text, self);
+
+    if (!icon.isNull())
+        act->setIcon(icon);
+
+    if (!shortcut.isEmpty())
+        act->setShortcut(shortcut);
+
+    self->addAction(act);
+
+    PyObject* pyAct = %CONVERTTOPYTHON[QAction*](act);
+    Shiboken::AutoDecRef result(PyObject_CallMethod(pyAct, "connect", "OsO", pyAct, SIGNAL(triggered()), callback));
+    if (result.isNull()) {
+        Py_DECREF(pyAct);
+        return 0;
+    }
+
+    return pyAct;
+}