move vips-operators.h into the header

doxy hates #include inside classes

cplusplus/Doxyfile

@@ -839,7 +839,6 @@ INPUT                  = \
 	include/vips/VError8.h \
 	include/vips/VImage8.h \
 	include/vips/VInterpolate8.h \
-	include/vips/vips-operators.h \
 	include/vips/vips8
 
 # This tag can be used to specify the character encoding of the source files

cplusplus/gen-operators.py

@@ -60,7 +60,7 @@ _OPERATION_DEPRECATED = 8
 
 
 def get_cpp_type(gtype):
-    """Map a gtype to C++ type name we use to represent it.
+    """Map a gtype to the C++ type name we use to represent it.
     """
     if gtype in gtype_to_cpp:
         return gtype_to_cpp[gtype]
@@ -85,7 +85,8 @@ def cppize(name):
 def generate_operation(operation_name, declaration_only=False):
     intro = Introspect.get(operation_name)
 
-    required_output = [name for name in intro.required_output if name != intro.member_x]
+    required_output = [name 
+        for name in intro.required_output if name != intro.member_x]
 
     has_output = len(required_output) >= 1
 
@@ -104,7 +105,7 @@ def generate_operation(operation_name, declaration_only=False):
                 result += '\n * @param {} {}.' \
                           .format(cppize(name), intro.details[name]['blurb'])
 
-        result += '\n * @param options Optional options.'
+        result += '\n * @param options Set of options.'
 
         if has_output:
             result += '\n * @return {}.' \

cplusplus/include/vips/Makefile.am

@@ -3,8 +3,7 @@ pkginclude_HEADERS = \
 	VImage8.h \
 	VInterpolate8.h \
 	VConnection8.h \
-	vips8 \
-	vips-operators.h 
+	vips8 
 
 vips-operators.h:
 	echo "// headers for vips operations" > vips-operators.h; \