3 files changed, 10 insertions, 9 deletions
diff --git a/tools/qtpy2cpp.py b/tools/qtpy2cpp.py
index 04a34a97d..6ab74d357 100644
--- a/tools/qtpy2cpp.py
+++ b/tools/qtpy2cpp.py
@@ -44,7 +44,8 @@ if __name__ == '__main__':
 
         ast_tree = ConvertVisitor.create_ast(input_file)
         if args.stdout:
-            sys.stdout.write(f'// Converted from {input_file}\n')
+            base_name = os.path.basename(input_file)
+            sys.stdout.write(f'// Converted from {base_name}\n')
             ConvertVisitor(input_file, sys.stdout).visit(ast_tree)
             sys.exit(0)
 
@@ -58,6 +59,7 @@ if __name__ == '__main__':
                 sys.exit(-1)
 
         with open(target_file, "w") as file:
-            file.write(f'// Converted from {input_file}\n')
+            base_name = os.path.basename(input_file)
+            file.write(f'// Converted from {base_name}\n')
             ConvertVisitor(input_file, file).visit(ast_tree)
             logger.info(f"Wrote {target_file} ...")
diff --git a/tools/qtpy2cpp_lib/formatter.py b/tools/qtpy2cpp_lib/formatter.py
index 98ba3f095..9a38e803d 100644
--- a/tools/qtpy2cpp_lib/formatter.py
+++ b/tools/qtpy2cpp_lib/formatter.py
@@ -86,6 +86,9 @@ def format_for_loop(f_node):
     elif isinstance(f_node.iter, ast.List):
         # Range based for over list
         result += ': ' + format_literal_list(f_node.iter)
+    elif isinstance(f_node.iter, ast.Name):
+        # Range based for over variable
+        result += ': ' + f_node.iter.id
     result += ') {'
     return result
 
@@ -248,20 +251,15 @@ class CppFormatter(Indenter):
         """Print a function definition with arguments"""
         self._output_file.write('\n')
         arguments = format_function_def_arguments(f_node)
-        warn = True
         if f_node.name == '__init__' and class_context:  # Constructor
             name = class_context
-            warn = len(arguments) > 0
         elif f_node.name == '__del__' and class_context:  # Destructor
             name = '~' + class_context
-            warn = False
         else:
             return_type = "void"
             if f_node.returns and isinstance(f_node.returns, ast.Name):
                 return_type = _fix_function_argument_type(f_node.returns.id, True)
             name = return_type + " " + f_node.name
         self.indent_string(f'{name}({arguments})')
-        if warn:
-            self._output_file.write(' /* FIXME: types */')
         self._output_file.write('\n')
         self.indent_line('{')
diff --git a/tools/qtpy2cpp_lib/visitor.py b/tools/qtpy2cpp_lib/visitor.py
index 3f63bb7a6..1e8b5dc84 100644
--- a/tools/qtpy2cpp_lib/visitor.py
+++ b/tools/qtpy2cpp_lib/visitor.py
@@ -96,6 +96,7 @@ class ConvertVisitor(ast.NodeVisitor, CppFormatter):
 
     def visit_AugAssign(self, node):
         """'Augmented_assign', Operators +=/-=, etc."""
+        self.INDENT()
         self.generic_visit(node)
         self._output_file.write("\n")
 
@@ -413,18 +414,18 @@ class ConvertVisitor(ast.NodeVisitor, CppFormatter):
         self.generic_visit(node)
 
     def visit_With(self, node):
-        self.indent()
         self.INDENT()
         self._output_file.write("{ // Converted from context manager\n")
+        self.indent()
         for item in node.items:
             self.INDENT()
             if item.optional_vars:
                 self._output_file.write(format_reference(item.optional_vars))
                 self._output_file.write(" = ")
         self.generic_visit(node)
+        self.dedent()
         self.INDENT()
         self._output_file.write("}\n")
-        self.dedent()
 
     def _debug_enter(self, node, parent=None):
         message = '{}>generic_visit({})'.format('  ' * self ._debug_indent,