diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index a7cb1fb..aac41ab 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -1426,15 +1426,33 @@
   </object-type>
   <object-type name="QFontComboBox"/>
   <object-type name="QFontDialog">
-    <!-- TODO Replace inject code! -->
-    <modify-function signature="getFont(bool*,QWidget*)" allow-thread="yes" remove="all" />
-
-    <!-- TODO Replace inject code! -->
-    <modify-function signature="getFont(bool*,QFont,QWidget*)" allow-thread="yes" remove="all" />
-
-    <!-- TODO Replace inject code! -->
-    <modify-function signature="getFont(bool*,QFont,QWidget*,QString)" allow-thread="yes" remove="all" />
-
+    <modify-function signature="getFont(bool*,QWidget*)" allow-thread="yes">
+        <modify-argument index="1" action="remove"/>
+        <modify-argument index="return">
+            <replace-type modified-type="PyTuple" />
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_bool*,arg"/>
+        </inject-code>
+    </modify-function>
+    <modify-function signature="getFont(bool*,QFont,QWidget*)" allow-thread="yes">
+        <modify-argument index="1" action="remove"/>
+        <modify-argument index="return">
+            <replace-type modified-type="PyTuple" />
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_bool*,arg,arg"/>
+        </inject-code>
+    </modify-function>
+    <modify-function signature="getFont(bool*,QFont,QWidget*,QString)" allow-thread="yes">
+        <modify-argument index="1" action="remove"/>
+        <modify-argument index="return">
+            <replace-type modified-type="PyTuple" />
+        </modify-argument>
+        <inject-code class="target" position="beginning">
+            <insert-template name="fix_bool*,arg,arg,arg"/>
+        </inject-code>
+    </modify-function>
   </object-type>
   <object-type name="QGraphicsEllipseItem">
   </object-type>
diff --git a/PySide/typesystem_templates.xml b/PySide/typesystem_templates.xml
index 03a2203..0460d34 100644
--- a/PySide/typesystem_templates.xml
+++ b/PySide/typesystem_templates.xml
@@ -21,6 +21,16 @@
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2);
         %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
     </template>
+    <template name="fix_bool*,arg,arg">
+        bool ok_;
+        %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2, %3);
+        %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
+    </template>
+    <template name="fix_bool*,arg,arg,arg">
+        bool ok_;
+        %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&amp;ok_, %2, %3, %4);
+        %PYARG_0 = Shiboken::makeTuple(retval_, ok_);
+    </template>
     <template name="fix_arg,arg,arg,arg,arg,arg,arg,bool*,arg">
         bool ok_;
         %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, %6, %7, &amp;ok_, %9);