summaryrefslogtreecommitdiffstats
path: root/src/libnrtype
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-06-19 13:55:58 +0000
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-06-19 13:55:58 +0000
commit884fe02952017ac219cd23f9407d27ed4d8a8620 (patch)
treea86d66e240ae1e72007ba75b23757c71d5a9a28c /src/libnrtype
parentRun clang-tidy’s modernize-use-emplace pass. (diff)
downloadinkscape-884fe02952017ac219cd23f9407d27ed4d8a8620.tar.gz
inkscape-884fe02952017ac219cd23f9407d27ed4d8a8620.zip
Run clang-tidy’s modernize-redundant-void-arg pass.
Diffstat (limited to 'src/libnrtype')
-rw-r--r--src/libnrtype/FontFactory.cpp6
-rw-r--r--src/libnrtype/FontInstance.cpp10
-rw-r--r--src/libnrtype/font-instance.h10
3 files changed, 13 insertions, 13 deletions
diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp
index 99717bb77..0c2c55f75 100644
--- a/src/libnrtype/FontFactory.cpp
+++ b/src/libnrtype/FontFactory.cpp
@@ -229,13 +229,13 @@ static void FactorySubstituteFunc(FcPattern *pattern,gpointer /*data*/)
font_factory *font_factory::lUsine = nullptr;
-font_factory *font_factory::Default(void)
+font_factory *font_factory::Default()
{
if ( lUsine == nullptr ) lUsine = new font_factory;
return lUsine;
}
-font_factory::font_factory(void) :
+font_factory::font_factory() :
nbEnt(0), // Note: this "ents" cache only keeps fonts from being unreffed, does not speed up access
maxEnt(32),
ents(static_cast<font_entry*>(g_malloc(maxEnt*sizeof(font_entry)))),
@@ -266,7 +266,7 @@ font_factory::font_factory(void) :
}
-font_factory::~font_factory(void)
+font_factory::~font_factory()
{
for (int i = 0;i < nbEnt;i++) ents[i].f->Unref();
if ( ents ) g_free(ents);
diff --git a/src/libnrtype/FontInstance.cpp b/src/libnrtype/FontInstance.cpp
index 619e78929..733eb4dd5 100644
--- a/src/libnrtype/FontInstance.cpp
+++ b/src/libnrtype/FontInstance.cpp
@@ -102,7 +102,7 @@ static int ft2_cubic_to(FT_Vector const *control1, FT_Vector const *control2, FT
*
*/
-font_instance::font_instance(void) :
+font_instance::font_instance() :
pFont(nullptr),
descr(nullptr),
refCount(0),
@@ -129,7 +129,7 @@ font_instance::font_instance(void) :
_baselines[ SP_CSS_BASELINE_TEXT_AFTER_EDGE ] = -_descent;
}
-font_instance::~font_instance(void)
+font_instance::~font_instance()
{
if ( parent ) {
parent->UnrefFace(this);
@@ -164,7 +164,7 @@ font_instance::~font_instance(void)
maxGlyph = 0;
}
-void font_instance::Ref(void)
+void font_instance::Ref()
{
refCount++;
//char *tc=pango_font_description_to_string(descr);
@@ -172,7 +172,7 @@ void font_instance::Ref(void)
//free(tc);
}
-void font_instance::Unref(void)
+void font_instance::Unref()
{
refCount--;
//char *tc=pango_font_description_to_string(descr);
@@ -320,7 +320,7 @@ void font_instance::InstallFace(PangoFont* iFace)
}
}
-bool font_instance::IsOutlineFont(void)
+bool font_instance::IsOutlineFont()
{
if ( pFont == nullptr ) {
return false;
diff --git a/src/libnrtype/font-instance.h b/src/libnrtype/font-instance.h
index 5cb26aec2..725d5d2d2 100644
--- a/src/libnrtype/font-instance.h
+++ b/src/libnrtype/font-instance.h
@@ -45,13 +45,13 @@ public:
// Maps for font variations.
std::map<Glib::ustring, OTVarAxis> openTypeVarAxes; // Axes with ranges
- font_instance(void);
- virtual ~font_instance(void);
+ font_instance();
+ virtual ~font_instance();
- void Ref(void);
- void Unref(void);
+ void Ref();
+ void Unref();
- bool IsOutlineFont(void); // utility
+ bool IsOutlineFont(); // utility
void InstallFace(PangoFont* iFace); // utility; should reset the pFont field if loading failed
// in case the PangoFont is a bitmap font, for example. that way, the calling function
// will be able to check the validity of the font before installing it in loadedFaces