[Bf-blender-cvs] [fffb46b5442] temp-gpencil-io: Remove redundant void parameter
Antonio Vazquez
noreply at git.blender.org
Wed Mar 17 16:32:56 CET 2021
Commit: fffb46b5442d4a305e789f61b797587893f1e7f8
Author: Antonio Vazquez
Date: Wed Mar 17 16:23:39 2021 +0100
Branches: temp-gpencil-io
https://developer.blender.org/rBfffb46b5442d4a305e789f61b797587893f1e7f8
Remove redundant void parameter
This is not required in C++
===================================================================
M source/blender/io/gpencil/intern/gpencil_io_base.cc
M source/blender/io/gpencil/intern/gpencil_io_base.h
M source/blender/io/gpencil/intern/gpencil_io_export_base.h
M source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
M source/blender/io/gpencil/intern/gpencil_io_export_pdf.h
M source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
M source/blender/io/gpencil/intern/gpencil_io_export_svg.h
M source/blender/io/gpencil/intern/gpencil_io_import_base.cc
M source/blender/io/gpencil/intern/gpencil_io_import_base.h
M source/blender/io/gpencil/intern/gpencil_io_import_svg.cc
M source/blender/io/gpencil/intern/gpencil_io_import_svg.h
===================================================================
diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.cc b/source/blender/io/gpencil/intern/gpencil_io_base.cc
index 051611f414c..8c9faf84eed 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc
@@ -151,7 +151,7 @@ GpencilIO::GpencilIO(const struct GpencilIOParams *iparams)
}
/** Create a list of selected objects sorted from back to front */
-void GpencilIO::create_object_list(void)
+void GpencilIO::create_object_list()
{
ViewLayer *view_layer = CTX_data_view_layer(params_.C);
@@ -403,33 +403,33 @@ void GpencilIO::gps_current_color_set(struct Object *ob, struct bGPDstroke *gps)
interp_v3_v3v3(fill_color_, fill_color_, gps->vert_color_fill, gps->vert_color_fill[3]);
}
-struct MaterialGPencilStyle *GpencilIO::gp_style_current_get(void)
+struct MaterialGPencilStyle *GpencilIO::gp_style_current_get()
{
return gp_style_;
}
-bool GpencilIO::material_is_stroke(void)
+bool GpencilIO::material_is_stroke()
{
return is_stroke_;
}
-bool GpencilIO::material_is_fill(void)
+bool GpencilIO::material_is_fill()
{
return is_fill_;
}
-float GpencilIO::stroke_average_opacity_get(void)
+float GpencilIO::stroke_average_opacity_get()
{
return avg_opacity_;
}
-bool GpencilIO::is_camera_mode(void)
+bool GpencilIO::is_camera_mode()
{
return is_camera_;
}
/* Calc selected strokes boundbox. */
-void GpencilIO::selected_objects_boundbox_set(void)
+void GpencilIO::selected_objects_boundbox_set()
{
const float gap = 10.0f;
const bGPDspoint *pt;
diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.h b/source/blender/io/gpencil/intern/gpencil_io_base.h
index dbd3d1517db..9219727da9a 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.h
@@ -94,20 +94,20 @@ class GpencilIO {
void gpencil_3d_point_to_2D(const float co[3], float r_co[2]);
float stroke_point_radius_get(struct bGPDlayer *gpl, struct bGPDstroke *gps);
- void create_object_list(void);
+ void create_object_list();
- struct MaterialGPencilStyle *gp_style_current_get(void);
- bool material_is_stroke(void);
- bool material_is_fill(void);
+ struct MaterialGPencilStyle *gp_style_current_get();
+ bool material_is_stroke();
+ bool material_is_fill();
- bool is_camera_mode(void);
+ bool is_camera_mode();
- float stroke_average_opacity_get(void);
+ float stroke_average_opacity_get();
void gpl_matrix_set(struct Object *ob, struct bGPDlayer *gpl);
void gps_current_color_set(struct Object *ob, struct bGPDstroke *gps);
- void selected_objects_boundbox_set(void);
+ void selected_objects_boundbox_set();
void selected_objects_boundbox_get(rctf *boundbox);
void filename_set(const char *filename);
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_base.h b/source/blender/io/gpencil/intern/gpencil_io_export_base.h
index caf58ad917d..ac04a8cdf32 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_base.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_base.h
@@ -29,7 +29,7 @@ class GpencilExporter : public GpencilIO {
public:
GpencilExporter(const struct GpencilIOParams *iparams);
- virtual bool write(void) = 0;
+ virtual bool write() = 0;
protected:
private:
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
index 4121b77eb73..24d403d382b 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
@@ -81,23 +81,23 @@ GpencilExporterPDF::GpencilExporterPDF(const char *filename, const struct Gpenci
gstate_ = nullptr;
}
-bool GpencilExporterPDF::new_document(void)
+bool GpencilExporterPDF::new_document()
{
return create_document();
}
-bool GpencilExporterPDF::add_newpage(void)
+bool GpencilExporterPDF::add_newpage()
{
return add_page();
}
-bool GpencilExporterPDF::add_body(void)
+bool GpencilExporterPDF::add_body()
{
export_gpencil_layers();
return true;
}
-bool GpencilExporterPDF::write(void)
+bool GpencilExporterPDF::write()
{
/* Support unicode character paths on Windows. */
HPDF_STATUS res = 0;
@@ -119,7 +119,7 @@ bool GpencilExporterPDF::write(void)
}
/* Create pdf document. */
-bool GpencilExporterPDF::create_document(void)
+bool GpencilExporterPDF::create_document()
{
pdf_ = HPDF_New(error_handler, nullptr);
if (!pdf_) {
@@ -130,7 +130,7 @@ bool GpencilExporterPDF::create_document(void)
}
/* Add page. */
-bool GpencilExporterPDF::add_page(void)
+bool GpencilExporterPDF::add_page()
{
/* Add a new page object. */
page_ = HPDF_AddPage(pdf_);
@@ -146,7 +146,7 @@ bool GpencilExporterPDF::add_page(void)
}
/* Main layer loop. */
-void GpencilExporterPDF::export_gpencil_layers(void)
+void GpencilExporterPDF::export_gpencil_layers()
{
/* If is doing a set of frames, the list of objects can change for each frame. */
if (params_.frame_mode != GP_EXPORT_FRAME_ACTIVE) {
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.h b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.h
index 4789df52539..1a175afed98 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.h
@@ -41,10 +41,10 @@ class GpencilExporterPDF : public GpencilExporter {
public:
GpencilExporterPDF(const char *filename, const struct GpencilIOParams *iparams);
- bool new_document(void);
- bool add_newpage(void);
- bool add_body(void);
- bool write(void);
+ bool new_document();
+ bool add_newpage();
+ bool add_body();
+ bool write();
protected:
private:
@@ -55,9 +55,9 @@ class GpencilExporterPDF : public GpencilExporter {
/* State. */
HPDF_ExtGState gstate_;
- bool create_document(void);
- bool add_page(void);
- void export_gpencil_layers(void);
+ bool create_document();
+ bool add_page();
+ void export_gpencil_layers();
void export_stroke_to_point(bGPDlayer *gpl, bGPDstroke *gps);
void export_stroke_to_polyline(bGPDlayer *gpl,
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
index d403fd5116d..1b1974dc09f 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
@@ -74,19 +74,19 @@ GpencilExporterSVG::GpencilExporterSVG(const char *filename, const struct Gpenci
invert_axis_[1] = true;
}
-bool GpencilExporterSVG::add_newpage(void)
+bool GpencilExporterSVG::add_newpage()
{
create_document_header();
return true;
}
-bool GpencilExporterSVG::add_body(void)
+bool GpencilExporterSVG::add_body()
{
export_gpencil_layers();
return true;
}
-bool GpencilExporterSVG::write(void)
+bool GpencilExporterSVG::write()
{
bool result = true;
/* Support unicode character paths on Windows. */
@@ -107,7 +107,7 @@ bool GpencilExporterSVG::write(void)
}
/* Create document header and main svg node. */
-void GpencilExporterSVG::create_document_header(void)
+void GpencilExporterSVG::create_document_header()
{
/* Add a custom document declaration node. */
pugi::xml_node decl = main_doc_.prepend_child(pugi::node_declaration);
@@ -142,7 +142,7 @@ void GpencilExporterSVG::create_document_header(void)
}
/* Main layer loop. */
-void GpencilExporterSVG::export_gpencil_layers(void)
+void GpencilExporterSVG::export_gpencil_layers()
{
const bool is_clipping = is_camera_mode() && (params_.flag & GP_EXPORT_CLIP_CAMERA) != 0;
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_svg.h b/source/blender/io/gpencil/intern/gpencil_io_export_svg.h
index 8be5115c4ae..4e1a4b8fc1c 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_svg.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_svg.h
@@ -39,9 +39,9 @@ class GpencilExporterSVG : public GpencilExporter {
public:
GpencilExporterSVG(const char *filename, const struct GpencilIOParams *iparams);
- bool add_newpage(void);
- bool add_body(void);
- bool write(void);
+ bool add_newpage();
+ bool add_body();
+ bool write();
protected:
static void add_rect(pugi::xml_node node,
@@ -66,8 +66,8 @@ class GpencilExporterSVG : public GpencilExporter {
pugi::xml_node main_node_;
/** Frame node */
pugi::xml_node frame_node_;
- void create_document_header(void);
- void export_gpencil_layers(void);
+ void create_document_header();
+ void export_gpencil_layers();
void export_stroke_to_point(struct bGPDlayer *gpl,
struct bGPDstroke *gps,
diff --git a/source/blender/io/gpencil/intern/gpencil_io_import_base.cc b/source/blender/io/gpencil/intern/gpencil_io_import_base.cc
index b15ac426510..0d3996abfb3 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_import_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_import_base.cc
@@ -65,7 +65,7 @@ GpencilImporter::GpencilImporter(const struct GpencilIOParams *iparams) : Gpenci
/* Nothing to do yet */
}
-Object *GpencilImporter::create_object(void)
+Object *GpencilImporter::create_object()
{
const float *cur = scene_->cursor.location;
ushort local_view_bits = (params_.v3d && params_.v3d->localvd) ? params_.v3d->local_view_uuid :
diff --git a/source/blender/io/gpencil/intern/gpencil_io_import_base.h b/source/blender/io/gpencil/intern/gpencil_io_import_base.h
index 21bdf38ebb6..efe6264e4e9 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_import_base.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_import_base.h
@@ -29,10 +29,10 @@ class GpencilImporter : public GpencilIO {
public:
GpencilImporter(const struct GpencilIOParams *iparams);
- virtual bool read(void) = 0;
+ virtual bool read() = 0;
protected:
- struct Object *create_object(void);
+ struct Object *create_object();
int32_t create_material(const char *name, const bool stroke, const bool fill);
private:
diff --git a/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc
index 49e1072b570..61445048bf4 100644
--- a/source/blen
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list