summaryrefslogtreecommitdiffstats
path: root/src/libnrtype
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-06-15 17:02:56 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2018-06-18 12:27:01 +0000
commit004e50d84773242a000f5cadb89466bbc793e1a8 (patch)
tree019c32e65caa08fe7cf90b521787531a7b1d2225 /src/libnrtype
parentRun clang-tidy’s modernize-use-nullptr pass. (diff)
downloadinkscape-004e50d84773242a000f5cadb89466bbc793e1a8.tar.gz
inkscape-004e50d84773242a000f5cadb89466bbc793e1a8.zip
Run clang-tidy’s modernize-use-equals-default pass.
This replaces empty constructors and destructors with the default keyword.
Diffstat (limited to 'src/libnrtype')
-rw-r--r--src/libnrtype/FontFactory.h2
-rw-r--r--src/libnrtype/Layout-TNG-Scanline-Maker.h2
-rw-r--r--src/libnrtype/Layout-TNG-Scanline-Makers.cpp3
-rw-r--r--src/libnrtype/Layout-TNG.h2
-rw-r--r--src/libnrtype/OpenTypeUtil.h2
5 files changed, 5 insertions, 6 deletions
diff --git a/src/libnrtype/FontFactory.h b/src/libnrtype/FontFactory.h
index 2f8907e27..eb1651f27 100644
--- a/src/libnrtype/FontFactory.h
+++ b/src/libnrtype/FontFactory.h
@@ -59,7 +59,7 @@ const char *sp_font_description_get_family(PangoFontDescription const *fontDescr
class StyleNames {
public:
- StyleNames() {};
+ StyleNames() = default;;
StyleNames( Glib::ustring name ) :
CssName( name ), DisplayName( name ) {};
StyleNames( Glib::ustring cssname, Glib::ustring displayname ) :
diff --git a/src/libnrtype/Layout-TNG-Scanline-Maker.h b/src/libnrtype/Layout-TNG-Scanline-Maker.h
index 786f44e51..dea9aa3c5 100644
--- a/src/libnrtype/Layout-TNG-Scanline-Maker.h
+++ b/src/libnrtype/Layout-TNG-Scanline-Maker.h
@@ -32,7 +32,7 @@ is a rectangle.
class Layout::ScanlineMaker
{
public:
- virtual ~ScanlineMaker() {}
+ virtual ~ScanlineMaker() = default;
struct ScanRun {
double y; /// that's the top of the scan run, not the baseline
diff --git a/src/libnrtype/Layout-TNG-Scanline-Makers.cpp b/src/libnrtype/Layout-TNG-Scanline-Makers.cpp
index a57aaa3e4..f95846279 100644
--- a/src/libnrtype/Layout-TNG-Scanline-Makers.cpp
+++ b/src/libnrtype/Layout-TNG-Scanline-Makers.cpp
@@ -37,8 +37,7 @@ Layout::InfiniteScanlineMaker::InfiniteScanlineMaker(double initial_x, double in
}
Layout::InfiniteScanlineMaker::~InfiniteScanlineMaker()
-{
-}
+= default;
std::vector<Layout::ScanlineMaker::ScanRun> Layout::InfiniteScanlineMaker::makeScanline(Layout::FontMetrics const &line_height)
{
diff --git a/src/libnrtype/Layout-TNG.h b/src/libnrtype/Layout-TNG.h
index 6db6c1221..678f04e6c 100644
--- a/src/libnrtype/Layout-TNG.h
+++ b/src/libnrtype/Layout-TNG.h
@@ -694,7 +694,7 @@ private:
class InputStreamItem {
public:
- virtual ~InputStreamItem() {}
+ virtual ~InputStreamItem() = default;
virtual InputStreamItemType Type() =0;
void *source_cookie;
};
diff --git a/src/libnrtype/OpenTypeUtil.h b/src/libnrtype/OpenTypeUtil.h
index 0a249f123..ef32e76f3 100644
--- a/src/libnrtype/OpenTypeUtil.h
+++ b/src/libnrtype/OpenTypeUtil.h
@@ -21,7 +21,7 @@
// OpenType substitution
class OTSubstitution {
public:
- OTSubstitution() {};
+ OTSubstitution() = default;;
Glib::ustring before;
Glib::ustring input;
Glib::ustring after;