Renamed worksheet_set_column() function.

Renamed worksheet_set_column() function to worksheet_set_column_opt()
for consistency with current and future APIs. The worksheet_set_column()
function is now used without the option.

This is a backward incompatible change.

test/functional/src/test_escapes06.c

@@ -17,7 +17,7 @@ int main() {
 
     format_set_num_format(num_format, "[Red]0.0%\\ \"a\"");
 
-    worksheet_set_column(worksheet, 0, 0, 14, NULL, NULL);
+    worksheet_set_column(worksheet, 0, 0, 14, NULL);
 
     worksheet_write_number(worksheet, CELL("A1"), 123, num_format);
 

test/functional/src/test_image12.c

@@ -15,7 +15,7 @@ int main() {
     lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
 
     worksheet_set_row(worksheet, 1, 75, NULL, NULL);
-    worksheet_set_column(worksheet, 2, 2, 32, NULL, NULL);
+    worksheet_set_column(worksheet, 2, 2, 32, NULL);
 
     worksheet_insert_image(worksheet, CELL("C2"), "images/logo.png");
 

test/functional/src/test_image13.c

@@ -17,7 +17,7 @@ int main() {
     lxw_image_options options = {.x_offset = 8, .y_offset = 5};
 
     worksheet_set_row(worksheet, 1, 75, NULL, NULL);
-    worksheet_set_column(worksheet, 2, 2, 32, NULL, NULL);
+    worksheet_set_column(worksheet, 2, 2, 32, NULL);
 
     worksheet_insert_image_opt(worksheet, CELL("C2"), "images/logo.png", &options);
 

test/functional/src/test_image14.c

@@ -16,8 +16,8 @@ int main() {
 
     worksheet_set_row(worksheet,    1,     4.5,  NULL, NULL);
     worksheet_set_row(worksheet,    2,    35.25, NULL, NULL);
-    worksheet_set_column(worksheet, 2, 4,  3.29, NULL, NULL);
-    worksheet_set_column(worksheet, 5, 5, 10.71, NULL, NULL);
+    worksheet_set_column(worksheet, 2, 4,  3.29, NULL);
+    worksheet_set_column(worksheet, 5, 5, 10.71, NULL);
 
     worksheet_insert_image(worksheet, CELL("C2"), "images/logo.png");
 

test/functional/src/test_image15.c

@@ -18,8 +18,8 @@ int main() {
 
     worksheet_set_row(worksheet,    1,     4.5,  NULL, NULL);
     worksheet_set_row(worksheet,    2,    35.25, NULL, NULL);
-    worksheet_set_column(worksheet, 2, 4,  3.29, NULL, NULL);
-    worksheet_set_column(worksheet, 5, 5, 10.71, NULL, NULL);
+    worksheet_set_column(worksheet, 2, 4,  3.29, NULL);
+    worksheet_set_column(worksheet, 5, 5, 10.71, NULL);
 
     worksheet_insert_image_opt(worksheet, CELL("C2"), "images/logo.png", &options);
 

test/functional/src/test_image17.c

@@ -15,7 +15,7 @@ int main() {
     lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
 
     worksheet_set_row(worksheet, 1, 96, NULL, NULL);
-    worksheet_set_column(worksheet, 2, 2, 18, NULL, NULL);
+    worksheet_set_column(worksheet, 2, 2, 18, NULL);
 
     worksheet_insert_image(worksheet, CELL("C2"), "images/issue32.png");
 

test/functional/src/test_image18.c

@@ -17,7 +17,7 @@ int main() {
     lxw_image_options options = {.x_offset = 5, .y_offset = 5};
 
     worksheet_set_row(worksheet, 1, 96, NULL, NULL);
-    worksheet_set_column(worksheet, 2, 2, 18, NULL, NULL);
+    worksheet_set_column(worksheet, 2, 2, 18, NULL);
 
     worksheet_insert_image_opt(worksheet, CELL("C2"), "images/issue32.png", &options);
 

test/functional/src/test_image31.c

@@ -16,7 +16,7 @@ int main() {
 
     lxw_image_options options = {.x_offset = -2, .y_offset = -1};
 
-    worksheet_set_column(worksheet, 3, 3, 3.86, NULL, NULL);
+    worksheet_set_column(worksheet, 3, 3, 3.86, NULL);
     worksheet_set_row(worksheet, 7, 7.5, NULL, NULL);
 
     worksheet_insert_image_opt(worksheet, CELL("E9"), "images/red.png", &options);

test/functional/src/test_image33.c

@@ -16,8 +16,8 @@ int main() {
 
     lxw_image_options options = {.x_offset = -2, .y_offset = -1};
 
-    worksheet_set_column(worksheet, 3, 3, 3.86, NULL, NULL);
-    worksheet_set_column(worksheet, 4, 4, 1.43, NULL, NULL);
+    worksheet_set_column(worksheet, 3, 3, 3.86, NULL);
+    worksheet_set_column(worksheet, 4, 4, 1.43, NULL);
     worksheet_set_row(worksheet, 7, 7.5, NULL, NULL);
     worksheet_set_row(worksheet, 8, 9.75, NULL, NULL);
 

test/functional/src/test_optimize22.c

@@ -19,7 +19,7 @@ int main() {
 
     format_set_bold(bold);
 
-    worksheet_set_column(worksheet, 0, 0, 36, bold, NULL);
+    worksheet_set_column(worksheet, 0, 0, 36, bold);
 
     return workbook_close(workbook);
 }

test/functional/src/test_properties01.c

@@ -27,7 +27,7 @@ int main() {
 
     workbook_set_properties(workbook, properties);
 
-    worksheet_set_column(worksheet, 0, 0, 70, NULL, NULL);
+    worksheet_set_column(worksheet, 0, 0, 70, NULL);
     worksheet_write_string(worksheet, CELL("A1"), "Select 'Office Button -> Prepare -> Properties' to see the file properties." , NULL);
 
     free(properties->title);

test/functional/src/test_row_col_format03.c

@@ -17,7 +17,7 @@ int main() {
     lxw_format    *italic      = workbook_add_format(workbook);
     format_set_italic(italic);
 
-    worksheet_set_column(worksheet, 0, 0, 8.43, italic, NULL);
+    worksheet_set_column(worksheet, 0, 0, 8.43, italic);
 
     return workbook_close(workbook);
 }

test/functional/src/test_row_col_format04.c

@@ -17,7 +17,7 @@ int main() {
     lxw_format    *italic      = workbook_add_format(workbook);
     format_set_italic(italic);
 
-    worksheet_set_column(worksheet, 0, 0, 8.43, italic, NULL);
+    worksheet_set_column(worksheet, 0, 0, 8.43, italic);
 
     worksheet_write_string(worksheet, 0, 0, "Foo", NULL);
 

test/functional/src/test_row_col_format05.c

@@ -20,8 +20,8 @@ int main() {
     lxw_format    *italic    = workbook_add_format(workbook);
     format_set_italic(italic);
 
-    worksheet_set_column(worksheet, 0, 0, 8.43, bold, NULL);
-    worksheet_set_column(worksheet, 2, 2, 8.43, italic, NULL);
+    worksheet_set_column(worksheet, 0, 0, 8.43, bold);
+    worksheet_set_column(worksheet, 2, 2, 8.43, italic);
 
     return workbook_close(workbook);
 }

test/functional/src/test_row_col_format06.c

@@ -20,8 +20,8 @@ int main() {
     lxw_format    *italic    = workbook_add_format(workbook);
     format_set_italic(italic);
 
-    worksheet_set_column(worksheet, 0, 0, 8.43, bold, NULL);
-    worksheet_set_column(worksheet, 2, 2, 8.43, italic, NULL);
+    worksheet_set_column(worksheet, 0, 0, 8.43, bold);
+    worksheet_set_column(worksheet, 2, 2, 8.43, italic);
 
     worksheet_write_string(worksheet, 0, 0, "Foo", NULL);
     worksheet_write_string(worksheet, 0, 2, "Bar", NULL);

test/functional/src/test_row_col_format08.c

@@ -28,7 +28,7 @@ int main() {
     _set_default_xf_indices(workbook);
 
     worksheet_set_row(worksheet, 0, 15, bold, NULL);
-    worksheet_set_column(worksheet, 0, 0, 8.43, italic, NULL);
+    worksheet_set_column(worksheet, 0, 0, 8.43, italic);
 
     worksheet_write_string(worksheet, 0, 0, "Foo", mixed);
     worksheet_write_string(worksheet, 0, 1, "Foo", NULL);

test/functional/src/test_row_col_format09.c

@@ -28,7 +28,7 @@ int main() {
     _set_default_xf_indices(workbook);
 
     worksheet_set_row(worksheet, 4, 15, bold, NULL);
-    worksheet_set_column(worksheet, 2, 2, 8.43, italic, NULL);
+    worksheet_set_column(worksheet, 2, 2, 8.43, italic);
 
     worksheet_write_string(worksheet, 0, 2, "Foo", NULL);
     worksheet_write_string(worksheet, 4, 0, "Foo", NULL);

test/functional/src/test_row_col_format10.c

@@ -17,7 +17,7 @@ int main() {
     lxw_format    *bold      = workbook_add_format(workbook);
     format_set_bold(bold);
 
-    worksheet_set_column(worksheet, 2, 2, LXW_DEF_COL_WIDTH, bold, NULL);
+    worksheet_set_column(worksheet, 2, 2, LXW_DEF_COL_WIDTH, bold);
 
     return workbook_close(workbook);
 }

test/functional/src/test_row_col_format11.c

@@ -14,7 +14,7 @@ int main() {
     lxw_workbook  *workbook  = new_workbook("test_row_col_format11.xlsx");
     lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
 
-    worksheet_set_column(worksheet, 2, 2, 4, NULL, NULL);
+    worksheet_set_column(worksheet, 2, 2, 4, NULL);
 
     return workbook_close(workbook);
 }

test/functional/src/test_row_col_format12.c

@@ -15,7 +15,7 @@ int main() {
     lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
     lxw_row_col_options options = {1, 0, 0};
 
-    worksheet_set_column(worksheet, 2, 2, LXW_DEF_COL_WIDTH, NULL, &options);
+    worksheet_set_column_opt(worksheet, 2, 2, LXW_DEF_COL_WIDTH, NULL, &options);
 
     return workbook_close(workbook);
 }

test/functional/src/test_row_col_format13.c

@@ -18,11 +18,11 @@ int main() {
 
     format_set_bold(bold);
 
-    worksheet_set_column(worksheet, COLS("B:D"), 5, NULL, NULL);
-    worksheet_set_column(worksheet, COLS("F:F"), 8, NULL, &options);
-    worksheet_set_column(worksheet, COLS("H:H"), LXW_DEF_COL_WIDTH, bold, NULL);
-    worksheet_set_column(worksheet, COLS("J:J"), 2, NULL, NULL);
-    worksheet_set_column(worksheet, COLS("L:L"), LXW_DEF_COL_WIDTH, NULL, &options);
+    worksheet_set_column(worksheet, COLS("B:D"), 5, NULL);
+    worksheet_set_column_opt(worksheet, COLS("F:F"), 8, NULL, &options);
+    worksheet_set_column(worksheet, COLS("H:H"), LXW_DEF_COL_WIDTH, bold);
+    worksheet_set_column(worksheet, COLS("J:J"), 2, NULL);
+    worksheet_set_column_opt(worksheet, COLS("L:L"), LXW_DEF_COL_WIDTH, NULL, &options);
 
     return workbook_close(workbook);
 }

test/functional/src/test_row_col_format14.c

@@ -18,11 +18,11 @@ int main() {
 
     format_set_bold(bold);
 
-    worksheet_set_column(worksheet, 1, 3, 5, NULL, NULL);
-    worksheet_set_column(worksheet, 5, 5, 8, NULL, NULL);
-    worksheet_set_column(worksheet, 7, 7, LXW_DEF_COL_WIDTH, bold, NULL);
-    worksheet_set_column(worksheet, 9, 9, 2, NULL, NULL);
-    worksheet_set_column(worksheet, 11, 11, LXW_DEF_COL_WIDTH, NULL, &options);
+    worksheet_set_column(worksheet, 1, 3, 5, NULL);
+    worksheet_set_column(worksheet, 5, 5, 8, NULL);
+    worksheet_set_column(worksheet, 7, 7, LXW_DEF_COL_WIDTH, bold);
+    worksheet_set_column(worksheet, 9, 9, 2, NULL);
+    worksheet_set_column_opt(worksheet, 11, 11, LXW_DEF_COL_WIDTH, NULL, &options);
 
     return workbook_close(workbook);
 }

test/functional/src/test_row_col_format15.c

@@ -17,7 +17,7 @@ int main() {
     lxw_format    *italic      = workbook_add_format(workbook);
     format_set_italic(italic);
 
-    worksheet_set_column(worksheet, 16383, 16383, 8.43, italic, NULL);
+    worksheet_set_column(worksheet, 16383, 16383, 8.43, italic);
 
     return workbook_close(workbook);
 }

test/functional/src/test_row_col_format16.c

@@ -17,7 +17,7 @@ int main() {
     lxw_format    *italic      = workbook_add_format(workbook);
     format_set_italic(italic);
 
-    worksheet_set_column(worksheet, 16383, 16383, 8.43, italic, NULL);
+    worksheet_set_column(worksheet, 16383, 16383, 8.43, italic);
 
     worksheet_write_string(worksheet, 0, 16383, "Foo", NULL);
 

test/functional/src/test_simple04.c

@@ -22,7 +22,7 @@ int main() {
     format_set_num_format_index(format1, 20);
     format_set_num_format_index(format2, 14);
 
-    worksheet_set_column(worksheet, 0, 0, 12, NULL, NULL);
+    worksheet_set_column(worksheet, 0, 0, 12, NULL);
 
     worksheet_write_datetime(worksheet, 0, 0, &datetime1, format1);
     worksheet_write_datetime(worksheet, 1, 0, &datetime2, format2);